diff --git a/src/views/business/comps/template/comps/sp/SP002.vue b/src/views/business/comps/template/comps/sp/SP002.vue index 32b3b2a..9cd2c2a 100644 --- a/src/views/business/comps/template/comps/sp/SP002.vue +++ b/src/views/business/comps/template/comps/sp/SP002.vue @@ -38,6 +38,7 @@ import templateMixin from "../../mixins/templateMixin"; import CustomTable from '@/components/Template/CustomTable.vue'; import { getLatestSn } from '@/api/template'; import { EventBus } from "@/utils/eventBus"; +import { uniqeResource } from "@/utils/calUnitTools"; export default { name: "SP002", @@ -306,13 +307,16 @@ export default { kc: content.targetActVolume, kcdw: content.targetActVolumeUnit, syl: null, + elnType: this.product, syldw: content.targetActVolumeUnit, yxzq: content.effectivePeriod, yxzqdw: content.effectivePeriodUnit, }) } - //使用的试剂 - this.resourceTmp = tmpResource + //使用的试剂、仪器 + const stepResource = this.$refs.stepRef.getStepResource() + this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) + this.yqResourceTmp = stepResource.yqResource||[] return content; } }