diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 68a12bbec..a28b46726 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -720,7 +720,13 @@ const submitForm = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } + data.subList = tableData.value // 拼接子表数据参数 + if(data.projectCode){ + data.subList.forEach(item => { + item.projectCode = data.projectCode + }); + } let isZC = true // 数量和标包数量 是否整除 data.subList.forEach(item => { item.productionLineCode = data.productionLineCode diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index 25826a97c..463c272e5 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -726,6 +726,55 @@ export const ProductionscrapRequestMain = useCrudSchemas( ] } }, + { + // HL-6202 还是子表数据,只是放在form中用来新增选择数据 + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + isDetail:false, + isTable:false, + isForm:true, + tableForm: { + enterSearch: true, + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择QAD项目信息', + searchField: 'projectCode', + searchTitle: '选择项目代码', + searchAllSchemas: QadProject.allSchemas, + searchPage: QadProjectApi.getQadProjectPage, + verificationParams: [{ + key: 'projectCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本 + searchField: 'projectCode', // 查询弹窗赋值字段 + searchTitle: '选择项目代码', // 查询弹窗标题 + searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类 + searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'projectCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, { label: '申请时间', field: 'requestTime', @@ -1545,12 +1594,14 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive