0513

src/views/business/outsourcedOrderDetails/index.vue

@@ -101,7 +101,7 @@
 								<el-button type="success" icon="Finished" circle @click="handleSaveRow(scope.row)" />
 								<el-button type="danger" icon="Close" circle @click="handleCancelRow(scope.row)" />
 							</template>
-							<el-button v-else type="primary" icon="Bell" @click="handleStartReport(scope.row)">报工</el-button>
+							<el-button v-else type="primary" :disabled="scope.row.auditNum || scope.row.auditNum == 0"   icon="Bell" @click="handleStartReport(scope.row)">报工</el-button>
 						</template>
 					</el-table-column>
 				</el-table>

src/views/business/returnReceipt/form.vue

@@ -67,7 +67,7 @@
 							prop="newCarrier"
 							width="320"
 						/>
-						<el-table-column label="外协工序" align="center" prop="processNames" width="320" />
+						<el-table-column label="外协工序" align="center" prop="processAlias" width="320" />
 						<el-table-column label="收回数量" align="center" prop="receiptNum" width="104"/>
 						<el-table-column label="备注" align="center" prop="remark">
 							<template #default="scope">
@@ -144,26 +144,36 @@ const handleShowDialogOutSourceDetails = () => {
 }
 // 外协明细选择带回
 const handleMultipleSelectedOutsourceDetails = (selection) => {
-	selection.forEach((item) => {
-		const newDetail = {
-			outsourceDetailId: item.id,
-			productDescription: item.productDescription,
-			lotCode:item.lotCode,
-			lotId:item.lotId,
-			dayworkId:item.dayworkId,
-			productId:item.productId,
-			productNum: item.productNum,
-			receiptNum: item.receiptNum,
-			originalCarrier:item.originalCarrier,
-			originalCarrierCount:item.originalCarrierCount,
-			newCarrier:item.newCarrier,
-			newCarrierCount:item.newCarrierCount,
-			processNames: item.processNames,
-			remark: ''
+	for(let i = 0;i<selection.length;i++) {
+		for(let j = 0;j<selection[i].outsourcedOrderDetailProcessList.length;j++) {
+			const newDetail = {
+			outsourceDetailId: selection[i].id,
+			productDescription: selection[i].productDescription,
+			lotCode:selection[i].lotCode,
+			lotId:selection[i].lotId,
+			dayworkId:selection[i].dayworkId,
+			productId:selection[i].productId,
+			productNum: selection[i].productNum,
+			receiptNum: selection[i].outsourcedOrderDetailProcessList[j].qualifiedNum,
+			originalCarrier:selection[i].originalCarrier,
+			originalCarrierCount:selection[i].originalCarrierCount,
+			newCarrier:selection[i].newCarrier,
+			newCarrierCount:selection[i].newCarrierCount,
+			processNames: selection[i].processNames,
+			remark: '',
+			technologicalProcessId:selection[i].outsourcedOrderDetailProcessList[j].technologicalProcessId,
+			technologyVersion:selection[i].outsourcedOrderDetailProcessList[j].technologyVersion,
+			technologicalProcessDetailId:selection[i].outsourcedOrderDetailProcessList[j].technologicalProcessDetailId,
+			processId:selection[i].outsourcedOrderDetailProcessList[j].processId,
+			processAlias:selection[i].outsourcedOrderDetailProcessList[j].processAlias,
+			processCode:selection[i].outsourcedOrderDetailProcessList[j].processCode,
+			processStepNumber:selection[i].outsourcedOrderDetailProcessList[j].processStepNumber
+			}
+		    form.value.details.push(newDetail)
+
 		}
-		form.value.details.push(newDetail)
-	})
-}
+		}
+	}
 
 /** 提交按钮 */
 function submitForm() {