结束派工单

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -2809,7 +2809,6 @@ export default {
         }
         //设置查询的数据
         this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
-        console.log(123)
       });
     },
 
@@ -2877,7 +2876,6 @@ export default {
 
     //刷新页签的table数据
     async refreshCurrentTabTable() {
-      console.log(456)
       //设置查询的数据
       this.searchData = JSON.parse(JSON.stringify(this.scheduleData));
       //判断是否按照当前卷来查询
@@ -2918,7 +2916,6 @@ export default {
     //刷新页面的数据
     async refreshPageData() {
       await getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
-        console.log(12)
         this.scheduleData.seqNo = data.row.seqNo;
         this.scheduleData.orderNo = data.row.orderNo;
         this.scheduleData.itemNo = data.row.itemNo;

src/views/modules/yieldReport/produce_order.vue

@@ -8,7 +8,7 @@
           <el-button type="primary" style="margin-left: 10px;  margin-bottom: 5px;">列表</el-button>
         </el-form-item>
         <el-form-item :label="''">
-          <el-button type="primary" style="margin-left: 10px;  margin-bottom: 5px;">关闭</el-button>
+          <el-button type="primary" @click="showFinishScheduleModal" style="margin-left: 10px;  margin-bottom: 5px;">结单</el-button>
         </el-form-item>
         <el-form-item :label="''">
           <el-button type="primary" @click="refreshPageTables()"
@@ -119,6 +119,12 @@
 
     </comProduceReportNormal>
 
+    <!-- 正常报工的组件 -->
+    <comFinishSchedule :close-on-click-modal="false"
+                            :visible.sync="showFinishScheduleFlag" ref="comFinishSchedule">
+
+    </comFinishSchedule>
+
   </div>
 </template>
 
@@ -127,10 +133,11 @@
 import {
   getProduceScheduleList,
 } from '@/api/yieldReport/produce_order.js';
+
 /*引入组件*/
 import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
 import comProduceReportNormal from "./com_produce_report_normal";/* 报工的组件*/
-import comFinishRoll from "./com_finish_roll";/*结束卷的组件*/
+import comFinishSchedule from "./com_finish_schedule";/*结束派工的组件*/
 
 export default {
   data() {
@@ -138,7 +145,7 @@ export default {
       height: 800,
       showOperatorFlag: false,
       showReportFlag: false,
-      showFinishFlag:false,
+      showFinishScheduleFlag:false,
       searchData: {
         site: this.$store.state.user.site,
         resourceId: '',
@@ -946,7 +953,7 @@ export default {
   components: {
     comSwitchOperator,/*切换用户的组件*/
     comProduceReportNormal,/*报工页面的组件*/
-    comFinishRoll,/*结束卷的组件*/
+    comFinishSchedule,/*结束派工单的组件*/
   },
   mounted() {
     this.$nextTick(() => {
@@ -1017,6 +1024,20 @@ export default {
       });
     },
 
+    //打开结束派工单的modal
+    showFinishScheduleModal() {
+      //首先判断是否选择好派工单
+      if (JSON.stringify(this.currentRow) == '{}') {
+        this.$message.error('请先选择派工单!');
+        return false;
+      }
+      //打开操作员切换功能
+      this.showFinishScheduleFlag = true;
+      this.$nextTick(() => {
+        this.$refs.comFinishSchedule.init(this.currentRow, this.operatorData);
+      });
+    },
+
     //保存操作员的信息
     saveOperatorData() {
       //查询操作员信息