From 124b38ec0c423a785d4f50130ce6821bd39f0e25 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Fri, 5 Jul 2024 16:54:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=20?= =?UTF-8?q?=E5=99=A8=E5=85=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E3=80=81=E8=AE=B0=E5=BD=95=E3=80=81=E6=B2=A1=E4=BC=A0type?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerRecordMain/index.vue | 14 ++++++++++---- .../initialContainerMainRequest/index.vue | 16 +++++++++++----- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index f5b547605..edfe467ad 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -49,7 +49,7 @@ :tableFormRules="ContainerRecordDetailRules" :isBusiness="true" /> - + { // 筛选提交 const searchFormClick = (searchData) => { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'INITIAL' + } + searchData.filters.push(cmd) tableObject.params = { isSearch: true, filters: searchData.filters diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 38af72a70..a8b9799b5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -109,7 +109,7 @@ const { tableObject, tableMethods } = useTable({ }) // 判断 路由名称 进行条件过滤 /** - * + * */ if ( routeName.value == 'InitialContainerManageRequest') { tableObject.params = { @@ -121,7 +121,7 @@ const { tableObject, tableMethods } = useTable({ }}); businessType.value = 'InitialContainerManage' importFileName.value = '器具初始化申请' -} +} //定义 展示子表数据时是否显示新增/修改/删除按钮 const trueFalse = ref(false) @@ -397,19 +397,19 @@ const submitForm = async (formType,submitData) => { if(data.masterId){ data.id = data.masterId } - data.subList = tableData.value // 拼接子表数据参数 + data.subList = tableData.value // 拼接子表数据参数 data.subList.forEach(item => { if(item.qty == 0){ message.error(`到数量不能为0!`) flag.value = true return; - } + } }) try { if (formType === 'create') { data.businessType = businessType.value console.log(data.businessType,999); - + await ContainerMainRequestApi.createContainerMainRequest(data) message.success(t('common.createSuccess')) } else { @@ -475,6 +475,12 @@ const importSuccess = () => { // 筛选提交 const searchFormClick = (searchData) => { + const cmd = { + 'column':'type', + 'action':'==', + 'value':'INITIAL' + } + searchData.filters.push(cmd) tableObject.params = { isSearch: true, filters: searchData.filters