From 637d61250b9cf8288f07a51ad57db8df91527841 Mon Sep 17 00:00:00 2001
From: xielue <gd_star@163.com>
Date: Sat, 16 Sep 2023 10:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=85=B7=20=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9C=AA=E5=8F=91=E6=96=99=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E8=B5=B7=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Middle/Mold/MoldProductionOrder/ComponentDetail.vue    | 2 +-
 src/pages/Middle/Mold/MoldProductionOrder/Edit.vue         | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
index 1505e65..6b19b13 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/ComponentDetail.vue
@@ -98,7 +98,7 @@
 
       <vxe-column title="完成" width="210">
         <template #default="{ row }">
-          <div v-if="getDataId()">
+          <div v-if="getDataId() && 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) }}
diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
index 8196232..1be256b 100644
--- a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
+++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue
@@ -571,7 +571,10 @@ export default {
             this.formOptions.data.horizontal_frame_time = this.getDateValue(detail.horizontal_frame_time);
 
           }
-
+          if(detail.mold_master_uid){
+            this.formOptions.data.mold_master_uid = detail.mold_master_uid;
+            this.formOptions.data.mold_master_user_detail = {id:detail.mold_master_user_detail.id,name:detail.mold_master_user_detail.name};
+          }
 
           this.formOptions.data = JSON.parse(JSON.stringify(this.formOptions.data))
 
@@ -596,6 +599,8 @@ export default {
 
 
           let row = a.data.mold_scheme;
+
+           
           let mold_scheme_processes = row.mold_scheme_processes || [];
           let currentAddRows1 = [];
           let currentAddRows2 = [];