|
|
@ -110,7 +110,7 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; |
|
|
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; |
|
|
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; |
|
|
import { getExpireDate, duplicateResource } from "@/utils/index.js"; |
|
|
import { getExpireDate, duplicateResource } from "@/utils/index.js"; |
|
|
import moment from "moment"; |
|
|
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"; |
|
|
import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js"; |
|
|
export default { |
|
|
export default { |
|
|
name: "SP00456", |
|
|
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 |
|
|
this.resourceTmp = tmpResource |
|
|
return content; |
|
|
return content; |
|
|
|