From 5c126c4b3c9340a39e7232615cd8e0f8c82bc859 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 5 Jul 2024 11:08:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7=201.?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=90=8E=E5=88=A0=E9=99=A4=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=9B=B4=E6=8E=A5=E6=96=B0=E5=A2=9E=E6=88=90=E5=8A=9F?= =?UTF-8?q?=EF=BC=8C=E4=BD=86=E6=98=AF=E9=A1=B5=E9=9D=A2=E4=B8=AD=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=AF=A5=E6=95=B0=E6=8D=AE=202.=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E6=97=B6=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=E9=A1=B9=20=E4=BD=86=E6=98=AF=E6=9C=AA=E6=A0=87?= =?UTF-8?q?=E8=AF=86,=E8=A1=A5=E6=96=99=E7=94=B3=E8=AF=B7=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E4=B8=AD=E5=BA=94=E8=AF=A5=E5=88=A0=E9=99=A4=E6=97=A0?= =?UTF-8?q?=E6=84=8F=E4=B9=89=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 4 +- .../issueRequestMain/issueRequestMain.data.ts | 3 + .../repleinshRequestMain.data.ts | 254 +++++++++--------- .../productreceiptRequestMain.data.ts | 3 + .../productreceiptAssembleRequestMain.data.ts | 3 + .../productscrapRequestMain.data.ts | 3 + 6 files changed, 147 insertions(+), 123 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 5fa0fbd9a..378a2ba07 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -615,14 +615,12 @@ const submitForm = async () => { formLoading.value = true if (formType.value == 'create') { const validateForm = await tableFormRef.value.validateForm() - if (!validateForm && props.tableFormDataLength) { + if (props.tableFormDataLength) { if (props.tableData.length == 0) { message.warning('请填写明细信息！') formLoading.value = false return } - formLoading.value = false - return } // 主子表——提交请求 try { diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 4a7479093..4b131b1bb 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -560,6 +560,9 @@ export const IssueRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间代码', trigger: 'change' } ], + productionLineCode: [ + { required: true, message: '请选择生产线代码', trigger: 'change' } + ], // fromWarehouseCode: [ // { required: true, message: '请选择从仓库代码', trigger: 'change' } // ], diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index f18f34c0d..80e5d6536 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -471,6 +471,122 @@ export const RepleinshRequestMainRules = reactive({ * @returns {Array} 补料申请子表 */ export const RepleinshRequestDetail = useCrudSchemas(reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch:true, + sortSearchDefault:2, + sortTableDefault:3, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition:[{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, + tableForm:{ + enterSearch:true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition:[{ + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key : 'businessTypeCode', + value: queryParams.businessTypeCode + }] + }, + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + sortTableDefault:4, + isTableForm: false, + isForm: false, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + isTableForm: false, + isForm: false, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + hiddenInMain:true, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:9, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '到库位代码', field: 'toLocationCode', @@ -541,7 +657,8 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', - isTable: true, + isTableForm: false, + isTable:false, sort: 'custom', form: { value: 'OK', @@ -557,6 +674,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm:false, tableForm: { type: 'Select', default: 'OK', @@ -573,63 +691,23 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, isTableForm: false, + isTable:false, form: { componentProps: { disabled: true } } }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch:true, - sortSearchDefault:2, - sortTableDefault:3, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物料基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - } - }, - tableForm:{ - enterSearch:true, - isInpuFocusShow: true, - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物料基础信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 - searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ - key : 'businessTypeCode', - value: queryParams.businessTypeCode - }] - }, - }, + { label: '备注', field: 'remark', sort: 'custom', + isTableForm:false, table: { width: 150 }, + isTable:false, hiddenInMain:true, }, { @@ -667,36 +745,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - sortTableDefault:4, - isTableForm: false, - isForm: false, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - isTableForm: false, - isForm: false, - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - isTableForm: false, - isForm: false, - }, + { label: '项目代码', field: 'projectCode', @@ -706,50 +755,10 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, isTableForm: false, + isTable:false, isForm: false, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - hiddenInMain:true, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 6 - } - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 6 - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:9, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, + { label: '采购订单号', field: 'poNumber', @@ -760,6 +769,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ hiddenInMain:true, isTableForm: false, sortTableDefault:1, + isTable:false, }, { label: '订单行', @@ -771,6 +781,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ hiddenInMain:true, isTableForm: false, sortTableDefault:2, + isTable:false, }, { @@ -783,6 +794,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, hiddenInMain:true, + isTable:false, }, { label: '到货主代码', @@ -794,6 +806,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, hiddenInMain:true, + isTable:false, }, { label: '最后更新时间', @@ -829,6 +842,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ }, isTableForm: false, hiddenInMain:true, + isTable:false, isForm: false }, { @@ -847,9 +861,9 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ //表单校验 export const RepleinshRequestDetailRules = reactive({ - inventoryStatus: [ - { required: true, message: '请选择库存状态', trigger: 'change' } - ], + // inventoryStatus: [ + // { required: true, message: '请选择库存状态', trigger: 'change' } + // ], toLocationCode: [ { required: true, message: '请输入到库位代码', trigger: 'blur' } ], diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index eb64606c0..ad2d93277 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -535,6 +535,9 @@ export const ProductreceiptRequestMainRules = reactive({ // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], + productionLineCode: [ + { required: true, message: '请选择生产线代码', trigger: 'change' } + ], autoCommit: [ { required: true, message: '请选择是否自动提交', trigger: 'change' } ], diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 9e01199c7..84fb8ddaa 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -536,6 +536,9 @@ export const ProductreceiptRequestMainRules = reactive({ // departmentCode: [ // { required: true, message: '请输入部门', trigger: 'blur' } // ], + productionLineCode: [ + { required: true, message: '请选择生产线代码', trigger: 'change' } + ], autoCommit: [ { required: true, message: '请选择是否自动提交', trigger: 'change' } ], diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 5c7911793..b6902aa29 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -500,6 +500,9 @@ export const ProductscrapRequestMainRules = reactive({ // dueTime: [ // { required: true, message: '请选择截止时间', trigger: 'change' } // ], + productionLineCode: [ + { required: true, message: '请选择生产线代码', trigger: 'change' } + ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ],