From 900d362161bf1e53cf17896ba17fa7b883df2339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A7=E9=AA=9E?= Date: Fri, 13 Mar 2026 15:30:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E4=BB=AA=E5=99=A8=E6=A0=A1=E9=AA=8C=E4=BF=AE=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/dl/DL007.vue | 14 ++++++++------ src/views/business/comps/template/comps/dl/DL008.vue | 16 +++++++++------- src/views/business/comps/template/comps/dl/DL009.vue | 16 +++++++++------- src/views/business/comps/template/comps/dl/DL013.vue | 16 +++++++++------- src/views/business/comps/template/comps/dl/DL014.vue | 16 +++++++++------- 5 files changed, 44 insertions(+), 34 deletions(-) diff --git a/src/views/business/comps/template/comps/dl/DL007.vue b/src/views/business/comps/template/comps/dl/DL007.vue index ad9fccd..934a213 100644 --- a/src/views/business/comps/template/comps/dl/DL007.vue +++ b/src/views/business/comps/template/comps/dl/DL007.vue @@ -263,13 +263,15 @@ export default { }, // 只做校验 async validFields() { - // 1. 校验仪器使用信息表格是否为空 - const yqsyTableRef = this.$refs[refConf.yqsy] - const yqsyTableData = yqsyTableRef?.getDataSource() || [] + // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验） + if (this.fillType === 'actFill') { + const yqsyTableRef = this.$refs[refConf.yqsy] + const yqsyTableData = yqsyTableRef?.getDataSource() || [] - if (yqsyTableData.length === 0) { - this.$message.warning(this.$t('template.dl.dl007.yqsyxxEmpty')) - return Promise.reject(this.$t('template.dl.dl007.yqsyxxEmpty')) + if (yqsyTableData.length === 0) { + this.$message.warning(this.$t('template.dl.dl007.yqsyxxEmpty')) + return Promise.reject(this.$t('template.dl.dl007.yqsyxxEmpty')) + } } // 2. 执行其他表单字段校验 diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue index 4a42b02..0441972 100644 --- a/src/views/business/comps/template/comps/dl/DL008.vue +++ b/src/views/business/comps/template/comps/dl/DL008.vue @@ -404,13 +404,15 @@ export default { }, //只做校验 async validFields() { - // 1. 校验仪器使用信息表格是否为空 - const yqsyTableRef = this.$refs[refConf.yqsy] - const yqsyTableData = yqsyTableRef?.getDataSource() || [] - - if (yqsyTableData.length === 0) { - this.$message.warning(this.$t('template.dl.dl008.yqsyxxEmpty')) - return Promise.reject(this.$t('template.dl.dl008.yqsyxxEmpty')) + // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验） + if (this.fillType === 'actFill') { + const yqsyTableRef = this.$refs[refConf.yqsy] + const yqsyTableData = yqsyTableRef?.getDataSource() || [] + + if (yqsyTableData.length === 0) { + this.$message.warning(this.$t('template.dl.dl008.yqsyxxEmpty')) + return Promise.reject(this.$t('template.dl.dl008.yqsyxxEmpty')) + } } // 2. 校验成像情况表格是否为空 diff --git a/src/views/business/comps/template/comps/dl/DL009.vue b/src/views/business/comps/template/comps/dl/DL009.vue index bea1ec9..6f8f362 100644 --- a/src/views/business/comps/template/comps/dl/DL009.vue +++ b/src/views/business/comps/template/comps/dl/DL009.vue @@ -511,13 +511,15 @@ export default { }, // 只做校验 async validFields() { - // 1. 校验仪器使用信息表格是否为空 - const yqsyTableRef = this.$refs[refConf.yqsy] - const yqsyTableData = yqsyTableRef?.getDataSource() || [] - - if (yqsyTableData.length === 0) { - this.$message.warning(this.$t('template.dl.dl009.yqsyxxEmpty')) - return Promise.reject(this.$t('template.dl.dl009.yqsyxxEmpty')) + // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验） + if (this.fillType === 'actFill') { + const yqsyTableRef = this.$refs[refConf.yqsy] + const yqsyTableData = yqsyTableRef?.getDataSource() || [] + + if (yqsyTableData.length === 0) { + this.$message.warning(this.$t('template.dl.dl009.yqsyxxEmpty')) + return Promise.reject(this.$t('template.dl.dl009.yqsyxxEmpty')) + } } // 2. 校验结果信息表格是否为空 diff --git a/src/views/business/comps/template/comps/dl/DL013.vue b/src/views/business/comps/template/comps/dl/DL013.vue index d892fb2..01ba62f 100644 --- a/src/views/business/comps/template/comps/dl/DL013.vue +++ b/src/views/business/comps/template/comps/dl/DL013.vue @@ -522,13 +522,15 @@ export default { }, // 获取填写完成的表单数据 async getFormData() { - // 1. 校验仪器使用信息表格是否为空 - const yqsyTableRef = this.$refs[refConf.yqsy] - const yqsyTableData = yqsyTableRef?.getDataSource() || [] - - if (yqsyTableData.length === 0) { - this.$message.warning(this.$t('template.dl.dl013.yqsyxxEmpty')) - return Promise.reject(this.$t('template.dl.dl013.yqsyxxEmpty')) + // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验） + if (this.fillType === 'actFill') { + const yqsyTableRef = this.$refs[refConf.yqsy] + const yqsyTableData = yqsyTableRef?.getDataSource() || [] + + if (yqsyTableData.length === 0) { + this.$message.warning(this.$t('template.dl.dl013.yqsyxxEmpty')) + return Promise.reject(this.$t('template.dl.dl013.yqsyxxEmpty')) + } } // 2. 校验测定信息是否为空 diff --git a/src/views/business/comps/template/comps/dl/DL014.vue b/src/views/business/comps/template/comps/dl/DL014.vue index 8a0fc44..00b7b60 100644 --- a/src/views/business/comps/template/comps/dl/DL014.vue +++ b/src/views/business/comps/template/comps/dl/DL014.vue @@ -580,13 +580,15 @@ export default { }, // 获取填写完成的表单数据 async getFormData() { - // 1. 校验仪器使用信息表格是否为空 - const yqsyTableRef = this.$refs[refConf.yqsy] - const yqsyTableData = yqsyTableRef?.getDataSource() || [] - - if (yqsyTableData.length === 0) { - this.$message.warning(this.$t('template.dl.dl014.yqsyxxEmpty')) - return Promise.reject(this.$t('template.dl.dl014.yqsyxxEmpty')) + // 1. 校验仪器使用信息表格是否为空（只在 actFill 时校验） + if (this.fillType === 'actFill') { + const yqsyTableRef = this.$refs[refConf.yqsy] + const yqsyTableData = yqsyTableRef?.getDataSource() || [] + + if (yqsyTableData.length === 0) { + this.$message.warning(this.$t('template.dl.dl014.yqsyxxEmpty')) + return Promise.reject(this.$t('template.dl.dl014.yqsyxxEmpty')) + } } // 2. 执行其他表单字段校验 From 9032def62f4b2149ed043d27c51ae22cf771974b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A7=E9=AA=9E?= Date: Fri, 13 Mar 2026 15:40:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?= =?UTF-8?q?DL014=E4=BE=9B=E8=AF=95=E5=93=81=E6=94=B9=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/dl/DL014.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/business/comps/template/comps/dl/DL014.vue b/src/views/business/comps/template/comps/dl/DL014.vue index 00b7b60..b7961eb 100644 --- a/src/views/business/comps/template/comps/dl/DL014.vue +++ b/src/views/business/comps/template/comps/dl/DL014.vue @@ -478,8 +478,8 @@ export default { bodyType: 'input', bodyFillType: 'preFill', bodyMaxlength: 20, - bodySubType: 'gsp', - bodySubKey: 'gspbh', + bodySubType: 'gyzj', + bodySubKey: 'gyzjbh', bodySubFillType: 'actFill' }, { From 5221a470584746b8728fd692313397ddf85e23c4 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Fri, 13 Mar 2026 16:16:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20ADA005+ADA007?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/TemplateTable.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index 87e8395..987c5d8 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -77,7 +77,9 @@ import LBA008 from "./comps/lba/LBA008.vue"; // ADA002-使用LBA002 // ADA003-使用LBA003 // ADA004-使用LBA004 +// ADA005-使用LBA005 // ADA006-使用LBA006 +// ADA007-使用LBA007 //样品 // YP001-使用SP001 @@ -292,7 +294,9 @@ export default { 'ADA002': 'LBA002', 'ADA003': 'LBA003', 'ADA004': 'LBA004', + 'ADA005': 'LBA005', 'ADA006': 'LBA006', + 'ADA007': 'LBA007', //样品 'YP001': 'SP001', 'YP002': 'YP002', From 9f43dca2e601988104a3af032dfd2b5a00d36fc0 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Fri, 13 Mar 2026 16:48:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20ADA=E4=BD=BF=E7=94=A8=E8=89=B2=E8=B0=B1=E5=BE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/TemplateTable.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index 987c5d8..0692907 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -294,9 +294,9 @@ export default { 'ADA002': 'LBA002', 'ADA003': 'LBA003', 'ADA004': 'LBA004', - 'ADA005': 'LBA005', + 'ADA005': 'SP00456', 'ADA006': 'LBA006', - 'ADA007': 'LBA007', + 'ADA007': 'SP00456', //样品 'YP001': 'SP001', 'YP002': 'YP002',