From a5dde9874698133fca881ec2eef1568064c62b39 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Mon, 5 Jan 2026 17:01:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPcakge.vue     |  18 ++-
 src/components/Template/CustomTable.vue            |  67 +++++----
 src/components/Template/DecimalInput.vue           |  15 +-
 src/components/Template/HandleFormItem.vue         |   1 +
 .../Template/operation/TableOpertaion.vue          |  65 ++++++++
 .../comps/template/comps/sp/SWYPBQGZYZBB.vue       | 165 ++++++++++++++++++---
 .../comps/template/comps/sp/SWYPFXCBYPZB.vue       |   2 +-
 .../comps/template/comps/sp/SWYPFXRYPZB.vue        |   2 +-
 .../comps/template/mixins/templateMixin.js         |  39 ++++-
 9 files changed, 311 insertions(+), 63 deletions(-)
 create mode 100644 src/components/Template/operation/TableOpertaion.vue

diff --git a/src/components/Template/BaseInfoFormPcakge.vue b/src/components/Template/BaseInfoFormPcakge.vue
index 96ae6f7..dcabe6c 100644
--- a/src/components/Template/BaseInfoFormPcakge.vue
+++ b/src/components/Template/BaseInfoFormPcakge.vue
@@ -11,6 +11,11 @@
                             <HandleFormItem @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]" 
                                 @copy="onCopy(sItem, key)" />
                         </template>
+                        <template v-else-if="sItem.type === 'inputNumber'">
+                            <div class="form-title">{{ sItem.label }}</div>
+                            <HandleFormItem type = "inputNumber" @blur="onBlur(key, $event)" :item="sItem" @input = "onInputNumberChange(key, $event)"  v-model="formFields[key]" 
+                                @copy="onCopy(sItem, key)" />
+                        </template>
                     </div>
                 </div>
             </template>
@@ -183,10 +188,10 @@ export default {
             }
             this.formFields[key] = val;
         },
-        updateFormField(key, value){
+        updateFormData(key, value){
             this.formFields[key] = value;
         },
-        batchUpdateFormFields(data){
+        batchUpdateFormData(data){
             Object.keys(data).forEach(key => {
                 this.formFields[key] = data[key];
             })
@@ -275,6 +280,7 @@ export default {
             // 更新表单字段
             this.formFields = result;
             this.allFieldsConfig = config;
+            console.log(config,"config")
         },
         getFormData() {
             const { formFields, allFieldsConfig } = this;
@@ -284,10 +290,9 @@ export default {
                     console.log(key,formFields[key])
                     if (!formFields[key]) {
                         const o = allFieldsConfig[key];
-                        console.log(templateStatus,o.fillType,"fill")
-                        if (o.fillType == templateStatus) {
+                        if (o.fillType == templateStatus && !o.disabled) {
                             let prefix = "";
-                            if (o.type === "input") {
+                            if (o.type === "input" || o.type === "inputNumber" || o.type === "textarea") {
                                 prefix = "填写"
                             } else {
                                 prefix = "选择"
@@ -303,6 +308,9 @@ export default {
             })
             
         },
+        getFormDataByKey(key){
+            return this.formFields[key];
+        },
         onBlur(key, val) {
             this.$emit("blur", { key, value: val ,...this.formFields});
         },
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index fbdd03f..ee5de5a 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -14,7 +14,7 @@
 
         </div>
         <!-- 默认操作栏 -->
-        <div class="custom-table-cell header-cell" :style="{ width: '80px' }">
+        <div class="custom-table-cell header-cell" :style="{ width: '180px' }" v-if="showOperation">
           <div class="header-cell-content">
             <div>操作</div>
           </div>
@@ -29,14 +29,14 @@
           <div class="inner-table-cell">
             <div>
               <template v-if="col.bodyType === 'input'">
-                <HandleFormItem type="input" class="body-input" :item="getBodyItem(col,rowIndex)" v-model="row[col.prop]" @change="onBodyValueChange(rowIndex, colIndex, $event)" />
+                <HandleFormItem type="input" @blur = "onBlur(rowIndex, col.prop, $event)" @copy = "onCopy(rowIndex, col)" class="body-input" :item="getBodyItem(col,rowIndex)" v-model="row[col.prop]" @change="onBodyValueChange(rowIndex, colIndex, $event)" />
               </template>
               <template v-else-if="col.bodyType === 'inputNumber'">
-                <HandleFormItem type="inputNumber" class="body-input-number" :item="getBodyItem(col,rowIndex)"
-                  v-model="row[col.prop]" @change="onBodyValueChange(rowIndex, colIndex, $event)" />
+                <HandleFormItem type="inputNumber"  @copy = "onCopy(rowIndex, col)"  class="body-input-number" :item="getBodyItem(col,rowIndex)"
+                  v-model="row[col.prop]" @blur = "onBlur(rowIndex, col.prop, $event)" @change="onBodyValueChange(rowIndex, colIndex, $event)" />
               </template>
               <template v-else-if="col.bodyType === 'select'">
-                <HandleFormItem type="select" class="body-select" :item="getBodyItem(col,rowIndex)" v-model="row[col.prop]" @change="onBodyValueChange(rowIndex, colIndex, $event)" />
+                <HandleFormItem type="select" class="body-select" @blur = "onBlur(rowIndex, col.prop, $event)" :item="getBodyItem(col,rowIndex)" v-model="row[col.prop]" @change="onBodyValueChange(rowIndex, colIndex, $event)" />
               </template>
               <template v-else>
                 {{ row[col.prop] }}
@@ -44,7 +44,7 @@
             </div>
             <div class="m-l-5">
               <template v-if="col.bodySubType === 'inputNumber' && col.showBodySub">
-                <HandleFormItem type="inputNumber" :item="getBodySubItem(col)"
+                <HandleFormItem type="inputNumber"  @copy = "onCopy(rowIndex, col)"  :item="getBodySubItem(col)"
                   v-model="row[col.bodySubKey]" @change="onBodySubValueChange(rowIndex, colIndex, $event)" />
               </template>
               <template v-else>
@@ -54,21 +54,9 @@
           </div>
         </div>
         <!-- 默认操作栏 -->
-        <div class="custom-table-cell body-cell" :style="{ width: '80px' }">
+        <div class="custom-table-cell body-cell" :style="{ width: '180px' }" v-if="showOperation">
           <div class="inner-table-cell">
-            <el-popconfirm
-              confirm-button-text='确认'
-              cancel-button-text='取消'
-              icon="el-icon-info"
-              icon-color="red"
-              title="确认删除当前数据？"
-              @confirm = "deleteRow(rowIndex)"
-            >
-              <el-button slot="reference" type="text" size="small"  class="delete-button" >
-                删除
-              </el-button>
-            </el-popconfirm>
-            
+            <slot name="operation" :row="row" :rowIndex="rowIndex" ></slot>
           </div>
         </div>
       </div>
@@ -84,6 +72,11 @@ export default {
     HandleFormItem
   },
   props: {
+    // 是否显示操作栏
+    showOperation: {
+      type: Boolean,
+      default: true,
+    },
     columns: {
       type: Array,
       required: true,
@@ -124,6 +117,16 @@ export default {
     this.initHeaderSelectValues();
   },
   methods: {
+    // 复制值
+    onCopy(rowIndex, col){
+   
+      if(col.copyFrom){
+           if(!this.localDataSource[rowIndex][col.copyFrom]){//没有值就不用复制了
+            return
+          }
+        this.$set(this.localDataSource[rowIndex], col.prop, this.localDataSource[rowIndex][col.copyFrom])
+      }
+    },
     // 初始化表头选择器值
     initHeaderSelectValues() {
       const headerSelectObj = {};
@@ -167,7 +170,9 @@ export default {
           if (col.bodyFillType === templateStatus || col.bodySubType === templateStatus) {
             // 检查主字段
             const mainValue = row[col.prop];
-            if (this.isValueEmpty(mainValue)) {
+            if (this.isValueEmpty(mainValue) && !col.bodyDisabled) {
+            console.log(col,"col")
+
               errors.push({
                 rowIndex,
                 colIndex,
@@ -178,7 +183,7 @@ export default {
             }
             
             // 检查子字段（如果有）
-            if (col.bodySubKey) {
+            if (col.bodySubKey&& !col.bodySubDisabled) {
               const subValue = row[col.bodySubKey];
               if (this.isValueEmpty(subValue)) {
                 errors.push({
@@ -244,6 +249,7 @@ export default {
         maxlength: col.bodyMaxlength,
         label: col.label,
         precision: currentItem[col.bodyPrecisionKey] || col.precision || 0,
+        copyFrom: col.copyFrom || "",
       };
       if(col.bodyDisabled){
         item.disabled = col.bodyDisabled;
@@ -254,13 +260,14 @@ export default {
      const item = {
         fillType: col.bodySubFillType,
         options: col.bodySubOptions,
-        maxlength: col.bodySubMaxlength,
+        maxlength: col.bodySubMaxlength || 10,
         label: "",
         placeholder:col.bodySubPlaceholder||"请输入"
       }
       if(col.bodySubDisabled){
         item.disabled = col.bodySubDisabled;
       }
+      return item
     },
     // 删除行
     deleteRow(rowIndex) {
@@ -271,6 +278,16 @@ export default {
     updateDataSource(dataSource = []) {
       // 深拷贝数据以避免直接修改原始数据
       this.localDataSource = JSON.parse(JSON.stringify(dataSource || []));
+    },
+    // 根据行索引更新数据
+    updateDataSourceByRowIndex(rowIndex,data){
+      this.localDataSource[rowIndex] = {...this.localDataSource[rowIndex],...data};
+      console.log(this.localDataSource,"this.localDataSource")
+      this.localDataSource = [...this.localDataSource];
+    },
+    onBlur(rowIndex, colKey) {
+      const value = this.localDataSource[rowIndex][colKey];
+      this.$emit("blur", {rowIndex, colKey, value,item:this.localDataSource[rowIndex]});
     }
   }
 };
@@ -398,7 +415,5 @@ export default {
   width: 100px;
   margin-left: 5px;
 }
-.delete-button{
-  color: red;
-}
+
 </style>
\ No newline at end of file
diff --git a/src/components/Template/DecimalInput.vue b/src/components/Template/DecimalInput.vue
index 27dd81e..f060d92 100644
--- a/src/components/Template/DecimalInput.vue
+++ b/src/components/Template/DecimalInput.vue
@@ -1,5 +1,10 @@
 <template>
-  <el-input v-model="internalValue" @input="handleInput" @blur="handleBlur" :placeholder="placeholder" :disabled="disabled" type="text" />
+  <el-input v-bind="$attrs" v-model="internalValue" @input="handleInput" @blur="handleBlur" :placeholder="placeholder" :disabled="disabled" type="text" >
+
+    <template slot="prepend" v-if="prepend">
+      {{ prepend }}
+    </template>
+  </el-input>
 </template>
 
 <script>
@@ -12,7 +17,7 @@ export default {
     },
     decimalDigits: {
       type: Number,
-      default: 0
+      default: 3
     },
     placeholder: {
       type: String,
@@ -21,7 +26,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false
-    }
+    },
+    prepend: {
+      type: String,
+      default: ''
+    },
   },
   data() {
     return {
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 4d409fe..305b36b 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -11,6 +11,7 @@
                 v-model="inputValue" @input="onInputChange" @change="onInputChange" />
             <DecimalInput v-else-if="type === 'inputNumber'" @blur="onBlur" :maxlength="item.maxlength || 10"
                 class="flex1" :disabled="getDisabled()" :controls="item.controls || false" :min="item.min || 0"
+                :prepend = "item.prepend"
                 :decimalDigits="item.precision" :class="item.fillType | getFillType"
                 :placeholder="item.placeholder ? item.placeholder : ('请输入' + item.label)" v-model="inputValue"
                 @input="onInputChange" @change="onInputChange" />
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
new file mode 100644
index 0000000..9900e71
--- /dev/null
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -0,0 +1,65 @@
+<template>
+    <div>
+        <el-popconfirm confirm-button-text='确认' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
+            title="确认删除当前数据？" @confirm="deleteRow(rowIndex)">
+            <el-button v-if="fillType === 'preFill'" slot="reference" type="text" size="small" class="delete-button">
+                删除
+            </el-button>
+            
+        </el-popconfirm>
+        <template v-if="fillType === 'actFill'">
+            <el-button  type="text" size="small" @click = "onSubPackage">分装</el-button>
+            <el-button  type="text" size="small" @click = "onStartConfig">开始配置</el-button>
+            <el-button  type="text" size="small" @click = "onConfigComplete">配置完成</el-button>
+            <el-button  type="text" size="small" @click = "onPrintLabel">打印标签</el-button>
+        </template>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "TableOpertaion",
+    props: {
+        row: {
+            type: Object,
+            default: () => { },
+        },
+        rowIndex: {
+            type: Number,
+            default: 0,
+        },
+        fillType: {
+            type: String,
+            default: "preFill",
+        },
+    },
+    methods: {
+        // 开始配置
+        onStartConfig() {
+            this.$emit("startConfig", this.row)
+        },
+        // 配置完成
+        onConfigComplete() {
+            this.$emit("configComplete", this.row)
+        },
+        // 打印标签
+        onPrintLabel() {
+            this.$emit("printLabel", this.row)
+        },
+        // 分装
+        onSubPackage() {
+            this.$emit("subPackage", this.row)
+        },
+        // 删除行
+        deleteRow(index) {
+            this.$emit("deleteRow", index)
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-button{
+  color: red;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index 887745d..5bbbb3b 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -16,8 +16,12 @@
 					<div class="template-form-item">
 						<BaseInfoFormPcakge @clickable="handleClickable" ref="stepFormPackageRef" :formConfig="stepFormConfig" @blur="onHandleBlur"
 							:formData="formData" />
-						<CustomTable  ref="stepTable" :columns="stepColumns"
-							:formData="formData" />
+						<CustomTable @blur="onHandleTableBlur" :showOperation="fillType === 'actFillill'" ref="stepTableRef" :columns="stepColumns"
+							:formData="formData" >
+							<template slot="operation" slot-scope="{ row, rowIndex}">
+								<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" @deleteRow="deleteRow"></TableOpertaion>
+							</template>
+						</CustomTable>
 					</div>
 					<Step ref="stepRef" :formData="formData"></Step>
 					<BaseInfoFormPcakge label="备注" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
@@ -42,10 +46,11 @@ import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
+import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 
 export default {
 	name: "SWYPBQGZYZBB",
-	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable, SelectReagentDialog },	
+	components: { BaseInfoFormPcakge, LineLabel, TableList, Step, CustomTable, SelectReagentDialog, TableOpertaion },		
 	mixins: [templateMixin],
 	props: {
 		value: {
@@ -63,7 +68,13 @@ export default {
 			handler(v) {
 
 			}
-		}
+		},
+		fillType: {
+			immediate: true,
+			handler(v) {
+				console.log(v,"fillType")
+			}
+		},
 	},
 	computed: {
 		// 存储条件表单配置
@@ -96,7 +107,7 @@ export default {
 							fillType: "actFill",
 							span: 1,
 							placeholder: "请输入备注",
-							maxlength: 500,
+							maxlength: 1000,
 							rows: 5
 						}
 					}
@@ -127,8 +138,9 @@ export default {
 						},
 						versionNum: {
 							label: "版本号",
-							type: "input",
+							type: "inputNumber",
 							fillType: "actFill",
+							prepend:"V",
 							maxlength: 50,
 						},
 
@@ -197,19 +209,23 @@ export default {
 							subType: "clickable",
 							subKey: "subStartSolution",
 							subFillType: "actFill",
+							maxlength: 20,
 						},
 						targetStartSolution: {
 							label: "预设起始源溶液浓度",
-							type: "input",
+							type: "inputNumber",
 							subType: "select",
 							fillType: "preFill",
 							subOptions: this.$store.state.template.mgOptions,
 							subKey: "subTargetStartSolution",
+							maxlength: 10,
 						},
 						targetAcSolution: {
 							label: "实际起始源溶液浓度",
 							type: "input",
 							fillType: "actFill",
+							disabled: true,
+							maxlength: 10,
 						},
 						solution: {
 							label: "稀释液",
@@ -218,6 +234,7 @@ export default {
 							subType: "clickable",
 							subKey: "subSolution",
 							subFillType: "actFill",
+							maxlength: 20,
 						},
 						codeSTD: {
 							label: "起始编号STD",
@@ -262,14 +279,16 @@ export default {
 					width: 280
 				},
 				{
-					label: "起始溶液编号", prop: "startSolutionCode",
+					label: "起始溶液编号", 
+					prop: "startSolutionCode",
 					width: 280,
 					bodyType: "input",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},
 				{
-					label: "预设起始溶液体积", prop: "targetStartSolutionVolume",
+					label: "预设起始溶液体积", 
+					prop: "targetStartSolutionVolume",
 					width: 280,
 					headerSelectKey: "targetStartSolutionVolumeUnit",
 					fillType: "preFill",
@@ -277,21 +296,119 @@ export default {
 					defaultValue: "mg",
 					bodyType: "inputNumber",
 					bodySubType: "inputNumber",
-					bodySubKey: "subTargetStartSolutionPrecision",
+					bodySubKey: "targetStartSolutionVolumePrecision",
 					bodyFillType: "preFill",
 					bodySubFillType: "preFill",
 					showBodySub: this.fillType === "preFill",
 					bodyDisabled: true,
-					bodyPrecisionKey: "subTargetStartSolutionPrecision",
+					bodyPrecisionKey: "targetStartSolutionVolumePrecision",
+					bodyMaxlength: 10,
+					bodySubPlaceholder: "请输入保留小数位数",
 				},
 				{
-					label: "实际起始溶液体积", prop: "actStartSolutionVolume",
+					label: "实际起始溶液体积", 
+					prop: "actStartSolutionVolume",
 					width: 280,
 					headerSelectKey: "actStartSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.$store.state.template.volumeOptions,
 					bodyType: "inputNumber",
 					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+					copyFrom: "targetStartSolutionVolume",//复制哪个字段
+				},
+				{
+					label: "预设稀释液体积", 
+					prop: "targetDiluentVolume",
+					width: 280,
+					headerSelectKey: "targetDiluentVolumeUnit",
+					fillType: "preFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					defaultValue: "mg",
+					bodyType: "inputNumber",
+					bodySubType: "inputNumber",
+					bodySubKey: "targetDiluentVolumePrecision",
+					bodyFillType: "preFill",
+					bodySubFillType: "preFill",
+					showBodySub: this.fillType === "preFill",
+					bodyDisabled: true,
+					bodyPrecisionKey: "targetDiluentVolumePrecision",
+					bodyMaxlength: 10,
+					bodySubPlaceholder: "请输入保留小数位数",
+				},
+				{
+					label: "实际稀释液体积", 
+					prop: "actDiluentVolume",
+					width: 280,
+					headerSelectKey: "actDiluentVolumeUnit",
+					fillType: "preFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					bodyType: "inputNumber",
+					bodyFillType: "actFill",
+					bodyMaxlength: 10,
+					copyFrom: "targetDiluentVolume",//复制哪个字段
+				},
+				{
+					label: "预设目标溶液浓度", 
+					prop: "targetSolutionConcentration",
+					width: 280,
+					headerSelectKey: "targetSolutionConcentrationUnit",
+					fillType: "preFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					bodyType: "inputNumber",
+					bodyFillType: "preFill",
+					bodyMaxlength: 10,
+				},
+				{
+					label: "实际目标溶液浓度", 
+					prop: "actSolutionConcentration",
+					width: 280,
+					headerSelectKey: "actSolutionConcentrationUnit",
+					fillType: "preFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					defaultValue: "mg",
+					bodyType: "inputNumber",
+					bodySubType: "inputNumber",
+					bodySubKey: "actSolutionConcentrationPrecision",
+					bodyFillType: "actFill",
+					bodySubFillType: "preFill",
+					showBodySub: this.fillType === "preFill",
+					bodyDisabled: true,
+					bodyPrecisionKey: "actSolutionConcentrationPrecision",
+					bodyMaxlength: 10,
+					copyFrom: "targetSolutionConcentration",//复制哪个字段
+					bodySubPlaceholder: "请输入保留小数位数",
+				},
+					{
+					label: "预设目标溶液体积", 
+					prop: "targetSolutionVolume",
+					width: 280,
+					headerSelectKey: "targetSolutionVolumeUnit",
+					fillType: "preFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					bodyType: "inputNumber",
+					bodyFillType: "preFill",
+					bodyMaxlength: 10,
+				},
+				{
+					label: "实际目标溶液体积", 
+					prop: "actSolutionVolume",
+					width: 280,
+					headerSelectKey: "actSolutionVolumeUnit",
+					fillType: "preFill",
+					headerOptions: this.$store.state.template.volumeOptions,
+					defaultValue: "mg",
+					bodyType: "inputNumber",
+					bodySubType: "inputNumber",
+					bodySubKey: "actSolutionVolumePrecision",
+					bodyFillType: "actFill",
+					bodySubFillType: "preFill",
+					showBodySub: this.fillType === "preFill",
+					bodyDisabled: true,
+					bodyPrecisionKey: "actSolutionVolumePrecision",
+					bodyMaxlength: 10,
+					copyFrom: "targetSolutionVolume",//复制哪个字段
+					bodySubPlaceholder: "请输入保留小数位数",
 				},
 			]
 		},
@@ -325,13 +442,17 @@ export default {
 			this.formData = {
 				effectivePeriodUnit: "days",//设置默认值
 				createTime: "2026-01-02 18:05:36",//设置默认值
-				stepTableFormData: [
-					{ actStartSolutionVolume: 1, subActStartSolutionVolume: "ul", subTargetStartSolutionPrecision: 3 },
-					{ targetStartSolutionVolume: 3, subTargetStartSolutionVolume: "mg", subTargetStartSolutionPrecision: 2 },
-				],
+				versionNum:1,
+				stepTableFormData: [],
 				headerSelectFields: {
 					targetStartSolutionVolumeUnit: "mg",
-					actStartSolutionVolumeUnit: "ul",
+					actStartSolutionVolumeUnit: "mg",
+					targetDiluentVolumeUnit: "mg",
+					actDiluentVolumeUnit: "mg",
+					targetSolutionConcentrationUnit: "mg",
+					actSolutionConcentrationUnit: "mg",
+					targetSolutionVolumeUnit: "mg",
+					actSolutionVolumeUnit: "mg",
 				}
 			}
 		}
@@ -349,16 +470,14 @@ export default {
 		},
 		//选择试剂提交事件
 		onSelectReagentSubmit(code){
-			this.formData[this.currentSubKey] = code;
-			this.$set(this.formData, this.currentSubKey, code);
-			this.formData = {...this.formData}
+			this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
 			this.selectReagentVisible = false;
 		},
 		async getFormData() {
 			const baseData = await this.$refs.baseInfoRef.getFormData();
 			const conditionData = await this.$refs.storageConditionRef.getFormData();
 			const stepFormData = await this.$refs.stepFormPackageRef.getFormData();
-			const stepDataFormData = await this.$refs.stepTable.getFormData();
+			const stepDataFormData = await this.$refs.stepTableRef.getFormData();
 			const stepData = await this.$refs.stepRef.getFormData();
 			if (!stepData.length) {
 				this.$message.error("请添加步骤");
@@ -376,8 +495,8 @@ export default {
 		},
 		async onSave() {
 			// const formData = await this.getFormData();
-			const stepDataFormData = await this.$refs.stepTable.getFormData();
-			console.log(stepDataFormData, "formData")
+			const formData = await this.$refs.stepTableRef.getFormData();
+			console.log(formData, "formData")
 		}
 	}
 };
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
index 02a823d..ed77f88 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
@@ -87,7 +87,7 @@ export default {
 							fillType: "actFill",
 							span: 1,
 							placeholder: "请输入备注",
-							maxlength: 500,
+							maxlength: 1000,
 							rows: 5
 						}
 					}
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index 0067996..48efd8d 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -88,7 +88,7 @@ export default {
 							fillType: "actFill",
 							span: 1,
 							placeholder: this.$t('template.common.remarkPlaceholder'),
-							maxlength: 500,
+							maxlength: 1000,
 							rows: 5
 						}
 					}
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index eeb05ef..5d40a31 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -54,6 +54,14 @@ export default {
     setConditionOptions(options) {
       this.$store.commit('template/SET_CONDITION_OPTIONS', options)
     },
+    //统一处理删除行
+    deleteRow(index) {
+      this.$refs.stepTableRef.deleteRow(index);
+    },
+    //获取版本号
+    getVersionNum(){
+      return this.formData.versionNum || "";
+    },
     //统一处理blur事件，因为有效周期和过期日期是相关的，所以需要在有效周期失焦时更新过期日期
     onHandleBlur(fields){
 			const {key ,effectivePeriodUnit,effectivePeriod,codeSTD} = fields;
@@ -61,15 +69,38 @@ export default {
 			if(key ==="effectivePeriod"){//统一处理有效周期失焦，计算失效事件，保证字段名不能变
 				const start = moment(createTime);
 				const end = start.add(Number(effectivePeriod), effectivePeriodUnit).format("YYYY-MM-DD HH:mm:ss");
-				this.$refs.stepFormPackageRef.updateFormField("expireDate", end);
+				this.$refs.stepFormPackageRef.updateFormData("expireDate", end);
 			}else if(key === "codeSTD"){//起始编号STD失焦时，更新stepDataSource
         const arr = Array.from({length:codeSTD},(item,index) => ({
-         subTargetStartSolutionPrecision:3,//小数点精度默认为3
+         actSolutionVolumePrecision:3,//小数点精度默认为3
+         actSolutionConcentrationPrecision:3,//小数点精度默认为3
+         targetDiluentVolumePrecision:3,//小数点精度默认为3
+         targetStartSolutionVolumePrecision:3,//小数点精度默认为3
          targetSolutionCode:`STD${Number(codeSTD)-index}`
         }));
-        this.$refs.stepTable.updateDataSource(arr);
+        console.log(arr, "arr")
+        this.$refs.stepTableRef.updateDataSource(arr);
       }
-		}
+		},
+    onHandleTableBlur(params){
+      const {rowIndex, colKey, value,item} = params;
+      if(colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration"){//预设起始溶液体积:（目标溶液预计浓度 乘以 目标溶液预计体积）除以 起始溶液浓度
+        const volume = this.$refs.stepFormPackageRef.getFormDataByKey("targetStartSolution") || 0;
+        const precision = item.targetStartSolutionVolumePrecision || 0;
+        if(volume){
+          const concentration = item.targetSolutionConcentration || 0;
+          const targetVolume = item.targetSolutionVolume || 0;
+          const result = ((concentration * targetVolume) / volume).toFixed(precision);
+          console.log(result,"reee")
+          this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex,{targetStartSolutionVolume:result});
+        }
+      }else if(colKey ==="targetSolutionVolume" || colKey === "targetDiluentVolume"){//预设稀释液体积：目标溶液预计体积 减去 源溶液预计体积；
+        // const targetVolume = item.targetSolutionVolume || 0;
+        // const targetDiluentVolume = item.targetDiluentVolume || 0;
+        // const result = (targetVolume - targetDiluentVolume).toFixed(precision);
+        // this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex,{targetDiluentVolume:result});
+      }
+    }
 
   },