外协修改

pages/mes/prodReport/index.vue

@@ -62,41 +62,36 @@
               <u-form label-width="100px" :model="feedback" :rules="rules" labelAlign="right">
                 <template v-if="isWaiXie">
                   <u-row>
-                    <u-col span="4">
+                    <u-col span="6">
                       <u-form-item label="生产工单:" prop="quantity">
                         {{ feedback.workorderCode }}
                       </u-form-item>
                     </u-col>
-                    <u-col span="3">
-                      <u-form-item label="采购单号:" prop="quantity">
-                        {{ feedback.assistProcessCode }}
-                      </u-form-item>
-                    </u-col>
-                    <u-col span="5">
+                    <u-col span="6">
                       <u-form-item label="工序:" prop="nickName">
                         {{ feedback.processName }}
                       </u-form-item>
                     </u-col>
                   </u-row>
                   <u-row>
-                    <u-col span="8">
+                    <u-col span="6">
                       <u-form-item label="已收货数:" prop="quantity">
                         {{ feedback.quantityFeedback }}
                       </u-form-item>
                     </u-col>
-                    <u-col span="4">
+                    <u-col span="6">
                       <u-form-item label="未收货数:" prop="nickName">
                         {{ feedback.unquantityFeedback }}
                       </u-form-item>
                     </u-col>
                   </u-row>
                   <u-row>
-                    <u-col span="4">
+                    <u-col span="6">
                       <u-form-item label="产品料号:" prop="quantity">
                         {{ feedback.productCode }}
                       </u-form-item>
                     </u-col>
-                    <u-col span="8">
+                    <u-col span="6">
                       <u-form-item label="产品名称:" prop="nickName">
                         {{ feedback.productName }}
                       </u-form-item>
@@ -163,7 +158,7 @@
                 <u-row>
                   <u-col span="6">
                     <u-form-item label="合格数量:" prop="quantityQualify">
-                      <u-number-box :min="0" @change="quantityChanged()" :max="feedback.isSerialReport && Number(feedback.isSerialReport) === 1 ? 1 : 9999999999999999999999999999999999999999" :input-width="190"
+                      <u-number-box :min="0" @change="quantityChanged()" :max="feedback.isSerialReport && Number(feedback.isSerialReport) === 1 && !isWaiXie ? 1 : 9999999999999999999999999999999999999999" :input-width="190"
                         v-model="feedback.quantityQualify" :long-press="false"></u-number-box>
                     </u-form-item>
                   </u-col>
@@ -1228,17 +1223,11 @@ export default {
             width: 65
           },
           {
-            name: 'quantityFeedback',
+            name: 'quantityQualify',
             label: '已收货数量',
             align: 'center',
             width: 75
           },
-          {
-            name: 'assistProcessCode',
-            label: '采购单号',
-            align: 'center',
-            width: 120
-          },
           {
             name: 'processName',
             label: '工序',
@@ -1677,13 +1666,8 @@ export default {
             this.$u.toast('工序未开工');
             return;
           }
-          if(this.isWaiXie) {
-			
-            this.assistFeed();
-			
-          } else {
-            this.doFeedback();
-          }
+
+          this.doFeedback();
           break;
         case 'editProd':
           this.doEditProd();
@@ -1976,11 +1960,18 @@ export default {
               item['checked'] = true
               this.tableSelectData.push(item)
             }
-            return {
+            const returnPra = {
               ...item,
               scheduleStartDateStr: item.scheduleStartDate?item.scheduleStartDate.substring(2, 16):'',
               scheduleEndDateStr: item.scheduleEndDate ? item.scheduleEndDate.substring(2, 16) : ''
-            };
+            }
+            if (this.isWaiXie && item.proWorkorderList && item.proWorkorderList.length > 0) {
+              returnPra['workorderCode'] = item.proWorkorderList[0]['workorderCode']
+              returnPra['workorderId'] = item.proWorkorderList[0]['workorderId']
+              returnPra['productCode'] = item.proWorkorderList[0]['productCode']
+              returnPra['productName'] = item.proWorkorderList[0]['productName']
+            }
+            return returnPra;
           });
           if (this.tableData.length > 0) {
             this.curTaskInfo = this.tableData[0];
@@ -2117,32 +2108,6 @@ export default {
       this.printTemplateData.printTemplate = this.$refs.printTemplateRef.tableSelectData[0].name;
       this.printTemplateVisible = false;
     },
-    assistFeed () {
-      const taskInfo = this.tableSelectData[0];
-      this.feedbackForms = [];
-      this.feedbackUnQuantityFu = 0;
-      this.feedbackQuantityFu = 0;
-      this.$u.api.feedbackinfo({
-        assistProcessCode: taskInfo.assistProcessCode,
-        assistProcessItemCode: taskInfo.assistProcessItemCode
-      }).then((res) => {
-        if (res.code === 200) {
-          // row.quantityQualify = res.data.workorderQualify
-          const feedback = res.rows[0]
-          feedback['unquantityFeedback'] = feedback.quantity - feedback.quantityFeedback
-          feedback['quantityUnqualify'] = 0
-          feedback['quantityQualify'] = 0
-          feedback['whether'] = '1'
-          feedback['printContents'] = feedback.workorderCode
-          feedback['userName'] = this.vuex_user.userName
-          feedback['nickName'] = this.vuex_user.nickName
-          feedback['feedbackChannel'] = 'PAD'
-          feedback['feedbackTime'] = this.parseTime(new Date())
-          this.feedbackForms.push(feedback)
-          this.proVisible = true;
-        }
-      })
-    },
     async doFeedback() {
       // this.reset();
       this.feedbackUnQuantityFu = 0;
@@ -2273,10 +2238,11 @@ export default {
         } else {
           feedback.quantityQualify = item.quantityWait
         }
-        if(feedback.taskType && feedback.taskType === 3) {
+        if(this.isWaiXie) {
           feedback.quantityQualify = item.quantity - item.quantityQualify - item.quantityUnqualify
           feedback.quantityUnqualify = item.quantityUnqualify
-          feedback.workorderCode = item.workorderCode
+          feedback.quantityFeedback = item.quantityQualify
+          feedback.unquantityFeedback = item.quantity - item.quantityQualify
           feedback.closeType = ''
         }
         this.feedbackForms.push(feedback);
@@ -2623,15 +2589,41 @@ export default {
         // if (item.lastProcess) {
         //   //最后工序
         // }
-        if ((item.printTemplate || item.whether == '1') && !this.vuex_printConnect) {
-          this.$u.toast('打印机连接失败');
-          return;
-        }
+        // if ((item.printTemplate || item.whether == '1') && !this.vuex_printConnect) {
+        //   this.$u.toast('打印机连接失败');
+        //   return;
+        // }
         let apires
         if(this.isWaiXie) {
           const par = {
-            ...item,
+            //工单
+            taskWorkunitId: item.taskWorkunitId,
+            taskId: item.taskId,
+            taskCode: item.taskCode,
+            quantityFeedback: item.quantityQualify + item.quantityUnqualify,
+            quantityQualify: item.quantityQualify,
+            quantityUnqualify: item.quantityUnqualify,
             userName: item.userName || this.vuex_user.userName,
+            feedbackType: item.feedbackType,
+            routeId: item.routeId,
+            routeCode: item.routeCode,
+            processId: item.processId,
+            processCode: item.processCode,
+            processName: item.processName,
+            itemId: item.itemId,
+            itemCode: item.processCode,
+            itemName: item.processName,
+            workstationId: item.workstationId,
+            workstationCode: item.workstationCode,
+            workorderId: item.workorderId,
+            workorderCode: item.workorderCode,
+            workstationName: item.workstationName,
+            startTime: item.scheduleStartDate,
+            printTemplate: item.printTemplate,
+            netWeight: item.netWeight,
+            feedbackTime: item.feedbackTime,
+            minPackageNum: item.minPackageNum,
+            closeType: item.closeType,
             printContents: item.whether == '1' ? item.printContents : null
           }
           apires = this.$u.api
@@ -2672,9 +2664,6 @@ export default {
             par['decompressionValue'] = item.decompressionValue
             par['remark'] = item.remark
           }
-          if (item.taskType === 3) {
-            par.closeType = item.closeType
-          }
           apires = this.$u.api
           .feedback(par)
         }