From f11c1fead953f8059e6fa13337a1ee15eeb1f315 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Sat, 7 Mar 2026 21:52:21 +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/Step.vue                          |  2 +-
 src/components/Template/StepFormPackage.vue               | 15 +++++++--------
 src/components/Template/mixins/stepMixins.js              |  4 ++++
 src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue |  2 +-
 src/views/business/comps/template/comps/gsp/GSP001.vue    |  2 +-
 src/views/business/comps/template/comps/gsp/GSP002.vue    |  2 +-
 src/views/business/comps/template/comps/gsp/GSP003.vue    |  2 +-
 src/views/business/comps/template/comps/gsp/GSP004.vue    |  2 +-
 src/views/business/comps/template/comps/gsp/GSP005.vue    |  2 +-
 src/views/business/comps/template/comps/gsp/GSP010.vue    |  2 +-
 src/views/business/comps/template/comps/lba/LBA002.vue    |  2 +-
 src/views/business/comps/template/comps/lba/LBA003.vue    |  2 +-
 src/views/business/comps/template/comps/lba/LBA004.vue    |  2 +-
 src/views/business/comps/template/comps/lba/LBA006.vue    |  2 +-
 src/views/business/comps/template/comps/sp/SP001.vue      |  2 +-
 src/views/business/comps/template/comps/sp/SP003.vue      |  2 +-
 src/views/business/comps/template/comps/sp/SP008.vue      |  2 +-
 src/views/business/comps/template/comps/sp/SP009.vue      |  2 +-
 .../business/comps/template/formConfig/PCRTableConfig.js  |  2 +-
 .../comps/template/formConfig/paralleAndLadderConfig.js   |  2 +-
 src/views/business/comps/template/formConfig/sp/SP0019.js |  2 +-
 src/views/business/comps/template/formConfig/sp/SP007.js  |  2 +-
 src/views/business/comps/template/mixins/templateMixin.js | 10 ++++++++--
 23 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index 5bcf70a..ccbd164 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -5,7 +5,7 @@
 			<draggable v-model="steps"  ghost-class="ghost" handle=".drag-handle" @end="onDragEnd" :animation="200">
 				<div v-for="(step, index) in steps" :key="step.id" class="step-list-item">
 					<div class="step-content">
-						<i class="el-icon-rank drag-handle" style="cursor: move; margin-right: 10px; margin-top: 6px;"></i>
+						<i class="el-icon-rank drag-handle" v-if="templateFillType === 'preFill'" style="cursor: move; margin-right: 10px; margin-top: 6px;"></i>
 						<span class="step-title">{{ index + 1 }}</span>
 						<HandleFormItem type="select" placeholder="请选择" class="step-type-select" :item="stepSelectConfig"
 							v-model="step.type" @change="onTypeChange(index)" />
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index d8d06fb..b778e89 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -4,25 +4,25 @@
             <div v-for="(sItem, key) in item.config" class="step-item" :key="key">
                 <template v-if="sItem.type === 'input'">
                     <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" @blur="onBlur(key, $event)"
-                        :item="sItem" v-model="formFields[key]" :field-key="prefixKey+uuid + '_' + key"
+                        :item="sItem" v-model="formFields[key]" :field-key="prefixKey+'_' + key"
                         @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                         :orange-bg="orangeBgFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'inputNumber'">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_' + key"
                         type="inputNumber" @blur="onBlur(key, $event)" :item="sItem"
                         @input="onInputNumberChange(key, $event)" v-model="formFields[key]" @copy="onCopy(sItem, key)"
                         :error="errors[key]" @update:error="errors[key] = false" :orange-bg="orangeBgFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'select'">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_' + key"
                         type="select" @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
                         @change="onSelectChange(key, $event, sItem.type)"
                         @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                         :orange-bg="orangeBgFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'checkbox'">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_' + key"
                         type="checkbox" :item="sItem" v-model="formFields[key]"
                         @change="onSelectChange(key, $event, sItem.type)"
                         @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
@@ -36,7 +36,7 @@
                 </template>
                 <!-- 仪器（instrument）sj(药剂) gsp(供试品) mix（药剂/供试品/给药制剂） -->
                 <template v-else-if="isRegent(sItem)">
-                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid + '_' + key"
+                    <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+ '_' + key"
                         :type="sItem.type" :error="errors[key]"
                         @onRegentSubmit="(data)=>onRegentSubmit(data,key,sItem)"
                         @update:error="errors[key] = false"  :item="getRegentItem(sItem)"
@@ -55,7 +55,7 @@
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
                     <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div>
-                    <HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+uuid+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
+                    <HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
                         v-model="formFields[sItem.otherCode]" @copy="onCopy(sItem, key)"
                         :error="errors[sItem.otherCode]" @update:error="errors[sItem.otherCode] = false"
                         :orange-bg="orangeBgFields[sItem.otherCode]" />
@@ -72,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,isRegent} from "@/utils/index.js";
+import { isRegent} from "@/utils/index.js";
 import moment from 'moment'
 export default {
     inject: ['templateFillType','templateData'],
@@ -112,7 +112,6 @@ export default {
             orangeBgFields: {},// 存储需要橙色背景的字段
             isShowOther,
             currentClickKey: "",//当前点击的字段key
-            uuid:getuuid(),
             isRegent,
         }
     },
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index 31c2428..469366b 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -8,6 +8,10 @@ export default {
         formData: {
             type: Object,
             default: () => ({})
+        },
+        stepIndex: {
+            type: Number,
+            default: 0
         }
     },
     methods: {
diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
index e93b860..2559921 100644
--- a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
+++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
@@ -133,7 +133,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue
index 45eb149..b057791 100644
--- a/src/views/business/comps/template/comps/gsp/GSP001.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP001.vue
@@ -132,7 +132,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index fb621ea..fdc3c71 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -149,7 +149,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: 'inputNumber',
-							fillType: 'actFill',
+							fillType: 'preFill',
 							prepend: 'V',
 							maxlength: 50
 						}
diff --git a/src/views/business/comps/template/comps/gsp/GSP003.vue b/src/views/business/comps/template/comps/gsp/GSP003.vue
index 97a4284..fc511f7 100644
--- a/src/views/business/comps/template/comps/gsp/GSP003.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP003.vue
@@ -155,7 +155,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/gsp/GSP004.vue b/src/views/business/comps/template/comps/gsp/GSP004.vue
index 5b09354..4b52eb1 100644
--- a/src/views/business/comps/template/comps/gsp/GSP004.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP004.vue
@@ -162,7 +162,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: 'inputNumber',
-							fillType: 'actFill',
+							fillType: 'preFill',
 							prepend: 'V',
 							maxlength: 50
 						}
diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue
index 9c9c894..7a17326 100644
--- a/src/views/business/comps/template/comps/gsp/GSP005.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP005.vue
@@ -157,7 +157,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/gsp/GSP010.vue b/src/views/business/comps/template/comps/gsp/GSP010.vue
index d947da1..8f008a1 100644
--- a/src/views/business/comps/template/comps/gsp/GSP010.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP010.vue
@@ -112,7 +112,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/lba/LBA002.vue b/src/views/business/comps/template/comps/lba/LBA002.vue
index 267750e..1fb262b 100644
--- a/src/views/business/comps/template/comps/lba/LBA002.vue
+++ b/src/views/business/comps/template/comps/lba/LBA002.vue
@@ -105,7 +105,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/lba/LBA003.vue b/src/views/business/comps/template/comps/lba/LBA003.vue
index a52a4bd..f1e2b05 100644
--- a/src/views/business/comps/template/comps/lba/LBA003.vue
+++ b/src/views/business/comps/template/comps/lba/LBA003.vue
@@ -90,7 +90,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/lba/LBA004.vue b/src/views/business/comps/template/comps/lba/LBA004.vue
index 4f2aee6..577595e 100644
--- a/src/views/business/comps/template/comps/lba/LBA004.vue
+++ b/src/views/business/comps/template/comps/lba/LBA004.vue
@@ -166,7 +166,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/lba/LBA006.vue b/src/views/business/comps/template/comps/lba/LBA006.vue
index 61c5155..3fea786 100644
--- a/src/views/business/comps/template/comps/lba/LBA006.vue
+++ b/src/views/business/comps/template/comps/lba/LBA006.vue
@@ -111,7 +111,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue
index f4e8766..31d669e 100644
--- a/src/views/business/comps/template/comps/sp/SP001.vue
+++ b/src/views/business/comps/template/comps/sp/SP001.vue
@@ -129,7 +129,7 @@ export default {
 				versionNum: {
 					label: 'template.common.versionNumber',
 					type: "inputNumber",
-					fillType: "actFill",
+					fillType: "preFill",
 					prepend: "V",
 					maxlength: 50
 				},
diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue
index f4cbc95..825aacf 100644
--- a/src/views/business/comps/template/comps/sp/SP003.vue
+++ b/src/views/business/comps/template/comps/sp/SP003.vue
@@ -131,7 +131,7 @@ export default {
 						versionNum: {
 							label: "template.common.versionNumber",
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50,
 						},
diff --git a/src/views/business/comps/template/comps/sp/SP008.vue b/src/views/business/comps/template/comps/sp/SP008.vue
index 4c1c256..4ab8cbf 100644
--- a/src/views/business/comps/template/comps/sp/SP008.vue
+++ b/src/views/business/comps/template/comps/sp/SP008.vue
@@ -140,7 +140,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/comps/sp/SP009.vue b/src/views/business/comps/template/comps/sp/SP009.vue
index 9c3b8bb..bcb6f8e 100644
--- a/src/views/business/comps/template/comps/sp/SP009.vue
+++ b/src/views/business/comps/template/comps/sp/SP009.vue
@@ -144,7 +144,7 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "actFill",
+							fillType: "preFill",
 							prepend: "V",
 							maxlength: 50
 						},
diff --git a/src/views/business/comps/template/formConfig/PCRTableConfig.js b/src/views/business/comps/template/formConfig/PCRTableConfig.js
index 57c0de1..8dacff8 100644
--- a/src/views/business/comps/template/formConfig/PCRTableConfig.js
+++ b/src/views/business/comps/template/formConfig/PCRTableConfig.js
@@ -453,7 +453,7 @@ export const getBaseInfoFormConfig = ($this) => {
         versionNum: {
           label: 'template.common.versionNumber',
           type: 'inputNumber',
-          fillType: 'actFill',
+          fillType: 'preFill',
           prepend: 'V',
           maxlength: 50
         }
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index ea61661..bfb54d9 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -498,7 +498,7 @@ export const getBaseInfoFormConfig = ($this) => {
         versionNum: {
           label: 'template.common.versionNumber',
           type: 'inputNumber',
-          fillType: 'actFill',
+          fillType: 'preFill',
           prepend: 'V',
           maxlength: 50
         }
diff --git a/src/views/business/comps/template/formConfig/sp/SP0019.js b/src/views/business/comps/template/formConfig/sp/SP0019.js
index f1b40ab..1325f6c 100644
--- a/src/views/business/comps/template/formConfig/sp/SP0019.js
+++ b/src/views/business/comps/template/formConfig/sp/SP0019.js
@@ -22,7 +22,7 @@ export const getBaseInfoFormConfig = (formType) => {
                 versionNum: {
                     label: 'template.common.versionNumber',
                     type: 'inputNumber',
-                    fillType: 'actFill',
+                    fillType: 'preFill',
                     prepend: 'V',
                     maxlength: 50
                 },
diff --git a/src/views/business/comps/template/formConfig/sp/SP007.js b/src/views/business/comps/template/formConfig/sp/SP007.js
index 15648b6..520bac4 100644
--- a/src/views/business/comps/template/formConfig/sp/SP007.js
+++ b/src/views/business/comps/template/formConfig/sp/SP007.js
@@ -22,7 +22,7 @@ export const getBaseInfoFormConfig = ($this) => {
         versionNum: {
           label: 'template.common.versionNumber',
           type: 'inputNumber',
-          fillType: 'actFill',
+          fillType: 'preFill',
           prepend: 'V',
           maxlength: 50
         },
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 395aaeb..44c873a 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -535,11 +535,17 @@ export default {
 					targetStartSolutionUnit:subTargetAcSolutionUnit,
 					headerSelectFields
 				}
-				if (isValueEmpty(targetAcSolution)) {
+				let initNd = 0;
+				if(rowIndex === 0){
+					initNd = targetAcSolution;
+				}else{
+					initNd = dataSource[rowIndex - 1].actSolutionConcentration;
+				}
+				if (isValueEmpty(initNd)) {
 					this.$message.error('请先选择起始源溶液')
 					return
 				} else {
-					const volResult = this.updateSjmbrynd(item, targetAcSolution,p)
+					const volResult = this.updateSjmbrynd(item, initNd,p)
 					if (!volResult) {
 						return
 					}