From 7e4ba1d612f4506392fc19c5314eb037e00dcb08 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Tue, 3 Feb 2026 10:03:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=20=E8=AF=95=E5=89=82=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue | 74 +++++++++++++++++++++- .../comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue | 74 +++++++++++++++++++++- .../template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue | 74 +++++++++++++++++++++- .../template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue | 74 +++++++++++++++++++++- .../template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue | 74 +++++++++++++++++++++- .../template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue | 74 +++++++++++++++++++++- .../template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue | 74 +++++++++++++++++++++- .../template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue | 74 +++++++++++++++++++++- .../comps/template/comps/sp/SWYPFXFFXZKPZB.vue | 74 +++++++++++++++++++++- 9 files changed, 639 insertions(+), 27 deletions(-) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue index bbd378d..8068356 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "CBYDB", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue index 88b40f9..fe1489f 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "CBYHGZYWDX", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue index 954ad02..8df85ed 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue @@ -69,7 +69,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "JZXY", @@ -322,6 +322,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: item.kbjzbh, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue index 16a43c7..c69f62c 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "QXWDX", @@ -335,6 +335,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue index 08e19df..e1c6bdd 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "RXJZXY", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue index 648fd36..2da97ce 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "XSKKX", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue index 67206b6..39875f5 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "XZXHTYX", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue index 4a0d0d2..25b67c5 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "ZDYBS", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue index a70aa50..da11319 100644 --- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue +++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue @@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue" import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import { EventBus } from "@/utils/eventBus"; import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj'; -import { addTj,uniqeResource } from "@/utils/calUnitTools"; +import { addTj,uniqeResource,uniqeResourceOne,addDecimals } from "@/utils/calUnitTools"; export default { name: "CBYDB", @@ -334,6 +334,70 @@ export default { //配置的试剂 let item = tableList[i] + //使用的 + tmpResource.push({ + mc: null, + bh: item.sjry, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjryxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjryxqlUnit, + yxzq:null, + yxzqdw:null, + }) + tmpResource.push({ + mc: null, + bh: content.subJz, + ph: null, + ndz: null, + nd: null, + nddw: null, + ly: 'ELN配制', + sxrq: null, + kc: null, + kcdw: null, + syl: item.sjjzxql, + type: null, + elnType: this.product, + syldw:content.headerSelectFields.sjjzxqlUnit, + yxzq:null, + yxzqdw:null, + }) + //分装的 + let fzTotal = 0//分装总量 + if(item.fzsj && item.fzsj.fzList && item.fzsj.fzList.length>0){ + for(let j=0;j0?fzTotal:null, type: null, elnType: this.product, - syldw:unit, + syldw:fzTotal>0?item.fzsj.dw:unit, yxzq:null, yxzqdw:null, }) } } } + debugger + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 const stepResource = this.$refs.stepRef.getStepResource() this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])