From ad1f202339d1de01691f9d0ce5abf632bddbd299 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Mon, 9 Feb 2026 13:50:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/CustomTable.vue            | 15 +++++---
 src/components/Template/HandleFormItem.vue         |  9 ++++-
 src/components/Template/StepComponents/ry/bdtj.vue |  2 +-
 src/components/Template/StepComponents/ry/bdzl.vue |  2 +-
 src/components/Template/StepComponents/ry/clcz.vue |  2 +-
 .../Template/StepComponents/ry/clfcz.vue           |  2 +-
 src/components/Template/StepComponents/ry/cs.vue   |  2 +-
 src/components/Template/StepComponents/ry/czdd.vue |  2 +-
 src/components/Template/StepComponents/ry/czhj.vue |  2 +-
 src/components/Template/StepComponents/ry/dc.vue   |  2 +-
 src/components/Template/StepComponents/ry/fr.vue   |  4 +-
 .../Template/StepComponents/ry/frdrq.vue           |  4 +-
 src/components/Template/StepComponents/ry/fs.vue   |  2 +-
 src/components/Template/StepComponents/ry/fy.vue   |  2 +-
 src/components/Template/StepComponents/ry/glsd.vue |  2 +-
 src/components/Template/StepComponents/ry/glzd.vue |  4 +-
 src/components/Template/StepComponents/ry/hwhy.vue |  2 +-
 src/components/Template/StepComponents/ry/jb.vue   |  2 +-
 src/components/Template/StepComponents/ry/jd.vue   |  2 +-
 src/components/Template/StepComponents/ry/jrjb.vue |  2 +-
 src/components/Template/StepComponents/ry/jrry.vue |  4 +-
 src/components/Template/StepComponents/ry/js.vue   |  2 +-
 src/components/Template/StepComponents/ry/jz.vue   |  2 +-
 src/components/Template/StepComponents/ry/lx.vue   |  2 +-
 src/components/Template/StepComponents/ry/mj.vue   |  2 +-
 src/components/Template/StepComponents/ry/rs.vue   |  4 +-
 src/components/Template/StepComponents/ry/sy.vue   |  2 +-
 .../Template/StepComponents/ry/tjphcz.vue          |  6 +--
 .../Template/StepComponents/ry/tjphfcz.vue         |  6 +--
 .../Template/StepComponents/ry/tpjydd.vue          |  2 +-
 .../Template/StepComponents/ry/tpjysd.vue          |  2 +-
 src/components/Template/StepComponents/ry/wxhy.vue |  2 +-
 src/components/Template/StepComponents/ry/ym.vue   |  4 +-
 src/components/Template/StepComponents/ry/zy.vue   |  2 +-
 src/components/Template/StepComponents/ry/zyhy.vue |  2 +-
 src/components/Template/StepFormPackage.vue        | 44 +++++++++++++++-------
 .../Template/mixins/formPackageMixins.js           |  5 ++-
 .../business/comps/template/comps/sp/SP003.vue     | 20 ++++++----
 .../comps/template/mixins/templateMixin.js         | 16 +++++---
 39 files changed, 115 insertions(+), 80 deletions(-)

diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 77447e3..790f414 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -4,7 +4,7 @@
 			<div class="custom-table-header">
 				<div class="custom-table-row">
 					<div v-for="(col, index) in columns" :key="index" class="custom-table-cell header-cell"
-						:style="{ width: (templateFillType !== 'actFill'&&col.showWidth)?col.showWidth + 'px' :(col.width ? col.width + 'px' : 'auto') }">
+						:style="getCellWidth(col)">
 						<div class="header-cell-content">
 							<div>{{ $t(col.label) }}</div>
 							<template
@@ -34,7 +34,7 @@
 			<div class="custom-table-body">
 				<div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row">
 					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell body-cell"
-						:style="{ width: (templateFillType !== 'actFill'&&col.showWidth)?col.showWidth + 'px' :(col.width ? col.width + 'px' : 'auto')  }">
+						:style="getCellWidth(col)">
 						<div class="inner-table-cell">
 							<div class="flex1">
 								<template v-if="col.bodyType === 'input'">
@@ -264,9 +264,14 @@ export default {
 		this.oldLocalDataSource = [];
 	},
 	methods: {
-		
-		
-		
+		getCellWidth(col){
+			const {templateFillType} = this;
+			let width = col.width ? col.width + 'px' : 'auto';
+			if(templateFillType !== "actFill" && templateFillType !== "preFill"){
+				width = (col.showWidth)?col.showWidth + 'px' :(col.width ? col.width + 'px' : 'auto')
+			}
+			return { width }
+		},
 		//取消按钮 重置记录
 		resetRecord(rowIndex, colIndex,) {
 			if (this.localDataSource.length) {
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 0d23842..6dbfdcf 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -234,7 +234,7 @@ export default {
         //试剂
         EventBus.$on("onReagentSubmit", this.onReagentSubmit)
         //仪器
-        EventBus.$on("onInstrumentSubmit", this.onInstrumentSubmit)
+        EventBus.$on("onInstrumentSubmit", this.onMixReagentSubmit)
         //供试品/试剂/给药制剂等
         EventBus.$on("onMixReagentSubmit", this.onMixReagentSubmit)
     },
@@ -243,10 +243,15 @@ export default {
         EventBus.$off('onEditSignCancel', this.handleEditSignCancel);
         EventBus.$off('onEditSignCallback', this.handleEditSignCallback);
         EventBus.$off("onReagentSubmit", this.onReagentSubmit)
-        EventBus.$off("onInstrumentSubmit", this.onInstrumentSubmit)
+        EventBus.$off("onInstrumentSubmit", this.onMixReagentSubmit)
         EventBus.$off("onMixReagentSubmit", this.onMixReagentSubmit)
     },
     methods: {
+        onInstrumentSubmit(data){
+            if(data.uuid !== this.uuid) return;
+            this.selectRegentInfo = data;
+            console.log(data,"yq")
+        },
         handleSuccess(res, file, fileList) {
             if(res.code == 200){
                 this.fileList = fileList;
diff --git a/src/components/Template/StepComponents/ry/bdtj.vue b/src/components/Template/StepComponents/ry/bdtj.vue
index c13bd72..416941a 100644
--- a/src/components/Template/StepComponents/ry/bdtj.vue
+++ b/src/components/Template/StepComponents/ry/bdtj.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/bdzl.vue b/src/components/Template/StepComponents/ry/bdzl.vue
index 225f176..4c54ce8 100644
--- a/src/components/Template/StepComponents/ry/bdzl.vue
+++ b/src/components/Template/StepComponents/ry/bdzl.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/clcz.vue b/src/components/Template/StepComponents/ry/clcz.vue
index 1684c10..e067f75 100644
--- a/src/components/Template/StepComponents/ry/clcz.vue
+++ b/src/components/Template/StepComponents/ry/clcz.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/clfcz.vue b/src/components/Template/StepComponents/ry/clfcz.vue
index 9316230..de8e8fb 100644
--- a/src/components/Template/StepComponents/ry/clfcz.vue
+++ b/src/components/Template/StepComponents/ry/clfcz.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
index 55e7884..26a6d5a 100644
--- a/src/components/Template/StepComponents/ry/cs.vue
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/czdd.vue b/src/components/Template/StepComponents/ry/czdd.vue
index 9764bef..d536728 100644
--- a/src/components/Template/StepComponents/ry/czdd.vue
+++ b/src/components/Template/StepComponents/ry/czdd.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/czhj.vue b/src/components/Template/StepComponents/ry/czhj.vue
index 12b1683..379b4c6 100644
--- a/src/components/Template/StepComponents/ry/czhj.vue
+++ b/src/components/Template/StepComponents/ry/czhj.vue
@@ -25,7 +25,7 @@ export default {
                         fillType: "preFill",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/dc.vue b/src/components/Template/StepComponents/ry/dc.vue
index c99cd6e..aeba99f 100644
--- a/src/components/Template/StepComponents/ry/dc.vue
+++ b/src/components/Template/StepComponents/ry/dc.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/fr.vue b/src/components/Template/StepComponents/ry/fr.vue
index 42ba755..b264241 100644
--- a/src/components/Template/StepComponents/ry/fr.vue
+++ b/src/components/Template/StepComponents/ry/fr.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
@@ -37,7 +37,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         sj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                             ylCode: "sjtj",
                             dwCode: "sjtjdw",
diff --git a/src/components/Template/StepComponents/ry/frdrq.vue b/src/components/Template/StepComponents/ry/frdrq.vue
index e8a5c6b..703e9c0 100644
--- a/src/components/Template/StepComponents/ry/frdrq.vue
+++ b/src/components/Template/StepComponents/ry/frdrq.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
@@ -37,7 +37,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         sj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                             ylCode: "sjtj",
                             dwCode: "sjtjdw",
diff --git a/src/components/Template/StepComponents/ry/fs.vue b/src/components/Template/StepComponents/ry/fs.vue
index ddf5d41..54dc249 100644
--- a/src/components/Template/StepComponents/ry/fs.vue
+++ b/src/components/Template/StepComponents/ry/fs.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
index 6e88206..ded50e6 100644
--- a/src/components/Template/StepComponents/ry/fy.vue
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/glsd.vue b/src/components/Template/StepComponents/ry/glsd.vue
index 33c50e6..0041022 100644
--- a/src/components/Template/StepComponents/ry/glsd.vue
+++ b/src/components/Template/StepComponents/ry/glsd.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         sj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                         },
                         text3:{
diff --git a/src/components/Template/StepComponents/ry/glzd.vue b/src/components/Template/StepComponents/ry/glzd.vue
index a6f5005..2c17e55 100644
--- a/src/components/Template/StepComponents/ry/glzd.vue
+++ b/src/components/Template/StepComponents/ry/glzd.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
@@ -33,7 +33,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         sj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                         },
                         text3:{
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
index bb7b3e2..d3353aa 100644
--- a/src/components/Template/StepComponents/ry/hwhy.vue
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq1: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue
index bb0e64c..101cbeb 100644
--- a/src/components/Template/StepComponents/ry/jb.vue
+++ b/src/components/Template/StepComponents/ry/jb.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text4: {
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index fe2fa17..24fcb13 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -26,7 +26,7 @@ export default {
                         fillType: "preFill",
                     },
                     sj: {
-                        type: "regent",
+                        type: "sj",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue
index c2e6216..711beac 100644
--- a/src/components/Template/StepComponents/ry/jrjb.vue
+++ b/src/components/Template/StepComponents/ry/jrjb.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/jrry.vue b/src/components/Template/StepComponents/ry/jrry.vue
index 9406502..3eb1867 100644
--- a/src/components/Template/StepComponents/ry/jrry.vue
+++ b/src/components/Template/StepComponents/ry/jrry.vue
@@ -26,7 +26,7 @@ export default {
                     },
                     sjrqcz: {
                         fillType: "actFill",
-                        type: "instrument",
+                        type: "yq",
                     },
                     text2: {
                         label: "仪器,吸取",
@@ -38,7 +38,7 @@ export default {
                     },
                     sjrq:{
                         fillType: "actFill",
-                        type: "regent",
+                        type: "sj",
                         ylCode: "sjsr2",
                         dwCode: "sjsrdw2",
                     },
diff --git a/src/components/Template/StepComponents/ry/js.vue b/src/components/Template/StepComponents/ry/js.vue
index 97df72f..17e38dc 100644
--- a/src/components/Template/StepComponents/ry/js.vue
+++ b/src/components/Template/StepComponents/ry/js.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/jz.vue b/src/components/Template/StepComponents/ry/jz.vue
index 5a3fc00..c2c288a 100644
--- a/src/components/Template/StepComponents/ry/jz.vue
+++ b/src/components/Template/StepComponents/ry/jz.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         sj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue
index 9ec3fe7..2253e91 100644
--- a/src/components/Template/StepComponents/ry/lx.vue
+++ b/src/components/Template/StepComponents/ry/lx.vue
@@ -21,7 +21,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
diff --git a/src/components/Template/StepComponents/ry/mj.vue b/src/components/Template/StepComponents/ry/mj.vue
index 55bb363..d4af8a6 100644
--- a/src/components/Template/StepComponents/ry/mj.vue
+++ b/src/components/Template/StepComponents/ry/mj.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/rs.vue b/src/components/Template/StepComponents/ry/rs.vue
index 7524d37..1be2dba 100644
--- a/src/components/Template/StepComponents/ry/rs.vue
+++ b/src/components/Template/StepComponents/ry/rs.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
@@ -78,7 +78,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yjsj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                             ylCode: "sjtj2",
                             dwCode: "sjtjdw1",
diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue
index daf4f84..5fcfbf3 100644
--- a/src/components/Template/StepComponents/ry/sy.vue
+++ b/src/components/Template/StepComponents/ry/sy.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/tjphcz.vue b/src/components/Template/StepComponents/ry/tjphcz.vue
index 4fece19..b946116 100644
--- a/src/components/Template/StepComponents/ry/tjphcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphcz.vue
@@ -21,7 +21,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
@@ -41,7 +41,7 @@ export default {
                         fillType: "preFill",
                     },
                     sj1: {
-                        type: "regent",
+                        type: "sj",
                         fillType: "actFill",
                         ylCode: "sjjrl",
                         dwCode: "sjjrldw",
@@ -70,7 +70,7 @@ export default {
                         fillType: "preFill",
                     },
                     sj2: {
-                        type: "regent",
+                        type: "sj",
                         fillType: "actFill",
                         ylCode: "sjjrl1",
                         dwCode: "sjjrldw1",
diff --git a/src/components/Template/StepComponents/ry/tjphfcz.vue b/src/components/Template/StepComponents/ry/tjphfcz.vue
index 3b5bc61..4a2ab9e 100644
--- a/src/components/Template/StepComponents/ry/tjphfcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphfcz.vue
@@ -21,7 +21,7 @@ export default {
                         type: "text",
                     },
                     yq: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                     text2: {
@@ -41,7 +41,7 @@ export default {
                         fillType: "preFill",
                     },
                     sj1: {
-                        type: "regent",
+                        type: "sj",
                         fillType: "actFill",
                         ylCode: "sjjrl",
                         dwCode: "sjjrldw",
@@ -70,7 +70,7 @@ export default {
                         fillType: "preFill",
                     },
                     sj2: {
-                        type: "regent",
+                        type: "sj",
                         fillType: "actFill",
                         ylCode: "sjjrl1",
                         dwCode: "sjjrldw1",
diff --git a/src/components/Template/StepComponents/ry/tpjydd.vue b/src/components/Template/StepComponents/ry/tpjydd.vue
index bcadc89..234e858 100644
--- a/src/components/Template/StepComponents/ry/tpjydd.vue
+++ b/src/components/Template/StepComponents/ry/tpjydd.vue
@@ -24,7 +24,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         ddsys:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/tpjysd.vue b/src/components/Template/StepComponents/ry/tpjysd.vue
index ca0a308..45e280b 100644
--- a/src/components/Template/StepComponents/ry/tpjysd.vue
+++ b/src/components/Template/StepComponents/ry/tpjysd.vue
@@ -22,7 +22,7 @@ export default {
                         type: "text",
                     },
                     ddsys: {
-                        type: "instrument",
+                        type: "yq",
                         fillType: "actFill",
                     },
                 }
diff --git a/src/components/Template/StepComponents/ry/wxhy.vue b/src/components/Template/StepComponents/ry/wxhy.vue
index 0eb132f..2b147a8 100644
--- a/src/components/Template/StepComponents/ry/wxhy.vue
+++ b/src/components/Template/StepComponents/ry/wxhy.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq1:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/ym.vue b/src/components/Template/StepComponents/ry/ym.vue
index abfb145..3b2110d 100644
--- a/src/components/Template/StepComponents/ry/ym.vue
+++ b/src/components/Template/StepComponents/ry/ym.vue
@@ -33,7 +33,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text3:{
@@ -45,7 +45,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         sj:{
-                            type:"regent",
+                            type:"sj",
                             fillType:"actFill",
                             ylCode: "ry3",
                             dwCode: "sjrytjdw",
diff --git a/src/components/Template/StepComponents/ry/zy.vue b/src/components/Template/StepComponents/ry/zy.vue
index d53f959..48e1756 100644
--- a/src/components/Template/StepComponents/ry/zy.vue
+++ b/src/components/Template/StepComponents/ry/zy.vue
@@ -21,7 +21,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         yq:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepComponents/ry/zyhy.vue b/src/components/Template/StepComponents/ry/zyhy.vue
index b175548..2113660 100644
--- a/src/components/Template/StepComponents/ry/zyhy.vue
+++ b/src/components/Template/StepComponents/ry/zyhy.vue
@@ -25,7 +25,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         yq1:{
-                            type:"instrument",
+                            type:"yq",
                             fillType:"actFill",
                         },
                         text2:{
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 25e0e0e..3bb4ff3 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -34,11 +34,12 @@
                         :item="getButtonItem(sItem)"
                         @clickButton="(e)=>handleClickButton(e,item)" />
                 </template>
-                <!-- 仪器（instrument）regent(药剂) gsp(供试品) mix（药剂/供试品/给药制剂） -->
-                <template v-else-if="sItem.type === 'instrument' || sItem.type === 'regent' || sItem.type === 'gsp' || sItem.type === 'mix' || sItem.type === 'xb'">
+                <!-- 仪器（instrument）sj(药剂) gsp(供试品) mix（药剂/供试品/给药制剂） -->
+                <template v-else-if="isRegent(sItem)">
                     <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                        type="clickable" @clickable="handleClickInstrument(key,sItem.type)" :error="errors[key]"
-                        @update:error="errors[key] = false" @resetRecord="resetRecord(key)" :item="getClickableItem(sItem)"
+                        :type="sItem.type" :error="errors[key]"
+                        @onRegentSubmit="(data)=>onRegentSubmit(data,key,sItem)"
+                        @update:error="errors[key] = false"  :item="getRegentItem(sItem)"
                         :value="formFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'text'">
@@ -71,7 +72,7 @@ import formPackageMixins from '@/components/Template/mixins/formPackageMixins.js
 import ZLSubPackage from '@/components/Template/StepComponents/ZLSubPackage.vue'
 import { isShowOther } from "@/utils/formPackageCommon.js";
 import { EventBus } from "@/utils/eventBus";
-import { getuuid } from "@/utils/index.js";
+import { getuuid,isRegent} from "@/utils/index.js";
 import moment from 'moment'
 export default {
     inject: ['templateFillType','templateData'],
@@ -101,13 +102,13 @@ export default {
     },
     mounted() {
         EventBus.$on("onReagentSubmit",this.onReagentSubmit)
-        EventBus.$on("onInstrumentSubmit",this.onInstrumentSubmit)
-        EventBus.$on("onMixReagentSubmit",this.onMixReagentSubmit)
+        // EventBus.$on("onInstrumentSubmit",this.onInstrumentSubmit)
+        // EventBus.$on("onMixReagentSubmit",this.onMixReagentSubmit)
     },
     unmounted() {
         EventBus.$off("onReagentSubmit",this.onReagentSubmit)
-        EventBus.$off("onInstrumentSubmit",this.onInstrumentSubmit)
-        EventBus.$off("onMixReagentSubmit",this.onMixReagentSubmit)
+        // EventBus.$off("onInstrumentSubmit",this.onInstrumentSubmit)
+        // EventBus.$off("onMixReagentSubmit",this.onMixReagentSubmit)
     },
     data() {
         return {
@@ -118,9 +119,24 @@ export default {
             isShowOther,
             currentClickKey: "",//当前点击的字段key
             uuid:getuuid(),
+            isRegent,
         }
     },
     methods: {
+        // //试剂/仪器等弹窗提交
+        // onRegentSubmit(data,key,item){
+        //     this.updateFormData(key,data.selectedId);
+        //     this.$emit("onRegentSubmit", {selectInfo:data,key,config:item});
+        // },
+        getRegentItem(item,fieldCode="type"){
+            const type = item[fieldCode] ;
+            return {
+                label: "",
+                type,
+                fillType: item.subFillType || item.fillType,
+                parentLabel: item.label,
+            }
+        },
         updateZlfzData(key,data){
             const ref = this.$refs[`zlSubPackageRef_${key}`][0];
             if(ref){
@@ -163,7 +179,7 @@ export default {
             const sjResource = [],yqResource = [];
             for(const key in allFieldsConfig){
                 const item = allFieldsConfig[key];
-                if(item.type === "xb" || item.type === "regent" || item.type === "gsp" || item.type === "mix"){
+                if(item.type === "xb" || item.type === "sj" || item.type === "gsp" || item.type === "mix"){
                     if(formFields[key]){
                         let o = {
                             ...formFields[`selectInfo_${key}`],
@@ -177,7 +193,7 @@ export default {
                         }
                         sjResource.push(o);
                     }
-                }else if(item.type === "instrument"){
+                }else if(item.type === "yq"){
                     if(formFields[key]){
                         yqResource.push({
                             type:item.type,
@@ -235,13 +251,13 @@ export default {
         getClickableItem(sItem) {
             return {
                 ...sItem,
-                type:"clickable",
+                type:sItem.type,
             
             }
         },
         handleClickInstrument(key,type) {
             this.currentClickKey = key;
-            if(type === 'regent'){//试剂
+            if(type === 'sj'){//试剂
                 EventBus.$emit("showSelectMixReagentDialog",{
                     studyFormId:this.templateData.id,
                     uuid:this.uuid,
@@ -291,7 +307,7 @@ export default {
                     sourceFrom:'step',
                     type:"11",
                 })  
-            }else if(type === 'instrument'){
+            }else if(type === 'yq'){
                 EventBus.$emit("showSelectInstrumentDialog",{
                     studyFormId:this.templateData.id,
                     uuid:this.uuid,
diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js
index a6bcc3a..577abfe 100644
--- a/src/components/Template/mixins/formPackageMixins.js
+++ b/src/components/Template/mixins/formPackageMixins.js
@@ -46,6 +46,9 @@ export default {
     },
 
     methods: {
+        onSelectChange(){
+            
+        },
         //试剂/仪器等弹窗提交
         onRegentSubmit(data,key,item){
             this.updateFormData(key,data.selectedId);
@@ -219,7 +222,6 @@ export default {
             selectInfoKeys.forEach(key => {
                 result[key] = formData[key];
             })
-            console.log(result,"result")
             // 更新表单字段
             this.formFields = result;
             this.allFieldsConfig = config;
@@ -257,7 +259,6 @@ export default {
             const errors = [];
             // 清空之前的错误状态
             this.errors = {};
-            console.log(allFieldsConfig,formFields,"allFieldsConfig")
             for (const key in allFieldsConfig) {
                 const o = allFieldsConfig[key];
                 if (o.otherCode) {//
diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue
index 5124fbd..f18857c 100644
--- a/src/views/business/comps/template/comps/sp/SP003.vue
+++ b/src/views/business/comps/template/comps/sp/SP003.vue
@@ -297,6 +297,7 @@ export default {
 					bodyPrecisionKey: "targetStartSolutionVolumePrecision",
 					bodyMaxlength: 10,
 					bodySubPlaceholder: "template.common.xswsPlaceholder",
+					headerSelectTo: "actStartSolutionVolumeUnit",
 				},
 				{
 					label: "template.sp.sp003.sjqsrytj",
@@ -330,6 +331,7 @@ export default {
 					bodyPrecisionKey: "targetDiluentVolumePrecision",
 					bodyMaxlength: 10,
 					bodySubPlaceholder: "请输入保留小数位数",
+					headerSelectTo: "actDiluentVolumeUnit",
 				},
 				{
 					label: "template.sp.sp003.sjxsytj",
@@ -348,20 +350,21 @@ export default {
 				{
 					label: "template.sp.sp003.ysmbrynd",
 					prop: "targetSolutionConcentration",
-					width: 180,
-					showWidth: 100,
+					width: 210,
+					showWidth: 120,
 					headerSelectKey: "targetSolutionConcentrationUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_nddw'),
 					bodyType: "inputNumber",
 					bodyFillType: "preFill",
 					bodyMaxlength: 10,
+					headerSelectTo:"actSolutionConcentrationUnit",
 				},
 				{
 					label: "template.sp.sp003.sjmbrynd",
 					prop: "actSolutionConcentration",
-					width: 190,
-					showWidth: 100,
+					width: 210,
+					showWidth: 120,
 					headerSelectKey: "actSolutionConcentrationUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_nddw'),
@@ -380,20 +383,21 @@ export default {
 				{
 					label: "template.sp.sp003.ysmbrytj",
 					prop: "targetSolutionVolume",
-					width: 180,
-					showWidth: 100,
+					width: 200,
+					showWidth: 120,
 					headerSelectKey: "targetSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
 					bodyType: "inputNumber",
 					bodyFillType: "preFill",
 					bodyMaxlength: 10,
+					headerSelectTo:"actSolutionVolumeUnit",
 				},
 				{
 					label: "template.sp.sp003.sjmbrytj",
 					prop: "actSolutionVolume",
-					width: 180,
-					showWidth: 100,
+					width: 200,
+					showWidth: 120,
 					headerSelectKey: "actSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 9c192eb..f715a3d 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -358,8 +358,10 @@ export default {
 				const volume =
 					this.$refs.stepFormPackageRef?.getFormDataByKey(
 						'targetStartSolution'
-					) || 0
-				if (volume) {
+					)
+				if(isValueEmpty(volume)){
+					this.$message.error('请先选择预设起始源溶液浓度')
+				}else{
 					this.updateTargetStartSolutionVolume(item, volume)
 				}
 			} else if (
@@ -368,9 +370,12 @@ export default {
 			) {
 				//实际起始溶液体积和实际目标溶液体积
 				const targetAcSolution =
-					this.$refs.stepFormPackageRef?.getFormDataByKey('targetAcSolution') ||
-					0 //获取实际起始溶液浓度
-				if (targetAcSolution) {
+					this.$refs.stepFormPackageRef?.getFormDataByKey('targetAcSolution') //获取实际起始溶液浓度
+					console.log(targetAcSolution,"targetAcSolution")
+					if(isValueEmpty(targetAcSolution)){
+						this.$message.error('请先选择起始源溶液')
+						return
+					}else {
 					const volResult = this.updateSjmbrynd(item, targetAcSolution);
 					if(!volResult){
 						return
@@ -413,7 +418,6 @@ export default {
 		},
 		//更新起始溶液体积时，计算目标溶液预计浓度
 		updateTargetStartSolutionVolume(item, volume) {
-			debugger
 			const precision = item.targetStartSolutionVolumePrecision || 0
 			const concentration = item.targetSolutionConcentration || 0
 			const targetVolume = item.targetSolutionVolume || 0