Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

pages/mes/prodReport/index.vue

@@ -708,12 +708,17 @@
       <view class="list-bar">
         <u-form :model="materialReturnFormData" label-width="100px">
           <u-row>
-            <u-col span="6">
+            <u-col span="4">
               <u-form-item label="编排单号">
                 {{ curTaskInfo.arrangeCode }}
               </u-form-item>
             </u-col>
-            <u-col span="6">
+			<u-col span="4">
+			  <u-form-item label="打印">
+			   <u-input v-model="materialReturnFormData.number"></u-input>
+			  </u-form-item>
+			</u-col>
+            <u-col span="4">
               <u-form-item label="生产工单" prop="workorderCode">
                 <uni-data-select v-model="materialReturnFormData.workorderCode" @change="materialReturnWorkorderChange"
                   :localdata="curTaskInfo.workorderOption"></uni-data-select>
@@ -721,6 +726,7 @@
             </u-col>
           </u-row>
         </u-form>
+
         <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
           <uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
             <uni-tr>
@@ -1331,7 +1337,8 @@ export default {
       materialReturnFormData: {
         itemName: null,
         applyNum: 1,
-        workorderCode: null
+        workorderCode: null,
+		number: 1,
       },
       materialReturnProcessItemData: {
         itemName: null,
@@ -2061,6 +2068,9 @@ export default {
         feedback.quantityUnqualify = quq / feedback.unitOfConvert;
       }
 
+      feedback.quantityUnqualify = feedback.quantityUnqualify === null ? 0 : feedback.quantityUnqualify;
+      feedback.quantityQualify = feedback.quantityQualify === null ? 0 : feedback.quantityQualify;
+
       feedback.quantity = feedback.quantityUnqualify + feedback.quantityQualify;
 
 
@@ -2741,21 +2751,23 @@ export default {
 			return `SN${year}${month}${day}${randomNumber}`
 		},
     materialReturnSave() {
-      const taskInfo = this.tableSelectData[0];
-			const apply_no = this.formatDateRandom()
+		let a=null;
+		const taskInfo = this.tableSelectData[0];
+		const apply_no = this.formatDateRandom()
       const rst = this.materialReturnList.map((s) => {
         let data = {
           itemId: s.itemId,
           taskId: taskInfo.taskId,
           backNum: s.applyNum,
           issueLineId: s.lineId,
-          taskWorkunitId: this.curTaskInfo.taskWorkunitId,
+          taskWorkunitId: this.curTaskInfo.taskWorkunNitId,
           workOrderId: s.workorderId,
           batchNo: s.batchCode,
           packNo: s.packNo,
-					apply_no: apply_no,
+		  applyNo: apply_no,
           isQualified: s.isQualified
         };
+		a=a+s.applyNum;
         if (this.materialReturnFormData.workorderCode) {
           data.workorderCode = this.materialReturnFormData.workorderCode;
         } else {
@@ -2773,7 +2785,33 @@ export default {
           t.$u.toast('保存成功');
         }
       });
+	if(this.materialReturnFormData.number>=1&a>0){
+	for(let i=0; i<this.materialReturnFormData.number ;i++){
+		this.printPdfSocket({
+					  reportName: 'mysql:qrcode-50*50-2',
+					  values:{
+						  detail:[
+							  {
+								barcode: apply_no,
+								showText: '退料单号:'+apply_no,
+								gp: i+1
+								  
+							  },
+							  {
+							  	barcode: apply_no,
+							  	showText: '退料单号:'+apply_no,
+							  	gp: i+1
+							  					  
+							  }
+						  ]
+					  }
+				  });
+	    }	  
+	  }
+	    
     },
+
+
     stockInShow() {
       this.stockInVisible = true;
     }