退料申请逻辑修改

pages/mes/prodReport/index.vue

@@ -789,32 +789,45 @@
       <view class="list-bar">
         <u-form :model="materialReturnFormData" label-width="100px">
           <u-row>
-            <u-col span="4">
+            <u-col span="6">
               <u-form-item label="编排单号">
                 {{ curTaskInfo.arrangeCode }}
               </u-form-item>
             </u-col>
-			<u-col span="4">
+			<u-col span="6">
+			  <u-form-item label="生产工单" prop="workorderCode">
+			    <uni-data-select v-model="materialReturnFormData.workorderCode" @change="materialReturnWorkorderChange"
+			      :localdata="curTaskInfo.workorderOption"></uni-data-select>
+			  </u-form-item>
+			</u-col>
+			<u-col span="6">
+				     <u-form-item label="退料原因" prop="returnReason">
+				    <uni-data-select v-model="curTaskInfo.returnReason" :localdata="reasonReturnList"
+				      @change="pickingCauses"></uni-data-select>
+				  </u-form-item>
+				</u-col>
+			<u-col span="6">
 			  <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>
-              </u-form-item>
-            </u-col>
-			    <u-col span="4">
-					     <u-form-item label="退料原因" prop="returnReason">
-					    <uni-data-select v-model="curTaskInfo.returnReason" :localdata="reasonReturnList"
-					      @change="pickingCauses"></uni-data-select>
-					  </u-form-item>
-					</u-col>
+			
+           
+			   
           </u-row>
         </u-form>
-
-        <scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 280 + 'px' }">
+		<scroll-view scroll-y="true" class="scroll-list" :style="{ height: this.screenHeight - 700 + 'px' }">
+		  <uni-table ref="qcTable" border stripe :loading="loading" emptyText="未查询到数据">
+		    <uni-tr>
+		      
+		    </uni-tr>
+		    <uni-tr v-for="(line, index) in materialReturnList" :key="index">
+		  
+		    </uni-tr>
+		  </uni-table>
+		</scroll-view>
+
+        <!-- <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>
               <uni-th width="60px" align="center">操作</uni-th>
@@ -845,7 +858,7 @@
                 }}</uni-td>
             </uni-tr>
           </uni-table>
-        </scroll-view>
+        </scroll-view> -->
       </view>
     </u-modal>
 
@@ -3468,7 +3481,7 @@ export default {
         let data = {
           itemId: s.itemId,
           taskId: taskInfo.taskId,
-          backNum: s.applyNum,
+          backNum: s.quantityIssued,
           issueLineId: s.lineId,
           taskWorkunitId: this.curTaskInfo.taskWorkunitId,
           workOrderId: s.workorderId,
@@ -3478,12 +3491,11 @@ export default {
           isQualified: s.isQualified,
 		  returnReason: this.curTaskInfo.returnReason,
         };
-		a=a+s.applyNum;
         if (this.materialReturnFormData.workorderCode) {
           data.workorderCode = this.materialReturnFormData.workorderCode;
         } else {
           // data.workorderCode = this.curTaskInfo.workorderOption.flatMap((it) => it.value).join(',');
-		  data.workorderCode = null;
+		  data.workorderCode = s.workorderCode;
         }
         return data;
       });
@@ -3496,7 +3508,7 @@ export default {
           t.$u.toast('保存成功');
         }
       });
-	if(this.materialReturnFormData.number>=1&a>0){
+	if(this.materialReturnFormData.number>=1){
 	for(let i=0; i<this.materialReturnFormData.number ;i++){
 		this.printPdfSocket({
 					  reportName: 'mysql:qrcode-50*50-2',