From 600db24da56607365fac450c2c243eddab6b8840 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Wed, 18 Mar 2026 10:51:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20=E6=AF=92=E7=90=86=E4=B8=8B=E6=B2=A1=E6=9C=89=E7=94=9F?= =?UTF-8?q?=E6=88=90=E7=89=A9=E7=9A=84resource=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/dl/DL007.vue | 12 +--- .../business/comps/template/comps/dl/DL008.vue | 12 +--- .../business/comps/template/comps/dl/DL009.vue | 12 +--- .../business/comps/template/comps/dl/DL010.vue | 64 ++-------------------- .../business/comps/template/comps/dl/DL013.vue | 17 +----- .../business/comps/template/comps/dl/DL015.vue | 35 ------------ .../business/comps/template/comps/dl/DL016.vue | 13 ----- .../business/comps/template/comps/dl/DL017.vue | 12 ---- .../business/comps/template/comps/dl/DL018.vue | 13 ----- .../business/comps/template/comps/dl/DL019.vue | 13 ----- .../business/comps/template/comps/dl/DL024.vue | 12 +--- .../business/comps/template/comps/yp/YP005.vue | 2 + 12 files changed, 13 insertions(+), 204 deletions(-) diff --git a/src/views/business/comps/template/comps/dl/DL007.vue b/src/views/business/comps/template/comps/dl/DL007.vue index 4b8e0a7..95d5173 100644 --- a/src/views/business/comps/template/comps/dl/DL007.vue +++ b/src/views/business/comps/template/comps/dl/DL007.vue @@ -280,17 +280,7 @@ export default { return await this.validFormFields(refNames) }, getResource() { - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - bh: item.yqbh, - type: 'yq' - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue index 4d658d1..0019082 100644 --- a/src/views/business/comps/template/comps/dl/DL008.vue +++ b/src/views/business/comps/template/comps/dl/DL008.vue @@ -439,17 +439,7 @@ export default { return await this.validFormFields(refNames) }, getResource() { - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - bh: item.yqbh, - type: 'yq' - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL009.vue b/src/views/business/comps/template/comps/dl/DL009.vue index 86bd1b9..bcbbbc5 100644 --- a/src/views/business/comps/template/comps/dl/DL009.vue +++ b/src/views/business/comps/template/comps/dl/DL009.vue @@ -550,17 +550,7 @@ export default { return await this.validFormFields(refNames) }, getResource() { - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - bh: item.yqbh, - type: 'yq' - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue index 23553da..5115496 100644 --- a/src/views/business/comps/template/comps/dl/DL010.vue +++ b/src/views/business/comps/template/comps/dl/DL010.vue @@ -485,66 +485,10 @@ export default { return await this.validFormFields(refsToValidate) }, getResource() { - const sjxxStepResource = this.$refs.sjxxStepRef.getStepResource() - // 使用的试剂、仪器 - this.resourceTmp = sjxxStepResource.sjResource || [] - this.yqResourceTmp = sjxxStepResource.yqResource || [] - - // 获取采集信息表格数据 - const sjxxTableData = this.$refs.sjxxTableRef?.getFilledFormData() - const sjxxList = sjxxTableData?.stepTableFormData || [] - const headerSelectFields = sjxxTableData?.headerSelectFields || {} - - // 提取实际0.9%氯化钠注射液加入量和实际加入血清的数据 - // 转换为标准资源格式 - const sjxxResource = [] - - sjxxList.forEach((item) => { - // 实际0.9%氯化钠注射液加入量 - if (item.sjlhnzsjyjrl) { - sjxxResource.push({ - mc: '0.9%氯化钠注射液', // 名称 - bh: null, // 编号 - ph: null, // 批号 - nd: null, // 浓度 - nddw: null, // 浓度单位 - ndz: null, // 浓度值 - ly: null, // 来源 - sxrq: null, // 失效日期 - kc: null, // 库存 - kcdw: null, // 库存单位 - type: 1, // 类型：1表示使用的资源 - syl: item.sjlhnzsjyjrl, // 使用量 - syldw: headerSelectFields.sjlhnUnit || '', // 使用量单位 - yxzq: null, // 有效期 - yxzqdw: null // 有效期单位 - }) - } - - // 实际加入血清 - if (item.sjjrxq) { - sjxxResource.push({ - mc: '血清', // 名称 - bh: null, // 编号 - ph: null, // 批号 - nd: null, // 浓度 - nddw: null, // 浓度单位 - ndz: null, // 浓度值 - ly: null, // 来源 - sxrq: null, // 失效日期 - kc: null, // 库存 - kcdw: null, // 库存单位 - type: 1, // 类型：1表示使用的资源 - syl: item.sjjrxq, // 使用量 - syldw: headerSelectFields.sjjrxqUnit || '', // 使用量单位 - yxzq: null, // 有效期 - yxzqdw: null // 有效期单位 - }) - } - }) - - // 将采集信息数据添加到资源列表中 - return [...this.resourceTmp, ...sjxxResource] + const stepResource = this.$refs.sjxxStepRef.getStepResource() + this.resourceTmp = stepResource.sjResource || [] + this.yqResourceTmp = stepResource.yqResource || [] + return this.resourceTmp; }, onRegentSubmit(e) { // 预留方法，如果需要处理试剂提交事件可以在这里添加 diff --git a/src/views/business/comps/template/comps/dl/DL013.vue b/src/views/business/comps/template/comps/dl/DL013.vue index 6112df9..503c098 100644 --- a/src/views/business/comps/template/comps/dl/DL013.vue +++ b/src/views/business/comps/template/comps/dl/DL013.vue @@ -614,22 +614,7 @@ export default { return await this.validFormFields(refsToValidate) }, getResource() { - // 从仪器使用信息表格中获取仪器资源 - const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData() - const yqsyList = yqsyData?.stepTableFormData || [] - - // 从仪器使用信息表格中提取仪器资源 - this.yqResourceTmp = yqsyList - .filter((item) => item.yqbh) - .map((item) => ({ - type: 'yq', - value: item.yqbh, - bh: item.yqbh, - mc: item.yqmc, - xh: item.yqxh, - jzrq: item.xccsjzjdrq - })) - + this.yqResourceTmp = [] this.resourceTmp = [] return this.resourceTmp }, diff --git a/src/views/business/comps/template/comps/dl/DL015.vue b/src/views/business/comps/template/comps/dl/DL015.vue index 787c7ae..b15617a 100644 --- a/src/views/business/comps/template/comps/dl/DL015.vue +++ b/src/views/business/comps/template/comps/dl/DL015.vue @@ -327,43 +327,8 @@ export default { }, getResource() { const stepResource = this.$refs.stepRef.getStepResource() - const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData() - const hyqkList = hyqkData?.stepTableFormData || [] - - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - // 从换液情况表格中提取悬液编号作为试剂资源 - // 用于去重的Set - const xybhSet = new Set() - const sjResourceFromHyqk = [] - - hyqkList.forEach((item) => { - if (item.xybh && !xybhSet.has(item.xybh)) { - xybhSet.add(item.xybh) - sjResourceFromHyqk.push({ - mc: '细胞悬液', - bh: item.xybh, - ph: null, - nd: null, - nddw: null, - ndz: null, - ly: null, - sxrq: null, - kc: null, - kcdw: null, - type: 1, - syl: item.pyybrl || null, - syldw: item.pyybrl ? 'mL' : null, - yxzq: null, - yxzqdw: null - }) - } - }) - - this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk] - return this.resourceTmp }, onRegentSubmit(e) { diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue index ddfbebd..14e6045 100644 --- a/src/views/business/comps/template/comps/dl/DL016.vue +++ b/src/views/business/comps/template/comps/dl/DL016.vue @@ -267,21 +267,8 @@ export default { getResource() { //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - // const tableList = hyqkData?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const tableFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk] - console.log('回显填写完成的表单数据==============',this.resourceTmp); return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue index b517588..a5a0a5c 100644 --- a/src/views/business/comps/template/comps/dl/DL017.vue +++ b/src/views/business/comps/template/comps/dl/DL017.vue @@ -369,20 +369,8 @@ export default { getResource() { //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const hyqkData = this.$refs.stepTableRef?.getFilledFormData() - const tableList = hyqkData?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const sjResourceFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue index 770704c..a7f91d3 100644 --- a/src/views/business/comps/template/comps/dl/DL018.vue +++ b/src/views/business/comps/template/comps/dl/DL018.vue @@ -331,22 +331,9 @@ export default { return content; }, getResource() { - //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const tableFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL019.vue b/src/views/business/comps/template/comps/dl/DL019.vue index b14cc43..56ad972 100644 --- a/src/views/business/comps/template/comps/dl/DL019.vue +++ b/src/views/business/comps/template/comps/dl/DL019.vue @@ -297,21 +297,8 @@ export default { getResource() { //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - // const tableList = hyqkData?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 this.resourceTmp = stepResource.sjResource || [] this.yqResourceTmp = stepResource.yqResource || [] - - const tableFromHyqk = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) - - this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk] - console.log('回显填写完成的表单数据==============',this.resourceTmp); return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue index 2cc98b0..0b26114 100644 --- a/src/views/business/comps/template/comps/dl/DL024.vue +++ b/src/views/business/comps/template/comps/dl/DL024.vue @@ -9,7 +9,7 @@ - + @@ -261,14 +261,8 @@ export default { return content; }, getResource() { - const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || [] - // 从操作步骤中提取试剂和仪器资源 - this.resourceTmp = tableList - .filter(item => item.xybh) - .map(item => ({ - bh: item.xybh, - type: 'cell' - })) + this.resourceTmp = [] + this.yqResourceTmp = [] return this.resourceTmp; }, //保存 diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue index 580a870..82cb9c7 100644 --- a/src/views/business/comps/template/comps/yp/YP005.vue +++ b/src/views/business/comps/template/comps/yp/YP005.vue @@ -173,6 +173,8 @@ export default { bodySubKey:"startBtn", showBodySub:this.fillType === "actFill", width: 280, + bodyDisabled:true, + bodySubDisabled:false, }] }, },