diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue index d82578b..5bfdbb5 100644 --- a/src/views/business/comps/template/comps/sp/SP003.vue +++ b/src/views/business/comps/template/comps/sp/SP003.vue @@ -54,7 +54,7 @@ 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 ,uniqeResource} from "@/utils/calUnitTools"; +import { addTj ,uniqeResource,uniqeResourceOne} from "@/utils/calUnitTools"; export default { name: "SP003", components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion }, @@ -622,6 +622,9 @@ export default { //使用 } + 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/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue index dd4ff0b..7619db8 100644 --- a/src/views/business/comps/template/comps/sp/SP00456.vue +++ b/src/views/business/comps/template/comps/sp/SP00456.vue @@ -110,7 +110,7 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import { getExpireDate, duplicateResource } from "@/utils/index.js"; import moment from "moment"; -import { addTj, uniqeResource } from "@/utils/calUnitTools"; +import { addTj, uniqeResource,uniqeResourceOne } from "@/utils/calUnitTools"; import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js"; export default { name: "SP00456", @@ -696,10 +696,13 @@ export default { } } } + if(tmpResource.length>0){ + tmpResource = uniqeResourceOne(tmpResource) + } //使用的试剂、仪器 - // const stepResource = this.$refs.stepRef.getStepResource() - // this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) - // this.yqResourceTmp = stepResource.yqResource||[] + const stepResource = this.getStepResource() + this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) + this.yqResourceTmp = stepResource.yqResource||[] this.resourceTmp = tmpResource return content;