From 9e6926f532c460995f4994286b6354762f7cb283 Mon Sep 17 00:00:00 2001
From: rui_li <877258667@qq.com>
Date: Wed, 17 Nov 2021 17:32:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E9=87=8F=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/yieldReport/produce_order.vue     |  3 +-
 .../yieldReport/produce_report_normal.vue     | 87 +++++++++++++++----
 2 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index f924dbc..4c99202 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -1002,6 +1002,7 @@ export default {
       getOperatorData(this.operatorData).then(({data}) => {
         let operatorData = data.row;
         let status = operatorData.status;
+        this.operatorData.operatorName = data.row.operatorName;
         //重置操作员信息状态
         this.operatorData.status = status;
         //判断是否验证通过
@@ -1025,7 +1026,7 @@ export default {
           this.showReportFlag = true;
           //打开报工操作页面
           this.$nextTick(() => {
-            this.$refs.produceReportNormal.init(this.currentRow.seqNo);
+            this.$refs.produceReportNormal.init(this.currentRow.seqNo, this.operatorData);
           });
         })
     }
diff --git a/src/views/modules/yieldReport/produce_report_normal.vue b/src/views/modules/yieldReport/produce_report_normal.vue
index d833b60..b413616 100644
--- a/src/views/modules/yieldReport/produce_report_normal.vue
+++ b/src/views/modules/yieldReport/produce_report_normal.vue
@@ -2,7 +2,7 @@
   <div class="produce-report customer-css">
     <el-dialog v-drag
       width="830px" class="customer-dialog"
-      :title="'生产报工'"
+      :title="titleCon"
       :close-on-click-modal="false"
       :visible.sync="visibleFlag">
       <el-form :inline="true" label-position="top" style="height: 480px;"               label-width="80px">
@@ -59,23 +59,23 @@
             <span>{{this.currentRollOps.rollNo}}</span>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
               创建新卷</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.switchRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
               切换卷</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.separatorRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
               创建分卷</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.finishRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
               结束卷</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.mergeRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
               合并卷</el-button>
           </el-form-item>
         </el-form>
@@ -288,7 +288,7 @@
         <legend class="customer-legend">生产调机</legend>
         <el-form>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 20px; margin-top: 20px; margin-bottom: 25px;">
+            <el-button type="primary" @click="refreshPageData"  style="margin-left: 20px; margin-top: 20px; margin-bottom: 25px;">
               刷新</el-button>
           </el-form-item>
           <el-form-item>
@@ -296,11 +296,11 @@
               切换用户</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary" :disabled="buttonTags.tuningFlag" style="margin-left: 10px; margin-bottom: 5px;">
               开始调机</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">
+            <el-button type="primary"  :disabled="buttonTags.produceFlag" style="margin-left: 10px; margin-bottom: 5px;">
               开始生产</el-button>
           </el-form-item>
         </el-form>
@@ -310,7 +310,7 @@
         <legend class="customer-legend">不良</legend>
         <el-form>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 50px; margin-top: 10px;">
+            <el-button type="primary" :disabled="buttonTags.defectFlag" style="margin-left: 50px; margin-top: 10px;">
               报告不良</el-button>
           </el-form-item>
         </el-form>
@@ -321,11 +321,11 @@
         <legend class="customer-legend">扫描</legend>
         <el-form>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 30px; margin-top: 20px;">
+            <el-button type="primary"  :disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;">
               刀模板</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 10px; margin-top: 20px;">
+            <el-button type="primary" :disabled="buttonTags.materialFlag" style="margin-left: 10px; margin-top: 20px;">
               材料</el-button>
           </el-form-item>
         </el-form>
@@ -336,7 +336,7 @@
         <legend class="customer-legend">停机</legend>
         <el-form>
           <el-form-item>
-            <el-button type="primary" style="margin-left: 30px; margin-top: 10px;">
+            <el-button type="primary" :disabled="buttonTags.downTimeFlag" style="margin-left: 30px; margin-top: 10px;">
               报告其他停机</el-button>
           </el-form-item>
         </el-form>
@@ -364,6 +364,7 @@ export default {
   name: "produce_report_normal",
   data() {
     return {
+      titleCon:'',
       visibleFlag: false,
       activeTable: 'sfdc_time',
       sfdcTimeList: [],
@@ -2535,6 +2536,28 @@ export default {
         site: this.$store.state.user.site,
         seqNo: '',
         rollNo: '',
+        finishedFlag: '',
+      },
+      operatorData: {
+        site: this.$store.state.user.site,
+        username: this.$store.state.user.name,
+        operatorId: '',
+        operatorName: '',
+        status: '',
+        showFlag: false
+      },
+      buttonTags:{
+        createRollFlag: true,
+        switchRollFlag: true,
+        separatorRollFlag: true,
+        finishRollFlag: true,
+        mergeRollFlag: true,
+        tuningFlag: true,
+        produceFlag: true,
+        defectFlag: true,
+        toolFlag: true,
+        materialFlag: true,
+        downTimeFlag: true
       },
       dataListLoading: false,
     }
@@ -2543,13 +2566,24 @@ export default {
     // 获取多语言列表
     getScheduleDataBySeqNo(){
       getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
-        this.scheduleData = data.row;
+        this.scheduleData.seqNo= data.row.seqNo;
+        this.scheduleData.orderNo= data.row.orderNo;
+        this.scheduleData.partNo= data.row.partNo;
+        this.scheduleData.partDesc= data.row.partDesc;
+        this.scheduleData.planStartTime= data.row.planStartTime;
+        this.scheduleData.planFinishTime= data.row.planFinishTime;
+        this.scheduleData.qtyRequiredOriginal= data.row.qtyRequiredOriginal;
+        this.scheduleData.scheduledDate= data.row.scheduledDate;
+        this.scheduleData.shiftNo= data.row.shiftNo;
+        this.scheduleData.preItemDesc= data.row.preItemDesc;
+        this.scheduleData.nextItemDesc= data.row.nextItemDesc;
       });
     },
     // 获取当前卷的信息
     getCurrentRollOpsBySeqNo(){
       getCurrentRollOpsBySeqNo(this.currentRollOps).then(({data}) => {
-        this.currentRollOps = data.row;
+        this.currentRollOps.rollNo = data.row.rollNo;
+        this.currentRollOps.finishedFlag = data.row.finishedFlag;
       });
     },
 
@@ -2620,7 +2654,9 @@ export default {
       //判断是否按照当前卷来查询
       if(this.scheduleData.currentRollFlag){
         //设置相关的卷号 判断是否存在卷
-        this.scheduleData.rollNo = data.row.rollNo;
+        this.scheduleData.rollNo = this.currentRollOps.rollNo;
+      }else{
+        this.scheduleData.rollNo = '';
       }
       //区分不同的页签刷新不同的列表数据
       if(this.activeTable == 'sfdc_time'){
@@ -2641,9 +2677,11 @@ export default {
     },
 
 
-    init(seqNo) {
+    init(seqNo, operatorData) {
+      debugger;
       this.scheduleData.seqNo = seqNo;
       this.currentRollOps.seqNo = seqNo;
+      this.operatorData = operatorData;
       //刷新当前派工单的信息
       this.refreshPageData();
     },
@@ -2651,7 +2689,20 @@ export default {
     //刷新页面的数据
     refreshPageData(){
       getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
-        this.scheduleData = data.row;
+        this.scheduleData.seqNo= data.row.seqNo;
+        this.scheduleData.orderNo= data.row.orderNo;
+        this.scheduleData.partNo= data.row.partNo;
+        this.scheduleData.partDesc= data.row.partDesc;
+        this.scheduleData.planStartTime= data.row.planStartTime;
+        this.scheduleData.planFinishTime= data.row.planFinishTime;
+        this.scheduleData.qtyRequiredOriginal= data.row.qtyRequiredOriginal;
+        this.scheduleData.scheduledDate= data.row.scheduledDate;
+        this.scheduleData.shiftNo= data.row.shiftNo;
+        this.scheduleData.preItemDesc= data.row.preItemDesc;
+        this.scheduleData.nextItemDesc= data.row.nextItemDesc;
+        //设置弹窗的标题
+        this.titleCon = '机台工作台' + ' - ' + data.row.workCenterDesc + ' '
+          + data.row.resourceDesc + ' （' + this.operatorData.operatorName+ '）';
       }).then(() => {
         //打开模态框
         this.visibleFlag = true;