From de85468ba9187b1fea53defe639f204521642c43 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Tue, 29 Mar 2022 15:00:01 +0800
Subject: [PATCH] =?UTF-8?q?produce=202022=E5=B9=B43=E6=9C=8829=E6=97=A5=20?=
 =?UTF-8?q?sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/yieldReport/com_create_recheck.vue |  4 +++-
 src/views/modules/yieldReport/produce_order.vue      | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/yieldReport/com_create_recheck.vue b/src/views/modules/yieldReport/com_create_recheck.vue
index d4cc4c2..1aceca6 100644
--- a/src/views/modules/yieldReport/com_create_recheck.vue
+++ b/src/views/modules/yieldReport/com_create_recheck.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="customer-css">
     <el-dialog :title="titleCon" v-drag
+               :close-on-click-modal="false"
                :visible.sync="createRecheckShow"
                width="300px" style="height: 680px;" class="customer-dialog">
       <el-container>
@@ -101,6 +102,7 @@ export default {
         username: this.$store.state.user.name,
         orderNo: '',
         itemNo: '',
+        scheduleDate: '',
         workCenterNo: '',
         resourceId: '',
         scheduledDate: '',
@@ -139,7 +141,7 @@ export default {
       this.pageData.seqNo = row.seqNo;
       this.pageData.rollNo = row.rollNo;
       this.pageData.operatorId = row.operatorId;
-      this.pageData.scheduleDate = row.scheduledDate;
+      this.pageData.scheduleDate = this.dayjs(new Date()).format('YYYY-MM-DD');
       this.pageData.workCenterNo = row.workCenterNo;
       //重置时间
       this.pageData.planStartTime  = this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index ef5db10..f1c4701 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -183,7 +183,7 @@
     <fqcSplitRollReport :close-on-click-modal="false"
                         :visible.sync="fqcRollShowReportFlag" ref="fqcSplitRollReport"></fqcSplitRollReport>
     <!-- 创建重检派工单   -->
-    <createRecheck ref="createRecheck"></createRecheck>
+    <createRecheck ref="createRecheck" ></createRecheck>
     <!-- 换包装   -->
     <changePackaging :close-on-click-modal="false"
                      :visible.sync="changePackagingFlag" ref="changePackaging"></changePackaging>
@@ -1136,12 +1136,14 @@ export default {
           // 暂停
           if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'N') {
             this.menuButton.pauseButton = false
-            this.menuButton.openReverseButton = true
+          }else {
+            this.menuButton.pauseButton = true
           }
           // 重开
-          if (currentRow.closedFlag == 'N' & currentRow.parkFlag == 'Y') {
-            menuButton.openReverseButton = false
-            menuButton.pauseButton = true
+          if (currentRow.closedFlag == 'N' && currentRow.parkFlag == 'Y') {
+            this.menuButton.openReverseButton = false
+          }else {
+            this.menuButton.openReverseButton = true
           }
           //  生产排料
           if (currentRow.costRollUpFlag == 'N') {