From 07ebce7aa5979ee3efc5af2cb4910209c8aa5b01 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Sun, 28 Apr 2024 13:38:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/mail/template/MailTemplateForm.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/mail/template/MailTemplateForm.vue b/src/views/system/mail/template/MailTemplateForm.vue index d771921a5..ade78f131 100644 --- a/src/views/system/mail/template/MailTemplateForm.vue +++ b/src/views/system/mail/template/MailTemplateForm.vue @@ -115,6 +115,7 @@ const onChange = async (field, cur) => { } const resetReceiverType = () => { + if (!formRef.value) return // 初始化设置值 const setV = { roleIdList: [], From b3cb4f7b08ddc02bb79905bbc17c0eb3d5e4f2c3 Mon Sep 17 00:00:00 2001 From: chenfang Date: Sun, 28 Apr 2024 13:39:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A3=85=E9=85=8D=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=AD=90=E8=A1=A8page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 5802e5e1a..1109357bf 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -66,7 +66,7 @@ :detailAllSchemasRules="ProductreceiptRequestDetailRules" :apiCreate="ProductreceiptRequestDetailApi.createProductreceiptRequestDetail" :apiUpdate="ProductreceiptRequestDetailApi.updateProductreceiptRequestDetail" - :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage" + :apiPage="ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble" :apiDelete="ProductreceiptRequestDetailApi.deleteProductreceiptRequestDetail" @searchTableSuccessDetail="searchTableSuccessDetail" :buttondataTable="buttondataTable" From 4b1e6488523988d66f98edc7114c6b243d55f2bf Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 28 Apr 2024 13:48:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 1109357bf..743c1eccd 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -163,7 +163,7 @@ const isCreateLabel = ref(false) const formLabelRef = ref() const labelType = ref('') // 标签类别 采购还是制造等 const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({ - getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPage + getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble }) const { getList:getDetailList } = detatableMethods From 00c9bc7f051e33cfc55d6d13b764435ffd7498ce Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 28 Apr 2024 13:58:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptAssembleJobMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts index e8f8bc2ea..9d561de4e 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/productreceiptAssembleJobMain.data.ts @@ -555,6 +555,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ field: 'action', isDetail: false, isForm: false, + isTable:false, table: { width: 120, fixed: 'right'