diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index f5557cfc9..8324adae6 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -476,7 +476,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['childList'] = [] newRow['singlePrice'] = item['singlePrice'] newRow['amount'] = newRow['qty']*item['singlePrice'] - + newRow['productionLineCode'] = item['productionLineCode'] if(item['bomList'].length>0){ newRow['bomVersionInitOptions'] = item['bomList'].map(item1=>({ label:item1, diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 165bf069c..90b04c253 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -981,8 +981,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key:'productionLineCode', value:'productionLineCode', message: '请填写生产线代码!', - isMainValue: true, - isOptional:true, // isMainValue=true情况,添加参数可选可空的判断 + isMainValue: false, + // isOptional:true, // isMainValue=true情况,添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }, // { // key: 'itemCode', @@ -1025,8 +1026,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key:'productionLineCode', value:'productionLineCode', message: '请填写生产线代码!', - isMainValue: true, - isOptional:true, // isMainValue=true情况,添加参数可选可空的判断 + isMainValue: false, + // isOptional:true, // isMainValue=true情况,添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }, // { // key: 'itemCode', @@ -1103,6 +1105,13 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码!', isMainValue: true + },{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码!', + isMainValue: false, + // isOptional:true, // isMainValue=true情况,添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }], verificationParams: [{ key: 'code', @@ -1127,6 +1136,18 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码!', + isMainValue: true + },{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码!', + isMainValue: false, + // isOptional:true, // isMainValue=true情况,添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }], verificationParams: [{ key: 'code',