diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index aa3e4f2..f3bbf45 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -1,147 +1,159 @@
 <template>
-  <div>
-    <div class="custom-table-wrapper">
-      <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: col.width ? col.width + 'px' : 'auto' }">
-            <div class="header-cell-content">
-              <div>{{ $t(col.label) }}</div>
-              <template
-                v-if="col.headerSelectKey && col.headerOptions && (showHeaderSelect || templateFillType === 'preFill')">
-                <HandleFormItem :fieldKey="prefixKey + '_' + col.headerSelectKey" :fieldItemLabel="fieldItemLabel"
-                  type="select" class="header-select" :item="getHeaderItem(col)"
-                  v-model="headerSelectFields[col.headerSelectKey]" @change="onHeaderSelectChange(col, $event)"
-                  :error="hasError(-1, index, col.headerSelectKey)"
-                  @update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" />
-              </template>
-              <span v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon">({{
-                headerSelectFields[col.headerSelectKey] }})</span>
-
-            </div>
-
-          </div>
-          <!-- 默认操作栏 -->
-          <div class="custom-table-cell header-cell" :style="{ width: '245px' }" v-if="showOperation">
-            <div class="header-cell-content">
-              <div>操作</div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <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: col.width ? col.width + 'px' : 'auto' }">
-            <div class="inner-table-cell">
-              <div class="flex1">
-                <template v-if="col.bodyType === 'input'">
-                  <HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-                    :fieldItemLabel="fieldItemLabel" 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)"
-                    :error="hasError(rowIndex, colIndex, col.prop)"
-                    @update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
-                </template>
-                <template v-else-if="col.bodyType === 'inputNumber'">
-                  <HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-                    :fieldItemLabel="fieldItemLabel" 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)"
-                    :error="hasError(rowIndex, colIndex, col.prop)"
-                    @update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
-                </template>
-                <template v-else-if="col.bodyType === 'select'">
-                  <div class="flex flex1">
-                    <HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-                      :fieldItemLabel="fieldItemLabel" 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)"
-                      :error="hasError(rowIndex, colIndex, col.prop)"
-                      @update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-                      :orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
-
-                  </div>
-
-                </template>
-                <div class="flex flex1" v-else-if="col.bodyType === 'clickable'">
-                  <HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-                    :fieldItemLabel="fieldItemLabel" type="clickable" class="body-clickable"
-                    :item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
-                    :error="hasError(rowIndex, colIndex, col.prop)"
-                    @clickable="handleClickable(col, rowIndex, colIndex)"
-                    @update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
-                </div>
-                <template v-else-if="col.bodyType === 'span'">
-                  <div class="body-span">
-                    {{ row[col.prop] }}
-                  </div>
-                </template>
-
-              </div>
-              <div v-show="isShowOther(row[col.prop],col)" class="flex flex1">
-                <div class="other-title">{{ col.otherLabel ? $t(col.otherLabel) : $t("template.common.other") }}
-                </div>
-                <div class="flex flex1">
-                  <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + col.otherCode"
-                    @blur="onBlur(rowIndex, col.prop, $event)" :item="getOtherItem(col)" v-model="row[col.otherCode]"
-                    :error="hasError(rowIndex, colIndex, col.otherCode)"
-                    @update:error="onErrorUpdate(rowIndex, colIndex, col.otherCode, $event)"
-                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.otherCode)" />
-                </div>
-              </div>
-              <div class="m-l-5 flex1" v-if="isShowBodySub(col, row)">
-                <template v-if="col.bodySubType === 'inputNumber'">
-                  <HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
-                    :fieldItemLabel="fieldItemLabel" type="inputNumber"
-                    @blur="onSubBlur(rowIndex, col.bodySubKey, $event)" @copy="onCopy(rowIndex, col)"
-                    :item="getBodySubItem(col)" v-model="row[col.bodySubKey]"
-                    @change="onBodySubValueChange(rowIndex, colIndex, $event)"
-                    :error="hasError(rowIndex, colIndex, col.bodySubKey)"
-                    @update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
-                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
-                </template>
-                <template v-else-if="col.bodySubType === 'select'">
-                  <HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
-                    :fieldItemLabel="fieldItemLabel" type="select" class="body-select"
-                    @blur="onSubBlur(rowIndex, col.bodySubKey, $event)" :item="getBodySubItem(col, rowIndex)"
-                    v-model="row[col.bodySubKey]" @change="onBodySubValueChange(rowIndex, colIndex, $event)"
-                    :error="hasError(rowIndex, colIndex, col.bodySubKey)"
-                    @update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
-                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
-                </template>
-
-                <template v-else-if="col.bodySubType === 'span'">
-                  <div class="body-span">
-                    {{ row[col.bodySubKey] }}
-                  </div>
-                </template>
-              </div>
-            </div>
-          </div>
-
-          <!-- 默认操作栏 -->
-          <div class="custom-table-cell body-cell" :style="{ width: '245px' }" v-if="showOperation">
-            <div class="inner-table-cell">
-              <slot name="operation" :row="row" :rowIndex="rowIndex" :columns = "getOperationColumns()" ></slot>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div v-if="localDataSource.length == 0">
-        <div class="no-data">暂无数据</div>
-      </div>
-
-
-    </div>
-    <div class="add-row" v-if="isShowAddRos()">
-      <el-button type="primary" plain @click="onAddRow">添加行</el-button>
-    </div>
-  </div>
+	<div>
+		<div class="custom-table-wrapper">
+			<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: col.width ? col.width + 'px' : 'auto' }">
+						<div class="header-cell-content">
+							<div>{{ $t(col.label) }}</div>
+							<template
+								v-if="col.headerSelectKey && col.headerOptions && (showHeaderSelect || templateFillType === 'preFill')">
+								<HandleFormItem :fieldKey="prefixKey + '_' + col.headerSelectKey"
+									:fieldItemLabel="fieldItemLabel" type="select" class="header-select"
+									:item="getHeaderItem(col)" v-model="headerSelectFields[col.headerSelectKey]"
+									@change="onHeaderSelectChange(col, $event)"
+									:error="hasError(-1, index, col.headerSelectKey)"
+									@update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" />
+							</template>
+							<span v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon">({{
+								headerSelectFields[col.headerSelectKey] }})</span>
+
+						</div>
+
+					</div>
+					<!-- 默认操作栏 -->
+					<div class="custom-table-cell header-cell" :style="{ width: '245px' }" v-if="showOperation">
+						<div class="header-cell-content">
+							<div>操作</div>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<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: col.width ? col.width + 'px' : 'auto' }">
+						<div class="inner-table-cell">
+							<div class="flex1">
+								<template v-if="col.bodyType === 'input'">
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										:fieldItemLabel="fieldItemLabel" 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)"
+										:error="hasError(rowIndex, colIndex, col.prop)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+								</template>
+								<template v-else-if="col.bodyType === 'inputNumber'">
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										:fieldItemLabel="fieldItemLabel" 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)"
+										:error="hasError(rowIndex, colIndex, col.prop)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+								</template>
+								<template v-else-if="col.bodyType === 'select'">
+									<div class="flex flex1">
+										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+											:fieldItemLabel="fieldItemLabel" 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)"
+											:error="hasError(rowIndex, colIndex, col.prop)"
+											@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
+											:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+
+									</div>
+
+								</template>
+								<div class="flex flex1" v-else-if="col.bodyType === 'clickable'">
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										:fieldItemLabel="fieldItemLabel" type="clickable" class="body-clickable"
+										:item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
+										:error="hasError(rowIndex, colIndex, col.prop)"
+										@clickable="handleClickable(col, rowIndex, colIndex, row)"
+										@resetRecord="resetRecord(rowIndex, colIndex, col.prop)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+								</div>
+								<template v-else-if="col.bodyType === 'span'">
+									<div class="body-span">
+										{{ row[col.prop] }}
+									</div>
+								</template>
+
+							</div>
+							<div v-show="isShowOther(row[col.prop], col)" class="flex flex1">
+								<div class="other-title">{{ col.otherLabel ? $t(col.otherLabel) :
+									$t("template.common.other") }}
+								</div>
+								<div class="flex flex1">
+									<HandleFormItem :field-item-label="fieldItemLabel"
+										:field-key="prefixKey + '_' + col.otherCode"
+										@blur="onBlur(rowIndex, col.prop, $event)" :item="getOtherItem(col)"
+										v-model="row[col.otherCode]"
+										:error="hasError(rowIndex, colIndex, col.otherCode)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.otherCode, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.otherCode)" />
+								</div>
+							</div>
+							<div class="m-l-5 flex1" v-if="isShowBodySub(col, row)">
+								<template v-if="col.bodySubType === 'inputNumber'">
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
+										:fieldItemLabel="fieldItemLabel" type="inputNumber"
+										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
+										@copy="onCopy(rowIndex, col)" :item="getBodySubItem(col)"
+										v-model="row[col.bodySubKey]"
+										@change="onBodySubValueChange(rowIndex, colIndex, $event)"
+										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
+								</template>
+								<template v-else-if="col.bodySubType === 'select'">
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
+										:fieldItemLabel="fieldItemLabel" type="select" class="body-select"
+										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
+										:item="getBodySubItem(col, rowIndex)" v-model="row[col.bodySubKey]"
+										@change="onBodySubValueChange(rowIndex, colIndex, $event)"
+										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
+								</template>
+
+								<template v-else-if="col.bodySubType === 'span'">
+									<div class="body-span">
+										{{ row[col.bodySubKey] }}
+									</div>
+								</template>
+							</div>
+						</div>
+					</div>
+
+					<!-- 默认操作栏 -->
+					<div class="custom-table-cell body-cell" :style="{ width: '245px' }" v-if="showOperation">
+						<div class="inner-table-cell">
+							<slot name="operation" :row="row" :rowIndex="rowIndex" :columns="getOperationColumns()">
+							</slot>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div v-if="localDataSource.length == 0">
+				<div class="no-data">暂无数据</div>
+			</div>
+
+
+		</div>
+		<div class="add-row" v-if="isShowAddRos()">
+			<el-button type="primary" plain @click="onAddRow">添加行</el-button>
+		</div>
+	</div>
 </template>
 
 <script>
@@ -149,684 +161,694 @@ import HandleFormItem from "./HandleFormItem.vue";
 import { isEqual } from "@/utils/index.js";
 import { isShowOther } from "@/utils/formPackageCommon.js";
 export default {
-  inject: ['templateFillType'],
-  name: 'CustomTable',
-  components: {
-    HandleFormItem
-  },
-  props: {
-    // 是否显示表头选择器
-    showHeaderSelect: {
-      type: Boolean,
-      default: false,
-    },
-    showAddRow: {
-      type: Boolean,
-      default: undefined,
-    },
-    // 是否显示操作栏
-    showOperation: {
-      type: Boolean,
-      default: true,
-    },
-    columns: {
-      type: Array,
-      required: true,
-      // 示例格式：
-      // [
-      //   { label: '姓名', prop: 'name' },
-      //   { label: '状态', prop: 'status', type: 'select', options: [{value:1,label:'启用'},...], selected: null }
-      // ]
-    },
-    formData: {
-      type: Object,
-      default: () => {
-        return {
-          stepTableFormData: [],
-          headerSelectFields: {}
-        }
-      }
-    },
-    fieldItemLabel: {
-      type: String,
-      default: '',
-    },
-    //循环组件的情况下需要用这个来区分字段
-    prefixKey: {
-      type: String,
-      default: "",
-    }
-  },
-  data() {
-    return {
-      localDataSource: [],
-      headerSelectFields: {},
-      formErrors: [], // 表单错误状态管理
-      orangeBgCells: {}, // 存储需要橙色背景的单元格 {rowIndex-colIndex: true/false}
-      isShowOther,
-    }
-  },
-  watch: {
-    formData: {
-      immediate: true,
-      handler(newData) {
-        const { stepTableFormData = [], headerSelectFields = {} } = newData;
-        this.updateDataSource(stepTableFormData);
-        this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields));
-
-        // 在数据加载后检查 compareTo 逻辑
-        this.checkCompareToOnDataLoad();
-      }
-    },
-    localDataSource: {
-      immediate: true,
-      deep: true,
-      handler(newVal, oldVal) {
-        // if(newVal.length == 0){
-        //   return
-        // }
-        // this.localDataSource = [...newVal];
-      }
-    }
-  },
-  mounted() {
-    // this.initHeaderSelectValues();
-  },
-  methods: {
-    //获取操作栏的列
-    getOperationColumns(){
-      return {columnsData:this.columns,headerSelectFields:this.headerSelectFields}
-    },
-    //获取其他下拉框的配置
-    getOtherItem(sItem) {
-      return {
-        label: sItem.otherLabel ? this.$t(sItem.otherLabel) : this.$t("template.common.other"),
-        fillType: sItem.bodyFillType,
-        maxlength: sItem.otherMaxlength || 50,
-        parentLabel: sItem.label,
-        type: "input"
-      }
-    },
-    isShowBodySub(col, row) {
-      if (col.hasOwnProperty("disabled")) {
-        return col.showBodySub
-      } else if (col.bodySubType === 'span' && !row[col.bodySubKey]) {//如果是span没有值的话就隐藏
-        return false;
-      }
-      return col.bodySubType && col.bodySubKey;
-    },
-    // 点击事件
-    handleClickable(col, rowIndex, colIndex) {
-      console.log("clickable", rowIndex, colIndex, col)
-      if (this.templateFillType !== 'actFill') {
-        // return
-      }
-      this.$emit("clickable", col, rowIndex)
-    },
-    isShowAddRos() {
-      if (this.showAddRow !== undefined) {
-        return this.showAddRow
-      }
-      return this.templateFillType === 'preFill';
-    },
-    // 复制值
-    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])
-        this.onBlur(rowIndex, col.prop, this.localDataSource[rowIndex][col.prop]);
-      }
-    },
-    // 初始化表头选择器值
-    initHeaderSelectValues() {
-      const headerSelectObj = {};
-      this.columns.map(col => {
-        if (col.headerSelectKey) {
-          headerSelectObj[col.headerSelectKey] = col.defaultValue || col.headerOptions[0].value || ""
-        }
-      });
-      this.headerSelectFields = headerSelectObj;
-    },
-    // 直接获取表单数据，不做校验
-    getFilledFormData() {
-      return {
-        stepTableFormData: [...this.localDataSource],
-        headerSelectFields: this.headerSelectFields,
-      };
-    },
-    // 获取最新数据
-    getFormData() {
-      // 合并表头选择器值到 columns
-
-
-      // 数据校验
-      const validateResult = this.validateFormData();
-      return new Promise((resolve, reject) => {
-        if (validateResult.valid) {
-          resolve({
-            stepTableFormData: [...this.localDataSource],
-            headerSelectFields: this.headerSelectFields,
-          })
-        } else {
-          // this.$message.error("表单内容未填完,请填写后再提交");
-          reject(validateResult.errors[0].error)
-        }
-      })
-
-    },
-    // 表单数据校验
-    validateFormData() {
-      const errors = [];
-
-      // 清空之前的错误状态
-      this.formErrors = [];
-
-      // 校验表头的 HandleFormItem
-      this.columns.forEach((col, colIndex) => {
-        if (col.headerSelectKey && col.headerOptions && col.fillType === this.templateFillType) {
-          const headerValue = this.headerSelectFields[col.headerSelectKey];
-          if (this.isValueEmpty(headerValue)) {
-            const errorItem = {
-              rowIndex: -1, // 表头特殊标记
-              colIndex,
-              field: col.headerSelectKey,
-              label: this.$t(col.label),
-              error: `请选择${this.$t(col.label)}`
-            };
-            errors.push(errorItem);
-            this.formErrors.push(errorItem);
-          }
-        }
-      });
-
-      // 遍历数据行
-      this.localDataSource.forEach((row, rowIndex) => {
-        // 遍历列
-        this.columns.forEach((col, colIndex) => {
-          // 只校验 fillType 与当前模板状态匹配的字段
-          if (col.bodyFillType === this.templateFillType || col.bodySubFillType === this.templateFillType) {
-            // 检查主字段
-            const mainValue = row[col.prop];
-            if (this.isValueEmpty(mainValue) && !col.bodyDisabled && col.bodyType !== 'span') {
-              const errorItem = {
-                rowIndex,
-                colIndex,
-                field: col.prop,
-                label: this.$t(col.label),
-                error: `请填写${this.$t(col.label)}`
-              };
-              errors.push(errorItem);
-              this.formErrors.push(errorItem);
-            }
-
-            // 检查子字段（如果有）
-            if (col.bodySubKey && !col.bodySubDisabled && col.bodySubType !== 'span') {
-              const subValue = row[col.bodySubKey];
-              console.log(col, subValue, "subValue")
-              if (this.isValueEmpty(subValue)) {
-                const errorItem = {
-                  rowIndex,
-                  colIndex,
-                  field: col.bodySubKey,
-                  label: `${this.$t(col.label)}单位`,
-                  error: `请填写${this.$t(col.label)}单位`
-                };
-                errors.push(errorItem);
-                this.formErrors.push(errorItem);
-              }
-            }
-            console.log(col.otherCode, "col.otherCode")
-
-            // 检查其他输入框
-            if (col.otherCode) {
-              const isSelectedOther = this.isShowOther(mainValue);
-              if (!isSelectedOther) {
-                return;
-              }
-              const otherValue = row[col.otherCode];
-              if (this.isValueEmpty(otherValue)) {
-                const errorItem = {
-                  rowIndex,
-                  colIndex,
-                  field: col.otherCode,
-                  label: `${this.$t(col.label)}单位`,
-                  error: `请填写${this.$t(col.otherLabel) ? this.$t(col.otherLabel) : '其他'}信息`
-                };
-                errors.push(errorItem);
-                this.formErrors.push(errorItem);
-              }
-            }
-
-          }
-        });
-      });
-      console.log(errors, this.localDataSource, "errors")
-      return {
-        valid: errors.length === 0,
-        errors: errors
-      };
-    },
-    // 判断值是否为空
-    isValueEmpty(value) {
-      if (value === null || value === undefined || value === '') {
-        return true;
-      }
-      if (typeof value === 'string' && value.trim() === '') {
-        return true;
-      }
-      if (Array.isArray(value) && value.length === 0) {
-        return true;
-      }
-      return false;
-    },
-    // 表头选择器变化
-    onHeaderSelectChange(col, value) {
-      this.headerSelectFields[col.headerSelectKey] = value;
-      // 输入时清除对应表单项的错误状态
-      this.formErrors = this.formErrors.filter(error =>
-        !(error.rowIndex === -1 &&
-          error.field === col.headerSelectKey)
-      );
-    },
-    // 检查并应用 compareTo 逻辑
-    checkCompareToLogic(rowIndex, colIndex, colKey, value) {
-      const col = this.columns[colIndex];
-
-      // 检查主字段的 compareTo 逻辑
-      if (col && col.bodyFillType === "actFill" && col.compareTo) {
-        const compareToValue = this.localDataSource[rowIndex][col.compareTo];
-
-        // 比较当前值和compareTo值，如果不相等则设置橙色背景
-        if (value !== compareToValue) {
-          this.setOrangeBg(rowIndex, colIndex, colKey, true);
-        } else {
-          // 相等则移除橙色背景
-          this.setOrangeBg(rowIndex, colIndex, colKey, false);
-        }
-      }
-    },
-
-    // 在数据加载时检查 compareTo 逻辑
-    checkCompareToOnDataLoad() {
-      // 遍历所有行和列，检查 compareTo 逻辑
-      this.localDataSource.forEach((row, rowIndex) => {
-        this.columns.forEach((col, colIndex) => {
-          const currentValue = row[col.prop];
-          const compareToValue = row[col.compareTo];
-          if (col.compareTo && currentValue && compareToValue) {
-            // 比较当前值和compareTo值，如果不相等则设置橙色背景
-            if (!isEqual(currentValue, compareToValue)) {
-              this.setOrangeBg(rowIndex, colIndex, col.prop, true);
-            } else {
-              // 相等则移除橙色背景
-              this.setOrangeBg(rowIndex, colIndex, col.prop, false);
-            }
-          }
-
-          // 检查子字段的 compareTo 逻辑
-          if (col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
-            const currentValue = row[col.bodySubKey];
-            const compareToValue = row[col.bodySubCompareTo];
-
-            if (!!currentValue && !!compareToValue) {
-              // 比较当前值和compareTo值，如果不相等则设置橙色背景
-              if (!isEqual(currentValue, compareToValue)) {
-                this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true);
-              } else {
-                // 相等则移除橙色背景
-                this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false);
-              }
-            }
-          }
-        });
-      });
-    },
-
-    // 表体值变化
-    onBodyValueChange(rowIndex, colIndex, value) {
-      const col = this.columns[colIndex];
-      this.localDataSource[rowIndex][col.prop] = value;
-
-      // 检查并应用 compareTo 逻辑
-      this.checkCompareToLogic(rowIndex, colIndex, col.prop, value);
-
-      // 输入时清除对应表单项的错误状态
-      this.formErrors = this.formErrors.filter(error =>
-        !(error.rowIndex === rowIndex &&
-          error.colIndex === colIndex &&
-          error.field === col.prop)
-      );
-      this.$emit('body-value-change', rowIndex, colIndex, value);
-    },
-    // 表体子值变化
-    onBodySubValueChange(rowIndex, colIndex, value) {
-      const col = this.columns[colIndex];
-      this.localDataSource[rowIndex][col.bodySubKey] = value;
-
-      // 检查子字段的 compareTo 逻辑
-      if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
-        const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo];
-
-        // 比较当前值和compareTo值，如果不相等则设置橙色背景
-        if (value !== compareToValue) {
-          this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true);
-        } else {
-          // 相等则移除橙色背景
-          this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false);
-        }
-      }
-
-      // 输入时清除对应表单项的错误状态
-      this.formErrors = this.formErrors.filter(error =>
-        !(error.rowIndex === rowIndex &&
-          error.colIndex === colIndex &&
-          error.field === col.bodySubKey)
-      );
-      this.$emit('body-sub-value-change', rowIndex, colIndex, value);
-    },
-    getHeaderItem(col) {
-      return {
-        fillType: col.fillType,
-        options: col.headerOptions,
-        label: ""
-      }
-    },
-    getBodyItem(col, rowIndex) {
-      const currentItem = this.localDataSource[rowIndex];
-      const item = {
-        fillType: col.bodyFillType,
-        options: col.bodyOptions,
-        maxlength: col.bodyMaxlength,
-        label: this.$t(col.label),
-        precision: currentItem[col.bodyPrecisionKey] || col.precision,
-        copyFrom: col.copyFrom || "",
-        compareTo: col.compareTo, // 添加 compareTo 字段
-        type: col.bodyType || "input",
-      };
-      if (col.bodyDisabled) {
-        item.disabled = col.bodyDisabled;
-      }
-      return item
-    },
-    getBodySubItem(col) {
-      const item = {
-        fillType: col.bodySubFillType,
-        options: col.bodySubOptions,
-        maxlength: col.bodySubMaxlength || 10,
-        label: "",
-        placeholder: col.bodySubPlaceholder || "请输入",
-        precision: col.subPrecision,
-        compareTo: col.bodySubCompareTo, // 添加 compareTo 字段
-        type: col.bodySubType || "input",
-      }
-      if (col.bodySubDisabled) {
-        item.disabled = col.bodySubDisabled;
-      }
-      return item
-    },
-    // 删除行
-    deleteRow(rowIndex) {
-      this.localDataSource.splice(rowIndex, 1);
-      this.$emit('row-delete', rowIndex);
-    },
-    // 更新数据方法，可在formData变更时调用，也可由父组件调用
-    updateDataSource(dataSource = []) {
-      // 深拷贝数据以避免直接修改原始数据
-      this.localDataSource = JSON.parse(JSON.stringify(dataSource || []));
-    },
-    onAddRow() {
-      this.addRow({
-        actSolutionVolumePrecision: 3,//小数点精度默认为3
-        actSolutionConcentrationPrecision: 3,//小数点精度默认为3
-        targetDiluentVolumePrecision: 3,//小数点精度默认为3
-        targetStartSolutionVolumePrecision: 3,//小数点精度默认为3
-      });
-    },
-    // 添加行
-    addRow(row = {}) {
-      this.localDataSource.push(row);
-    },
-    getDataSource() {
-      return this.localDataSource;
-    },
-    // 根据行索引更新数据
-    updateDataSourceByRowIndex(rowIndex, data) {
-      console.log(rowIndex, data, "updateDataSourceByRowIndex")
-      this.localDataSource[rowIndex] = { ...this.localDataSource[rowIndex], ...data };
-      this.localDataSource = [...this.localDataSource];
-    },
-    // 判断表单项是否有错误
-    hasError(rowIndex, colIndex, field) {
-      return this.formErrors.some(error =>
-        error.rowIndex === rowIndex &&
-        error.colIndex === colIndex &&
-        error.field === field
-      );
-    },
-    // 处理错误状态更新
-    onErrorUpdate(rowIndex, colIndex, field, isError) {
-      if (!isError) {
-        this.formErrors = this.formErrors.filter(error =>
-          !(error.rowIndex === rowIndex &&
-            error.colIndex === colIndex &&
-            error.field === field)
-        );
-      }
-    },
-    onSubBlur(rowIndex, colKey, value) {
-      this.$emit("blur", { rowIndex, colKey, value, item: this.localDataSource[rowIndex] });
-    },
-    // 检查是否需要橙色背景
-    hasOrangeBg(rowIndex, colIndex, field) {
-      const key = `${rowIndex}-${colIndex}-${field}`;
-      return this.orangeBgCells[key] || false;
-    },
-    // 设置橙色背景状态
-    setOrangeBg(rowIndex, colIndex, field, status) {
-      const key = `${rowIndex}-${colIndex}-${field}`;
-      this.$set(this.orangeBgCells, key, status);
-    },
-    onBlur(rowIndex, colKey) {
-      const value = this.localDataSource[rowIndex][colKey];
-
-      // 查找对应的列配置
-      const col = this.columns.find(c => c.prop === colKey);
-      if (col && col.bodyFillType === "actFill" && col.compareTo) {
-        const compareToValue = this.localDataSource[rowIndex][col.compareTo];
-
-        // 比较当前值和compareTo值，如果不相等则设置橙色背景
-        if (value !== compareToValue) {
-          this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.prop === colKey), colKey, true);
-        } else {
-          // 相等则移除橙色背景
-          this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.prop === colKey), colKey, false);
-        }
-      }
-
-      this.$emit("blur", { rowIndex, colKey, value, item: this.localDataSource[rowIndex] });
-    },
-    onSubBlur(rowIndex, colKey, value) {
-      // 查找对应的列配置
-      const col = this.columns.find(c => c.bodySubKey === colKey);
-      if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
-        const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo];
-
-        // 比较当前值和compareTo值，如果不相等则设置橙色背景
-        if (value !== compareToValue) {
-          this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.bodySubKey === colKey), colKey, true);
-        } else {
-          // 相等则移除橙色背景
-          this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.bodySubKey === colKey), colKey, false);
-        }
-      }
-
-      this.$emit("blur", { rowIndex, colKey, value, item: this.localDataSource[rowIndex] });
-    }
-  }
+	inject: ['templateFillType'],
+	name: 'CustomTable',
+	components: {
+		HandleFormItem
+	},
+	props: {
+		// 是否显示表头选择器
+		showHeaderSelect: {
+			type: Boolean,
+			default: false,
+		},
+		showAddRow: {
+			type: Boolean,
+			default: undefined,
+		},
+		// 是否显示操作栏
+		showOperation: {
+			type: Boolean,
+			default: true,
+		},
+		columns: {
+			type: Array,
+			required: true,
+			// 示例格式：
+			// [
+			//   { label: '姓名', prop: 'name' },
+			//   { label: '状态', prop: 'status', type: 'select', options: [{value:1,label:'启用'},...], selected: null }
+			// ]
+		},
+		formData: {
+			type: Object,
+			default: () => {
+				return {
+					stepTableFormData: [],
+					headerSelectFields: {}
+				}
+			}
+		},
+		fieldItemLabel: {
+			type: String,
+			default: '',
+		},
+		//循环组件的情况下需要用这个来区分字段
+		prefixKey: {
+			type: String,
+			default: "",
+		}
+	},
+	data() {
+		return {
+			localDataSource: [],
+			headerSelectFields: {},
+			formErrors: [], // 表单错误状态管理
+			orangeBgCells: {}, // 存储需要橙色背景的单元格 {rowIndex-colIndex: true/false}
+			isShowOther,
+			oldLocalDataSource: [],
+		}
+	},
+	watch: {
+		formData: {
+			immediate: true,
+			handler(newData) {
+				const { stepTableFormData = [], headerSelectFields = {} } = newData;
+				this.updateDataSource(stepTableFormData);
+				this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields));
+
+				// 在数据加载后检查 compareTo 逻辑
+				this.checkCompareToOnDataLoad();
+			}
+		},
+		localDataSource: {
+			immediate: true,
+			deep: true,
+			handler(newVal, oldVal) {
+				// if(newVal.length == 0){
+				//   return
+				// }
+				// this.localDataSource = [...newVal];
+			}
+		}
+	},
+	mounted() {
+		// this.initHeaderSelectValues();
+	},
+	methods: {
+		//取消按钮 重置记录
+		resetRecord(rowIndex, colIndex,) {
+			if(this.localDataSource.length){
+				this.localDataSource = [...this.oldLocalDataSource];
+				this.oldLocalDataSource = [];
+			}
+		},
+		//获取操作栏的列
+		getOperationColumns() {
+			return { columnsData: this.columns, headerSelectFields: this.headerSelectFields }
+		},
+		//获取其他下拉框的配置
+		getOtherItem(sItem) {
+			return {
+				label: sItem.otherLabel ? this.$t(sItem.otherLabel) : this.$t("template.common.other"),
+				fillType: sItem.bodyFillType,
+				maxlength: sItem.otherMaxlength || 50,
+				parentLabel: sItem.label,
+				type: "input"
+			}
+		},
+		isShowBodySub(col, row) {
+			if (col.hasOwnProperty("showBodySub")) {
+				return col.showBodySub
+			} else if (col.bodySubType === 'span' && !row[col.bodySubKey]) {//如果是span没有值的话就隐藏
+				return false;
+			}
+			return col.bodySubType && col.bodySubKey;
+		},
+		// 点击事件
+		handleClickable(col, rowIndex, colIndex, row) {
+			console.log("clickable", rowIndex, colIndex, col, row)
+			if (this.templateFillType !== 'actFill') {
+				return
+			}
+			this.$emit("clickable", col, rowIndex, row)
+		},
+		isShowAddRos() {
+			if (this.showAddRow !== undefined) {
+				return this.showAddRow
+			}
+			return this.templateFillType === 'preFill';
+		},
+		// 复制值
+		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])
+				this.onBlur(rowIndex, col.prop, this.localDataSource[rowIndex][col.prop]);
+			}
+		},
+		// 初始化表头选择器值
+		initHeaderSelectValues() {
+			const headerSelectObj = {};
+			this.columns.map(col => {
+				if (col.headerSelectKey) {
+					headerSelectObj[col.headerSelectKey] = col.defaultValue || col.headerOptions[0].value || ""
+				}
+			});
+			this.headerSelectFields = headerSelectObj;
+		},
+		// 直接获取表单数据，不做校验
+		getFilledFormData() {
+			return {
+				stepTableFormData: [...this.localDataSource],
+				headerSelectFields: this.headerSelectFields,
+			};
+		},
+		// 获取最新数据
+		getFormData() {
+			// 合并表头选择器值到 columns
+
+
+			// 数据校验
+			const validateResult = this.validateFormData();
+			return new Promise((resolve, reject) => {
+				if (validateResult.valid) {
+					resolve({
+						stepTableFormData: [...this.localDataSource],
+						headerSelectFields: this.headerSelectFields,
+					})
+				} else {
+					// this.$message.error("表单内容未填完,请填写后再提交");
+					reject(validateResult.errors[0].error)
+				}
+			})
+
+		},
+		// 表单数据校验
+		validateFormData() {
+			const errors = [];
+
+			// 清空之前的错误状态
+			this.formErrors = [];
+
+			// 校验表头的 HandleFormItem
+			this.columns.forEach((col, colIndex) => {
+				if (col.headerSelectKey && col.headerOptions && col.fillType === this.templateFillType) {
+					const headerValue = this.headerSelectFields[col.headerSelectKey];
+					if (this.isValueEmpty(headerValue)) {
+						const errorItem = {
+							rowIndex: -1, // 表头特殊标记
+							colIndex,
+							field: col.headerSelectKey,
+							label: this.$t(col.label),
+							error: `请选择${this.$t(col.label)}`
+						};
+						errors.push(errorItem);
+						this.formErrors.push(errorItem);
+					}
+				}
+			});
+
+			// 遍历数据行
+			this.localDataSource.forEach((row, rowIndex) => {
+				// 遍历列
+				this.columns.forEach((col, colIndex) => {
+					// 只校验 fillType 与当前模板状态匹配的字段
+					if (col.bodyFillType === this.templateFillType || col.bodySubFillType === this.templateFillType) {
+						// 检查主字段
+						const mainValue = row[col.prop];
+						if (this.isValueEmpty(mainValue) && !col.bodyDisabled && col.bodyType !== 'span') {
+							const errorItem = {
+								rowIndex,
+								colIndex,
+								field: col.prop,
+								label: this.$t(col.label),
+								error: `请填写${this.$t(col.label)}`
+							};
+							errors.push(errorItem);
+							this.formErrors.push(errorItem);
+						}
+
+						// 检查子字段（如果有）
+						if (col.bodySubKey && !col.bodySubDisabled && col.bodySubType !== 'span') {
+							const subValue = row[col.bodySubKey];
+							console.log(col, subValue, "subValue")
+							if (this.isValueEmpty(subValue)) {
+								const errorItem = {
+									rowIndex,
+									colIndex,
+									field: col.bodySubKey,
+									label: `${this.$t(col.label)}单位`,
+									error: `请填写${this.$t(col.label)}单位`
+								};
+								errors.push(errorItem);
+								this.formErrors.push(errorItem);
+							}
+						}
+						console.log(col.otherCode, "col.otherCode")
+
+						// 检查其他输入框
+						if (col.otherCode) {
+							const isSelectedOther = this.isShowOther(mainValue);
+							if (!isSelectedOther) {
+								return;
+							}
+							const otherValue = row[col.otherCode];
+							if (this.isValueEmpty(otherValue)) {
+								const errorItem = {
+									rowIndex,
+									colIndex,
+									field: col.otherCode,
+									label: `${this.$t(col.label)}单位`,
+									error: `请填写${this.$t(col.otherLabel) ? this.$t(col.otherLabel) : '其他'}信息`
+								};
+								errors.push(errorItem);
+								this.formErrors.push(errorItem);
+							}
+						}
+
+					}
+				});
+			});
+			console.log(errors, this.localDataSource, "errors")
+			return {
+				valid: errors.length === 0,
+				errors: errors
+			};
+		},
+		// 判断值是否为空
+		isValueEmpty(value) {
+			if (value === null || value === undefined || value === '') {
+				return true;
+			}
+			if (typeof value === 'string' && value.trim() === '') {
+				return true;
+			}
+			if (Array.isArray(value) && value.length === 0) {
+				return true;
+			}
+			return false;
+		},
+		// 表头选择器变化
+		onHeaderSelectChange(col, value) {
+			this.headerSelectFields[col.headerSelectKey] = value;
+			// 输入时清除对应表单项的错误状态
+			this.formErrors = this.formErrors.filter(error =>
+				!(error.rowIndex === -1 &&
+					error.field === col.headerSelectKey)
+			);
+		},
+		// 检查并应用 compareTo 逻辑
+		checkCompareToLogic(rowIndex, colIndex, colKey, value) {
+			const col = this.columns[colIndex];
+
+			// 检查主字段的 compareTo 逻辑
+			if (col && col.bodyFillType === "actFill" && col.compareTo) {
+				const compareToValue = this.localDataSource[rowIndex][col.compareTo];
+
+				// 比较当前值和compareTo值，如果不相等则设置橙色背景
+				if (value !== compareToValue) {
+					this.setOrangeBg(rowIndex, colIndex, colKey, true);
+				} else {
+					// 相等则移除橙色背景
+					this.setOrangeBg(rowIndex, colIndex, colKey, false);
+				}
+			}
+		},
+
+		// 在数据加载时检查 compareTo 逻辑
+		checkCompareToOnDataLoad() {
+			// 遍历所有行和列，检查 compareTo 逻辑
+			this.localDataSource.forEach((row, rowIndex) => {
+				this.columns.forEach((col, colIndex) => {
+					const currentValue = row[col.prop];
+					const compareToValue = row[col.compareTo];
+					if (col.compareTo && currentValue && compareToValue) {
+						// 比较当前值和compareTo值，如果不相等则设置橙色背景
+						if (!isEqual(currentValue, compareToValue)) {
+							this.setOrangeBg(rowIndex, colIndex, col.prop, true);
+						} else {
+							// 相等则移除橙色背景
+							this.setOrangeBg(rowIndex, colIndex, col.prop, false);
+						}
+					}
+
+					// 检查子字段的 compareTo 逻辑
+					if (col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
+						const currentValue = row[col.bodySubKey];
+						const compareToValue = row[col.bodySubCompareTo];
+
+						if (!!currentValue && !!compareToValue) {
+							// 比较当前值和compareTo值，如果不相等则设置橙色背景
+							if (!isEqual(currentValue, compareToValue)) {
+								this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true);
+							} else {
+								// 相等则移除橙色背景
+								this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false);
+							}
+						}
+					}
+				});
+			});
+		},
+
+		// 表体值变化
+		onBodyValueChange(rowIndex, colIndex, value) {
+			const col = this.columns[colIndex];
+			this.localDataSource[rowIndex][col.prop] = value;
+
+			// 检查并应用 compareTo 逻辑
+			this.checkCompareToLogic(rowIndex, colIndex, col.prop, value);
+
+			// 输入时清除对应表单项的错误状态
+			this.formErrors = this.formErrors.filter(error =>
+				!(error.rowIndex === rowIndex &&
+					error.colIndex === colIndex &&
+					error.field === col.prop)
+			);
+			this.$emit('body-value-change', rowIndex, colIndex, value);
+		},
+		// 表体子值变化
+		onBodySubValueChange(rowIndex, colIndex, value) {
+			const col = this.columns[colIndex];
+			this.localDataSource[rowIndex][col.bodySubKey] = value;
+
+			// 检查子字段的 compareTo 逻辑
+			if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
+				const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo];
+
+				// 比较当前值和compareTo值，如果不相等则设置橙色背景
+				if (value !== compareToValue) {
+					this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, true);
+				} else {
+					// 相等则移除橙色背景
+					this.setOrangeBg(rowIndex, colIndex, col.bodySubKey, false);
+				}
+			}
+
+			// 输入时清除对应表单项的错误状态
+			this.formErrors = this.formErrors.filter(error =>
+				!(error.rowIndex === rowIndex &&
+					error.colIndex === colIndex &&
+					error.field === col.bodySubKey)
+			);
+			this.$emit('body-sub-value-change', rowIndex, colIndex, value);
+		},
+		getHeaderItem(col) {
+			return {
+				fillType: col.fillType,
+				options: col.headerOptions,
+				label: ""
+			}
+		},
+		getBodyItem(col, rowIndex) {
+			const currentItem = this.localDataSource[rowIndex];
+			const item = {
+				fillType: col.bodyFillType,
+				options: col.bodyOptions,
+				maxlength: col.bodyMaxlength,
+				label: this.$t(col.label),
+				precision: currentItem[col.bodyPrecisionKey] || col.precision,
+				copyFrom: col.copyFrom || "",
+				compareTo: col.compareTo, // 添加 compareTo 字段
+				type: col.bodyType || "input",
+			};
+			if (col.bodyDisabled) {
+				item.disabled = col.bodyDisabled;
+			}
+			return item
+		},
+		getBodySubItem(col) {
+			const item = {
+				fillType: col.bodySubFillType,
+				options: col.bodySubOptions,
+				maxlength: col.bodySubMaxlength || 10,
+				label: "",
+				placeholder: col.bodySubPlaceholder || "请输入",
+				precision: col.subPrecision,
+				compareTo: col.bodySubCompareTo, // 添加 compareTo 字段
+				type: col.bodySubType || "input",
+			}
+			if (col.bodySubDisabled) {
+				item.disabled = col.bodySubDisabled;
+			}
+			return item
+		},
+		// 删除行
+		deleteRow(rowIndex) {
+			this.localDataSource.splice(rowIndex, 1);
+			this.$emit('row-delete', rowIndex);
+		},
+		// 更新数据方法，可在formData变更时调用，也可由父组件调用
+		updateDataSource(dataSource = []) {
+			this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource));
+			console.log(this.oldLocalDataSource, "oldLocalDataSource")
+			// 深拷贝数据以避免直接修改原始数据
+			this.localDataSource = JSON.parse(JSON.stringify(dataSource || []));
+		},
+		onAddRow() {
+			this.addRow({
+				actSolutionVolumePrecision: 3,//小数点精度默认为3
+				actSolutionConcentrationPrecision: 3,//小数点精度默认为3
+				targetDiluentVolumePrecision: 3,//小数点精度默认为3
+				targetStartSolutionVolumePrecision: 3,//小数点精度默认为3
+			});
+		},
+		// 添加行
+		addRow(row = {}) {
+			this.localDataSource.push(row);
+		},
+		getDataSource() {
+			return this.localDataSource;
+		},
+		// 根据行索引更新数据
+		updateDataSourceByRowIndex(rowIndex, data) {
+			this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource));
+			this.localDataSource[rowIndex] = { ...this.localDataSource[rowIndex], ...data };
+			this.localDataSource = [...this.localDataSource];
+		},
+		// 判断表单项是否有错误
+		hasError(rowIndex, colIndex, field) {
+			return this.formErrors.some(error =>
+				error.rowIndex === rowIndex &&
+				error.colIndex === colIndex &&
+				error.field === field
+			);
+		},
+		// 处理错误状态更新
+		onErrorUpdate(rowIndex, colIndex, field, isError) {
+			if (!isError) {
+				this.formErrors = this.formErrors.filter(error =>
+					!(error.rowIndex === rowIndex &&
+						error.colIndex === colIndex &&
+						error.field === field)
+				);
+			}
+		},
+		onSubBlur(rowIndex, colKey, value) {
+			this.$emit("blur", { rowIndex, colKey, value, item: this.localDataSource[rowIndex] });
+		},
+		// 检查是否需要橙色背景
+		hasOrangeBg(rowIndex, colIndex, field) {
+			const key = `${rowIndex}-${colIndex}-${field}`;
+			return this.orangeBgCells[key] || false;
+		},
+		// 设置橙色背景状态
+		setOrangeBg(rowIndex, colIndex, field, status) {
+			const key = `${rowIndex}-${colIndex}-${field}`;
+			this.$set(this.orangeBgCells, key, status);
+		},
+		onBlur(rowIndex, colKey) {
+			const value = this.localDataSource[rowIndex][colKey];
+
+			// 查找对应的列配置
+			const col = this.columns.find(c => c.prop === colKey);
+			if (col && col.bodyFillType === "actFill" && col.compareTo) {
+				const compareToValue = this.localDataSource[rowIndex][col.compareTo];
+
+				// 比较当前值和compareTo值，如果不相等则设置橙色背景
+				if (value !== compareToValue) {
+					this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.prop === colKey), colKey, true);
+				} else {
+					// 相等则移除橙色背景
+					this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.prop === colKey), colKey, false);
+				}
+			}
+
+			this.$emit("blur", { rowIndex, colKey, value, item: this.localDataSource[rowIndex] });
+		},
+		onSubBlur(rowIndex, colKey, value) {
+			// 查找对应的列配置
+			const col = this.columns.find(c => c.bodySubKey === colKey);
+			if (col && col.bodySubFillType === "actFill" && col.bodySubCompareTo) {
+				const compareToValue = this.localDataSource[rowIndex][col.bodySubCompareTo];
+
+				// 比较当前值和compareTo值，如果不相等则设置橙色背景
+				if (value !== compareToValue) {
+					this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.bodySubKey === colKey), colKey, true);
+				} else {
+					// 相等则移除橙色背景
+					this.setOrangeBg(rowIndex, this.columns.findIndex(c => c.bodySubKey === colKey), colKey, false);
+				}
+			}
+
+			this.$emit("blur", { rowIndex, colKey, value, item: this.localDataSource[rowIndex] });
+		}
+	}
 };
 </script>
 
 <style scoped>
 .custom-table-wrapper {
-  border: 1px solid #ebeef5;
-  border-radius: 4px;
-  overflow: hidden;
-  font-size: 14px;
-  color: #606266;
-  margin-top: 20px;
+	border: 1px solid #ebeef5;
+	border-radius: 4px;
+	overflow: hidden;
+	font-size: 14px;
+	color: #606266;
+	margin-top: 20px;
 }
 
 .inner-table-cell {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
 .m-l-5 {
-  margin-left: 5px;
+	margin-left: 5px;
 }
 
 .sub-input-number {
-  width: 145px;
+	width: 145px;
 
-  .el-input-number--mini {
-    width: 145px;
-  }
+	.el-input-number--mini {
+		width: 145px;
+	}
 }
 
 /* 表头 */
 .custom-table-header {
-  background-color: #f5f7fa;
-  border-bottom: 1px solid #ebeef5;
-  white-space: nowrap;
-  display: block;
+	background-color: #f5f7fa;
+	border-bottom: 1px solid #ebeef5;
+	white-space: nowrap;
+	display: block;
 }
 
 .custom-table-body {
-  max-height: 300px;
-  /* 可根据需要调整或由父组件控制 */
+	max-height: 300px;
+	/* 可根据需要调整或由父组件控制 */
 }
 
 .header-cell-content {
-  display: flex;
-  align-items: center;
-  justify-content: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
 /* 共同行样式 */
 .custom-table-row {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
+	display: table;
+	width: 100%;
+	table-layout: fixed;
 }
 
 .custometable-row {
-  display: table;
-  width: 100%;
-  table-layout: fixed;
+	display: table;
+	width: 100%;
+	table-layout: fixed;
 
-  &:not(:last-child) {
-    border-bottom: 1px solid #ebeef5;
-  }
+	&:not(:last-child) {
+		border-bottom: 1px solid #ebeef5;
+	}
 }
 
 /* 单元格 */
 .custom-table-cell {
-  display: table-cell;
-  padding: 12px 10px;
-  text-align: left;
-  vertical-align: middle;
-  border-right: 1px solid #ebeef5;
-  box-sizing: border-box;
+	display: table-cell;
+	padding: 12px 10px;
+	text-align: left;
+	vertical-align: middle;
+	border-right: 1px solid #ebeef5;
+	box-sizing: border-box;
 }
 
 .custom-table-cell:last-child {
-  border-right: none;
+	border-right: none;
 }
 
 .header-cell {
-  font-weight: bold;
-  color: #909399;
-  background-color: #f5f7fa;
+	font-weight: bold;
+	color: #909399;
+	background-color: #f5f7fa;
 }
 
 .body-cell {
-  color: #606266;
-  background-color: #fff;
+	color: #606266;
+	background-color: #fff;
 }
 
 /* select 样式（模仿 Element UI） */
 .header-cell select {
-  width: 100%;
-  padding: 4px 8px;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  outline: none;
-  background-color: #fff;
-  font-size: 13px;
-  color: #606266;
-  appearance: none;
-  /* 隐藏默认箭头（可选） */
-  background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6,9 12,15 18,9'%3e%3c/polyline%3e%3c/svg%3e");
-  background-repeat: no-repeat;
-  background-position: right 8px center;
-  background-size: 14px;
-  padding-right: 28px;
+	width: 100%;
+	padding: 4px 8px;
+	border: 1px solid #dcdfe6;
+	border-radius: 4px;
+	outline: none;
+	background-color: #fff;
+	font-size: 13px;
+	color: #606266;
+	appearance: none;
+	/* 隐藏默认箭头（可选） */
+	background-image: url("data:image/svg+xml;charset=UTF-8,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='currentColor' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3e%3cpolyline points='6,9 12,15 18,9'%3e%3c/polyline%3e%3c/svg%3e");
+	background-repeat: no-repeat;
+	background-position: right 8px center;
+	background-size: 14px;
+	padding-right: 28px;
 }
 
 /* 滚动容器：如果整体宽度超限，显示横向滚动条 */
 .custom-table-wrapper {
-  display: flex;
-  flex-direction: column;
-  max-width: 100%;
-  /* 父容器决定宽度 */
-  overflow-x: auto;
+	display: flex;
+	flex-direction: column;
+	max-width: 100%;
+	/* 父容器决定宽度 */
+	overflow-x: auto;
 }
 
 .custom-table-header,
 .custom-table-body {
-  min-width: 100%;
+	min-width: 100%;
 }
 
 .header-select {
-  width: 100px;
-  margin-left: 5px;
+	width: 100px;
+	margin-left: 5px;
 }
 
 .no-data {
-  text-align: center;
-  padding: 20px 0;
-  color: rgb(144, 147, 153)
+	text-align: center;
+	padding: 20px 0;
+	color: rgb(144, 147, 153)
 }
 
 .add-row {
-  display: flex;
-  justify-content: center;
-  padding: 20px 0;
-  margin-top: 20px;
+	display: flex;
+	justify-content: center;
+	padding: 20px 0;
+	margin-top: 20px;
 }
 
 .flex1 {
-  flex: 1;
+	flex: 1;
 }
 
 .flex {
-  display: flex;
+	display: flex;
 }
 
 .other-title {
-  text-align: right;
-  margin: 0 10px;
-  font-size: 14px;
-  font-weight: normal;
-  color: #606266;
-  width: auto;
+	text-align: right;
+	margin: 0 10px;
+	font-size: 14px;
+	font-weight: normal;
+	color: #606266;
+	width: auto;
 }
 
 .body-span {
-  text-align: center;
+	text-align: center;
 }
 </style>
\ No newline at end of file
diff --git a/src/components/Template/DecimalInput.vue b/src/components/Template/DecimalInput.vue
index 1023504..cc8e23a 100644
--- a/src/components/Template/DecimalInput.vue
+++ b/src/components/Template/DecimalInput.vue
@@ -41,7 +41,6 @@ export default {
   watch: {
     value(newVal) {
       // 外部值变化时同步到内部（但不做格式化，避免干扰用户输入）
-      console.log(newVal,"newVal")
       if (newVal === '' || newVal == null) {
         this.internalValue = '';
       } else {
@@ -51,7 +50,6 @@ export default {
   },
   methods: {
     handleInput(val) {
-      console.log(val,"val")
       if (val === '') {
         this.internalValue = '';
         this.$emit('input', '');
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 27cb6d4..7553d9d 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -325,7 +325,6 @@ export default {
         // 下拉框失去焦点处理
         onSelectBlur(visible) {
             if (!visible) {
-                console.log(this.inputValue, "onSelectBlur")
                 this.onCommonHandleSaveRecord(this.inputValue);
             }
         },
@@ -382,18 +381,19 @@ export default {
             } else if (!this.error && isEmpty) {
                 this.$emit('update:error', true);
             }
+            if(!this.isFieldsRecord){//是否需要记录修改记录
+                this.$emit("blur", this.inputValue);
+                this.$emit('input', this.inputValue);
+                this.$emit("change", this.inputValue);
+                return;
+            }
             // 值发生了变化，需要弹出密码输入框
             const isSame = this.isEqual(this.oldValue, this.inputValue);
             if(isSame){
                 return;
             }
             if (this.oldValue && !isSame && this.templateFillType === "actFill") {
-                if(!this.isFieldsRecord){//是否需要记录修改记录
-                    this.$emit("blur", this.inputValue);
-                    this.$emit('input', this.inputValue);
-                    this.$emit("change", this.inputValue);
-                    return;
-                }
+                
                 this.$refs.editSignRef.show()
                 // this.handleUpdateRecord();
             }else{//如果是第一次填写，不需要密码验证
diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js
index 30e4fc8..6bc3191 100644
--- a/src/components/Template/mixins/formPackageMixins.js
+++ b/src/components/Template/mixins/formPackageMixins.js
@@ -343,7 +343,8 @@ export default {
             }
         },
         resetRecord(key){
-            this.formFields = {...this.formFields, ...this.oldFormFields}
+            this.formFields = {...this.formFields, ...this.oldFormFields};
+            this.$emit("resetRecord");
         },
     }
 }
\ No newline at end of file
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 3b7b0dc..1491a75 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -19,6 +19,7 @@
 <script>
 import { EventBus } from "@/utils/eventBus";
 import { addTj } from "@/utils/calUnitTools";
+import {getuuid} from "@/utils/index"
 
 export default {
     name: "TableOpertaion",
@@ -64,12 +65,10 @@ export default {
     data() {
         return {
             innerRow: this.row,
+            uuid:getuuid(),
         }
     },
-    mounted() {
-        console.log("mounted")
-        
-    },
+  
     methods: {
         // 开始配置
         onStartConfig() {
@@ -117,10 +116,12 @@ export default {
             if (innerRow.fzsj) {
                 defaultData = {...innerRow.fzsj,...defaultData}
             }
-            EventBus.$emit("showSubPackageDialog", defaultData)
+            EventBus.$emit("showSubPackageDialog", {...defaultData,uuid:this.uuid})
         },
         onSubPackageSubmit(data) {
-            if (data.rowIndex === this.rowIndex) {
+            console.log(data,"submit")
+            if (data.uuid === this.uuid) {
+                console.log(data,"inner submit")
                 this.innerRow.fzsj = data;
                 //通知后端保存数据
                 const params = {
diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index 221ec47..e127e18 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -15,6 +15,7 @@
 					<LineLabel label="操作步骤" />
 					<div class="template-form-item">
 						<BaseInfoFormPackage @clickable="handleClickable" ref="stepFormPackageRef"
+							@resetRecord="resetRecord"
 							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData" />
 						<CustomTable fieldItemLabel="操作步骤" @blur="onHandleTableBlur" :showAddRow="false"
 							:showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
@@ -416,6 +417,9 @@ export default {
 	mounted() {
 	},
 	methods: {
+		resetRecord(){
+			this.$refs.stepTableRef.resetRecord();
+		},
 		startConfig(val){
 			const { rowData } = val;
 			let postData = {
@@ -507,10 +511,10 @@ export default {
 		//选择试剂提交事件
 		onSelectReagentSubmit(code, row) {
 			if (this.currentSubKey === "subStartSolution") {//起始源溶液点击事件
-				this.$refs.stepFormPackageRef.updateFormData("targetAcSolution", row.nd);
+				this.$refs.stepFormPackageRef.updateFormData("targetAcSolution", row.nd,["targetAcSolution"]);
 				this.updateStepTableData(row);
 			}
-			this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code);
+			this.$refs.stepFormPackageRef.updateFormData(this.currentSubKey, code,[this.currentSubKey]);
 			this.$refs.selectReagentDialogRef.onCancel()
 		},
 		//更新table数据
@@ -523,7 +527,6 @@ export default {
 			// 遍历数据，按要求更新起始溶液编号
 			for (let i = 0; i < newStepTableData.length; i++) {
 				const item = newStepTableData[i];
-				const volume = item.actStartSolutionVolume || 0;
 				if (i === 0) {
 					// 第一条记录的起始溶液编号是确认弹框带出来的，也就是row.code字段
 					newStepTableData[i].startSolutionCode = row.bh;
@@ -532,7 +535,9 @@ export default {
 					// 第三条的起始溶液编号是第二条数据里面的targetSolutionCode字段，以此类推
 					newStepTableData[i].startSolutionCode = newStepTableData[i - 1].targetSolutionCode;
 				}
-				this.updateSjmbrynd(item, row.nd)
+				const {actVol,actNd} = this.updateSjmbrynd(item, row.nd);
+				item.actSolutionVolume = actVol;
+				item.actSolutionConcentration = actNd;
 			}
 
 			// 更新stepTableRef组件的数据
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index da384f7..f3f3d53 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -28,6 +28,7 @@
 									@click="deleteLadderConfig(ladderIndex)">删除</el-button>
 							</div>
 							<BaseInfoFormPackage @clickable="(e) => handleClickable('ladder', ladderIndex, e)"
+								@resetRecord="(e) => resetRecord('ladder', ladderIndex, e)"
 								:ref="`ladderStepFormPackageRef_${ladderIndex}`" :formConfig="ladderStepFormConfig"
 								@blur="onHandleBlur" :formData="ladderConfig" fieldItemLabel="阶梯配制"
 								:prefixKey="'ladder_' + ladderIndex" />
@@ -67,6 +68,7 @@
 								fieldItemLabel="平行配制" />
 							<CustomTable @blur="(e) => onHandleTableBlur('paralle', paralleIndex, e)"
 								:ref="`paralleStepTableRef_${paralleIndex}`" :columns="paralleStepColumns"
+								@clickable="(e, tableRowIndex, rowData) => handleTableClickable('paralle', paralleIndex, e, tableRowIndex, rowData)"
 								:formData="paralleConfig" :prefixKey="'paralle' + paralleIndex" fieldItemLabel="平行配制">
 								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 									<TableOpertaion @printTag="(e) => printTag(e, 'paralleConfigs', paralleIndex)"
@@ -107,6 +109,7 @@ import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue";
 import { getExpireDate } from "@/utils/index.js";
 import moment from "moment";
+import { addTj } from "@/utils/calUnitTools";
 import { getLadderColumnsConfig, getParallelColumnsConfig, getLadderFormConfig, getBaseInfoFormConfig, getRemarkFormConfig, getStorageConditionFormConfig, getParalleStepFormConfig } from "../../formConfig/paralleAndLadderConfig.js";
 export default {
 	name: "SWYPBQGZYZBB",
@@ -176,17 +179,44 @@ export default {
 			currentTableIndex: "",//当前点击的表格索引
 			currentTableKey: "",//当前点击的表格key
 			targetAcSolutionFromTable: true,//是否从表格中获取实际原始溶液浓度
+			currentRowData: {},//当前点击的行数据
 		};
 	},
 	mounted() {
 	},
 	methods: {
-		subPackageSubmit(val, configType, index) {
-			// const { rowData } = val;
-			// let postData = {
-			// 	bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-			// }
-			// this.startConfigRequest(postData);
+		resetRecord(type, index, e) {
+			this.$refs[`ladderStepTableRef_${index}`][0].resetRecord();
+		},
+		//分装
+		subPackageSubmit(data, configType, index) {
+			const { fzsj, rowData, headerSelectFields } = data;
+			const { fzList = [], dw = "", mybh } = fzsj;
+			if (fzList && fzList.length > 0) {
+				const list = fzList.map((item) => {
+					return {
+						bh: mybh + item.subCode,
+						kc: item.num,
+						kcdw: dw,
+					}
+				})
+				let postData = {
+					studyId: this.formData.studyId,
+					studyFormId: this.formData.id,
+					bh: mybh,
+					nd: rowData.actSolutionConcentration || 0,
+					nddw: headerSelectFields.actSolutionConcentrationUnit,
+					list: list
+				}
+				this.subPackageRequest(postData);
+			}
+		},
+		startConfig(val) {
+			const { rowData } = val;
+			let postData = {
+				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
+			}
+			this.startConfigRequest(postData);
 		},
 		configComplete(val) {
 			const { rowData, headerSelectFields } = val;
@@ -277,7 +307,6 @@ export default {
 		async handleUpdateCode() {
 			Promise.all([this.assignNumbersToTableData("ladderConfigs"), this.assignNumbersToTableData("paralleConfigs")
 			]).then(() => {
-				console.log("nextTick")
 				//通知后端保存数据
 				const params = {
 					type: "fieldChanged",
@@ -349,7 +378,7 @@ export default {
 
 		// 表格失去焦点事件
 		onHandleTableBlur(type, configIndex, e) {
-			const { colKey = "", item } = e;
+			const { colKey = "", item,rowIndex } = e;
 			if (colKey === "targetStartSolutionConcentration" || colKey === "targetSolutionVolume" || colKey === "targetSolutionConcentration" || colKey === "targetStartSolutionVolumePrecision" || colKey === "targetDiluentVolumePrecision") {
 				if (type === "ladder") {
 					const volume = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetStartSolution") || 0;
@@ -366,24 +395,30 @@ export default {
 				if (type === "ladder") {
 					const targetAcSolution = this.$refs[`ladderStepFormPackageRef_${configIndex}`][0]?.getFormDataByKey("targetAcSolution") || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
-						this.updateSjmbrynd(item, targetAcSolution);
+						const {actVol, actNd} = this.updateSjmbrynd(item, targetAcSolution);
+						this.$refs[`ladderStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex,{actSolutionVolume: actVol,
+						actSolutionConcentration: actNd,});
 					}
 				} else if (type === "paralle") {
 					const targetAcSolution = item.targetAcSolution || 0;//获取实际起始溶液浓度
 					if (targetAcSolution) {
 						this.updateSjmbrynd(item, targetAcSolution);
+						const {actVol, actNd} = this.updateSjmbrynd(item, targetAcSolution);
+						this.$refs[`paralleStepTableRef_${configIndex}`][0]?.updateDataSourceByRowIndex(rowIndex,{actSolutionVolume: actVol,
+						targetAcSolution: actNd,});
 					}
 				}
 
 			}
 		},
 		//表格点击事件
-		handleTableClickable(type, rowIndex, col, tableRowIndex) {
+		handleTableClickable(type, rowIndex, col, tableRowIndex, rowData) {
 			if (col.prop === "actStartSolutionCode") {//实际原始溶液编号点击事件
 				this.currentTableKey = col.prop;
 				this.currentType = type;
 				this.currentRowIndex = rowIndex;
 				this.currentTableIndex = tableRowIndex;
+				this.currentRowData = rowData;
 				this.$refs.selectReagentDialogRef.show();
 			}
 		},
@@ -410,20 +445,47 @@ export default {
 				if (currentSubKey === "subStartSolution") {
 					packageRef.updateFormData("targetAcSolution", row.nd, ["targetAcSolution"]);
 					packageRef.onValueChangeCompareTo("targetAcSolution", row.nd, "targetStartSolution");
+					this.updateTableNd(row);
 				}
-				packageRef.updateFormData(currentSubKey, code);
+				packageRef.updateFormData(currentSubKey, code, [currentSubKey]);
 				this.currentSubKey = "";
 			} else if (currentTableKey === "actStartSolutionCode") {//实际原始溶液编号点击事件
 				const tableRef = this.$refs[`paralleStepTableRef_${currentRowIndex}`][0];
 				if (tableRef) {
+					const { actVol, actNd } = this.updateSjmbrynd(this.currentRowData, row.nd);
 					tableRef.updateDataSourceByRowIndex(currentTableIndex, {
 						actStartSolutionCode: code,
 						targetAcSolution: row.nd,
+						actSolutionVolume: actVol,
+						targetAcSolution: actNd,
 					})
 
 				}
 			}
-			this.$refs.selectReagentDialogRef.onCancel()
+			this.$refs.selectReagentDialogRef.onCancel();
+		},
+		updateRecord() {
+			this.$nextTick(() => {
+				EventBus.$emit('onModifyRecord', {
+					type: "fieldChanged",
+					newRecord: null,
+					resourceList: null,
+				},)
+			})
+		},
+		//选择实际的时候更新table的浓度
+		updateTableNd(row) {
+			const { stepTableFormData = [] } = this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].getFilledFormData();
+			const newData = JSON.parse(JSON.stringify(stepTableFormData));
+			// 遍历数据，按要求更新起始溶液编号
+			newData.forEach((item, index) => {
+				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
+				item.actSolutionVolume = actVol;
+				item.actSolutionConcentration = actNd;
+			})
+			// 更新stepTableRef组件的数据
+			this.$refs[`ladderStepTableRef_${this.currentRowIndex}`][0].updateDataSource(newData);
+			// this.updateRecord();
 		},
 		//只做校验
 		async validFields() {
diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue
index 3b19ece..544a8ff 100644
--- a/src/views/business/comps/template/dialog/SubPackageDialog.vue
+++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue
@@ -10,7 +10,8 @@
                 <div class="header-item">
                     <div class="header-title">分装数量</div>
                     <HandleFormItem :isFieldsRecord="false" @blur="onBlurFzsl" :item="integerInputNumberItem"
-                        :error="formErrors.fzsl" v-model="formData.fzsl" />
+                    type = "inputNumber"    
+                    :error="formErrors.fzsl" v-model="formData.fzsl" />
                 </div>
             </div>
             <div class="content-container">
@@ -23,7 +24,7 @@
                     </div>
                     <span class="ml-20">每份包装量：</span>
                     <div class="unit-select">
-                        <HandleFormItem :isFieldsRecord="false" :item="inputNumberItem"  v-model="formData.mfbzl" />
+                        <HandleFormItem type="inputNumber" :isFieldsRecord="false" :item="inputNumberItem"  v-model="formData.mfbzl" />
                     </div>
                     <el-button type="primary" plain @click="onAverage">平均分配</el-button>
                     <el-button type="primary" plain @click="onReset">重置</el-button>
@@ -32,7 +33,7 @@
                     <div v-for="(item, index) in fzList" class="list-item" :key="index">
                         <div class="list-label">{{ formData.mybh }}-set{{ item.subCode }}</div>
                         <HandleFormItem :isFieldsRecord="false" :item="inputNumberItem" :error="fzListErrors[index]"
-                            @blur="onBlurFzNum(index)" v-model="item.num" />
+                         type="inputNumber"   @blur="onBlurFzNum(index)" v-model="item.num" />
                         <el-button type="primary" plain @click="onPrint(item)">打印</el-button>
                     </div>
                 </div>
@@ -88,7 +89,8 @@ export default {
                 fzsl: false,
                 dw: false,
             },
-            fzListErrors: [] // 分装列表错误状态
+            fzListErrors: [], // 分装列表错误状态
+            uuid:"",//事件id
         }
     },
     computed: {
@@ -109,6 +111,9 @@ export default {
         },
         show(data) {
             const cloneData = JSON.parse(JSON.stringify(data));
+            if(data && data.uuid) {//为了标识eventBus的事件id
+                this.uuid = data.uuid
+            }
             if (data.fzList) {
                 this.fzList = JSON.parse(JSON.stringify(cloneData.fzList));
                 // 初始化分装列表错误状态
@@ -151,7 +156,7 @@ export default {
 
         },
         submitEmit(){
-            EventBus.$emit('dialogSubPackageSubmit', {...this.formData, fzList: this.fzList});
+            EventBus.$emit('dialogSubPackageSubmit', {...this.formData, fzList: this.fzList,uuid:this.uuid});
             setTimeout(() => {
                 this.close();
             }, 500);
@@ -207,6 +212,7 @@ export default {
         },
         // 分装数量失去焦点时，根据数量生成分装列表
         async onBlurFzsl(e) {
+            console.log(e,"失去焦点时的数量")
             // 清除当前字段的错误状态
             if (e) {
                 this.formErrors.fzsl = false;
@@ -256,7 +262,7 @@ export default {
             this.formErrors.mfbzl = false;
         },
         onPrint(item) {
-            EventBus.$emit('subPackageDialogPrintTag', {...this.formData, printCode: `${this.formData.mybh}-set${item.subCode}`});
+            EventBus.$emit('subPackageDialogPrintTag', {...this.formData, printCode: `${this.formData.mybh}-set${item.subCode}`,uuid:this.uuid});
          },
         onCommonBlur(e, field) {
             if (this.formData[field]) {
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 7e7b8d7..53ecdc5 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -1,372 +1,377 @@
 import moment from 'moment'
 import { getLatestSn } from '@/api/template';
-import { sj_subpackage,sj_startConfiguration,sj_configurationCompleted } from '@/api/business/sj/sj';
+import { sj_subpackage, sj_startConfiguration, sj_configurationCompleted } from '@/api/business/sj/sj';
 export default {
-  dicts: [
-    'business_pztj',
-    'business_cctj',
-    'business_nddw',
-    'business_tjdw',
-    'business_yxqdw',
-    'business_rqcz',
+	dicts: [
+		'business_pztj',
+		'business_cctj',
+		'business_nddw',
+		'business_tjdw',
+		'business_yxqdw',
+		'business_rqcz',
 
-    'business_sp_jmdyzqdyp', //色谱-编号-准确度与精密度
-    'business_sp_nbgzy', //色谱-编号-内标工作液
-    'business_sp_zkgzy', //色谱-编号-质控工作液
-    'business_sp_bqgzy', //色谱-编号-标曲工作液
-    'business_sp_bzqxzkypzbb', //色谱-编号-标准曲线/质控样品制备表
-    'business_sp_tqhsl', //色谱-编号-提取回收率
-    'business_sp_qxwdx', //色谱-编号-全血稳定性
-    'business_sp_cbyhgzywdx', //色谱-编号-储备液和工作液稳定性
-    'business_sp_rxjzxy', //色谱-编号-溶血基质效应
-    'business_sp_jzxy', //色谱-编号-基质效应
-    'business_sp_xzxytyx', //色谱-编号-选择性与特异性
-    'business_sp_zdybs', //色谱-编号-最大样本数
-    'business_sp_xskkx', //色谱-编号-稀释可靠性
-    'business_sp_cbydb' //色谱-编号-储备液对比
-  ],
-  props: {
-    templateData: {
-      type: Object,
-      default: () => {}
-    }
-  },
-  watch: {
-    templateData: {
-      immediate: true,
-      deep: true,
-      handler(v) {
-        if (v) {
-          const {
-            studyId,
-            studyMc,
-            studySn,
-            templateMc,
-            templateMcEn,
-            templateSn,
-            startDate,
-            bdmc,
-            endDate,
-            id
-          } = v
-          if (v.resource) {
-            //试验试剂信息
-            this.resource = JSON.parse(v.resource)
-          }
-          if (v.bdnr) {
-            this.formData = {
-              ...JSON.parse(v.bdnr),
-              studyId,
-              studyMc,
-              studySn,
-              templateMc,
-              templateMcEn,
-              templateSn,
-              startDate,
-              bdmc,
-              endDate,
-              id
-            }
-          } else {
-            this.formData = {
-              studyId,
-              studyMc,
-              studySn,
-              templateMc,
-              templateMcEn,
-              templateSn,
-              startDate,
-              bdmc,
-              endDate,
-              id
-            }
-          }
-          const { effectivePeriod, effectivePeriodUnit, expireDate } =
-            this.formData
-          //实际填报的时候，如果有了开始时间，并且有有效周期，但是没有失效日，就计算失效日为开始时间+有效周期
-          if (
-            startDate &&
-            this.fillType === 'actFill' &&
-            effectivePeriod &&
-            effectivePeriodUnit &&
-            !expireDate
-          ) {
-            const start = moment(startDate)
-            const unit = effectivePeriodUnit === '天' ? 'days' : 'hours'
-            const end = start
-              .add(Number(effectivePeriod), unit)
-              .format('YYYY-MM-DD HH:mm:ss')
-            this.formData = { ...this.formData, expireDate: end }
-          }
-          console.log(this.formData, 'formData from templateData')
-          this.setTemplateData(v)
-        }
-      }
-    }
-  },
-  data() {
-    return {
-      formData: {},
-      templateDetail: {},
-      resource: [], //试验试剂信息
-      sysjColumns: [
-        { label: '试剂名称', prop: 'reagentName' },
-        { label: '编号', prop: 'reagentCode' },
-        { label: '批号', prop: 'reagentNo' },
-        { label: '浓度/含量/纯度', prop: 'concentration' },
-        { label: '来源', prop: 'source' },
-        { label: '失效日', prop: 'expireDate' }
-      ],
-      yqsColumns: [
-        { label: '仪器名称', prop: 'instrumentName' },
-        { label: '仪器型号', prop: 'instrumentModel' },
-        { label: '仪器编号', prop: 'instrumentCode' },
-        { label: '下次测试/校准/检定日期', prop: 'nextTestDate' }
-      ]
-    }
-  },
-  mounted() {},
-  unmounted() {
-    this.setTemplateData({})
-  },
-  methods: {
-    //开始配置
-    //postData: {bh: '123456'}
-    async startConfigRequest (postData){
-      const res = await sj_startConfiguration(postData)
-      if (res.code === 200) {
-        this.$message.success('开始配置成功')
-      } else {
-        this.$message.error('开始配置失败')
-      }
-    },
-    //完成配置
-    async configCompleteRequest (postData){
-      const res = await sj_configurationCompleted(postData)
-      if (res.code === 200) {
-        this.$message.success('完成配置成功')
-      } else {
-        this.$message.error('完成配置失败')
-      }
-    },
-    //分装
-    async subPackageRequest (postData){
-      const res = await sj_subpackage(postData)
-      if (res.code === 200) {
-        this.$message.success('分装成功')
-      } else {
-        this.$message.error('分装失败')
-      }
-    },
-    //获取打印配置
-    getBasePrintConfig (data = {}){
-      const { printCode,type,row = {} } = data;
-      const {stepStorageCondition,startDate,expireDate} =  this.formData;;
-      const { nickName, name } = this.$store.getters;
-      const lang = this.$i18n.locale;
-      const printConfig = {
-        "品名":"暂时还不知道品名是哪个字段",
-        "存储条件":stepStorageCondition,
-        "配制日期":moment(startDate).format("YYYY-MM-DD"),
-        "有效期至":moment(expireDate).format("YYYY-MM-DD HH:mm"),
-        "配置者":lang === "zh_CN" ? nickName : name,
-        //type==="subPackage"从分装打印过来的，
-        //type==="row" 从列表上点过来的
-        "编号":type === "subPackage" ? printCode : (row.targetSolutionCode+row.subTargetSolutionCode),
-      }
-      return printConfig
-    },
-    async getLatestSn(count = 1) {
-      const res = await getLatestSn({ count })
-      if (res.code === 200) {
-        return res.data
-      }
-      return null
-    },
-    getResource() {
-      return this.resource
-    },
-    //根据ref数组获取直接formData
-    getFilledFormDataByRefs(refArr = []) {
-      let result = {}
-      refArr.map((ref) => {
-        const refData = this.$refs[ref]?.getFilledFormData() || {}
-        for (const [key, value] of Object.entries(refData)) {
-          let index = 0
-          // 如果当前键是可能重复的字段，且结果对象中已经存在该键，则添加索引后缀
-          if (
-            (key === 'headerSelectFields' || key === 'stepTableFormData') &&
-            result.hasOwnProperty(key)
-          ) {
-            // 为重复字段生成带索引的键名，从1开始（因为第一个组件不需要后缀）
-            const newKey = `${key}_${++index}`
-            result[newKey] = value
-          } else {
-            // 正常合并其他字段
-            result[key] = value
-          }
-        }
-      })
-      return result
-    },
-    //统一校验form表单是否填写
-    async validFormFields(refArr = []) {
-      let result = {}
-      const refs = refArr.map((ref) => {
-        let refData = {}
-        if (this.$refs[ref][0]) {
-          refData = this.$refs[ref][0]?.getFormData() || {}
-        } else {
-          refData = this.$refs[ref]?.getFormData() || {}
-        }
-        return refData
-      })
-      const validFormData = await Promise.all(refs).catch((err) => {
-        // this.$message.error(err);
-        if (err.errorType && err.errorType === 'step') {
-          this.$message.error('请添加步骤')
-          return
-        }
-        this.$message.error('表单内容未填完,请填写后再提交')
-      })
-      if (validFormData) {
-        validFormData.forEach((item) => {
-          for (const [key, value] of Object.entries(item)) {
-            let index = 0
-            // 如果当前键是可能重复的字段，且结果对象中已经存在该键，则添加索引后缀
-            if (
-              (key === 'headerSelectFields' || key === 'stepTableFormData') &&
-              result.hasOwnProperty(key)
-            ) {
-              // 为重复字段生成带索引的键名，从1开始（因为第一个组件不需要后缀）
-              const newKey = `${key}_${++index}`
-              result[newKey] = value
-            } else {
-              // 正常合并其他字段
-              result[key] = value
-            }
-          }
-        })
-        return result
-      }
-      return false
-    },
-    //试验配制条件options
-    getDictOptions(dictType) {
-      return this.dict.type[dictType] || []
-    },
+		'business_sp_jmdyzqdyp', //色谱-编号-准确度与精密度
+		'business_sp_nbgzy', //色谱-编号-内标工作液
+		'business_sp_zkgzy', //色谱-编号-质控工作液
+		'business_sp_bqgzy', //色谱-编号-标曲工作液
+		'business_sp_bzqxzkypzbb', //色谱-编号-标准曲线/质控样品制备表
+		'business_sp_tqhsl', //色谱-编号-提取回收率
+		'business_sp_qxwdx', //色谱-编号-全血稳定性
+		'business_sp_cbyhgzywdx', //色谱-编号-储备液和工作液稳定性
+		'business_sp_rxjzxy', //色谱-编号-溶血基质效应
+		'business_sp_jzxy', //色谱-编号-基质效应
+		'business_sp_xzxytyx', //色谱-编号-选择性与特异性
+		'business_sp_zdybs', //色谱-编号-最大样本数
+		'business_sp_xskkx', //色谱-编号-稀释可靠性
+		'business_sp_cbydb' //色谱-编号-储备液对比
+	],
+	props: {
+		templateData: {
+			type: Object,
+			default: () => { }
+		}
+	},
+	watch: {
+		templateData: {
+			immediate: true,
+			deep: true,
+			handler(v) {
+				if (v) {
+					const {
+						studyId,
+						studyMc,
+						studySn,
+						templateMc,
+						templateMcEn,
+						templateSn,
+						startDate,
+						bdmc,
+						endDate,
+						id
+					} = v
+					if (v.resource) {
+						//试验试剂信息
+						this.resource = JSON.parse(v.resource)
+					}
+					if (v.bdnr) {
+						this.formData = {
+							...JSON.parse(v.bdnr),
+							studyId,
+							studyMc,
+							studySn,
+							templateMc,
+							templateMcEn,
+							templateSn,
+							startDate,
+							bdmc,
+							endDate,
+							id
+						}
+					} else {
+						this.formData = {
+							studyId,
+							studyMc,
+							studySn,
+							templateMc,
+							templateMcEn,
+							templateSn,
+							startDate,
+							bdmc,
+							endDate,
+							id
+						}
+					}
+					const { effectivePeriod, effectivePeriodUnit, expireDate } =
+						this.formData
+					//实际填报的时候，如果有了开始时间，并且有有效周期，但是没有失效日，就计算失效日为开始时间+有效周期
+					if (
+						startDate &&
+						this.fillType === 'actFill' &&
+						effectivePeriod &&
+						effectivePeriodUnit &&
+						!expireDate
+					) {
+						const start = moment(startDate)
+						const unit = effectivePeriodUnit === '天' ? 'days' : 'hours'
+						const end = start
+							.add(Number(effectivePeriod), unit)
+							.format('YYYY-MM-DD HH:mm:ss')
+						this.formData = { ...this.formData, expireDate: end }
+					}
+					console.log(this.formData, 'formData from templateData')
+					this.setTemplateData(v)
+				}
+			}
+		}
+	},
+	data() {
+		return {
+			formData: {},
+			templateDetail: {},
+			resource: [], //试验试剂信息
+			sysjColumns: [
+				{ label: '试剂名称', prop: 'reagentName' },
+				{ label: '编号', prop: 'reagentCode' },
+				{ label: '批号', prop: 'reagentNo' },
+				{ label: '浓度/含量/纯度', prop: 'concentration' },
+				{ label: '来源', prop: 'source' },
+				{ label: '失效日', prop: 'expireDate' }
+			],
+			yqsColumns: [
+				{ label: '仪器名称', prop: 'instrumentName' },
+				{ label: '仪器型号', prop: 'instrumentModel' },
+				{ label: '仪器编号', prop: 'instrumentCode' },
+				{ label: '下次测试/校准/检定日期', prop: 'nextTestDate' }
+			]
+		}
+	},
+	mounted() { },
+	unmounted() {
+		this.setTemplateData({})
+	},
+	methods: {
+		//开始配置
+		//postData: {bh: '123456'}
+		async startConfigRequest(postData) {
+			const res = await sj_startConfiguration(postData)
+			if (res.code === 200) {
+				this.$message.success('开始配置成功')
+			} else {
+				this.$message.error('开始配置失败')
+			}
+		},
+		//完成配置
+		async configCompleteRequest(postData) {
+			const res = await sj_configurationCompleted(postData)
+			if (res.code === 200) {
+				this.$message.success('完成配置成功')
+			} else {
+				this.$message.error('完成配置失败')
+			}
+		},
+		//分装
+		async subPackageRequest(postData) {
+			const res = await sj_subpackage(postData)
+			if (res.code === 200) {
+				this.$message.success('分装成功')
+			} else {
+				this.$message.error('分装失败')
+			}
+		},
+		//获取打印配置
+		getBasePrintConfig(data = {}) {
+			const { printCode, type, row = {} } = data;
+			const { stepStorageCondition, startDate, expireDate } = this.formData;;
+			const { nickName, name } = this.$store.getters;
+			const lang = this.$i18n.locale;
+			const printConfig = {
+				"品名": "暂时还不知道品名是哪个字段",
+				"存储条件": stepStorageCondition,
+				"配制日期": moment(startDate).format("YYYY-MM-DD"),
+				"有效期至": moment(expireDate).format("YYYY-MM-DD HH:mm"),
+				"配置者": lang === "zh_CN" ? nickName : name,
+				//type==="subPackage"从分装打印过来的，
+				//type==="row" 从列表上点过来的
+				"编号": type === "subPackage" ? printCode : (row.targetSolutionCode + row.subTargetSolutionCode),
+			}
+			return printConfig
+		},
+		async getLatestSn(count = 1) {
+			const res = await getLatestSn({ count })
+			if (res.code === 200) {
+				return res.data
+			}
+			return null
+		},
+		getResource() {
+			return this.resource
+		},
+		//根据ref数组获取直接formData
+		getFilledFormDataByRefs(refArr = []) {
+			let result = {}
+			refArr.map((ref) => {
+				const refData = this.$refs[ref]?.getFilledFormData() || {}
+				for (const [key, value] of Object.entries(refData)) {
+					let index = 0
+					// 如果当前键是可能重复的字段，且结果对象中已经存在该键，则添加索引后缀
+					if (
+						(key === 'headerSelectFields' || key === 'stepTableFormData') &&
+						result.hasOwnProperty(key)
+					) {
+						// 为重复字段生成带索引的键名，从1开始（因为第一个组件不需要后缀）
+						const newKey = `${key}_${++index}`
+						result[newKey] = value
+					} else {
+						// 正常合并其他字段
+						result[key] = value
+					}
+				}
+			})
+			return result
+		},
+		//统一校验form表单是否填写
+		async validFormFields(refArr = []) {
+			let result = {}
+			const refs = refArr.map((ref) => {
+				let refData = {}
+				if (this.$refs[ref][0]) {
+					refData = this.$refs[ref][0]?.getFormData() || {}
+				} else {
+					refData = this.$refs[ref]?.getFormData() || {}
+				}
+				return refData
+			})
+			const validFormData = await Promise.all(refs).catch((err) => {
+				// this.$message.error(err);
+				if (err.errorType && err.errorType === 'step') {
+					this.$message.error('请添加步骤')
+					return
+				}
+				this.$message.error('表单内容未填完,请填写后再提交')
+			})
+			if (validFormData) {
+				validFormData.forEach((item) => {
+					for (const [key, value] of Object.entries(item)) {
+						let index = 0
+						// 如果当前键是可能重复的字段，且结果对象中已经存在该键，则添加索引后缀
+						if (
+							(key === 'headerSelectFields' || key === 'stepTableFormData') &&
+							result.hasOwnProperty(key)
+						) {
+							// 为重复字段生成带索引的键名，从1开始（因为第一个组件不需要后缀）
+							const newKey = `${key}_${++index}`
+							result[newKey] = value
+						} else {
+							// 正常合并其他字段
+							result[key] = value
+						}
+					}
+				})
+				return result
+			}
+			return false
+		},
+		//试验配制条件options
+		getDictOptions(dictType) {
+			return this.dict.type[dictType] || []
+		},
 
-    setTemplateData(data) {
-      this.$store.commit('template/SET_TEMPLATE_DATA', data)
-    },
-    //统一处理删除行
-    deleteRow(index) {
-      this.$refs.stepTableRef.deleteRow(index)
-    },
+		setTemplateData(data) {
+			this.$store.commit('template/SET_TEMPLATE_DATA', data)
+		},
+		//统一处理删除行
+		deleteRow(index) {
+			this.$refs.stepTableRef.deleteRow(index)
+		},
 
-    //统一处理blur事件，因为有效周期和过期日期是相关的，所以需要在有效周期失焦时更新过期日期
-    onHandleBlur(fields) {
-      const {
-        key,
-        effectivePeriodUnit,
-        effectivePeriod,
-        codeSTD,
-        targetStartSolution
-      } = fields
-      const { startDate } = this.formData
-      if (key === 'codeSTD') {
-        //起始编号STD失焦时，更新stepDataSource
-        const arr = Array.from({ length: codeSTD }, (item, index) => ({
-          actSolutionVolumePrecision: 3, //小数点精度默认为3
-          actSolutionConcentrationPrecision: 3, //小数点精度默认为3
-          targetDiluentVolumePrecision: 3, //小数点精度默认为3
-          targetStartSolutionVolumePrecision: 3, //小数点精度默认为3
-          targetSolutionCode: `STD${Number(codeSTD) - index}`
-        }))
-        this.$refs.stepTableRef.updateDataSource(arr)
-      } else if (key === 'targetStartSolution') {
-        //起始溶液体积失焦时，更新目标溶液预计浓度
-        const arr = this.$refs.stepTableRef?.getDataSource()
-        arr.forEach((item, rowIndex) => {
-          this.updateTargetStartSolutionVolume(
-            rowIndex,
-            item,
-            targetStartSolution
-          )
-        })
-      }
-    },
-    //统一处理table失焦事件
-    onHandleTableBlur(params) {
-      const { rowIndex, colKey, value, item } = params
-      if (
-        colKey === 'targetSolutionVolume' ||
-        colKey === 'targetSolutionConcentration' ||
-        colKey === 'targetStartSolutionVolumePrecision' ||
-        colKey === 'targetDiluentVolumePrecision'
-      ) {
-        const volume =
-          this.$refs.stepFormPackageRef?.getFormDataByKey(
-            'targetStartSolution'
-          ) || 0
-        if (volume) {
-          this.updateTargetStartSolutionVolume(item, volume)
-        }
-      } else if (
-        colKey === 'actStartSolutionVolume' ||
-        colKey === 'actDiluentVolume'
-      ) {
-        //实际起始溶液体积和实际目标溶液体积
-        const targetAcSolution =
-          this.$refs.stepFormPackageRef?.getFormDataByKey('targetAcSolution') ||
-          0 //获取实际起始溶液浓度
-        if (targetAcSolution) {
-          this.updateSjmbrynd(item, targetAcSolution)
-        }
-      }
-    },
+		//统一处理blur事件，因为有效周期和过期日期是相关的，所以需要在有效周期失焦时更新过期日期
+		onHandleBlur(fields) {
+			const {
+				key,
+				effectivePeriodUnit,
+				effectivePeriod,
+				codeSTD,
+				targetStartSolution
+			} = fields
+			const { startDate } = this.formData
+			if (key === 'codeSTD') {
+				//起始编号STD失焦时，更新stepDataSource
+				const arr = Array.from({ length: codeSTD }, (item, index) => ({
+					actSolutionVolumePrecision: 3, //小数点精度默认为3
+					actSolutionConcentrationPrecision: 3, //小数点精度默认为3
+					targetDiluentVolumePrecision: 3, //小数点精度默认为3
+					targetStartSolutionVolumePrecision: 3, //小数点精度默认为3
+					targetSolutionCode: `STD${Number(codeSTD) - index}`
+				}))
+				this.$refs.stepTableRef.updateDataSource(arr)
+			} else if (key === 'targetStartSolution') {
+				//起始溶液体积失焦时，更新目标溶液预计浓度
+				const arr = this.$refs.stepTableRef?.getDataSource()
+				arr.forEach((item, rowIndex) => {
+					this.updateTargetStartSolutionVolume(
+						rowIndex,
+						item,
+						targetStartSolution
+					)
+				})
+			}
+		},
+		//统一处理table失焦事件
+		onHandleTableBlur(params) {
+			const { rowIndex, colKey, value, item } = params
+			if (
+				colKey === 'targetSolutionVolume' ||
+				colKey === 'targetSolutionConcentration' ||
+				colKey === 'targetStartSolutionVolumePrecision' ||
+				colKey === 'targetDiluentVolumePrecision'
+			) {
+				const volume =
+					this.$refs.stepFormPackageRef?.getFormDataByKey(
+						'targetStartSolution'
+					) || 0
+				if (volume) {
+					this.updateTargetStartSolutionVolume(item, volume)
+				}
+			} else if (
+				colKey === 'actStartSolutionVolume' ||
+				colKey === 'actDiluentVolume'
+			) {
+				//实际起始溶液体积和实际目标溶液体积
+				const targetAcSolution =
+					this.$refs.stepFormPackageRef?.getFormDataByKey('targetAcSolution') ||
+					0 //获取实际起始溶液浓度
+				if (targetAcSolution) {
+					const { actVol, actNd } = this.updateSjmbrynd(item, targetAcSolution);
+					this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, { actSolutionVolume: actVol })
+					this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, { actSolutionConcentration: actNd })
+				}
+			}
+		},
 
-    //计算并更新实际目标溶液浓度  先计算实际目标溶液体积再计算实际目标溶液浓度
-    updateSjmbrynd(item, targetAcSolution) {
-      //实际源溶液浓度÷（实际终体积÷源溶液加入体积）；
-      const precision = item.actSolutionConcentrationPrecision || 0
-      const volPrecision = item.actSolutionVolumePrecision || 0
-      //实际稀释液体积
-      const actDiluentVolume = item.actDiluentVolume || 0
-      const actStartSolutionVolume = item.actStartSolutionVolume || 0
-      //实际高源溶液加入体积+实际稀释液加入体积
-      const actVol = (
-        Number(actStartSolutionVolume) + Number(actDiluentVolume)
-      ).toFixed(volPrecision)
-      //实际目标溶液体积
-      item.actSolutionVolume = actVol
-      //实际目标溶液浓度
-      const actNd = (
-        targetAcSolution /
-        actStartSolutionVolume /
-        actVol
-      ).toFixed(precision)
-      console.log(actNd,targetAcSolution,actStartSolutionVolume,actVol, "actNd")
-      item.actSolutionConcentration = actNd === 'Infinity' ? 0 : actNd
-    },
-    //更新起始溶液体积时，计算目标溶液预计浓度
-    updateTargetStartSolutionVolume(item, volume) {
-      const precision = item.targetStartSolutionVolumePrecision || 0
-      const concentration = item.targetSolutionConcentration || 0
-      const targetVolume = item.targetSolutionVolume || 0
-      //目标溶液预计浓度:（目标溶液预计体积 乘以 起始溶液浓度）除以 起始溶液体积
-      const result = ((concentration * targetVolume) / volume).toFixed(
-        precision
-      )
-      item.targetStartSolutionVolume = result
-      // this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, { targetStartSolutionVolume: result });
-      if (targetVolume) {
-        //预设稀释液体积:目标溶液预计体积 减去 源溶液预计体积；
-        const precision1 = item.targetDiluentVolumePrecision || 0
-        const result1 = (targetVolume - result).toFixed(precision1)
-        item.targetDiluentVolume = result1
-        // this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, { targetDiluentVolume: result1 });
-      }
-    }
-  }
+		//计算并更新实际目标溶液浓度  先计算实际目标溶液体积再计算实际目标溶液浓度
+		updateSjmbrynd(item, targetAcSolution) {
+			//实际源溶液浓度÷（实际终体积÷源溶液加入体积）；
+			const precision = item.actSolutionConcentrationPrecision || 0
+			const volPrecision = item.actSolutionVolumePrecision || 0
+			//实际稀释液体积
+			const actDiluentVolume = item.actDiluentVolume || 0
+			const actStartSolutionVolume = item.actStartSolutionVolume || 0
+			//实际高源溶液加入体积+实际稀释液加入体积
+			const actVol = (
+				Number(actStartSolutionVolume) + Number(actDiluentVolume)
+			).toFixed(volPrecision)
+			//实际目标溶液体积
+			// item.actSolutionVolume = actVol
+			//实际目标溶液浓度
+			const actNd = (
+				targetAcSolution /
+				actStartSolutionVolume /
+				actVol
+			).toFixed(precision)
+			const nd = actNd === 'Infinity' ? 0 : actNd
+			console.log(actNd, targetAcSolution, actStartSolutionVolume, actVol, "actNd")
+
+			// item.actSolutionConcentration = actNd === 'Infinity' ? 0 : actNd
+			return { actVol, actNd: nd }
+		},
+		//更新起始溶液体积时，计算目标溶液预计浓度
+		updateTargetStartSolutionVolume(item, volume) {
+			const precision = item.targetStartSolutionVolumePrecision || 0
+			const concentration = item.targetSolutionConcentration || 0
+			const targetVolume = item.targetSolutionVolume || 0
+			//目标溶液预计浓度:（目标溶液预计体积 乘以 起始溶液浓度）除以 起始溶液体积
+			const result = ((concentration * targetVolume) / volume).toFixed(
+				precision
+			)
+			item.targetStartSolutionVolume = result
+			// this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, { targetStartSolutionVolume: result });
+			if (targetVolume) {
+				//预设稀释液体积:目标溶液预计体积 减去 源溶液预计体积；
+				const precision1 = item.targetDiluentVolumePrecision || 0
+				const result1 = (targetVolume - result).toFixed(precision1)
+				item.targetDiluentVolume = result1
+				// this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, { targetDiluentVolume: result1 });
+			}
+		}
+	}
 }