From e9a90b0bb635474ac6861b443c982bca869ee0a9 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Mar 2024 17:14:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=AE=BE=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=90=E8=A1=A8=E5=85=81=E8=AE=B8=E4=B8=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 8 +++++++- .../wms/basicDataManage/itemManage/itemarea/index.vue | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index dd189cf7d..3a5aa7429 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -245,6 +245,12 @@ const props = defineProps({ type: Boolean, required: false, default: true + }, + // 明细数据长度校验 + tableFormDataLength: { + type: Boolean, + required: false, + default: true } }) @@ -432,7 +438,7 @@ const submitForm = async () => { formLoading.value = true if (formType.value == 'create') { const validateForm = await tableFormRef.value.validateForm() - if (!validateForm) { + if (!validateForm && props.tableFormDataLength) { if (props.tableData.length == 0) { message.warning('请填写明细信息!') formLoading.value = false diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index db7184c0c..c55ae9007 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -57,6 +57,7 @@ @submitForm="submitForm" :isShowButton = isShowButton :basicFormWidth="75" + :tableFormDataLength="false" /> @@ -130,6 +131,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['inPackUnit'] = val[0]['code'] }else if(formField == 'outPackUnit') { setV['outPackUnit'] = val[0]['code'] + }else if(formField == 'itemCode') { + setV['itemCode'] = val[0]['code'] }else{ setV[formField] = setV[0][searchField] } @@ -285,7 +288,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ItemareaApi.exportItemarea(tableObject.params) - download.excel(data, '发货申请主.xlsx') + download.excel(data, '物料库区配置管理主.xlsx') } catch { } finally { exportLoading.value = false