From 79b85d2aa5a90d0aaa495d5625c9fe8de445d101 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZHANGTENG=5C=E5=BC=A0=E8=85=BE?= <894697943@qq.com> Date: Thu, 19 Mar 2026 17:48:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]DL00?= =?UTF-8?q?6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/bl/BL001.vue | 36 ++++---- .../business/comps/template/comps/dl/DL005.vue | 9 +- .../business/comps/template/comps/dl/DL006.vue | 95 +++++++++++++++++++++- 3 files changed, 110 insertions(+), 30 deletions(-) diff --git a/src/views/business/comps/template/comps/bl/BL001.vue b/src/views/business/comps/template/comps/bl/BL001.vue index de98507..7aaa37b 100644 --- a/src/views/business/comps/template/comps/bl/BL001.vue +++ b/src/views/business/comps/template/comps/bl/BL001.vue @@ -253,24 +253,24 @@ export default { width: 280, bodyOptions: this.ypmcTaOptions, }, - { - label: 'template.dj.dj003.cysj', - prop: "cysj", - bodyType: 'dateTimeRange', - width: 450, - bodyFillType: 'actFill' - }, - { - label: 'template.dj.dj003.sjbd', - prop: "sjbd", - bodyType: 'select', - bodyOptions: [ - {value:1,label:'正常'}, - {value:0,label:'偏离'}, - ], - bodyFillType: 'actFill', - width: 180, - }, + // { + // label: 'template.dj.dj003.cysj', + // prop: "cysj", + // bodyType: 'dateTimeRange', + // width: 450, + // bodyFillType: 'actFill' + // }, + // { + // label: 'template.dj.dj003.sjbd', + // prop: "sjbd", + // bodyType: 'select', + // bodyOptions: [ + // {value:1,label:'正常'}, + // {value:0,label:'偏离'}, + // ], + // bodyFillType: 'actFill', + // width: 180, + // }, { label: 'template.dj.dj003.yps', prop: "yps", diff --git a/src/views/business/comps/template/comps/dl/DL005.vue b/src/views/business/comps/template/comps/dl/DL005.vue index 5e69418..462533e 100644 --- a/src/views/business/comps/template/comps/dl/DL005.vue +++ b/src/views/business/comps/template/comps/dl/DL005.vue @@ -25,7 +25,7 @@ :formConfig="czInfoFormConfig" :formData="formData" /> - + diff --git a/src/views/business/comps/template/comps/dl/DL006.vue b/src/views/business/comps/template/comps/dl/DL006.vue index 1770176..724453c 100644 --- a/src/views/business/comps/template/comps/dl/DL006.vue +++ b/src/views/business/comps/template/comps/dl/DL006.vue @@ -68,6 +68,7 @@ class="mt20" fieldItemLabel="template.dl.dl006.czxx" ref="czFormRef" + @onRegentSubmit="onRegentSubmit" :formConfig="czFormConfig" :formData="formData" /> @@ -96,6 +97,7 @@ import TableList from '@/components/Template/Table' import Step from '@/components/Template/Step' import templateMixin from '../../mixins/templateMixin' import { formatNumberByDigits,justUpdateFilledFormData } from '@/utils/index.js' +import { uniqeYqOne, uniqeResourceOne } from "@/utils/calUnitTools"; const refConf = { base: 'baseInfoRef', @@ -140,6 +142,7 @@ export default { if(stepTableFormData_1.length>0){ this.clickFinish() } + console.log(this.getFilledFormData()) }, computed: { czxxColumns: { @@ -472,17 +475,101 @@ export default { return await this.validFormFields(refNames) }, getResource() { + let content = this.getFilledFormData(); + let tmpResource = [] + let tmpYq = [] + let addYq = [] + let addResource = [] + if (this.fillType === "actFill") { + let header1 = content.headerSelectFields + let table1 = content.stepTableFormData + + // 如果添加了S9混合液，提取S9混合液编号 + if (content.sftjs9 === 1 && content.s9hhybh) { + console.log('sbdhau1') + tmpResource.push({ + mc: 'S9混合液', + bh: content.s9hhybh, + ph: null, + nd: null, + nddw: null, + ndz: null, + ly: null, + sxrq: null, + kc: null, + kcdw: null, + type: 1, + syl: content.s9hhyyjjrl || null, + syldw: content.s9hhyyjjrldw || null, + yxzq: null, + yxzqdw: null + }) + } + //如果添加了PBS，提取PBS混合液编号 + if (content.sftjs9 === 0 && content.pbsbh) { + tmpResource.push({ + mc: 'PBS', + bh: content.pbsbh, + ph: null, + nd: null, + nddw: null, + ndz: null, + ly: null, + sxrq: null, + kc: null, + kcdw: null, + type: 1, + syl: content.pbsryyjrl || null, + syldw: content.pbsryyjrldw || null, + yxzq: null, + yxzqdw: null + }) + } + + if (table1 && table1.length > 0) { + for (let i = 0; i < table1.length; i++) { + tmpResource.push({ + mc: '加液编号', + bh: table1[i].jybh, + ph: null, + nd: null, + nddw: null, + ndz: null, + ly: null, + sxrq: null, + kc: null, + kcdw: null, + type: 1, + syl: table1[i].ysjytj || null, + syldw: header1.ysjytjDw || null, + yxzq: null, + yxzqdw: null + }) + } + } + tmpYq.push({ + mc: content.pyxbhmc, + xh: content.pyxbhxh, + bh: content.pyxbh, + jzrq: content.pyxbhjzrq, + }) + } const stepResource = this.$refs.stepRef.getStepResource() // 使用的试剂、仪器 - this.resourceTmp = stepResource.sjResource || [] - this.yqResourceTmp = stepResource.yqResource || [] + addYq = [...stepResource.yqResource,...tmpYq] + addResource = [...stepResource.sjResource,...tmpResource] + this.resourceTmp = uniqeResourceOne(addResource) || [] + this.yqResourceTmp = uniqeYqOne(addYq) || [] return this.resourceTmp }, onRegentSubmit(e) { - console.log(e,909090) const { selectInfo, key, rowIndex } = e const { row } = selectInfo - + if (key == 'pyxbh') { + this.$refs.czFormRef.updateFormData('pyxbhmc', row.mc) + this.$refs.czFormRef.updateFormData('pyxbhxh', row.xh) + this.$refs.czFormRef.updateFormData('pyxbhjzrq', row.jzrq) + } if (key === 'qxbd') { this.$refs.czInfoRef.updateFormData('pykssj', row.startDate) }