Merge branch 'master' into ouqian

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)" />

src/components/Template/StepComponents/b/cl.vue

@@ -1,6 +1,6 @@
 <!-- 称量 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="b_cl" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'b_cl'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/b/jrry_b.vue

@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="b_jrry_b" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'b_jrry_b'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/bdtj.vue

@@ -1,6 +1,6 @@
 <!-- 标定(体积) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_bdtj" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdtj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/bdzl.vue

@@ -1,6 +1,6 @@
 <!-- 标定(质量) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_bdzl" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdzl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/clcz.vue

@@ -1,6 +1,6 @@
 <!-- 称量（非传值） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_clcz" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_clcz'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/clfcz.vue

@@ -1,6 +1,6 @@
 <!-- 称量（传值） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_clfcz" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_clfcz'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/cs.vue

@@ -1,6 +1,6 @@
 <!-- 超声 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_cs" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_cs'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/czdd.vue

@@ -1,6 +1,6 @@
 <!-- 操作地点 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_czdd" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_czdd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/czhj.vue

@@ -1,6 +1,6 @@
 <!-- 操作环境 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_czhj" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_czhj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/dc.vue

@@ -1,6 +1,6 @@
 <!-- 氮吹 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_dc" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_dc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/ddhy.vue

@@ -1,6 +1,6 @@
 <!-- 颠倒混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_ddhy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_ddhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/fb.vue

@@ -1,6 +1,6 @@
 <!-- 封板 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_fb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/fr.vue

@@ -1,6 +1,6 @@
 <!-- 复溶 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_fr" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/frdrq.vue

@@ -1,6 +1,6 @@
 <!-- 复溶(多容器) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_frdrq" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_frdrq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/fs.vue

@@ -1,6 +1,6 @@
 <!-- 复苏 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_fs" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fs'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/fy.vue

@@ -1,6 +1,6 @@
 <!-- 孵育 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_fy" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fy'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/glsd.vue

@@ -1,6 +1,6 @@
 <!-- 过滤(手动)  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_glsd" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_glsd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/glzd.vue

@@ -1,6 +1,6 @@
 <!-- 过滤(自动) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_glzd" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_glzd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/hb.vue

@@ -1,6 +1,6 @@
 <!-- 合并 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_hb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_hb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/hwhy.vue

@@ -1,6 +1,6 @@
 <!-- 恒温混匀 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_hwhy" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_hwhy'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/jb.vue

@@ -1,6 +1,6 @@
 <!-- 搅拌 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jb" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jb'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/jd.vue

@@ -1,6 +1,6 @@
 <!-- 解冻  -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jd" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jd'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/jr.vue

@@ -1,6 +1,6 @@
 <!-- 加热 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_jr" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/jrjb.vue

@@ -1,6 +1,6 @@
 <!-- 加热搅拌 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_jrjb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jrjb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/jrry.vue

@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_jrry" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jrry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/js.vue

@@ -1,6 +1,6 @@
 <!-- 计数 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_js" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_js'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/jz.vue

@@ -1,6 +1,6 @@
 <!-- 静置  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_jz" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/kb.vue

@@ -1,6 +1,6 @@
 <!-- 空白 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_kb" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/kbsjgsp.vue

@@ -1,6 +1,6 @@
 <!-- 空白（试剂/供试品） -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_kbsjgsp" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kbsjgsp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/kbyq.vue

@@ -1,6 +1,6 @@
 <!-- 空白（仪器） -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_kbyq" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kbyq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/lx.vue

@@ -1,6 +1,6 @@
 <!-- 离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_lx" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_lx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/mj.vue

@@ -1,6 +1,6 @@
 <!-- 灭菌 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_mj" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_mj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/qcyy.vue

@@ -1,6 +1,6 @@
 <!-- 取出原药 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_qcyy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_qcyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/qywz.vue

@@ -1,6 +1,6 @@
 <!-- 取用物质 -->
 <template>
-    <StepFormPackage @onDialogSubmit="onDialogSubmit" prefixKey="ry_qywz" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage @onDialogSubmit="onDialogSubmit" :prefixKey="stepIndex+'_'+'ry_qywz'" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/rs.vue

@@ -1,6 +1,6 @@
 <!-- 染色 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_rs" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_rs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/sy.vue

@@ -1,6 +1,6 @@
 <!-- 水浴 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_sy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_sy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/tjphcz.vue

@@ -1,6 +1,6 @@
 <!-- 调节PH(传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_tjphcz" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tjphcz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/tjphfcz.vue

@@ -1,6 +1,6 @@
 <!-- 调节PH(非传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_tjphfcz" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tjphfcz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/tpjydd.vue

@@ -1,7 +1,7 @@
 <!-- 天平校验(单点) -->
 <template>
     <StepFormPackage 
-        ref = "stepFormPackageRef" prefixKey="ry_tpjydd" @resetRecord = "resetRecord" 
+        ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tpjydd'" @resetRecord = "resetRecord" 
         @clickButton="handleClickButton"
         :form-config="formConfig" :formData = "formData" />
 </template>

src/components/Template/StepComponents/ry/tpjysd.vue

@@ -1,6 +1,6 @@
 <!-- 天平校验(双点) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_tpjysd" @resetRecord="resetRecord"
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tpjysd'" @resetRecord="resetRecord"
         @clickButton="handleClickButton" :form-config="formConfig" :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/wxhy.vue

@@ -1,6 +1,6 @@
 <!-- 涡旋混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_wxhy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_wxhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/xzrq.vue

@@ -1,6 +1,6 @@
 <!-- 选择容器 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="ry_xzrq" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_xzrq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/ym.vue

@@ -1,6 +1,6 @@
 <!-- 研磨 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_ym" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_ym'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/zlfz.vue

@@ -2,7 +2,7 @@
 <template>
     <StepFormPackage
     @onDialogSubmit = "onDialogSubmit"
-     ref="stepFormPackageRef" prefixKey="ry_zlfz" @resetRecord="resetRecord" :form-config="formConfig"
+     ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zlfz'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 

src/components/Template/StepComponents/ry/zy.vue

@@ -1,6 +1,6 @@
 <!-- 正压 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_zy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/ry/zyhy.vue

@@ -1,6 +1,6 @@
 <!-- 振摇混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="ry_zyhy" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zyhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/spyjzzb/jszz.vue

@@ -1,6 +1,6 @@
 <!-- 剪碎组织 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" prefixKey="spyjzzb_jszz" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_jszz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/swypfx/hhspe.vue

@@ -1,6 +1,6 @@
 <!-- 活化（SPE） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="swypfx_hhspe" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_hhspe'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/swypfx/jryp.vue

@@ -1,6 +1,6 @@
 <!-- 加入样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="swypfx_jryp" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_jryp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

src/components/Template/StepComponents/swypfx/zyfc.vue

@@ -1,6 +1,6 @@
 <!-- 转移（分层） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" prefixKey="swypfx_zyfc" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_zyfc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>

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,
         }
     },

src/components/Template/mixins/stepMixins.js

@@ -8,6 +8,10 @@ export default {
         formData: {
             type: Object,
             default: () => ({})
+        },
+        stepIndex: {
+            type: Number,
+            default: 0
         }
     },
     methods: {

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
 						},

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
 						},

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
 						}

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
 						},

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
 						}

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
 						},

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
 						},

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
 						},

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
 						},

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
 						},

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
 						},

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
 				},

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,
 						},

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
 						},

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
 						},

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
         }

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
         }

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
                 },

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
         },

src/views/business/comps/template/mixins/templateMixin.js

@@ -537,11 +537,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
 					}