From 04d3203d169439be3916c16886699b6aeb3ebc84 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Thu, 17 Mar 2022 10:48:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=93=8D=E4=BD=9C=E5=8E=9F=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=20=E6=89=80=E6=9C=89=E7=9A=84=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=20=E6=9A=82=E5=81=9C=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yieldReport/com_produce_report_normal.vue | 35 ++++++++++++++-----
 .../modules/yieldReport/produce_order.vue     |  3 ++
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 8eebfc3..9f16d90 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -93,7 +93,7 @@
               </el-button>
             </el-form-item>
             <el-form-item>
-              <el-button class="customer-bun-mid" type="primary"
+              <el-button class="customer-bun-mid" type="primary" :disabled="buttonTags.finishScheduleFlag"
                          @click="showFinishScheduleModal" style="margin-left: 10px; margin-bottom: 5px;">
                 结单
               </el-button>
@@ -374,14 +374,14 @@
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: 35px;">
-              <el-button class="customer-bun-mid" type="primary" @click="startTuningModal"
+              <el-button class="customer-bun-mid controller-bun" type="primary" @click="startTuningModal"
                          :disabled="buttonTags.tuningFlag"
                          style="margin-left: 15px; margin-bottom: 5px;">
                 开始调机
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: 35px;">
-              <el-button class="customer-bun-mid" type="primary" @click="startProduceModal"
+              <el-button class="customer-bun-mid controller-bun" type="primary" @click="startProduceModal"
                          :disabled="buttonTags.produceFlag"
                          style="margin-left: 20px; margin-bottom: 5px;">
                 开始生产
@@ -394,7 +394,7 @@
           <legend class="customer-legend">不良</legend>
           <el-form style="text-align: center;">
             <el-form-item style="margin-top: 5px;">
-              <el-button class="customer-bun-mid" @click="defectRollModal" type="primary"
+              <el-button class="customer-bun-mid controller-bun" @click="defectRollModal" type="primary"
                          :disabled="buttonTags.defectFlag"
                          style="margin-left: 0px; margin-top: 10px;">
                 报告不良
@@ -408,13 +408,13 @@
           <legend class="customer-legend">扫描</legend>
           <el-form>
             <el-form-item style="margin-top: -5px;">
-              <el-button class="customer-bun-mid" type="primary" @click="produceToolModal"
+              <el-button class="customer-bun-mid controller-bun" type="primary" @click="produceToolModal"
                          :disabled="buttonTags.toolFlag" style="margin-left: 15px; margin-top: 20px;">
                 刀模板
               </el-button>
             </el-form-item>
             <el-form-item style="margin-top: -5px;">
-              <el-button class="customer-bun-mid" type="primary" @click="produceMaterialModal"
+              <el-button class="customer-bun-mid controller-bun" type="primary" @click="produceMaterialModal"
                          :disabled="buttonTags.materialFlag" style="margin-left: 20px; margin-top: 20px;">
                 材料
               </el-button>
@@ -428,7 +428,7 @@
           <legend class="customer-legend">停机</legend>
           <el-form style="text-align: center;">
             <el-form-item>
-              <el-button class="customer-bunx-max" type="primary" @click="produceDownModal"
+              <el-button class="customer-bunx-max controller-bun" type="primary" @click="produceDownModal"
                          :disabled="buttonTags.downTimeFlag" style="margin-top: 10px;">
                 报告其他停机
               </el-button>
@@ -463,7 +463,7 @@
                     未生产下机拆卷
                   </el-button>
                 </div>
-                <el-button type="primary" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
+                <el-button type="primary" class="controller-bun" :disabled="buttonTags.finishScheduleFlag" style=" width: 80px; margin-bottom: 5px; " @click="popoverFlag=true"
                            slot="reference">其它操作
                 </el-button>
               </el-popover>
@@ -2867,7 +2867,9 @@ export default {
         defectFlag: false,
         produceToolFlag: false,
         materialFlag: false,
-        downTimeFlag: false
+        downTimeFlag: false,
+        finishScheduleFlag: false,
+        otherBunFlag: false,
       },
       dataListLoading: false,
     }
@@ -3054,6 +3056,7 @@ export default {
     },
 
     init(seqNo, operatorData) {
+      //判断是否关闭所有的页面按钮
       this.scheduleData.seqNo = seqNo;
       this.currentRollOps.seqNo = seqNo;
       this.operatorData = operatorData;
@@ -3120,9 +3123,14 @@ export default {
         this.buttonTags.toolFlag = true;
         this.buttonTags.materialFlag = true;
         this.buttonTags.downTimeFlag = true;
+        this.buttonTags.mergeRollFlag = true;
+        this.buttonTags.finishScheduleFlag = true;
       } else {
         //存在人员既可以合并卷
         this.buttonTags.mergeRollFlag = false;
+        this.buttonTags.finishScheduleFlag = false;
+        this.buttonTags.otherBunFlag = false;
+
         //刷新其他的菜单
         await refreshWorkPlatformButtons(this.scheduleData).then(({data}) => {
           if (data.resultMap.createNewRollFlag == 'Y') {
@@ -3192,8 +3200,17 @@ export default {
 
     /*不初始化操作员的方法*/
     notInitOperatorData() {
+      debugger;
       //关闭切换用户的组件
       this.showOperatorFlag = false;
+      $(".controller-bun").addClass("disabled-bun");
+      //注销用户的信息
+      this.operatorData.operatorId = '';
+      this.operatorData.operatorName = '';
+      this.operatorData.showFlag = false;
+      //刷新标题
+      this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' '
+        + this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）';
     },
 
     //切换员工modal
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index bf80e25..b444fa6 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1072,6 +1072,9 @@ export default {
     },
 
     notInitOperatorData(val){
+      //注销用户信息
+      this.operatorData.operatorId = '';
+      this.operatorData.operatorName = '';
       //关闭切换用户模态框
       this.showOperatorFlag = false;
       if (val == 0){