From 605f6eb10a92ccf89d24143944f25c44530cba2c Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Sat, 31 Jan 2026 11:26:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E7=94=9F=E6=88=90=E8=AF=95=E5=89=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue         | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue    | 10 +++++++---
 .../business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue         | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue        | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue      | 12 +++++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue         | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue       | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue         | 10 +++++++---
 .../comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue       | 10 +++++++---
 .../business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue      | 10 +++++++---
 11 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
index 53d3b60..f058dbe 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYDB.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
index ac3a373..a5a59f5 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/CBYHGZYWDX.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
index 071f959..133bc44 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/JZXY.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
index 72486d7..3c9b76a 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/QXWDX.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
index 7de853b..d52f57f 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/RXJZXY.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
index 0211402..1b3a6b2 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/Recovery.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
index f838cd3..74e1607 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XSKKX.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
index 34dc1a7..9a92c36 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/XZXHTYX.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
index e81bd77..82ba37f 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZDYBS.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
index b2881a2..40881ca 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXYPZBB/ZQDYJMD.vue
+++ b/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() {
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index 8b15adc..76bdc87 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/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() {