From 112fbaa4f5e98e1ce78ee0369b05fd97dbc2a912 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sat, 16 Sep 2023 13:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=20=E5=B8=83=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Middle/Mold/MoldOrder/dataset.js             |  3 +--
 .../Mold/MoldProductionOrder/ComponentDetail.vue       | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/pages/Middle/Mold/MoldOrder/dataset.js b/src/pages/Middle/Mold/MoldOrder/dataset.js
index df14b27..1c5027a 100644
--- a/src/pages/Middle/Mold/MoldOrder/dataset.js
+++ b/src/pages/Middle/Mold/MoldOrder/dataset.js
@@ -43,8 +43,7 @@ var dataset = {
             { field: 'inlay_deep_hole_time', type: 'timestamp' },
             { field: 'update_uid', type: 'bigint' },
             { field: 'mold_id', type: 'bigint' },
-            { field: 'mold_master_uid', type: 'bigint' },
-            { field: 'manufacture_cycle', type: 'timestamp' }, 
+            { field: 'mold_master_uid', type: 'bigint' }, 
             { field: 'product_structure_uid', type: 'bigint' }, 
             { field: 'mold_structure_uid', type: 'bigint' },  
             { field: 'create_uid', type: 'bigint' }
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index 41b464c..8853220 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -33,11 +33,9 @@
 
       <vxe-column title="完成" width="160" v-if="getDataId()">
         <template #default="{ row }">
-          <div>
-
-            <a-button v-if="pageIsComplete()" @click.stop="pageComplete(row)" type="primary">完成</a-button>
-
+          <div v-if="row.id"> 
             <div v-if="row.complete_time">{{ $mk.getDateString(row.complete_time) }}</div>
+            <a-button v-else :disabled="!(isComponentOutProduct() || pageIsComplete())" @click.stop="pageComplete(row)" type="primary">完成</a-button>
           </div>
         </template>
       </vxe-column>
@@ -86,7 +84,7 @@
 
       <vxe-column title="发料" width="210" v-if="getDataId()">
         <template #default="{ row }">
-          <div>
+          <div  v-if="row.id">
             <a-button v-if="!row.is_send" @click.stop="pageSend(row)" type="primary">发料</a-button>
             <div v-if="row.is_send">
 
@@ -99,7 +97,7 @@
 
       <vxe-column title="完成" width="210" v-if="getDataId()">
         <template #default="{ row }">
-          <div v-if="row.is_send">
+          <div v-if="row.id && row.is_send">
             <a-button v-if="!row.is_complete" @click.stop="pageDone(row)" type="primary">完成</a-button>
             <div v-if="row.is_complete">
               {{ $mk.getDateString(row.complete_time) }}