Merge remote-tracking branch 'origin/dev' into dev

pages/mes/prodReport/components/dModelList.vue

@@ -56,11 +56,11 @@
 					},
 				],
 			}
-		},
-		computed: {
-			tableData() {
-				return this.data || []
-			}
+		},
+		computed: {
+			tableData() {
+				return this.data || []
+			}
 		},
 		methods: {
 			async commonClick(type) {
@@ -81,16 +81,18 @@
 					if (!flag) {
 						return this.$u.toast('请选择状态相同的数据')
 					}
-				}
-				
-				const params = {
-					toolMachinesRecordIdList: this.tableSelectData.map(v => v.toolMachinesRecordId),
-					type
-				}
-				const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
-				if (code == 200) {
-					this.$emit('action')
-				}
+				}
+				
+				const params = this.tableSelectData.map(v => {
+					 return {
+						 toolMachinesId: v.toolMachinesId,
+						 type
+					 }
+				})
+				const {code} = await this.$u.api.dModel.tmToolMachinesRecord(params)
+				if (code == 200) {
+					this.$emit('action')
+				}
 				
 			},
 			toggleAllSelection(checked, arr) {
@@ -109,4 +111,4 @@
 		margin-top: 20rpx;
 		padding: 0 20rpx;
 	}
-</style>
+</style>

pages/mes/prodReport/index.vue

@@ -1065,6 +1065,7 @@ export default {
           workunitName: this.vuex_workunit.workunitName,
           processId: selectData.processId,
           taskId: selectData.taskId,
+          taskWorkunitId: selectData.taskWorkunitId,
           workorderId: selectData.workorderId,
           toolRequestUseId: data[0].toolRequestUseId,
           toolMachinesRecordList: data.map((v) => {