feat: [模板管理] 生成试剂

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYDB",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYHGZYWDX",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue

@@ -69,7 +69,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "JZXY",
@@ -336,6 +336,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -343,8 +345,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "QXWDX",
@@ -349,6 +349,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -356,8 +358,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "RXJZXY",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue

@@ -78,7 +78,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 export default {
 	name: "SWYPFXRYPZB",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog },
@@ -439,6 +439,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -464,6 +466,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -471,8 +475,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "XSKKX",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "XZXHTYX",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "ZDYBS",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "ZQDYJMD",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {

src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue

@@ -71,7 +71,7 @@ import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import { EventBus } from "@/utils/eventBus";
 import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
-import { addTj } from "@/utils/calUnitTools";
+import { addTj,uniqeResource } from "@/utils/calUnitTools";
 
 export default {
 	name: "CBYDB",
@@ -348,6 +348,8 @@ export default {
 							kc: total,
 							kcdw: unit,
 							syl: null,
+							type: null,
+							elnType: this.product,
 							syldw:unit,
 							yxzq:null,
 							yxzqdw:null,
@@ -355,8 +357,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() {