From 139bce07e733753f910530f7b4f814c10c89a3b7 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Fri, 22 Apr 2022 15:38:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=88=87=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=88=86=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_split_order_finish_roll.vue   |  2 +-
 .../yieldReport/com_split_order_report.vue        | 15 ++++++++-------
 src/views/modules/yieldReport/produce_order.vue   |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/yieldReport/com_split_order_finish_roll.vue b/src/views/modules/yieldReport/com_split_order_finish_roll.vue
index 92cf8e7..7c020c4 100644
--- a/src/views/modules/yieldReport/com_split_order_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_split_order_finish_roll.vue
@@ -554,7 +554,7 @@ export default {
       //初始化操作员对象
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //初始化标题
-      this.titleCon = '结束卷-分切操作 \
+      this.titleCon = '结束卷-操作 \
        派工单号:'+scheduleData.seqNo;
       //处理异常的原因
       this.pageData.exceptionFlag = 'N';
diff --git a/src/views/modules/yieldReport/com_split_order_report.vue b/src/views/modules/yieldReport/com_split_order_report.vue
index e4117fc..fe7d9c8 100644
--- a/src/views/modules/yieldReport/com_split_order_report.vue
+++ b/src/views/modules/yieldReport/com_split_order_report.vue
@@ -440,7 +440,7 @@
         <!--其他操作-->
         <fieldset class="customer-fieldset"
                   style="margin-left: 680px; margin-bottom: 10px; width: 200px; height: 105px;">
-          <legend class="customer-legend">其他操作</legend>
+          <legend class="customer-legend">其它操作</legend>
           <el-form style="text-align: center;">
 
             <el-form-item style="margin-top: 20px ; margin-left: 10px">
@@ -449,8 +449,8 @@
                 width="150"
                 content
                 v-model="popoverFlag"
-                trigger="click">
-                <div style="text-align: right; margin: 0;width: 120px;">
+                trigger="click" :disabled="true">
+                <div style="text-align: right; margin: 0;width: 120px;"  v-show="false">
                   <el-button type="primary" @click="finishPartRollModal"
                              style=" width: 120px; margin-bottom: 5px; margin-left: 3PX">
                     产量报告
@@ -465,9 +465,9 @@
                     未生产下机拆卷
                   </el-button>
                 </div>
-                <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag"
-                           style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
-                           slot="reference">其它操作
+                <el-button type="primary" class="controller-bun"  :disabled="buttonTags.otherFlag"
+                           style="width: 80px; margin-bottom: 5px; " @click="popoverFlag=false"
+                           slot="reference">其她操作
                 </el-button>
               </el-popover>
             </el-form-item>
@@ -2784,6 +2784,7 @@ export default {
         downTimeFlag: false,
         finishScheduleFlag: false,
         otherBunFlag: false,
+        otherFlag: true,
       },
       dataListLoading: false,
     }
@@ -3180,7 +3181,7 @@ export default {
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //切换当前账户的信息
       //设置弹窗的标题
-      this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' '
+      this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ''
         + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）';
       //刷新菜单
     },
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index eab2cea..0f5aa64 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1691,7 +1691,7 @@ export default {
       }
 
       //分切报工
-      if (val == 5) {
+      if (val == 8) {
         //分切报工
         this.showSplitOrderReportModal();
       }