diff --git a/src/views/business/comps/template/comps/sp/SP002.vue b/src/views/business/comps/template/comps/sp/SP002.vue index 9cd2c2a..ca20420 100644 --- a/src/views/business/comps/template/comps/sp/SP002.vue +++ b/src/views/business/comps/template/comps/sp/SP002.vue @@ -307,6 +307,7 @@ export default { kc: content.targetActVolume, kcdw: content.targetActVolumeUnit, syl: null, + type: null, elnType: this.product, syldw: content.targetActVolumeUnit, yxzq: content.effectivePeriod, diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue index 74b0277..fc922e8 100644 --- a/src/views/business/comps/template/comps/sp/SP003.vue +++ b/src/views/business/comps/template/comps/sp/SP003.vue @@ -52,9 +52,9 @@ import CustomTable from '@/components/Template/CustomTable.vue'; import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import { EventBus } from "@/utils/eventBus"; -import { addTj } from "@/utils/calUnitTools"; +import { addTj ,uniqeResource} from "@/utils/calUnitTools"; export default { - name: "SWYPBQGZYZBB", + name: "SP003", components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion }, mixins: [templateMixin], props: { @@ -577,6 +577,8 @@ export default { sxrq: content.expireDate, kc: total, kcdw: unit, + type: null, + elnType: this.product, syl: null, syldw: unit, yxzq: content.effectivePeriod, @@ -595,6 +597,8 @@ export default { sxrq: content.expireDate, kc: item.fzsj.fzList[j].num, kcdw: item.fzsj.dw, + type: null, + elnType: this.product, syl: null, syldw: item.fzsj.dw, yxzq: content.effectivePeriod, @@ -607,8 +611,10 @@ export default { //使用 } - this.resourceTmp = tmpResource - + //使用的试剂、仪器 + const stepResource = this.$refs.stepRef.getStepResource() + this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) + this.yqResourceTmp = stepResource.yqResource||[] return content; }, async onSave() { diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue index 5108d95..e5037d5 100644 --- a/src/views/business/comps/template/comps/sp/SP00456.vue +++ b/src/views/business/comps/template/comps/sp/SP00456.vue @@ -111,7 +111,7 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import { getExpireDate } from "@/utils/index.js"; import moment from "moment"; -import { addTj } from "@/utils/calUnitTools"; +import { addTj,uniqeResource } from "@/utils/calUnitTools"; import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js"; export default { name: "SP00456", @@ -597,6 +597,8 @@ export default { sxrq: ladderConfigs.expireDate, kc: total, kcdw: unit, + type: null, + elnType: this.product, syl: null, syldw: unit, yxzq: ladderConfigs.effectivePeriod, @@ -616,6 +618,8 @@ export default { sxrq: ladderConfigs.expireDate, kc: fzsj.fzList[k].num, kcdw: fzsj.dw, + type: null, + elnType: this.product, syl: null, syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit, yxzq: ladderConfigs.effectivePeriod, @@ -644,6 +648,8 @@ export default { sxrq: stepTableFormData[j].targetSolutionExpirationDate, kc: total, kcdw: unit, + type: null, + elnType: this.product, syl: null, syldw: unit, yxzq: stepTableFormData[j].targetSolutionCycle, @@ -663,6 +669,8 @@ export default { sxrq: paralleConfigs.expireDate, kc: fzsj.fzList[k].num, kcdw: fzsj.dw, + type: null, + elnType: this.product, syl: null, syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit, yxzq: paralleConfigs.effectivePeriod, @@ -674,7 +682,10 @@ export default { } } } - this.resourceTmp = tmpResource + //使用的试剂、仪器 + const stepResource = this.$refs.stepRef.getStepResource() + this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) + this.yqResourceTmp = stepResource.yqResource||[] return content; }, async onSave() {