Browse Source

fix:[模板管理]sp003,4,5,6 优化

lkf
15881625488@163.com 2 months ago
parent
commit
8bb74f2d09
2 changed files with 11 additions and 5 deletions
  1. +4
    -1
      src/views/business/comps/template/comps/sp/SP003.vue
  2. +7
    -4
      src/views/business/comps/template/comps/sp/SP00456.vue

+ 4
- 1
src/views/business/comps/template/comps/sp/SP003.vue View File

@ -54,7 +54,7 @@ import CustomTable from '@/components/Template/CustomTable.vue';
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue'; import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"; import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
import { EventBus } from "@/utils/eventBus"; import { EventBus } from "@/utils/eventBus";
import { addTj ,uniqeResource} from "@/utils/calUnitTools";
import { addTj ,uniqeResource,uniqeResourceOne} from "@/utils/calUnitTools";
export default { export default {
name: "SP003", name: "SP003",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion }, 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() const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[]) this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])

+ 7
- 4
src/views/business/comps/template/comps/sp/SP00456.vue View File

@ -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;

Loading…
Cancel
Save