结束派工单

src/views/modules/yieldReport/com_finish_schedule.vue

@@ -9,13 +9,13 @@
           <legend>数量</legend>
           <el-col :span="9" style="margin-left: 35px; margin-top: -8px;">
           <el-form-item class="customer-item" label="总良品数量(PCS):" style="margin-top: -10px;">
-            <el-input v-model="pageData.totalApprovedQty" type="number"  @blur="checkValidApprovedQty"
+            <el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"
                       style="width: 80px;" ></el-input>
           </el-form-item>
           </el-col>
           <el-col :span="9" style="margin-top: -8px;">
           <el-form-item class="customer-item" label="总不良品数量(PCS):" style="margin-top: -10px;">
-            <el-input v-model="pageData.totalDefectedQty" disabled="disabled" style="width: 100px;"></el-input>
+            <el-input v-model="pageData.defectedQty" disabled="disabled" style="width: 100px;"></el-input>
           </el-form-item>
           </el-col>
         </fieldset>
@@ -288,8 +288,8 @@ export default {
         itemNo: 0,
         seqNo: '',
         operatorId: '',
-        totalApprovedQty: 0,
-        totalDefectedQty: 0,
+        approvedQty: 0,
+        defectedQty: 0,
         reportedTime: this.dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
         scheduledDate: '',
         shiftDesc: '',
@@ -311,6 +311,7 @@ export default {
         remark: '',
         exceptionFlag: 'N',
         exceptionReason: '',
+        autoTool: 'N',//是否自动处理工具
       },
       operatorData: {
         site: this.$store.state.user.site,
@@ -906,8 +907,8 @@ export default {
     /*刷新当前的页面参数*/
     refreshPageData(){
       getFinishSchedulePageData(this.pageData).then(({data}) => {
-        this.pageData.totalApprovedQty = data.resultMap.reportedQty;//总良品数量
-        this.pageData.totalDefectedQty = data.resultMap.defectedQty;//总不良品数量
+        this.pageData.approvedQty = data.resultMap.reportedQty;//总良品数量
+        this.pageData.defectedQty = data.resultMap.defectedQty;//总不良品数量
         //调机的数据
         this.pageData.totalSetupTime = data.resultMap.totalSetupTime;//总调机时间
         this.pageData.totalDowntimeTimeSetup = data.resultMap.totalDowntimeTimeSetup;//总调机过程停机时间
@@ -969,26 +970,10 @@ export default {
       });
     },
 
-
-
-    /*添加定制的css类*/
-    customerCellClassName({row, column, rowIndex, columnIndex}) {
-      if(column.property == 'netIssueQty'){
-        return 'customer-number-cell';
-      }
-    },
-
-    /*添加定制的cess样式*/
-    customerCellStyle({row, column, rowIndex, columnIndex}) {
-      if(column.property == 'netIssueQty'){
-        return 'padding: 0px 0px;';
-      }
-    },
-
     /*检验良品的总数量*/
     checkValidApprovedQty(){
       //首先判断数值是否通过判断
-      let approvedQty = this.pageData.totalApprovedQty;
+      let approvedQty = this.pageData.approvedQty;
       if(approvedQty == null || approvedQty == ''){
         this.$message.error('请输入总良品数量!');
         this.pageData.approvedQty = 0;//重新赋值
@@ -999,15 +984,15 @@ export default {
     /*结束当前的操作*/
     finishScheduleBun(){
       //首先判断数值是否通过判断
-      let totalApprovedQty = this.pageData.totalApprovedQty;
-      if(totalApprovedQty == null || totalApprovedQty == ''){
+      let approvedQty = this.pageData.approvedQty;
+      if(approvedQty == null || approvedQty == ''){
         this.$message.error('请输入总良品数量!');
-        this.pageData.totalApprovedQty = 0;//重新赋值
+        this.pageData.approvedQty = 0;//重新赋值
         return false;
       }
-      if(totalApprovedQty <= 0){
+      if(approvedQty <= 0){
         this.$message.error('总良品数量必须大于0!');
-        this.pageData.totalApprovedQty = 0;//重新赋值
+        this.pageData.approvedQty = 0;//重新赋值
         return false;
       }
       //班次判断
@@ -1016,11 +1001,8 @@ export default {
         return false;
       }
 
-      //验证通过提交到后台
-      let postData = {'pageData': JSON.stringify(this.pageData), 'materialList': JSON.stringify(this.sfdcMaterialList)};
-
       //先调用检查方法
-      checkFinishRollWithNoFqc(postData).then(({data}) => {
+      checkFinishScheduleWithNoFqc(this.pageData).then(({data}) => {
         //判断是否成功
         if(data.code == 500){
           this.$message.error(data.msg);

src/views/modules/yieldReport/com_produce_report_normal.vue

@@ -61,36 +61,43 @@
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="createNewRollFun" :disabled="buttonTags.createNewRollFlag"
-                         style="margin-left: 10px; margin-bottom: 5px;">
+                         style="margin-left: 0px; margin-bottom: 5px;">
                 创建新卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="switchRollModal" :disabled="buttonTags.switchRollFlag"
-                         style="margin-left: 10px; margin-bottom: 5px;">
+                         style="margin-left: 0px; margin-bottom: 5px;">
                 切换卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="separateRollModal" :disabled="buttonTags.separateRollFlag"
-                         style="margin-left: 10px; margin-bottom: 5px;">
+                         style="margin-left: 0px; margin-bottom: 5px;">
                 创建分卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" :disabled="buttonTags.finishRollFlag"
-                         @click="finishRollModal" style="margin-left: 10px; margin-bottom: 5px;">
+                         @click="finishRollModal" style="margin-left: 0px; margin-bottom: 5px;">
                 结束卷
               </el-button>
             </el-form-item>
             <el-form-item>
               <el-button type="primary" :disabled="buttonTags.mergeRollFlag"
-                         @click="mergeRollModal" style="margin-left: 10px; margin-bottom: 5px;">
+                         @click="mergeRollModal" style="margin-left: 0px; margin-bottom: 5px;">
                 合并卷
               </el-button>
             </el-form-item>
+            <el-form-item>
+              <el-button type="primary"
+                         @click="showFinishScheduleModal" style="margin-left: 0px; margin-bottom: 5px;">
+                结单
+              </el-button>
+            </el-form-item>
           </el-form>
         </fieldset>
+
         <!-- 列表展示区域 -->
         <fieldset class="customer-fieldset" style="margin-bottom: 10px; width: 585px; height: 260px;">
           <legend class="customer-legend">列表信息</legend>
@@ -478,6 +485,13 @@
 
     </comProduceDown>
 
+    <!-- 正常的组件 -->
+    <comFinishSchedule :close-on-click-modal="false"
+                       :visible.sync="showFinishScheduleFlag" ref="comFinishSchedule">
+
+
+    </comFinishSchedule>
+
   </div>
 
 </template>
@@ -512,6 +526,7 @@ import comReplaceTool from "./com_replace_tool";/*生产过程的工具组件*/
 import comProduceMaterial from "./com_produce_material";/*生产过程的材料组件*/
 import comReplaceMaterial from "./com_replace_material"/*换料组件*/
 import comProduceDown from "./com_produce_down";/*停机组件*/
+import comFinishSchedule from "./com_finish_schedule";/*结束派工单组件*/
 /*生产过程的停机组件*/
 export default {
   name: "com_produce_report_normal",
@@ -531,6 +546,7 @@ export default {
       showMaterialFlag: false,
       showReplaceMaterialFlag: false,
       showDownFlag: false,
+      showFinishScheduleFlag: false,
       activeTable: 'sfdc_time',
       sfdcTimeList: [],
       orderToolList: [],
@@ -2773,6 +2789,7 @@ export default {
     comProduceMaterial,/*生产过程的材料组件*/
     comReplaceMaterial,/*换料的组件*/
     comProduceDown,/*生产过程的停机组件*/
+    comFinishSchedule,/*结束派工单的组件*/
   },
   methods: {
     // 获取派工单的信息
@@ -3204,6 +3221,21 @@ export default {
       });
     },
 
+    //打开结束派工单的modal
+    showFinishScheduleModal() {
+      //打开操作员切换功能
+      this.showFinishScheduleFlag = true;
+      this.$nextTick(() => {
+        this.$refs.comFinishSchedule.init(this.scheduleData, this.operatorData);
+      });
+    },
+
+    //结束派工单后刷新页面
+    processFinishScheduleOperation(){
+      //刷新当前页面的数据
+      this.refreshPageTables();
+    },
+
     //创建新卷的方法
     createNewRollDo() {
       createNewRoll(this.scheduleData).then(({data}) => {

src/views/modules/yieldReport/produce_order.vue

@@ -119,9 +119,10 @@
 
     </comProduceReportNormal>
 
-    <!-- 正常报工的组件 -->
+    <!-- 正常的结束派工单组件 -->
     <comFinishSchedule :close-on-click-modal="false"
-                            :visible.sync="showFinishScheduleFlag" ref="comFinishSchedule">
+                            :visible.sync="showFinishScheduleFlag" ref="comFinishSchedule"
+                       @processFinishScheduleOperation = "processFinishScheduleOperation">
 
     </comFinishSchedule>
 
@@ -1038,6 +1039,12 @@ export default {
       });
     },
 
+    //结束派工单后刷新页面
+    processFinishScheduleOperation(){
+      //刷新当前页面的数据
+      this.refreshPageTables();
+    },
+
     //保存操作员的信息
     saveOperatorData() {
       //查询操作员信息