diff --git a/.env.development b/.env.development
index c4d0bed..947d501 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,6 @@
 # 页面标题
-VUE_APP_TITLE = 华西海圻ELN V1.0
+VUE_APP_TITLE = 华西海圻实验室电子记录系统V1.0
+VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook
 
 # 开发环境配置
 ENV = 'development'
diff --git a/.env.production b/.env.production
index bb1ed9a..5d50a5d 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,6 @@
 # 页面标题
-VUE_APP_TITLE = 华西海圻ELN V1.0
+VUE_APP_TITLE = 华西海圻实验室电子记录系统V1.0
+VUE_APP_TITLE_EN = WCFP Electronic Laboratory Notebook
 
 # 生产环境配置
 ENV = 'production'
diff --git a/src/App.vue b/src/App.vue
index c0c9f75..028a004 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -123,6 +123,10 @@ export default {
 #app .theme-picker {
   display: none;
 }
+html{
+  color:#606266;
+  font-size: 14px;
+}
 
 .el-dialog__header {
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1) !important;
diff --git a/src/api/business/gyzj/gyzjFfjl.js b/src/api/business/gyzj/gyzjFfjl.js
index 4f88e14..844979e 100644
--- a/src/api/business/gyzj/gyzjFfjl.js
+++ b/src/api/business/gyzj/gyzjFfjl.js
@@ -8,6 +8,14 @@ export function list(query) {
     params: query
   })
 }
+
+export function yltj(query) {
+  return request({
+    url: '/system/business/gyzjFfjl/yltj',
+    method: 'get',
+    params: query
+  })
+}
 // 稽查轨迹列表
 export function jcgjList(query) {
   return request({
diff --git a/src/api/business/mjy/mjyFfjl.js b/src/api/business/mjy/mjyFfjl.js
index 92fb274..1aba384 100644
--- a/src/api/business/mjy/mjyFfjl.js
+++ b/src/api/business/mjy/mjyFfjl.js
@@ -8,6 +8,14 @@ export function list(query) {
     params: query
   })
 }
+// 列表
+export function yltj(query) {
+  return request({
+    url: '/system/business/mjyFfjl/yltj',
+    method: 'get',
+    params: query
+  })
+}
 // 稽查轨迹列表
 export function jcgjList(query) {
   return request({
diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js
index 009ca76..119f8b8 100644
--- a/src/api/business/study/studyFormFill.js
+++ b/src/api/business/study/studyFormFill.js
@@ -24,6 +24,16 @@ export function studyFormFill_exportDetail(query) {
     params: query
   })
 }
+
+export function studyFormFill_exportTbByFileUrl(query) {
+  return request({
+    url: '/system/business/studyFormFill/exportTbByFileUrl',
+    method: 'get',
+    params: query
+  })
+}
+
+
 export function studyFormFill_exportByFileUrl(query) {
   return request({
     url: '/system/business/studyFormFill/exportByFileUrl',
diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index 7350c5b..debf7d4 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -127,6 +127,7 @@
                                     :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     :type="sItem.type" sourceFrom="baseInfoFormPackage" :error="errors[key]"
                                     @update:error="errors[key] = false"
+                                    :orange-bg="regentIsExpired(key)"
                                     @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, key, sItem)"
                                     :item="sItem" :value="formFields[key]" />
                             </div>
@@ -183,7 +184,7 @@
                             :style="{ 'width': sItem.labelWidth ? sItem.labelWidth + 'px' : '150px' }"
                             v-if="sItem.label">
                             {{ $t(sItem.label) }}</div>
-                        <div v-if="sItem.type === 'span'" class="flex1">
+                        <div v-if="sItem.type === 'span'" class="flex1 span-text">
                             {{ formFields[key] }}
                         </div>
                         <div v-if="sItem.type === 'dateTime'" class="flex1">
@@ -274,6 +275,7 @@
                                     @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
                                     @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
                                     :error="errors[sItem.subKey]" @update:error="errors[sItem.subKey] = false"
+                                    :orange-bg="regentIsExpired(sItem.subKey)"
                                     :value="formFields[sItem.subKey]" />
                             </template>
                             <div v-if="isShowSub(sItem,'thirdType')">
@@ -309,6 +311,7 @@
                                 @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, key)"
                                 @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, key, sItem)"
                                 :field-key="prefixKey + '_' + key" :type="sItem.type" :error="errors[key]"
+                                :orange-bg="regentIsExpired(key)"
                                 @update:error="errors[key] = false" :item="getRegentItem(sItem)"
                                 :value="formFields[key]" />
                             <span v-if="sItem.subType === 'text'" class="sub-text">{{ $t(sItem.subText) }}</span>
@@ -441,9 +444,7 @@ export default {
             const arr = ["动物种属", "细胞系"];
             return arr.includes(value)
         },
-        onBeforeReagentSubmit(data, callback, key) {
-            this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields })
-        },
+       
         // 点击按钮
         handleClickButton(e, item, val, data, key) {
             if (!item.isClearForm) {
@@ -466,22 +467,30 @@ export default {
         },
         // 获取按钮项
         getThirdButtonItem(sItem) {
-            return {
+            const o = 
+            {
                 ...sItem,
                 key: sItem.thirdKey,
-                disabled: sItem.thirdDisabled,
                 buttonName: sItem.thirdButtonName,
                 fillType: sItem.thirdFillType || sItem.fillType
             }
+            if(sItem.hasOwnProperty("thirdDisabled")){
+                o.disabled = sItem.thirdDisabled;
+            }
+            return o;
         },
         getFourthButtonItem(sItem) {
-            return {
+            const o = 
+            {
                 ...sItem,
                 key: sItem.fourthKey,
                 buttonName: sItem.fourthButtonName,
-                disabled: sItem.fourthDisabled,
                 fillType: sItem.fourthFillType || sItem.fillType
             }
+            if(sItem.hasOwnProperty("fourthDisabled")){
+                o.disabled = sItem.fourthDisabled;
+            }
+            return o;
         },
         // 处理fqyq变化
         onFqyqChange(key, e) {
@@ -691,4 +700,9 @@ export default {
     width: 120px;
     text-align: center;
 }
+.span-text {
+    font-size: 14px;
+    font-weight: normal;
+    color: #606266;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 66501e5..f30aa93 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<div class="custom-table-wrapper" :class="{ 'no-border': !isBorder }">
-			<div class="custom-table-header" v-if="isBorder">
+			<div class="custom-table-header   no-break" v-if="isBorder">
 				<div class="custom-table-row">
 					<div v-if="showSort" class="custom-table-cell header-cell sort-cell">
 						序号
@@ -12,8 +12,8 @@
 								@change="handleCheckAllChange"></el-checkbox>
 						</div>
 					</div>
-					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell header-cell"
-						:style="getCellWidth(col)">
+					<div v-for="(col, colIndex) in columns" :key="colIndex"
+						class="custom-table-cell header-cell   no-break" :style="getCellWidth(col)">
 						<div class="header-cell-content" v-if="col.headerColumns && col.headerColumns.length > 0">
 							<div class="header-columns-grid"
 								:style="{ 'grid-template-columns': `repeat(${col.span || 2}, 1fr)` }">
@@ -31,6 +31,7 @@
 											:value="headerFields[`${colIndex}_${headerIndex}`]"
 											:error="hasHeaderError(colIndex, headerIndex, headerCol.key)"
 											@update:error="onHeaderColumnErrorUpdate(colIndex, headerIndex, headerCol.key, $event)"
+											:orange-bg="regentIsExpired(headerCol.key,rowIndex)"
 											@onRegentSubmit="(data, inputValue) => onHeaderRegentSubmit(data, inputValue, colIndex, headerIndex)" />
 									</template>
 									<template
@@ -74,7 +75,7 @@
 			</div>
 
 			<div class="custom-table-body">
-				<div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row">
+				<div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row   no-break">
 					<div v-if="showSort" class="custom-table-cell body-cell sort-cell">
 						{{ rowIndex + 1 }}
 					</div>
@@ -83,8 +84,8 @@
 							<el-checkbox v-model="row._checked" @change="handleCheckChange(row, $event)"></el-checkbox>
 						</div>
 					</div>
-					<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell body-cell"
-						:style="getCellWidth(col)">
+					<div v-for="(col, colIndex) in columns" :key="colIndex"
+						class="custom-table-cell body-cell   no-break" :style="getCellWidth(col)">
 						<div class="inner-table-cell">
 							<div class="flex1" :class="{ 'item-center': !isBorder && col.label }">
 								<div v-if="!isBorder && col.label" class="mr-5">
@@ -97,8 +98,7 @@
 											:fieldItemLabel="fieldItemLabel" :type="col.bodyType"
 											@blur="onBlur(rowIndex, col.prop, $event)" @copy="onCopy(rowIndex, col)"
 											class="body-input" :item="getBodyItem(col, rowIndex)"
-											v-model="row[col.prop]"
-											:ref = "col.prop+rowIndex"
+											v-model="row[col.prop]" :ref="col.prop + rowIndex"
 											@change="onBodyValueChange(rowIndex, colIndex, $event, row, col.bodyType)"
 											:error="hasError(rowIndex, colIndex, col.prop)"
 											@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
@@ -107,13 +107,14 @@
 									</div>
 
 								</template>
-								<div v-else-if = "col.bodyType === 'checkboxTree'">
-									<HandleFormItem 
-                                    :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + col.prop+ rowIndex"
-                                    type="checkboxTree" :item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
-                                     @change="(e) => onBodyValueChange(rowIndex, colIndex, e, row, col.bodyType)"
-                                    :error="hasError(rowIndex, colIndex, col.prop)" @update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-                                    :orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+								<div v-else-if="col.bodyType === 'checkboxTree'">
+									<HandleFormItem :field-item-label="fieldItemLabel"
+										:field-key="prefixKey + '_' + col.prop + rowIndex" type="checkboxTree"
+										:item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
+										@change="(e) => onBodyValueChange(rowIndex, colIndex, e, row, col.bodyType)"
+										:error="hasError(rowIndex, colIndex, col.prop)"
+										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
+										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
 								</div>
 								<div v-else-if="col.bodyType === 'operableInput'" class="flex flex1">
 									<div class="flex1 grid-container">
@@ -125,9 +126,9 @@
 												:fieldItemLabel="fieldItemLabel" type="input"
 												@blur="onOperableInputBlur(opItem, $event)" class="body-input"
 												:item="getBodyItem(col, rowIndex)" :value="opItem.value"
-												:error="hasError(rowIndex, colIndex, rowIndex+col.prop+itemIndex)"
-												@update:error="onErrorUpdate(rowIndex, colIndex, rowIndex+col.prop+itemIndex, $event)"
-												:orange-bg="hasOrangeBg(rowIndex, colIndex, rowIndex+col.prop+itemIndex)" />
+												:error="hasError(rowIndex, colIndex, rowIndex + col.prop + itemIndex)"
+												@update:error="onErrorUpdate(rowIndex, colIndex, rowIndex + col.prop + itemIndex, $event)"
+												:orange-bg="hasOrangeBg(rowIndex, colIndex, rowIndex + col.prop + itemIndex)" />
 											<el-popconfirm confirm-button-text='确认' cancel-button-text='取消'
 												icon="el-icon-info" icon-color="red" title="确认删除当前输入框？"
 												@confirm="removeOperableInput(rowIndex, colIndex, col.prop, itemIndex)">
@@ -136,7 +137,8 @@
 											</el-popconfirm>
 										</div>
 									</div>
-									<i class="el-icon-circle-plus add-icon" v-if="templateFillType === 'actFill' && !row.isComplete"
+									<i class="el-icon-circle-plus add-icon"
+										v-if="templateFillType === 'actFill' && !row.isComplete"
 										@click="addOperableInput(rowIndex, colIndex, col.prop)"></i>
 								</div>
 
@@ -158,7 +160,7 @@
 										@onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, col, rowIndex, colIndex, row, col.prop)"
 										@beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, col, row)"
 										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+										:orange-bg="regentIsExpired(col.prop,rowIndex)" />
 								</div>
 								<template v-else-if="col.bodyType === 'span'">
 									<div class="body-span">
@@ -201,7 +203,8 @@
 										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.otherCode)" />
 								</div>
 							</div>
-							<div class="m-l-5 flex" :class="{ 'flex1': col.bodySubType !== 'button' }"
+							<div class="m-l-5 flex"
+								:class="{ 'flex1': (col.bodySubType !== 'button' && col.bodySubType !== 'span') }"
 								v-if="isShowBodySub(col, row)">
 								<template
 									v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input' || col.bodySubType === 'select'">
@@ -209,7 +212,6 @@
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType"
 										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
 										@copy="onCopy(rowIndex, col)" :item="getBodySubItem(col)"
-										
 										v-model="row[col.bodySubKey]"
 										@change="onBodySubValueChange(rowIndex, colIndex, $event, row, col.bodySubType)"
 										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
@@ -224,8 +226,8 @@
 								<template v-else-if="col.bodySubType === 'button'">
 									<HandleFormItem class="ml-10" type="button" :item="getBodyButtonItem(col, rowIndex)"
 										:value="row[col.bodySubKey]"
-										 :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
-										@clickButton="(e,val, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
+										:fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
+										@clickButton="(e, val, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
 								</template>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodySubType')">
 									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
@@ -236,13 +238,13 @@
 										@onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, col, rowIndex, colIndex, row, col.bodySubKey)"
 										@beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, col, row)"
 										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
-										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
+										:orange-bg="regentIsExpired(col.bodySubKey,rowIndex)" />
 								</div>
 								<template v-if="col.bodyThirdType === 'button'">
-									<HandleFormItem class="ml-10" type="button" :item="getBodyThirdButtonItem(col, rowIndex)"
-										:value="row[col.bodyThirdKey]"
-										 :fieldKey="prefixKey + '_' + col.bodyThirdKey + '_' + row.id"
-										@clickButton="(e,val, data) => handleClickButton(e, data, col.bodyThirdKey, rowIndex, colIndex)" />
+									<HandleFormItem class="ml-10" type="button"
+										:item="getBodyThirdButtonItem(col, rowIndex)" :value="row[col.bodyThirdKey]"
+										:fieldKey="prefixKey + '_' + col.bodyThirdKey + '_' + row.id"
+										@clickButton="(e, val, data) => handleClickButton(e, data, col.bodyThirdKey, rowIndex, colIndex)" />
 								</template>
 							</div>
 						</div>
@@ -278,6 +280,7 @@ import { EventBus } from "@/utils/eventBus";
 import { getuuid, justUpdateFilledFormData } from "@/utils/index.js";
 import { isRegent } from "@/utils/index.js";
 import { isValueEmpty } from '@/utils/index.js';
+import moment from 'moment';
 
 import _ from "lodash";
 export default {
@@ -465,7 +468,7 @@ export default {
 				isValid = value && value.some(tag => tag.checked === true);
 			} else if (this.templateFillType === "preFill") {
 				// preFill时，检查所有tagValue是否不为空
-				isValid = value && value.every(tag => tag.tagValue && (tag.tagValue+'').trim() !== '');
+				isValid = value && value.every(tag => tag.tagValue && (tag.tagValue + '').trim() !== '');
 			}
 			this.onErrorUpdate(rowIndex, colIndex, col.prop, !isValid);
 			this.$emit("onCheckboxTagChange", rowIndex, col, value)
@@ -505,7 +508,7 @@ export default {
 		},
 		//获取操作栏的列
 		getOperationColumns() {
-			return { columnsData: this.columns, headerSelectFields: this.headerSelectFields,fieldItemLabel: this.fieldItemLabel }
+			return { columnsData: this.columns, headerSelectFields: this.headerSelectFields, fieldItemLabel: this.fieldItemLabel }
 		},
 		//获取其他下拉框的配置
 		getOtherItem(sItem) {
@@ -527,9 +530,9 @@ export default {
 		},
 		// 点击事件
 		handleClickable(col, rowIndex, colIndex, row) {
-			if (this.templateFillType !== 'actFill') {
-				return
-			}
+			// if (this.templateFillType !== 'actFill') {
+			// 	return
+			// }
 			this.$emit("clickable", col, rowIndex, row)
 		},
 		onBeforeReagentSubmit(data, callback, col, row) {
@@ -543,11 +546,23 @@ export default {
 
 			this.$emit("onHeaderRegentSubmit", { selectInfo: data, headerIndex, colIndex, headerFields: this.headerFields })
 		},
+		//是否过期
+		regentIsExpired(key,rowIndex) {
+			const item = this.localDataSource[rowIndex];
+			const { yxq, sxrq } = item[`selectInfo_${key}`] || {};
+			const rq = sxrq || yxq;
+			if (rq) {
+				const time = moment(yxq);
+				return time.isBefore(moment());
+			} else {
+				return false;
+			}
+		},
 		onRegentSubmit(data, inputValue, col, rowIndex, colIndex, row, key) {
 			// if (this.templateFillType !== 'actFill') {
 			// 	return
 			// }
-			this.updateDataSourceByRowIndex(rowIndex, { [key]: inputValue })
+			this.updateDataSourceByRowIndex(rowIndex, { [key]: inputValue, [`selectInfo_${key}`]: data.selectInfo })
 			this.$emit("onRegentSubmit", { selectInfo: data, key, col, rowIndex, colIndex, rowData: row })
 		},
 		isShowAddRos() {
@@ -664,7 +679,7 @@ export default {
 							if (this.templateFillType === "actFill") {
 								// actFill时，检查是否有checked为true的项
 								const hasChecked = mainValue && mainValue.some(tag => tag.checked === true);
-								if (!hasChecked && !col.bodyDisabled) {
+								if (!hasChecked) {
 									const errorItem = {
 										rowIndex,
 										colIndex,
@@ -677,8 +692,8 @@ export default {
 								}
 							} else if (this.templateFillType === "preFill") {
 								// preFill时，检查所有tagValue是否不为空
-								const allTagValuesFilled = mainValue && mainValue.every(tag => tag.tagValue && (tag.tagValue+'').trim() !== '');
-								if (!allTagValuesFilled && !col.bodyDisabled) {
+								const allTagValuesFilled = mainValue && mainValue.every(tag => tag.tagValue && (tag.tagValue + '').trim() !== '');
+								if (!allTagValuesFilled) {
 									const errorItem = {
 										rowIndex,
 										colIndex,
@@ -693,7 +708,7 @@ export default {
 						} else if (col.bodyType === "checkbox") {
 							// checkbox类型的校验逻辑
 							// checkbox只在actFill时进行必填校验
-							if (!col.bodyDisabled && this.templateFillType === 'actFill' && !col.isNeedCheck) {
+							if (this.templateFillType === 'actFill' && !col.isNeedCheck) {
 								// 单个checkbox：值必须为true
 								// checkbox组：至少选中一个
 								const hasChecked = Array.isArray(mainValue) ? mainValue.length > 0 : mainValue === true;
@@ -709,13 +724,13 @@ export default {
 									this.formErrors.push(errorItem);
 								}
 							}
-						} else if(col.bodyType === "operableInput"){
+						} else if (col.bodyType === "operableInput") {
 							mainValue.forEach((itemItem, itemIndex) => {
 								if (isValueEmpty(itemItem.value)) {
 									const errorItem = {
 										rowIndex,
 										colIndex,
-										field: rowIndex+col.prop+itemIndex,
+										field: rowIndex + col.prop + itemIndex,
 										label: this.$t(col.label),
 										error: `请填写${this.$t(col.label)}`
 									};
@@ -724,8 +739,9 @@ export default {
 								}
 							})
 
-						}else {
-							if (isValueEmpty(mainValue) && !col.bodyDisabled && col.bodyType !== 'span' && col.bodyType !== 'button') {
+						} else {
+							if (isValueEmpty(mainValue) &&col.bodyFillType === this.templateFillType  && col.bodyType !== 'span' && col.bodyType !== 'button') {
+								console.log(col.bodyFillType,col.bodySubFillType,"bodySubFillType")
 								const errorItem = {
 									rowIndex,
 									colIndex,
@@ -737,7 +753,7 @@ export default {
 								this.formErrors.push(errorItem);
 							}
 							// 检查子字段（如果有）
-							if (col.bodySubKey && !col.bodySubDisabled && col.bodySubFillType === this.templateFillType && col.bodySubType !== 'span' && col.bodySubType !== "button") {
+							if (col.bodySubKey && col.bodySubFillType === this.templateFillType && col.bodySubType !== 'span' && col.bodySubType !== "button") {
 								const subValue = row[col.bodySubKey];
 								if (isValueEmpty(subValue)) {
 									const errorItem = {
@@ -797,6 +813,13 @@ export default {
 				!(error.rowIndex === -1 &&
 					error.field === col.headerSelectKey)
 			);
+			
+			if (col && col.headerSelectTo) {
+				this.formErrors = this.formErrors.filter(error =>
+					!(error.rowIndex === -1 &&
+						error.field === col.headerSelectTo)
+				);
+			}
 		},
 		// 检查并应用 compareTo 逻辑
 		checkCompareToLogic(rowIndex, colIndex, colKey, value) {
@@ -942,20 +965,20 @@ export default {
 				// 否则使用列配置的checkboxLabel
 				item.checkboxLabel = this.$t(col.checkboxLabel);
 			}
-			if (col.bodyType === "operableInput" ) {
-				if(currentItem.isComplete || this.templateFillType !== 'actFill'){
+			if (col.bodyType === "operableInput") {
+				if (currentItem.isComplete || this.templateFillType !== 'actFill') {
 					item.disabled = true;
-				}else{
+				} else {
 					item.disabled = false;
 				}
 			}
-			if(col.noBorder){
+			if (col.noBorder) {
 				item.noBorder = true;
 			}
-			if(col.bodyLayout){
+			if (col.bodyLayout) {
 				item.layout = col.bodyLayout;
 			}
-		
+
 			return item
 		},
 		getBodyButtonItem(col,) {
@@ -1022,15 +1045,15 @@ export default {
 			this.checkCompareToOnDataLoad();
 		},
 		// 根据行索引更新数据 autoUpdateRecord 是否自动更新记录
-		updateDataSourceByRowIndex(rowIndex, data,updateFieldsInfo={}) {
-			const {signData,updateFields = []} = updateFieldsInfo;
+		updateDataSourceByRowIndex(rowIndex, data, updateFieldsInfo = {}) {
+			const { signData, updateFields = [] } = updateFieldsInfo;
 			this.oldLocalDataSource = JSON.parse(JSON.stringify(this.localDataSource));
 			this.localDataSource[rowIndex] = { ...this.localDataSource[rowIndex], ...data };
 			this.localDataSource = [...this.localDataSource];
-			if(updateFields.length > 0){
-				updateFields.map((key)=>{
-					const ref = this.$refs[key+rowIndex];
-					if(ref){
+			if (updateFields.length > 0) {
+				updateFields.map((key) => {
+					const ref = this.$refs[key + rowIndex];
+					if (ref) {
 						ref[0].handleUpdateRecord(signData, { oldValue: this.oldLocalDataSource[rowIndex][key], inputValue: data[key] });
 					}
 				})
@@ -1039,7 +1062,7 @@ export default {
 			this.checkCompareToOnDataLoad();
 			// justUpdateFilledFormData();
 		},
-		pushDataSource(data=[]) {
+		pushDataSource(data = []) {
 			this.localDataSource.push(...data);
 			this.localDataSource = [...this.localDataSource];
 			this.checkCompareToOnDataLoad();
@@ -1087,7 +1110,7 @@ export default {
 		},
 		onAddRow() {
 			if (this.$listeners && this.$listeners['onAddRow']) {
-				this.$emit('onAddRow',{dataSource:this.localDataSource});
+				this.$emit('onAddRow', { dataSource: this.localDataSource });
 				return;
 			}
 			this.addRow({
@@ -1095,8 +1118,8 @@ export default {
 				actSolutionConcentrationPrecision: 3,//小数点精度默认为3
 				targetDiluentVolumePrecision: 3,//小数点精度默认为3
 				targetStartSolutionVolumePrecision: 3,//小数点精度默认为3
-				id:getuuid(),
-				rowIndex:this.localDataSource.length,
+				id: getuuid(),
+				rowIndex: this.localDataSource.length,
 			});
 			justUpdateFilledFormData()
 		},
diff --git a/src/components/Template/DecimalInput.vue b/src/components/Template/DecimalInput.vue
index fd5077b..1eb3897 100644
--- a/src/components/Template/DecimalInput.vue
+++ b/src/components/Template/DecimalInput.vue
@@ -92,17 +92,22 @@ export default {
         return;
       }
 
-      // 检查是否已经输入了完整的NA
-      if (this.isNA) {
-        // 如果已经输入了NA，无论输入什么，都保持NA不变
-        this.internalValue = 'NA';
-        this.$emit('input', 'NA');
-        return;
-      }
-
       const upperVal = val.toUpperCase();
       let cleaned = val;
       let matchedRule = null;
+
+      // 如果已经输入了完整的NA
+      if (this.isNA) {
+        // 只有输入完整NA时才保持不变，允许用户删除或输入其他值
+        if (upperVal === 'NA') {
+          this.internalValue = 'NA';
+          this.$emit('input', 'NA');
+          return;
+        } else {
+          // 用户删除了NA或输入其他值，重置状态并继续处理
+          this.isNA = false;
+        }
+      }
       
       // 检查是否匹配特殊模式（NA或FRACTION）
       // 优先检查完整的NA模式
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index d33f339..4028574 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -109,7 +109,7 @@
                     <el-button :disabled="getDisabled()" :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')"
                         size="small" type="primary">点击上传</el-button>
                     <span v-if="error" class="atta-tips">请上传附件</span>
-                    <div slot="tip" class="el-upload__tip">支持扩展名：.rar .zip .doc .docx .pdf .jpg，文件大小不超过2MB</div>
+                    <div slot="tip" class="el-upload__tip">支持扩展名：.{{allowedTypes.join('. ')}}，文件大小不超过2MB</div>
                 </el-upload>
             </template>
             <div v-else-if="type === 'checkboxTag'" class="flex1 checkbox-tag-wrapper"
@@ -341,8 +341,8 @@ export default {
                         picker.$emit('pick', new Date());
                     }
                 }]
-            }
-
+            },
+            allowedTypes: ["zip","rar","doc","docx","pdf","jpg"],
         }
     },
     watch: {
@@ -404,7 +404,7 @@ export default {
             return false;
         },
         getFlexClass() {
-            const noFlexArr = ["radio", "checkboxTag", "fqyq","button"]
+            const noFlexArr = ["radio", "checkboxTag", "fqyq", "button"]
             return noFlexArr.includes(this.type) ? '' : 'flex1'
         },
         getDecimalDigits() {
@@ -423,13 +423,11 @@ export default {
         handleChange(file, fileList) {
             // 如果是新添加的文件（status为ready），进行验证
             if (file.status === 'ready') {
-                const isAllowedType = ['image/jpeg', 'image/png', 'image/gif', 'application/pdf',
-                    'application/x-rar-compressed', 'application/zip',
-                    'application/msword', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'].includes(file.raw.type)
+                const suffix = file.name.split('.').pop().toLowerCase();
+                const isAllowedType = this.allowedTypes.includes(suffix)
                 const isLt2M = file.size / 1024 / 1024 < 2
-
                 if (!isAllowedType) {
-                    this.$message.error(`文件 ${file.name} 格式不支持!只能上传 JPG/PNG/GIF/PDF/RAR/ZIP/DOC/DOCX 格式的文件`)
+                    this.$message.error(`文件 ${file.name} 格式不支持!只能上传 ${this.allowedTypes.join('/')} 格式的文件`)
                     // 从fileList中移除该文件
                     const index = fileList.indexOf(file);
                     if (index > -1) {
@@ -657,6 +655,10 @@ export default {
         // 点击按钮
         handleClickButton(item) {
             this.inputValue = `button-${new Date().getTime()}`;
+            if (item.noSign) {//不需要签名的直接emit
+                this.$emit("clickButton", item);
+                return;
+            }
             this.onCommonHandleSaveRecord(this.inputValue);
         },
         onDateChange(val, format) {
@@ -1148,7 +1150,7 @@ export default {
             if (!this.isFieldsRecord) {//是否需要记录修改记录
                 this.$emit("blur", this.inputValue);
                 this.$emit('input', this.inputValue);
-                this.$emit("change", this.inputValue);
+                this.$emit("change", this.inputValue, "change");
                 return;
             }
             // 值发生了变化，需要弹出密码输入框
@@ -1245,7 +1247,7 @@ export default {
                 this.oldValue = recordData.oldValue;
                 this.inputValue = recordData.inputValue;
             }
-            let recordOldVlaue = this.oldValue, recordValue = this.inputValue, isModify = !!this.oldValue;
+            let recordOldVlaue = this.oldValue, recordValue = this.inputValue, isModify = !!this.oldValue,oldUrl = "",url="";
             if (this.type === "checkboxTag") {
                 // checkboxTag类型，只记录当前tagIndex的数据变化
                 const oldTag = this.oldCheckboxTagList[this.currentTagIndex] || {};
@@ -1276,14 +1278,16 @@ export default {
                     isModify = !!current.oldValue;
                 }
             } else if (this.type === "checkbox") {
-                recordOldVlaue = `${this.item.checkboxLabel || ""}:${this.oldValue ? '勾选' : '未勾选'}`;
-                recordValue = `${this.item.checkboxLabel || ""}:${this.inputValue ? '勾选' : '未勾选'}`;
+                recordOldVlaue = `${this.item.checkboxLabel || this.fieldItemLabel || ""}:${this.oldValue ? '勾选' : '未勾选'}`;
+                recordValue = `${this.item.checkboxLabel || this.fieldItemLabel || ""}:${this.inputValue ? '勾选' : '未勾选'}`;
                 isModify = this.oldValue !== '';
             } else if (this.type === "attachment") {
                 const attList = JSON.parse(recordValue);
                 const oldAttList = JSON.parse(recordOldVlaue || "[]");
                 recordValue = attList.map(item => item.name).join(";");
                 recordOldVlaue = oldAttList.map(item => item.name).join(";");
+                oldUrl = oldAttList.map(item => item.url).join(";");
+                url = attList.map(item => item.url).join(";");
             }
 
             const record = {
@@ -1293,6 +1297,10 @@ export default {
                 title: !this.isUnSubmitted(finallyKey) ? "修改" : "提交",
                 time: moment().format("YYYY-MM-DD HH:mm:ss"),
             }
+            if(url){
+                record.url = url;
+                record.oldUrl = oldUrl;
+            }
             if (data) {
                 record.reason = data.remark
             }
@@ -1365,6 +1373,7 @@ export default {
                 fieldLabelEn = this.$i18n.t(parentLabel, "en_US") + this.$i18n.t("template.common.unit", "en_US");
             }
             const commonInfo = {
+                type:this.type,
                 userNameCn: nickName,
                 userNameEn: name,
                 key: this.fieldKey,
@@ -1374,9 +1383,9 @@ export default {
             return commonInfo;
         },
         handleClickable(item, event) {
-            if (this.templateFillType !== 'actFill') {
-                return
-            }
+            // if (this.templateFillType !== 'actFill') {
+            //     return
+            // }
             this.$emit("clickable", item)
         },
         //判断是否禁用复选框
@@ -1733,16 +1742,16 @@ export default {
     .clickable,
     .el-date-editor,
     .el-checkbox__inner {
-        border-color: #ff5d5d;
+        border: 1px solid #ff5d5d !important;
         box-shadow: 0 0 6px #ffc3c3 !important;
 
         &:focus {
-            border-color: #ff5d5d;
+            border: 1px solid #ff5d5d !important;
             box-shadow: 0 0 6px #ffc3c3 !important;
         }
 
         &:hover {
-            border-color: #ff5d5d;
+            border: 1px solid #ff5d5d !important;
             box-shadow: 0 0 6px #ffc3c3 !important;
         }
     }
@@ -1750,14 +1759,14 @@ export default {
     // 为 el-select 和 el-date-picker 添加错误边框样式
     .el-select .el-input__inner,
     .el-date-editor .el-input__inner .el-checkbox__inner {
-        border-color: #ff5d5d;
+        border: 1px solid #ff5d5d !important;
         box-shadow: 0 0 6px #ffc3c3 !important;
     }
 
     // 处理 DecimalInput 组件的错误边框样式
-    :deep(.el-input-number) {
+    .el-input-number {
         .el-input__inner {
-            border-color: #ff5d5d;
+            border: 1px solid #ff5d5d !important;
             box-shadow: 0 0 6px #ffc3c3 !important;
         }
     }
@@ -1887,6 +1896,15 @@ export default {
         box-shadow: 0 0 6px #ffc3c3 !important;
     }
 
+    .el-checkbox__label {
+        white-space: normal;
+    }
+
+    .checkbox-tree-item .el-checkbox {
+        display: flex;
+        align-items: center;
+    }
+
     .checkbox-item {
         margin-right: 16px;
         display: flex;
@@ -2067,4 +2085,7 @@ export default {
 .no-border {
     border: none;
 }
+.record-row{
+    text-align: left;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/Template/Input.vue b/src/components/Template/Input.vue
deleted file mode 100644
index 8f347de..0000000
--- a/src/components/Template/Input.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-    <el-input
-        v-model="inputValue"
-        :maxlength="maxLength"
-        :disabled="disabled"
-        :readonly="readonly"
-        :clearable="clearable"
-        :show-password="showPassword"
-        :placeholder="placeholder || ('请输入' + label)"
-        :class="borderClass"
-        @blur="onBlur"
-        @focus="onFocus"
-        @change="onChange"
-        @clear="onClear"
-        @keyup.enter="onEnter"
-    />
-</template>
-
-<script>
-export default {
-    name: 'CustomInput',
-    props: {
-        // v-model 值
-        value: {
-            type: [String, Number],
-            default: ''
-        },
-        // 标签名称
-        label: {
-            type: String,
-            default: ''
-        },
-        // 最大长度
-        maxLength: {
-            type: Number,
-            default: null
-        },
-        // 是否禁用
-        disabled: {
-            type: Boolean,
-            default: false
-        },
-        // 是否只读
-        readonly: {
-            type: Boolean,
-            default: false
-        },
-        // 是否显示清除按钮
-        clearable: {
-            type: Boolean,
-            default: true
-        },
-        // 是否显示密码
-        showPassword: {
-            type: Boolean,
-            default: false
-        },
-        // 占位符
-        placeholder: {
-            type: String,
-            default: ''
-        },
-        // 边框类型
-        fillType: {
-            type: String,
-            default: '',
-            validator: value => {
-                return ['', 'actFill', 'green', 'preFill'].includes(value)
-            }
-        },
-        // 输入框尺寸
-        size: {
-            type: String,
-            default: 'default',
-            validator: value => {
-                return ['large', 'default', 'small'].includes(value)
-            }
-        }
-    },
-    data() {
-        return {
-            inputValue: this.value
-        }
-    },
-    computed: {
-        borderClass() {
-            const typeMap = {
-                actFill: 'orange-border',
-                green: 'green-border', 
-                preFill: 'blue-border'
-            }
-            return typeMap[this.fillType] || ''
-        }
-    },
-    watch: {
-        value(newVal) {
-            this.inputValue = newVal
-        },
-        inputValue(newVal) {
-            this.$emit('input', newVal)
-        }
-    },
-    methods: {
-        onBlur(event) {
-            this.$emit('blur', event)
-        },
-        onFocus(event) {
-            this.$emit('focus', event)
-        },
-        onChange(value) {
-            this.$emit('change', value)
-        },
-        onClear() {
-            this.$emit('clear')
-        },
-        onEnter(event) {
-            this.$emit('enter', event)
-        },
-        // 公开方法：清除输入
-        clear() {
-            this.inputValue = ''
-            this.$emit('input', '')
-            this.$emit('clear')
-        },
-        // 公开方法：聚焦
-        focus() {
-            this.$el.querySelector('input').focus()
-        },
-        // 公开方法：失焦
-        blur() {
-            this.$el.querySelector('input').blur()
-        }
-    },
-    filters: {
-        getFillType(type) {
-            const typeMap = {
-                actFill: 'orange-border',
-                green: 'green-border',
-                preFill: 'blue-border'
-            }
-            return typeMap[type] || ''
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-// 基础样式增强
-:deep(.el-input) {
-    .el-input__inner {
-        transition: border-color 0.2s ease, box-shadow 0.2s ease;
-        
-        &:focus {
-            box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
-        }
-    }
-}
-
-// 橙色边框样式
-.orange-border {
-    :deep(.el-input__inner) {
-        border-color: #f9c588;
-
-        &:focus {
-            border-color: #f9c588;
-            box-shadow: 0 0 0 2px rgba(249, 197, 136, 0.2);
-        }
-
-        &:hover {
-            border-color: #f9c588;
-        }
-    }
-}
-
-// 绿色边框样式
-.green-border {
-    :deep(.el-input__inner) {
-        border-color: #67c23a;
-
-        &:focus {
-            border-color: #67c23a;
-            box-shadow: 0 0 0 2px rgba(103, 194, 58, 0.2);
-        }
-
-        &:hover {
-            border-color: #67c23a;
-        }
-    }
-}
-
-// 蓝色边框样式
-.blue-border {
-    :deep(.el-input__inner) {
-        border-color: #409eff;
-
-        &:focus {
-            border-color: #409eff;
-            box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
-        }
-
-        &:hover {
-            border-color: #409eff;
-        }
-    }
-}
-
-// 禁用状态样式
-:deep(.el-input.is-disabled) {
-    .el-input__inner {
-        background-color: #f5f7fa;
-        border-color: #e4e7ed;
-        color: #c0c4cc;
-    }
-}
-
-// 只读状态样式
-:deep(.el-input.is-readonly) {
-    .el-input__inner {
-        background-color: #fafafa;
-        cursor: not-allowed;
-    }
-}
-
-// 清除按钮样式
-:deep(.el-input__clear) {
-    color: #909399;
-    transition: color 0.2s ease;
-    
-    &:hover {
-        color: #409eff;
-    }
-}
-
-// 密码显示按钮样式
-:deep(.el-input__password) {
-    color: #909399;
-    transition: color 0.2s ease;
-    
-    &:hover {
-        color: #409eff;
-    }
-}
-
-// 输入框尺寸样式
-:deep(.el-input--large) {
-    .el-input__inner {
-        height: 40px;
-        font-size: 16px;
-    }
-}
-
-:deep(.el-input--small) {
-    .el-input__inner {
-        height: 32px;
-        font-size: 13px;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index a70ea52..2401b1a 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -10,7 +10,8 @@
 						<HandleFormItem type="select" placeholder="请选择" class="step-type-select" :item="stepSelectConfig"
 							v-model="step.type" @change="onTypeChange(index)" />
 						<!-- 根据步骤类型显示对应的表单 -->
-						<component class="flex1" :sn="step.type" :is="getStepComponent(step.type)" :formData="step.formData"
+						<component class="flex1" :sn="step.type" :is="getStepComponent(step.type)" :formData="step.formData" :formIndex="formIndex" :formType="formType"
+							:fieldItemLabel="stepNameConfig[step.type]"
 							@update="onFormUpdate(index, $event)" :stepIndex = "prefixKey + index" :ref="'stepCompRef_' + index">
 						</component>
 						<div v-if="templateFillType === 'preFill'" class="step-header-item">
@@ -32,6 +33,7 @@
 <script>
 import draggable from 'vuedraggable';
 import { duplicateResource,justUpdateFilledFormData } from '@/utils/index.js';
+import stepNameConfig from "./StepComponents/stepNameConfig.js"
 import HandleFormItem from './HandleFormItem.vue';
 import Czdd from './StepComponents/ry/czdd.vue';//溶液-操作地点
 import Czhj from './StepComponents/ry/czhj.vue';//溶液-操作方法
@@ -80,6 +82,11 @@ import kbsjgsp from "./StepComponents/ry/kbsjgsp.vue";//溶液-空白（试剂/
 import kb from "./StepComponents/ry/kb.vue";//溶液-空白
 import jr from "./StepComponents/ry/jr.vue";//溶液-加热
 import fz from "./StepComponents/ry/fz.vue";//溶液-分装
+//溶液-样品分装：使用溶液-分装
+//溶液-给药制剂分装：使用溶液-分装
+//溶液-供试品样品分装：使用溶液-分装
+import csqx from "./StepComponents/ry/csqx.vue";//溶液-超声清洗
+import rj from "./StepComponents/ry/rj.vue";//溶液-融解
 //罗开凡新增
 
 //表配制
@@ -106,7 +113,7 @@ import cl from './StepComponents/b/cl.vue';//表配制-称量
 
 
 //生物样品分析
-//生物样品分析-解冻：使用溶液-解冻
+import jd_swypfx from './StepComponents/swypfx/jd_swypfx.vue';//生物样品分析-解冻：生物样品分析-融解
 //生物样品分析-涡旋混匀：使用溶液-涡旋混匀
 //生物样品分析-选择容器：使用溶液-选择容器
 import jryp from './StepComponents/swypfx/jryp.vue';//生物样品分析-加入样品
@@ -366,6 +373,19 @@ export default {
 		prefixKey: {
 			type: String,
 			default: ''
+		},
+		formIndex: {
+			type: Number,
+			default: 0
+		},
+		formType: {
+			type: String,
+			default: ''
+		}
+	},
+	provide() {
+    	return {
+			getStepData:()=>this.formData
 		}
 	},
 	data() {
@@ -377,7 +397,8 @@ export default {
 			},
 			steps: [],
 			stepId: 1,
-			componentMap: null
+			componentMap: null,
+			stepNameConfig
 		}
 	},
 	components: {
@@ -429,6 +450,8 @@ export default {
 		kb,
 		jr,
 		fz,
+		csqx,
+		rj,
 		//罗开凡新增
 
 		//表配制
@@ -436,6 +459,7 @@ export default {
 		cl,
 
 		//生物样品分析
+		jd_swypfx,
 		jryp,
 		hhspe,
 		zyfc,
@@ -627,6 +651,11 @@ export default {
 					'kb': 'kb',
 					'jr': 'jr',
 					'fz': 'fz',
+					'ypfz': 'fz',
+					'gyzjfz': 'fz',
+					'gspypfz': 'fz',
+					'csqx': 'csqx',
+					'rj': 'rj',
 					//罗开凡新增
 
 					//标配配制
@@ -652,7 +681,7 @@ export default {
 					'fr_b': 'Fr',
 
 					//生物样品分析
-					'jd_swypfx': 'Jd',
+					'jd_swypfx': 'jd_swypfx',
 					'jryp': 'jryp',
 					'ysfy': 'Lx',
 					'hhspe': 'hhspe',
diff --git a/src/components/Template/StepComponents/CdmdComp.vue b/src/components/Template/StepComponents/CdmdComp.vue
new file mode 100644
index 0000000..a0eaf6b
--- /dev/null
+++ b/src/components/Template/StepComponents/CdmdComp.vue
@@ -0,0 +1,252 @@
+<!-- 细胞密度测定组件 -->
+<template>
+    <div class="cdmd-container">
+        <!-- 使用一个table包含所有测定组 -->
+        <table class="cdmd-table" cellspacing="0" cellpadding="0">
+            <!-- 根据cs值循环生成每个测定组 -->
+            <div v-for="(item, index) in tableData" :key="index" class="cdmd-group">
+                <!-- 第一行 -->
+                <tr>
+                    <td rowspan="3" class="first-col">第{{ index +1}}次</td>
+                    <td class="fixed-text">稀释倍数</td>
+                    <td class="fixed-text">
+                        <HandleFormItem :fieldItemLabel="fieldItemLabel" :fieldKey="prefixKey + 'xsbs' + index"
+                            :error = "errorFields['xsbs'+index]"
+                            @update:error="(v)=>errorFields['xsbs'+index] = v"
+                            @blur="(v)=>handleBlur(v,index,'xsbs')" :item="inputItem" :value="item.xsbs" :index="index" />
+                    </td>
+                    <td class="fixed-text">细胞密度（个/mL）</td>
+                    <td>
+                        {{ item.xbmd }}
+                    </td>
+                </tr>
+                <!-- 第二行 -->
+                <tr>
+                    <td class="fixed-text">左上格(个)</td>
+                    <td class="fixed-text">右上格(个)</td>
+                    <td class="fixed-text">左下格(个)</td>
+                    <td class="fixed-text">右下格(个)</td>
+                </tr>
+                <!-- 第三行 -->
+                <tr>
+                    <td>
+                        <HandleFormItem :fieldItemLabel="fieldItemLabel" :fieldKey="prefixKey + 'zsg' + index"
+                            :error = "errorFields['zsg'+index]"
+                            @update:error="(v)=>errorFields['zsg'+index] = v"
+                            :value="item.zsg" :item="inputItem" @blur="(v)=>handleBlur(v,index,'zsg')" :index="index" />
+                    </td>
+                    <td>
+                        <HandleFormItem :fieldItemLabel="fieldItemLabel" :fieldKey="prefixKey + 'ysg' + index"
+                            :error = "errorFields['ysg'+index]"
+                            @update:error="(v)=>errorFields['ysg'+index] = v"
+                            @blur="(v)=>handleBlur(v,index,'ysg')" :item="inputItem" :value="item.ysg" :index="index" />
+                    </td>
+                    <td>
+                        <HandleFormItem :fieldItemLabel="fieldItemLabel" :fieldKey="prefixKey + 'zxg' + index"
+                            :error = "errorFields['zxg'+index]"
+                            @update:error="(v)=>errorFields['zxg'+index] = v"
+                            :value="item.zxg" :item="inputItem" @blur="(v)=>handleBlur(v,index,'zxg')" :index="index" />
+                    </td>
+                    <td>
+                        <HandleFormItem :fieldItemLabel="fieldItemLabel" :fieldKey="prefixKey + 'yxg' + index"
+                            :error = "errorFields['yxg'+index]"
+                            @update:error="(v)=>errorFields['yxg'+index] = v"
+                            :value="item.yxg" :item="inputItem" @blur="(v)=>handleBlur(v,index,'yxg')" :index="index" />
+                    </td>
+                </tr>
+            </div>
+        </table>
+    </div>
+</template>
+
+<script>
+import HandleFormItem from '../HandleFormItem.vue';
+import { getuuid } from '@/utils/index.js';
+export default {
+    inject: ['templateFillType'],
+    components: {
+        HandleFormItem
+    },
+    props: {
+        cs: {
+            type: [Number, String],
+            default: 0
+        },
+        formData: {
+            type: Array,
+            default: () => []
+        },
+        stepIndex: {
+            type: Number,
+            default: 0
+        },
+        prefixKey: {
+            type: String,
+            default: ''
+        },
+        fieldItemLabel: {
+            type: String,
+            default: ''
+        },
+    },
+    data() {
+        return {
+            tableData: [],
+            inputItem: {
+                type: 'inputNumber',
+                fillType: 'actFill',
+                precision: 0,
+            },
+            errorFields: {}
+        }
+    },
+  
+    mounted() {
+        this.tableData = this.formData;
+        if(this.templateFillType == 'actFill' && this.tableData.length == 0) {
+            this.onDataChange();
+        }
+    },
+    methods: {
+         getCellDensity(item) {
+            if(!item.xsbs || !item.zsg || !item.zxg || !item.ysg || !item.yxg) {
+                return '';
+            }
+            return ((+item.zsg + +item.zxg + +item.ysg + +item.yxg) /4) * item.xsbs*10000;
+        },
+        // 数据变化处理
+        handleBlur(v, index, key) {
+            this.tableData[index][key] = v;
+            const count = this.getCellDensity(this.tableData[index]);
+            this.tableData[index].xbmd = count;
+            // this.tableData = JSON.parse(JSON.stringify(this.tableData));
+            this.$emit('update', this.tableData);
+        },
+         // 实现validateFormData方法，用于表单验证
+        validateFormData() {
+            let isValid = true;
+            const errorFields = {};
+            const requiredFields = ['xsbs', 'zsg', 'zxg', 'ysg', 'yxg'];
+            this.tableData.map((item,index)=>{
+                requiredFields.forEach(field=>{
+                    if(!item[field]) {
+                        errorFields[field+index] = true;
+                        isValid = false;
+                    }
+                })
+            })
+            this.errorFields = errorFields;
+            return { valid: isValid, error: isValid? '' : '请填写细胞密度信息' };
+        },
+        onDataChange() {
+            // 构建表格数据
+            const tableData = [];
+            for (let i = 1; i <= this.cs; i++) {
+                tableData.push({
+                    index: i,
+                    zsg: "",
+                    zxg: "",
+                    ysg: "",
+                    yxg: "",
+                    xsbs: "",
+                    xbmd: "",
+                    id: getuuid(),
+                });
+            }
+            this.tableData = tableData;
+            this.$emit('update', this.tableData);
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.cdmd-container {
+    width: 1100px;
+    margin: 10px 0;
+}
+
+.cdmd-table {
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #e8e8e8;
+    border-radius: 4px;
+    overflow: hidden;
+    background-color: #fff;
+
+    td {
+        padding: 8px;
+        text-align: center;
+        border: 1px solid #e8e8e8;
+        vertical-align: middle;
+        width: 200px;
+    }
+
+    .cdmd-group {
+        &:not(:first-child) {
+            td {
+                border-top: none;
+            }
+        }
+    }
+
+
+}
+
+.first-col {
+    width: 100px !important;
+    font-weight: 500;
+    color: #333;
+    background-color: #f9f9f9;
+}
+
+.orange-input {
+    width: 80px;
+    margin: 0 auto;
+
+    ::v-deep .el-input__inner {
+        background-color: #fff7e6 !important;
+        border-color: #ffa940 !important;
+        color: #d46b08 !important;
+        text-align: center;
+
+        &:focus {
+            border-color: #d46b08 !important;
+            box-shadow: 0 0 0 2px rgba(255, 169, 64, 0.2) !important;
+        }
+    }
+}
+
+.fixed-text {
+    // color: #595959;
+    font-size: 14px;
+}
+
+.formula-btn {
+    background-color: #52c41a !important;
+    border-color: #52c41a !important;
+    color: #fff !important;
+    font-size: 12px;
+    padding: 4px 12px;
+
+    &:hover {
+        background-color: #73d13d !important;
+        border-color: #73d13d !important;
+    }
+
+    &:active {
+        background-color: #389e0d !important;
+        border-color: #389e0d !important;
+    }
+}
+
+.cdmd-warning {
+    margin-top: 8px;
+    padding: 8px 12px;
+    background-color: #fff2e8;
+    border: 1px solid #ffbb96;
+    border-radius: 4px;
+    color: #d46b08;
+    font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/JcbComp.vue b/src/components/Template/StepComponents/JcbComp.vue
new file mode 100644
index 0000000..c54ade9
--- /dev/null
+++ b/src/components/Template/StepComponents/JcbComp.vue
@@ -0,0 +1,163 @@
+<template>
+    <div class="jcb-table-container">
+        <CustomTable :ref="`tableRef`" :columns="jcbColumns" :formData="formData" :prefixKey="prefixKey"
+            class="jcb-table" operationWidth="120px" @clickButton="handleClickButton" @blur="commonHandleUpdate"
+            @onAddRow="onAddRow"
+            @onRegentSubmit="commonHandleUpdate"
+            fieldItemLabel="template.common.operationSteps" :showOperation="templateFillType === 'preFill'">
+            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
+                <TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns" @deleteRow="deleteRow">
+                </TableOpertaionDelete>
+            </template>
+        </CustomTable>
+    </div>
+</template>
+<script>
+import CustomTable from '../CustomTable.vue';
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue";
+import { getuuid } from "@/utils/index.js";
+import moment from "moment"
+
+export default {
+    inject: ['templateFillType'],
+    components: {
+        CustomTable,
+        TableOpertaionDelete,
+    },
+    name: 'JcbComp',
+    props: {
+        formData: {
+            type: Object,
+            default: () => { },
+        },
+        prefixKey: {
+            type: String,
+            default: '',
+        },
+        item:{
+            type: Object,
+            default: () => { },
+        },
+        type:{
+            type: String,
+            default: 'qb',
+        }
+    },
+    data() {
+        return {
+        };
+    },
+    mounted() {
+        console.log(this.prefixKey,"prefixKey")
+    },
+    computed: {
+        jcbColumns() {
+            const { buttonName = "取出" } = this.item;
+            return [
+                {
+                    label: '处理批',
+                    prop: 'mc',
+                    width: '200px',
+                    bodyType: "jcb",
+                    bodyKey: "clpClick",
+                    bodyFillType: "preFill",
+                    bodySubType: 'span',
+				    bodySubKey: 'bh',
+                },
+                {
+                    label: '时间',
+                    prop: 'time',
+                    width: '200px',
+                    bodyType: "input",
+                    bodyDisabled: true,
+                    bodyFillType: "actFill",
+                    bodySubType: "button",
+                    bodySubButtonName: buttonName,
+                    bodySubKey: "timeClick",
+                    bodySubFillType: "actFill",
+                },
+
+            ]
+        },
+    },
+    methods: {
+        // 添加表格行
+        onAddRow(data) {
+            const { dataSource = [] } = data;
+            const tableRef = this.$refs['tableRef'];
+            if (tableRef) {
+                tableRef.addRow({ mc: '', time: '' ,id:getuuid(),rowIndex:dataSource.length});
+                // 添加行后触发数据变化
+                this.onDataChange();
+            }
+        },
+        // 删除表格行
+        deleteRow(rowIndex) {
+            const tableRef = this.$refs['tableRef'];
+            if (tableRef) {
+                tableRef.deleteRow(rowIndex);
+                // 删除行后触发数据变化
+                this.onDataChange();
+            }
+        },
+        // 实现validateFormData方法，用于表单验证
+        validateFormData() {
+            
+            // 调用CustomTable的同步验证方法
+            const validateResult = this.$refs.tableRef.validateFormData();
+            
+            // 如果验证通过，还需要检查是否有数据行
+            if (validateResult.valid) {
+                const filledData = this.$refs.tableRef.getFilledFormData();
+                const { stepTableFormData = [] } = filledData;
+                if (stepTableFormData.length === 0) {
+                    return { valid: false, error: '请添加取板数据' };
+                }
+            }
+            console.log("validateResult",validateResult);
+            return validateResult;
+        },
+        // 点击按钮事件
+        handleClickButton(key, rowIndex,colIndex,e,data) {
+            if (key === 'timeClick') {
+                this.$refs['tableRef'].updateDataSourceByRowIndex(rowIndex, { time: moment().format("YYYY-MM-DD HH:mm:ss") },{signData:data,updateFields:['time']})
+                this.onDataChange();
+            }
+        },
+        // 数据变化处理方法
+        onDataChange() {
+            // 获取表格数据
+            let tableData = [];
+            if (this.$refs.tableRef) {
+                const filledData = this.$refs.tableRef.getFilledFormData();
+                tableData = filledData.stepTableFormData || [];
+            }
+            
+            // 触发自定义事件，将数据变化传递给父组件
+            this.$emit('update', {
+                jcbInfo: {
+                    stepTableFormData: tableData,
+                }
+            });
+        },
+      
+        // 处理表格blur事件
+        commonHandleUpdate() {
+            // 表格数据变化时触发数据变化通知
+            this.onDataChange();
+        },
+    }
+}
+</script>
+
+<style lang="scss">
+.jcb-table-container {
+    width: 600px;
+}
+
+.jcb-table {
+    .custom-table-wrapper {
+        margin-top: 0;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ZLSubPackage.vue b/src/components/Template/StepComponents/ZLSubPackage.vue
index 78c6d8a..264812f 100644
--- a/src/components/Template/StepComponents/ZLSubPackage.vue
+++ b/src/components/Template/StepComponents/ZLSubPackage.vue
@@ -13,8 +13,7 @@
                     <span class="ml-5">{{ item.unit }}</span>
                 </div>
                 <div class="header-item">
-                    <div class="header-title">分装编号</div>
-                    <div class="header-title">单位</div>
+                    <div class="header-title">分装单位</div>
                     <div class="unit-select">
                         <HandleFormItem :fieldKey = "prefixKey+stepIndex + 'dw'"  :item="unitItem" type="select" :error="formErrors.dw"
                             @blur="(e) => onCommonBlur(e, 'dw')" v-model="formData.dw" />
@@ -31,6 +30,9 @@
                     <el-button v-if = "templateFillType == 'preFill'" type="primary" plain @click="onReset">重置</el-button>
                     
                 </div>
+                <div class="header-item">
+                    <div class="header-title">分装编号</div>
+                </div>
             </div>
             <div class="content-container">
                 <div class="zl-header-container">
@@ -64,7 +66,7 @@ import { isValueEmpty,justUpdateFilledFormData } from '@/utils/index.js';
 export default {
     inject: ['templateFillType'],
     dicts: [
-        'business_tjdw',
+        'business_zldw',
     ],
     components: {
         HandleFormItem,
@@ -151,7 +153,7 @@ export default {
             return {
                 type: "select",
                 fillType: "preFill",
-                options: this.dict.type.business_tjdw
+                options: this.dict.type.business_zldw
             }
         },
         subConfig(){
@@ -210,6 +212,7 @@ export default {
                 // 根据输入的数量生成新列表
                 for (let i = 0; i < fzList.length; i++) {
                     fzList[i].subCode = codes[i];
+                    fzList[i].preCode = `${mybh}-set${codes[i]}`
                 }
                 justUpdateFilledFormData()
             }
@@ -259,7 +262,7 @@ export default {
         },
         onReset() {
             this.fzList.forEach((item, index) => {
-                item.num = "";
+                item.actnum = "";
                 // 同时更新错误状态
                 if (this.fzListErrors[index] !== undefined) {
                     this.$set(this.fzListErrors, index, false);
diff --git a/src/components/Template/StepComponents/ames/hwzd.vue b/src/components/Template/StepComponents/ames/hwzd.vue
index 3b23d47..7901312 100644
--- a/src/components/Template/StepComponents/ames/hwzd.vue
+++ b/src/components/Template/StepComponents/ames/hwzd.vue
@@ -1,6 +1,6 @@
 <!-- 恒温振荡 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ames_hwzd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ames_hwzd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ames/hygh.vue b/src/components/Template/StepComponents/ames/hygh.vue
index 9b0c454..bc2606f 100644
--- a/src/components/Template/StepComponents/ames/hygh.vue
+++ b/src/components/Template/StepComponents/ames/hygh.vue
@@ -1,6 +1,6 @@
 <!-- 混匀固化 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ames_hygh'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ames_hygh'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
diff --git a/src/components/Template/StepComponents/ames/jbcpyj.vue b/src/components/Template/StepComponents/ames/jbcpyj.vue
index 1b4d7f1..db4fd63 100644
--- a/src/components/Template/StepComponents/ames/jbcpyj.vue
+++ b/src/components/Template/StepComponents/ames/jbcpyj.vue
@@ -1,6 +1,6 @@
 <!-- 加表层培养基 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ames_jbcpyj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ames_jbcpyj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/b/cl.vue b/src/components/Template/StepComponents/b/cl.vue
index 18cd2b1..29b6789 100644
--- a/src/components/Template/StepComponents/b/cl.vue
+++ b/src/components/Template/StepComponents/b/cl.vue
@@ -1,6 +1,6 @@
 <!-- 称量 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'b_cl'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'b_cl'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
diff --git a/src/components/Template/StepComponents/b/jrry_b.vue b/src/components/Template/StepComponents/b/jrry_b.vue
index f6232e2..dc998e9 100644
--- a/src/components/Template/StepComponents/b/jrry_b.vue
+++ b/src/components/Template/StepComponents/b/jrry_b.vue
@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'b_jrry_b'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'b_jrry_b'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/bb.vue b/src/components/Template/StepComponents/jcb/bb.vue
index 6bd1085..ad30951 100644
--- a/src/components/Template/StepComponents/jcb/bb.vue
+++ b/src/components/Template/StepComponents/jcb/bb.vue
@@ -8,7 +8,7 @@
 <!-- 终止 -->
 <!-- 检测 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_bb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_bb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/czqx.vue b/src/components/Template/StepComponents/jcb/czqx.vue
index 86e49f4..8e2c6d2 100644
--- a/src/components/Template/StepComponents/jcb/czqx.vue
+++ b/src/components/Template/StepComponents/jcb/czqx.vue
@@ -1,6 +1,6 @@
 <!-- 磁珠清洗 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_czqx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_czqx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/czzx.vue b/src/components/Template/StepComponents/jcb/czzx.vue
index bbd7002..f6915dc 100644
--- a/src/components/Template/StepComponents/jcb/czzx.vue
+++ b/src/components/Template/StepComponents/jcb/czzx.vue
@@ -1,6 +1,6 @@
 <!-- 磁珠重悬 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_czzx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_czzx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/czzy.vue b/src/components/Template/StepComponents/jcb/czzy.vue
index 3d4e2ec..b856c8d 100644
--- a/src/components/Template/StepComponents/jcb/czzy.vue
+++ b/src/components/Template/StepComponents/jcb/czzy.vue
@@ -1,6 +1,6 @@
 <!-- 磁珠转移 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_czzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_czzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/dbdhxfgxt.vue b/src/components/Template/StepComponents/jcb/dbdhxfgxt.vue
index d6abf10..b7df2fa 100644
--- a/src/components/Template/StepComponents/jcb/dbdhxfgxt.vue
+++ b/src/components/Template/StepComponents/jcb/dbdhxfgxt.vue
@@ -1,6 +1,6 @@
 <!-- 读板（电化学发光系统） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dbdhxfgxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dbdhxfgxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/dbmby.vue b/src/components/Template/StepComponents/jcb/dbmby.vue
index 37b095c..7d734da 100644
--- a/src/components/Template/StepComponents/jcb/dbmby.vue
+++ b/src/components/Template/StepComponents/jcb/dbmby.vue
@@ -1,7 +1,7 @@
 <!-- 读板（酶标仪） -->
 <!-- 读板（化学发光系统） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dbmby'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dbmby'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/dbygxt.vue b/src/components/Template/StepComponents/jcb/dbygxt.vue
index e8abd34..7188c3e 100644
--- a/src/components/Template/StepComponents/jcb/dbygxt.vue
+++ b/src/components/Template/StepComponents/jcb/dbygxt.vue
@@ -1,6 +1,6 @@
 <!-- 读板（荧光系统） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dbygxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dbygxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/dzacl.vue b/src/components/Template/StepComponents/jcb/dzacl.vue
index 920a3ac..e1cbf87 100644
--- a/src/components/Template/StepComponents/jcb/dzacl.vue
+++ b/src/components/Template/StepComponents/jcb/dzacl.vue
@@ -2,7 +2,7 @@
 <!-- 覆膜 -->
 <!-- 拍干 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dzacl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_dzacl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/fyxks.vue b/src/components/Template/StepComponents/jcb/fyxks.vue
index c899f8c..8532310 100644
--- a/src/components/Template/StepComponents/jcb/fyxks.vue
+++ b/src/components/Template/StepComponents/jcb/fyxks.vue
@@ -1,69 +1,75 @@
 <!-- 孵育箱开始 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_fyxks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'jcb_fyxks'" @resetRecord="resetRecord"
+        :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
 import StepFormPackage from '@/components/Template/StepFormPackage.vue';
-import stepMixins from '@/components/Template/mixins/stepMixins.js';    
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
 
-    export default {
-        mixins: [stepMixins],
-        props: {
-            sn: {
-                type: String,
-                default: 'fyxks',
-            },
+export default {
+    mixins: [stepMixins],
+    props: {
+        sn: {
+            type: String,
+            default: 'fyxks',
         },
-        components: {
-            StepFormPackage
-        },
-        computed: {
-            formConfig() {
-                let config = [{
-                    config:{
-                        text1:{
-                            label:"将检测板放置于孵育箱",
-                            type:"text",
-                        },
-                        yq:{
-                            type:"yq",
-                            fillType:"actFill",
-                        },
-                        text2:{
-                            label:"中，设置预计温度为",
-                            type:"text",
-                        },
-                        temp:{
-                            type:"inputNumber",
-                            fillType:"preFill",
-                        },
-                        text3:{
-                            label:"°C，实际设置温度为",
-                            type:"text",
-                        },
-                        actTemp:{
-                            type:"inputNumber",
-                            fillType:"actFill",
-                            compareTo:"temp",
-                            copyFrom:"temp",
-                        },
-                        text4:{
-                            label:"°C，放置",
-                            type:"text",
-                        },
-                        time:{
-                            fillType: "preFill",
-                            type: "input",
-                        },
+    },
+    components: {
+        StepFormPackage
+    },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将检测板放置于孵育箱",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: "中，设置预计温度为",
+                        type: "text",
+                    },
+                    temp: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: "°C，实际设置温度为",
+                        type: "text",
+                    },
+                    actTemp: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo: "temp",
+                        copyFrom: "temp",
+                    },
+                    text4: {
+                        label: "°C，放置",
+                        type: "text",
+                    },
+                    time: {
+                        fillType: "preFill",
+                        type: "input",
+                    },
+                    jcb: {
+                        type: "dcjcb",
+                        buttonName: "开始"
                     }
-                }]
-                return config
-            }
-        },
-    }
+                }
+            }]
+            return config
+        }
+    },
+}
 </script>
 
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/jcb/js_jcb.vue b/src/components/Template/StepComponents/jcb/js_jcb.vue
index a9b57a5..e66028e 100644
--- a/src/components/Template/StepComponents/jcb/js_jcb.vue
+++ b/src/components/Template/StepComponents/jcb/js_jcb.vue
@@ -1,6 +1,6 @@
 <!-- 结束 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_js_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_js_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
@@ -18,14 +18,17 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config =  [{
                 config: {
-                    text1: {
-                        label: "待处理。。。。",
-                        type: "text",
-                    },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"结束"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/jy.vue b/src/components/Template/StepComponents/jcb/jy.vue
index 5a41d01..38886aa 100644
--- a/src/components/Template/StepComponents/jcb/jy.vue
+++ b/src/components/Template/StepComponents/jcb/jy.vue
@@ -1,6 +1,6 @@
 <!-- 加样 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_jy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_jy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/jzks.vue b/src/components/Template/StepComponents/jcb/jzks.vue
index 79d5adb..ed1c3a9 100644
--- a/src/components/Template/StepComponents/jcb/jzks.vue
+++ b/src/components/Template/StepComponents/jcb/jzks.vue
@@ -1,7 +1,7 @@
 <!-- 静置开始  -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_jzks'" @resetRecord="resetRecord" :form-config="formConfig"
-        :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_jzks'" @resetRecord="resetRecord" :form-config="formConfig"
+        :formData="localFormData" />
 </template>
 
 <script>
@@ -19,6 +19,9 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config = [{
@@ -65,6 +68,10 @@ export default {
                         fillType: "preFill",
                         type: "input",
                     },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"开始"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/qb.vue b/src/components/Template/StepComponents/jcb/qb.vue
index 26fc060..10d68cb 100644
--- a/src/components/Template/StepComponents/jcb/qb.vue
+++ b/src/components/Template/StepComponents/jcb/qb.vue
@@ -1,6 +1,6 @@
 <!-- 取板 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_qb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_qb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -22,9 +22,8 @@ export default {
         formConfig() {
             let config =  [{
                 config: {
-                    text1: {
-                        label: "待处理。。。。",
-                        type: "text",
+                    qb: {
+                        type: "qb",
                     },
                 }
             }]
diff --git a/src/components/Template/StepComponents/jcb/sjbj.vue b/src/components/Template/StepComponents/jcb/sjbj.vue
index 239007c..3465d9c 100644
--- a/src/components/Template/StepComponents/jcb/sjbj.vue
+++ b/src/components/Template/StepComponents/jcb/sjbj.vue
@@ -1,6 +1,6 @@
 <!-- 试剂标记 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_sjbj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_sjbj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/sjjy_jcb.vue b/src/components/Template/StepComponents/jcb/sjjy_jcb.vue
index 7416478..dde00e4 100644
--- a/src/components/Template/StepComponents/jcb/sjjy_jcb.vue
+++ b/src/components/Template/StepComponents/jcb/sjjy_jcb.vue
@@ -1,6 +1,6 @@
 <!-- 酸解加样 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_sjjy_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_sjjy_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/xs_jcb.vue b/src/components/Template/StepComponents/jcb/xs_jcb.vue
index de61293..23d94ba 100644
--- a/src/components/Template/StepComponents/jcb/xs_jcb.vue
+++ b/src/components/Template/StepComponents/jcb/xs_jcb.vue
@@ -1,6 +1,6 @@
 <!-- 显色 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_xs_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_xs_jcb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/ycfyks.vue b/src/components/Template/StepComponents/jcb/ycfyks.vue
index 21fef78..eaa46e7 100644
--- a/src/components/Template/StepComponents/jcb/ycfyks.vue
+++ b/src/components/Template/StepComponents/jcb/ycfyks.vue
@@ -1,6 +1,6 @@
 <!-- 摇床孵育开始 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycfyks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycfyks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
@@ -18,6 +18,9 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config = [{
@@ -87,6 +90,10 @@ export default {
                         fillType: "preFill",
                         type: "input",
                     },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"开始"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/ychy.vue b/src/components/Template/StepComponents/jcb/ychy.vue
index ba5d99b..df63ba9 100644
--- a/src/components/Template/StepComponents/jcb/ychy.vue
+++ b/src/components/Template/StepComponents/jcb/ychy.vue
@@ -1,6 +1,6 @@
 <!-- 摇床混匀 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ychy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ychy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/jcb/ycks.vue b/src/components/Template/StepComponents/jcb/ycks.vue
index 698793d..c33a229 100644
--- a/src/components/Template/StepComponents/jcb/ycks.vue
+++ b/src/components/Template/StepComponents/jcb/ycks.vue
@@ -1,6 +1,6 @@
 <!-- 摇床开始 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_ycks'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="localFormData" />
 </template>
 
 <script>
@@ -18,6 +18,9 @@ export default {
     components: {
         StepFormPackage
     },
+    mounted() {
+        this.commonHandleJcbUpdate();
+    },
     computed: {
         formConfig() {
             let config = [{
@@ -68,6 +71,10 @@ export default {
                         fillType: "preFill",
                         type: "input",
                     },
+                    jcb:{
+                        type:"dcjcb",
+                        buttonName:"开始"
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/jcb/zhfy.vue b/src/components/Template/StepComponents/jcb/zhfy.vue
index ce2531b..87ed67f 100644
--- a/src/components/Template/StepComponents/jcb/zhfy.vue
+++ b/src/components/Template/StepComponents/jcb/zhfy.vue
@@ -1,6 +1,6 @@
 <!-- 中和孵育 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_zhfy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'jcb_zhfy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/bzyp.vue b/src/components/Template/StepComponents/pcr/bzyp.vue
index be9b1f8..bb5a6d7 100644
--- a/src/components/Template/StepComponents/pcr/bzyp.vue
+++ b/src/components/Template/StepComponents/pcr/bzyp.vue
@@ -1,6 +1,6 @@
 <!-- 补足样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_bzyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_bzyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,将",
+                        label: "仪器，将",
                         type: "text",
                     },
                     ytry: {
diff --git a/src/components/Template/StepComponents/pcr/czclcl.vue b/src/components/Template/StepComponents/pcr/czclcl.vue
index f3be5b0..1b31d8a 100644
--- a/src/components/Template/StepComponents/pcr/czclcl.vue
+++ b/src/components/Template/StepComponents/pcr/czclcl.vue
@@ -1,6 +1,6 @@
 <!-- 磁珠残留处理 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_czclcl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_czclcl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/ddhy_pcr.vue b/src/components/Template/StepComponents/pcr/ddhy_pcr.vue
index d81f135..5e34274 100644
--- a/src/components/Template/StepComponents/pcr/ddhy_pcr.vue
+++ b/src/components/Template/StepComponents/pcr/ddhy_pcr.vue
@@ -1,6 +1,6 @@
 <!-- 颠倒混匀 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ddhy_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ddhy_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/ecsj.vue b/src/components/Template/StepComponents/pcr/ecsj.vue
index af6cd31..c643675 100644
--- a/src/components/Template/StepComponents/pcr/ecsj.vue
+++ b/src/components/Template/StepComponents/pcr/ecsj.vue
@@ -1,6 +1,6 @@
 <!-- 二次上机 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ecsj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ecsj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/ecxt.vue b/src/components/Template/StepComponents/pcr/ecxt.vue
index 65e9e74..8dc5c2b 100644
--- a/src/components/Template/StepComponents/pcr/ecxt.vue
+++ b/src/components/Template/StepComponents/pcr/ecxt.vue
@@ -1,6 +1,6 @@
 <!-- 二次洗脱 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ecxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ecxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/hsypfz.vue b/src/components/Template/StepComponents/pcr/hsypfz.vue
index 5c2afca..903c028 100644
--- a/src/components/Template/StepComponents/pcr/hsypfz.vue
+++ b/src/components/Template/StepComponents/pcr/hsypfz.vue
@@ -1,6 +1,6 @@
 <!-- 核酸样品分装 -->
 <template>
-    <StepFormPackage @clickButton="onHandleClickButton" ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'pcr_hsypfz'"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" @clickButton="onHandleClickButton" ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'pcr_hsypfz'"
         @resetRecord="resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
@@ -102,6 +102,7 @@ export default {
                         fillType: "actFill",
                         fzType: "step",
                         buttonName: "分装",
+                        noSign: true,
                         maxVolumeField: "sjtj",
                         maxVolumeUnitField: "sjtjdw",
                         myCodeFields: ["lbbh", "lbbhCode"],
diff --git a/src/components/Template/StepComponents/pcr/jd_pcr.vue b/src/components/Template/StepComponents/pcr/jd_pcr.vue
index e4440ff..65d1e36 100644
--- a/src/components/Template/StepComponents/pcr/jd_pcr.vue
+++ b/src/components/Template/StepComponents/pcr/jd_pcr.vue
@@ -1,6 +1,6 @@
 <!-- 解冻 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_jd_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_jd_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/jryp_pcr.vue b/src/components/Template/StepComponents/pcr/jryp_pcr.vue
index 628294e..69baaba 100644
--- a/src/components/Template/StepComponents/pcr/jryp_pcr.vue
+++ b/src/components/Template/StepComponents/pcr/jryp_pcr.vue
@@ -1,6 +1,6 @@
 <!-- 加入样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_jryp_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_jryp_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,将",
+                        label: "仪器，将",
                         type: "text",
                     },
                     srry: {
diff --git a/src/components/Template/StepComponents/pcr/jz_pcr.vue b/src/components/Template/StepComponents/pcr/jz_pcr.vue
index 6c556e0..d98afe1 100644
--- a/src/components/Template/StepComponents/pcr/jz_pcr.vue
+++ b/src/components/Template/StepComponents/pcr/jz_pcr.vue
@@ -1,6 +1,6 @@
 <!-- 静置  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jz_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jz_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/lssj.vue b/src/components/Template/StepComponents/pcr/lssj.vue
index 4bffdbd..2846453 100644
--- a/src/components/Template/StepComponents/pcr/lssj.vue
+++ b/src/components/Template/StepComponents/pcr/lssj.vue
@@ -1,6 +1,6 @@
 <!-- 罗氏上机 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_lssj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_lssj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/lx.vue b/src/components/Template/StepComponents/pcr/lx.vue
index 5196f88..d471220 100644
--- a/src/components/Template/StepComponents/pcr/lx.vue
+++ b/src/components/Template/StepComponents/pcr/lx.vue
@@ -1,6 +1,6 @@
 <!-- 离心 -->
 <template>
-    <StepFormPackage @select="select"  ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_lx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" @select="select"  ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_lx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/lxdy.vue b/src/components/Template/StepComponents/pcr/lxdy.vue
index 370484e..d9f65d0 100644
--- a/src/components/Template/StepComponents/pcr/lxdy.vue
+++ b/src/components/Template/StepComponents/pcr/lxdy.vue
@@ -1,6 +1,6 @@
 <!-- 离心（倒液） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_lxdy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_lxdy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/nscyp.vue b/src/components/Template/StepComponents/pcr/nscyp.vue
index 1c002f0..499ec17 100644
--- a/src/components/Template/StepComponents/pcr/nscyp.vue
+++ b/src/components/Template/StepComponents/pcr/nscyp.vue
@@ -1,6 +1,6 @@
 <!-- NSC样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_nscyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_nscyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按照样品排列示意图将无菌去离子水",
+                        label: "仪器，按照样品排列示意图将无菌去离子水",
                         type: "text",
                     },
                     sjry:{
diff --git a/src/components/Template/StepComponents/pcr/qrhy.vue b/src/components/Template/StepComponents/pcr/qrhy.vue
index f16e161..fa9b244 100644
--- a/src/components/Template/StepComponents/pcr/qrhy.vue
+++ b/src/components/Template/StepComponents/pcr/qrhy.vue
@@ -1,6 +1,6 @@
 <!-- 轻柔混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_qrhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_qrhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/sjjy.vue b/src/components/Template/StepComponents/pcr/sjjy.vue
index 36b67ae..ebda35a 100644
--- a/src/components/Template/StepComponents/pcr/sjjy.vue
+++ b/src/components/Template/StepComponents/pcr/sjjy.vue
@@ -1,6 +1,6 @@
 <!-- 试剂加样 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sjjy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sjjy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按照样品排列示意图将",
+                        label: "仪器，按照样品排列示意图将",
                         type: "text",
                     },
                     srry: {
diff --git a/src/components/Template/StepComponents/pcr/sjjyst.vue b/src/components/Template/StepComponents/pcr/sjjyst.vue
index 62904b5..2c8f179 100644
--- a/src/components/Template/StepComponents/pcr/sjjyst.vue
+++ b/src/components/Template/StepComponents/pcr/sjjyst.vue
@@ -1,6 +1,6 @@
 <!-- 试剂加样（手提） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sjjyst'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sjjyst'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/sslx.vue b/src/components/Template/StepComponents/pcr/sslx.vue
index fbb0669..f3074b2 100644
--- a/src/components/Template/StepComponents/pcr/sslx.vue
+++ b/src/components/Template/StepComponents/pcr/sslx.vue
@@ -1,6 +1,6 @@
 <!-- 瞬时离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sslx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sslx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/sy_pcr.vue b/src/components/Template/StepComponents/pcr/sy_pcr.vue
index c9e50e7..f58315f 100644
--- a/src/components/Template/StepComponents/pcr/sy_pcr.vue
+++ b/src/components/Template/StepComponents/pcr/sy_pcr.vue
@@ -1,6 +1,6 @@
 <!-- 水浴 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sy_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_sy_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/tgbwfz.vue b/src/components/Template/StepComponents/pcr/tgbwfz.vue
index 3ff209d..7660aee 100644
--- a/src/components/Template/StepComponents/pcr/tgbwfz.vue
+++ b/src/components/Template/StepComponents/pcr/tgbwfz.vue
@@ -1,6 +1,6 @@
 <!-- 天根板位放置 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_tgbwfz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_tgbwfz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/tqsj.vue b/src/components/Template/StepComponents/pcr/tqsj.vue
index e74478d..d3711bf 100644
--- a/src/components/Template/StepComponents/pcr/tqsj.vue
+++ b/src/components/Template/StepComponents/pcr/tqsj.vue
@@ -1,6 +1,6 @@
 <!-- 提取上机 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_tqsj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_tqsj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/wxhy_pcr.vue b/src/components/Template/StepComponents/pcr/wxhy_pcr.vue
index 3da4228..bd509ea 100644
--- a/src/components/Template/StepComponents/pcr/wxhy_pcr.vue
+++ b/src/components/Template/StepComponents/pcr/wxhy_pcr.vue
@@ -1,6 +1,6 @@
 <!-- 涡旋混匀 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_wxhy_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_wxhy_pcr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -31,7 +31,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,对样品进行涡旋混匀。",
+                        label: "仪器，对样品进行涡旋混匀。",
                         type: "text",
                     },
                 }
diff --git a/src/components/Template/StepComponents/pcr/xfzcl.vue b/src/components/Template/StepComponents/pcr/xfzcl.vue
index eda1fa6..03d515a 100644
--- a/src/components/Template/StepComponents/pcr/xfzcl.vue
+++ b/src/components/Template/StepComponents/pcr/xfzcl.vue
@@ -1,6 +1,6 @@
 <!-- 吸附柱处理 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xfzcl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xfzcl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/xfzzylxg.vue b/src/components/Template/StepComponents/pcr/xfzzylxg.vue
index f8d6506..3d995f6 100644
--- a/src/components/Template/StepComponents/pcr/xfzzylxg.vue
+++ b/src/components/Template/StepComponents/pcr/xfzzylxg.vue
@@ -1,6 +1,6 @@
 <!-- 吸附柱转移（离心管） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xfzzylxg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xfzzylxg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/xfzzysjg.vue b/src/components/Template/StepComponents/pcr/xfzzysjg.vue
index 49e64f1..89a14d6 100644
--- a/src/components/Template/StepComponents/pcr/xfzzysjg.vue
+++ b/src/components/Template/StepComponents/pcr/xfzzysjg.vue
@@ -1,6 +1,6 @@
 <!-- 吸附柱转移（收集管） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xfzzysjg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xfzzysjg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/xt.vue b/src/components/Template/StepComponents/pcr/xt.vue
index fcd75d4..1a415c1 100644
--- a/src/components/Template/StepComponents/pcr/xt.vue
+++ b/src/components/Template/StepComponents/pcr/xt.vue
@@ -1,6 +1,6 @@
 <!-- 洗脱 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xtxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_xtxt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/ypbc.vue b/src/components/Template/StepComponents/pcr/ypbc.vue
index 5ebb9bc..9f15eb6 100644
--- a/src/components/Template/StepComponents/pcr/ypbc.vue
+++ b/src/components/Template/StepComponents/pcr/ypbc.vue
@@ -1,6 +1,6 @@
 <!-- 样品保存 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ypbc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ypbc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/ypzy.vue b/src/components/Template/StepComponents/pcr/ypzy.vue
index 25e2fa8..407f4f4 100644
--- a/src/components/Template/StepComponents/pcr/ypzy.vue
+++ b/src/components/Template/StepComponents/pcr/ypzy.vue
@@ -1,6 +1,6 @@
 <!-- 样品转移 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ypzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_ypzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcr/yqzt.vue b/src/components/Template/StepComponents/pcr/yqzt.vue
index b6a1895..2593e93 100644
--- a/src/components/Template/StepComponents/pcr/yqzt.vue
+++ b/src/components/Template/StepComponents/pcr/yqzt.vue
@@ -1,6 +1,6 @@
 <!-- 仪器暂停 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_yqzt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcr_yqzt'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcrcjg/jrry_pcrcjg.vue b/src/components/Template/StepComponents/pcrcjg/jrry_pcrcjg.vue
index 16537a2..9d775fe 100644
--- a/src/components/Template/StepComponents/pcrcjg/jrry_pcrcjg.vue
+++ b/src/components/Template/StepComponents/pcrcjg/jrry_pcrcjg.vue
@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrcjg_jrry_pcrcjg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrcjg_jrry_pcrcjg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcrfx/ndcd.vue b/src/components/Template/StepComponents/pcrfx/ndcd.vue
index d3ecf44..a162f0a 100644
--- a/src/components/Template/StepComponents/pcrfx/ndcd.vue
+++ b/src/components/Template/StepComponents/pcrfx/ndcd.vue
@@ -1,6 +1,6 @@
 <!-- 浓度测定 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfx_ndcd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfx_ndcd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -29,7 +29,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按核酸浓度测定排版表吸取核酸样品和Blank样品",
+                        label: "仪器，按核酸浓度测定排版表吸取核酸样品和Blank样品",
                         type: "text",
                     },
                     ry:{
diff --git a/src/components/Template/StepComponents/pcrfxyp/cbygxz.vue b/src/components/Template/StepComponents/pcrfxyp/cbygxz.vue
index eca7541..cfe2ba8 100644
--- a/src/components/Template/StepComponents/pcrfxyp/cbygxz.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/cbygxz.vue
@@ -1,6 +1,6 @@
 <!-- 参比荧光选择 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_cbygxz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_cbygxz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcrfxyp/cdnsypfz.vue b/src/components/Template/StepComponents/pcrfxyp/cdnsypfz.vue
index ebc2d90..42b795d 100644
--- a/src/components/Template/StepComponents/pcrfxyp/cdnsypfz.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/cdnsypfz.vue
@@ -1,6 +1,6 @@
 <!-- cDNA样品分装 -->
 <template>
-    <StepFormPackage @clickButton="onHandleClickButton" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_cdnsypfz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" @clickButton="onHandleClickButton" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_cdnsypfz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -97,6 +97,7 @@ export default {
                         type:"button",
                         buttonName:"分装",
                         fzType: "step",
+                        noSign: true,
                         maxVolumeField: "sjtj",
                         maxVolumeUnitField: "sjtjdw",
                         myCodeFields: ["lbbh", "lbbhCode"],
diff --git a/src/components/Template/StepComponents/pcrfxyp/fmlx.vue b/src/components/Template/StepComponents/pcrfxyp/fmlx.vue
index 5f1d031..f857fc7 100644
--- a/src/components/Template/StepComponents/pcrfxyp/fmlx.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/fmlx.vue
@@ -1,6 +1,6 @@
 <!-- 封膜离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_fmlx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_fmlx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcrfxyp/jryp_pcrfxyp.vue b/src/components/Template/StepComponents/pcrfxyp/jryp_pcrfxyp.vue
index 270aaff..e8253d4 100644
--- a/src/components/Template/StepComponents/pcrfxyp/jryp_pcrfxyp.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/jryp_pcrfxyp.vue
@@ -1,6 +1,6 @@
 <!-- 加入样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_jryp_pcrfxyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_jryp_pcrfxyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,将",
+                        label: "仪器，将",
                         type: "text",
                     },
                     srry: {
diff --git a/src/components/Template/StepComponents/pcrfxyp/pbsz.vue b/src/components/Template/StepComponents/pcrfxyp/pbsz.vue
index f49d280..60393f6 100644
--- a/src/components/Template/StepComponents/pcrfxyp/pbsz.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/pbsz.vue
@@ -1,6 +1,6 @@
 <!-- 排版设置 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_pbsz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_pbsz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcrfxyp/pcrsj.vue b/src/components/Template/StepComponents/pcrfxyp/pcrsj.vue
index 4f9be10..e89015e 100644
--- a/src/components/Template/StepComponents/pcrfxyp/pcrsj.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/pcrsj.vue
@@ -1,6 +1,6 @@
 <!-- PCR上机 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_pcrsj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_pcrsj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcrfxyp/sjjy_pcrfxyp.vue b/src/components/Template/StepComponents/pcrfxyp/sjjy_pcrfxyp.vue
index d510773..eaafb1f 100644
--- a/src/components/Template/StepComponents/pcrfxyp/sjjy_pcrfxyp.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/sjjy_pcrfxyp.vue
@@ -1,6 +1,6 @@
 <!-- 试剂加样 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_sjjy_pcrfxyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_sjjy_pcrfxyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -35,7 +35,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按照样品排列示意图将",
+                        label: "仪器，按照样品排列示意图将",
                         type: "text",
                     },
                     srry: {
diff --git a/src/components/Template/StepComponents/pcrfxyp/xs.vue b/src/components/Template/StepComponents/pcrfxyp/xs.vue
index 1ad8244..30c408d 100644
--- a/src/components/Template/StepComponents/pcrfxyp/xs.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/xs.vue
@@ -1,6 +1,6 @@
 <!-- 稀释 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_xs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_xs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -29,7 +29,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,按上表进行稀释。",
+                        label: "仪器，按上表进行稀释。",
                         type: "text",
                     },
                 }
diff --git a/src/components/Template/StepComponents/pcrfxyp/yxpcry.vue b/src/components/Template/StepComponents/pcrfxyp/yxpcry.vue
index 33288c3..830d919 100644
--- a/src/components/Template/StepComponents/pcrfxyp/yxpcry.vue
+++ b/src/components/Template/StepComponents/pcrfxyp/yxpcry.vue
@@ -1,6 +1,6 @@
 <!-- 运行PCR仪 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_yxpcry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcrfxyp_yxpcry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcryj/cqzz_pcryj.vue b/src/components/Template/StepComponents/pcryj/cqzz_pcryj.vue
index 7de65fc..b135301 100644
--- a/src/components/Template/StepComponents/pcryj/cqzz_pcryj.vue
+++ b/src/components/Template/StepComponents/pcryj/cqzz_pcryj.vue
@@ -1,6 +1,6 @@
 <!-- 称取组织 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcryj_cqzz_pcryj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcryj_cqzz_pcryj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcryj/jryjry_pcryj.vue b/src/components/Template/StepComponents/pcryj/jryjry_pcryj.vue
index a182c2d..82211a5 100644
--- a/src/components/Template/StepComponents/pcryj/jryjry_pcryj.vue
+++ b/src/components/Template/StepComponents/pcryj/jryjry_pcryj.vue
@@ -1,6 +1,6 @@
 <!-- 加入匀浆溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcryj_jryjry_pcryj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcryj_jryjry_pcryj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/pcryj/jszz_pcryj.vue b/src/components/Template/StepComponents/pcryj/jszz_pcryj.vue
index d9d6b10..4d367cb 100644
--- a/src/components/Template/StepComponents/pcryj/jszz_pcryj.vue
+++ b/src/components/Template/StepComponents/pcryj/jszz_pcryj.vue
@@ -1,6 +1,6 @@
 <!-- 剪碎组织 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcryj_jszz_pcryj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'pcryj_jszz_pcryj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ptjhfxyp/xs_ptjhfxyp.vue b/src/components/Template/StepComponents/ptjhfxyp/xs_ptjhfxyp.vue
index 070cde5..c17e826 100644
--- a/src/components/Template/StepComponents/ptjhfxyp/xs_ptjhfxyp.vue
+++ b/src/components/Template/StepComponents/ptjhfxyp/xs_ptjhfxyp.vue
@@ -1,6 +1,6 @@
 <!-- 稀释 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ptjhfxyp_xs_ptjhfxyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ptjhfxyp_xs_ptjhfxyp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/qxwdx/qxfz.vue b/src/components/Template/StepComponents/qxwdx/qxfz.vue
index 9673cad..a67acf7 100644
--- a/src/components/Template/StepComponents/qxwdx/qxfz.vue
+++ b/src/components/Template/StepComponents/qxwdx/qxfz.vue
@@ -1,6 +1,6 @@
 <!-- 全血分装 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxfz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxfz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/qxwdx/qxjz.vue b/src/components/Template/StepComponents/qxwdx/qxjz.vue
index c80c673..e1151e5 100644
--- a/src/components/Template/StepComponents/qxwdx/qxjz.vue
+++ b/src/components/Template/StepComponents/qxwdx/qxjz.vue
@@ -1,6 +1,6 @@
 <!-- 全血静置  -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxjz'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxjz'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
diff --git a/src/components/Template/StepComponents/qxwdx/qxlx.vue b/src/components/Template/StepComponents/qxwdx/qxlx.vue
index fc9a270..04af295 100644
--- a/src/components/Template/StepComponents/qxwdx/qxlx.vue
+++ b/src/components/Template/StepComponents/qxwdx/qxlx.vue
@@ -1,6 +1,6 @@
 <!-- 全血离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxlx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'qxwdx_qxlx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/bdtj.vue b/src/components/Template/StepComponents/ry/bdtj.vue
index 214601f..d9354ab 100644
--- a/src/components/Template/StepComponents/ry/bdtj.vue
+++ b/src/components/Template/StepComponents/ry/bdtj.vue
@@ -1,6 +1,6 @@
 <!-- 标定(体积) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdtj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdtj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -69,9 +69,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             options:this.getDictOptions("business_tjdw"),
                             fillType:"preFill",
                         },
-                        text5:{
-                            label:"，划线。",
-                            type:"text",
+                        hx:{
+                            type:"input",
+                            fillType:"preFill",
                         },
 
                     }
diff --git a/src/components/Template/StepComponents/ry/bdzl.vue b/src/components/Template/StepComponents/ry/bdzl.vue
index b233757..fff483b 100644
--- a/src/components/Template/StepComponents/ry/bdzl.vue
+++ b/src/components/Template/StepComponents/ry/bdzl.vue
@@ -1,6 +1,6 @@
 <!-- 标定(质量) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdzl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_bdzl'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -14,6 +14,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
         },
         computed: {
             formConfig() {
+                console.log(this.stepIndex,"stepIndex")
                 return [{
                     config:{
                         text1:{
@@ -47,7 +48,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"inputNumber",
                             fillType:"actFill",
                             compareTo:"rm",
-                            copyFrom:"rm"
+                            disabled:true,
                         },
                         button1:{
                             type:"button",
diff --git a/src/components/Template/StepComponents/ry/clcz.vue b/src/components/Template/StepComponents/ry/clcz.vue
index 0a59ff4..41dc73c 100644
--- a/src/components/Template/StepComponents/ry/clcz.vue
+++ b/src/components/Template/StepComponents/ry/clcz.vue
@@ -1,6 +1,6 @@
 <!-- 称量（非传值） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_clcz'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_clcz'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
@@ -36,7 +36,7 @@ export default {
                         dwCode: "wzsuldw",
                     },
                     text3: {
-                        label: "物质,称取预计质量为",
+                        label: "物质，称取预计质量为",
                         type: "text",
                     },
                     wzsul: {
diff --git a/src/components/Template/StepComponents/ry/clfcz.vue b/src/components/Template/StepComponents/ry/clfcz.vue
index 292dc42..8626a8d 100644
--- a/src/components/Template/StepComponents/ry/clfcz.vue
+++ b/src/components/Template/StepComponents/ry/clfcz.vue
@@ -1,6 +1,6 @@
 <!-- 称量（传值） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_clfcz'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_clfcz'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
@@ -36,7 +36,7 @@ export default {
                         dwCode: "wzsuldw1",
                     },
                     text3: {
-                        label: "物质,称取预计质量为",
+                        label: "物质，称取预计质量为",
                         type: "text",
                     },
                     wzsul: {
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
index d034cdd..319d2b5 100644
--- a/src/components/Template/StepComponents/ry/cs.vue
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -1,6 +1,6 @@
 <!-- 超声 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_cs'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_cs'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
@@ -64,7 +64,7 @@ export default {
                         fillType: "preFill",
                     },
                     text5: {
-                        label: "，实际时长为",
+                        label: "，实际设置时长为",
                         type: "text",
                     },
                     sjsc: {
diff --git a/src/components/Template/StepComponents/ry/csqx.vue b/src/components/Template/StepComponents/ry/csqx.vue
new file mode 100644
index 0000000..d340eb1
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/csqx.vue
@@ -0,0 +1,93 @@
+<!-- 超声清洗 -->
+<template>
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_csqx'" @resetRecord="resetRecord" :form-config="formConfig"
+        :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+		sn: {
+			type: String,
+			default: 'csqx',
+		},
+	},
+    components: {
+        StepFormPackage
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "使用超声波清洗机",
+                        type: "text",
+                    },
+                    yq: {
+                        type: "yq",
+                        fillType: "actFill",
+                    },
+                    text2: {
+                        label: "仪器，设置预计频率为",
+                        type: "text",
+                    },
+                    yjpl: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    text3: {
+                        label: "Hz，实际设置频率为",
+                        type: "text",
+                    },
+                    sjpl: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo: "yjpl",
+                        copyFrom: "yjpl",
+                    },
+                    text4: {
+                        label: "Hz，设置预计时长为",
+                        type: "text",
+                    },
+                    yjsc: {
+                        type: "inputNumber",
+                        fillType: "preFill",
+                    },
+                    yjscdw: {
+                        type: "select",
+                        options: this.getDictOptions("business_yqscdw"),
+                        selectTo: "sjscdw",
+                        fillType: "preFill",
+                    },
+                    text5: {
+                        label: "，实际设置时长为",
+                        type: "text",
+                    },
+                    sjsc: {
+                        type: "inputNumber",
+                        fillType: "actFill",
+                        compareTo: "yjsc",
+                        copyFrom: "yjsc",
+                    },
+                    sjscdw: {
+                        type: "select",
+                        options: this.getDictOptions("business_yqscdw"),
+                        fillType: "preFill",
+                    },
+                    text6: {
+                        label: "，进行超声。",
+                        type: "text",
+                    },
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/czdd.vue b/src/components/Template/StepComponents/ry/czdd.vue
index ea36a1f..0202682 100644
--- a/src/components/Template/StepComponents/ry/czdd.vue
+++ b/src/components/Template/StepComponents/ry/czdd.vue
@@ -1,6 +1,6 @@
 <!-- 操作地点 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_czdd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_czdd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/czhj.vue b/src/components/Template/StepComponents/ry/czhj.vue
index f6eb45f..a243c5d 100644
--- a/src/components/Template/StepComponents/ry/czhj.vue
+++ b/src/components/Template/StepComponents/ry/czhj.vue
@@ -1,6 +1,6 @@
 <!-- 操作环境 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_czhj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_czhj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -29,7 +29,7 @@ export default {
                         fillType: "actFill",
                     },
                     text2: {
-                        label: "环境下，操作下预计在",
+                        label: "环境下，预计在",
                         type: "text",
                     },
                     ytczhj: {
diff --git a/src/components/Template/StepComponents/ry/dc.vue b/src/components/Template/StepComponents/ry/dc.vue
index 63de78b..da30953 100644
--- a/src/components/Template/StepComponents/ry/dc.vue
+++ b/src/components/Template/StepComponents/ry/dc.vue
@@ -1,6 +1,6 @@
 <!-- 氮吹 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_dc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_dc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -39,7 +39,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         text3:{
-                            label:"°C，实际温度为",
+                            label:"°C，实际温度设置为",
                             type:"text",
                         },
                         actTemp:{
diff --git a/src/components/Template/StepComponents/ry/ddhy.vue b/src/components/Template/StepComponents/ry/ddhy.vue
index 0137da5..7413560 100644
--- a/src/components/Template/StepComponents/ry/ddhy.vue
+++ b/src/components/Template/StepComponents/ry/ddhy.vue
@@ -1,6 +1,6 @@
 <!-- 颠倒混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_ddhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_ddhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/fb.vue b/src/components/Template/StepComponents/ry/fb.vue
index c01f16f..dd20c8c 100644
--- a/src/components/Template/StepComponents/ry/fb.vue
+++ b/src/components/Template/StepComponents/ry/fb.vue
@@ -1,6 +1,6 @@
 <!-- 封板 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/fr.vue b/src/components/Template/StepComponents/ry/fr.vue
index a4004fb..6757265 100644
--- a/src/components/Template/StepComponents/ry/fr.vue
+++ b/src/components/Template/StepComponents/ry/fr.vue
@@ -1,6 +1,6 @@
 <!-- 复溶 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/frdrq.vue b/src/components/Template/StepComponents/ry/frdrq.vue
index 08fac67..c4c0a36 100644
--- a/src/components/Template/StepComponents/ry/frdrq.vue
+++ b/src/components/Template/StepComponents/ry/frdrq.vue
@@ -1,6 +1,6 @@
 <!-- 复溶(多容器) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_frdrq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_frdrq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/fs.vue b/src/components/Template/StepComponents/ry/fs.vue
index affd914..389d3c0 100644
--- a/src/components/Template/StepComponents/ry/fs.vue
+++ b/src/components/Template/StepComponents/ry/fs.vue
@@ -1,6 +1,6 @@
 <!-- 复苏 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fs'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fs'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
@@ -34,7 +34,7 @@ export default {
                         fillType: "preFill",
                     },
                     text3: {
-                        label: "°C，实际温度",
+                        label: "°C，实际温度设置为",
                         type: "text",
                     },
                     sjwd: {
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
index f7ec3eb..803561b 100644
--- a/src/components/Template/StepComponents/ry/fy.vue
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -1,6 +1,6 @@
 <!-- 孵育 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fy'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fy'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
@@ -27,6 +27,11 @@ export default {
                         label: "使用",
                         type: "text",
                     },
+                    yqmc: {
+                        type: "input",
+                        fillType: "preFill",
+                    },
+                    
                     yq: {
                         type: "yq",
                         fillType: "actFill",
diff --git a/src/components/Template/StepComponents/ry/fz.vue b/src/components/Template/StepComponents/ry/fz.vue
index aadbfd4..1842ae8 100644
--- a/src/components/Template/StepComponents/ry/fz.vue
+++ b/src/components/Template/StepComponents/ry/fz.vue
@@ -1,6 +1,6 @@
 <!-- 分装 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" @clickButton="onHandleClickButton" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_fz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -22,15 +22,20 @@ export default {
         formConfig() {
             let config =  [{
                 config: {
-                    text1: {
-                        label: "待处理。。。。",
-                        type: "text",
+                    fz: {
+                        type: "button",
+                        buttonName:"分装",
+                        fillType:"actFill",
+                        noSign: true,
                     },
                 }
             }]
             return config
         }
     },
+    methods: {
+     
+    }
 }
 </script>
 
diff --git a/src/components/Template/StepComponents/ry/glsd.vue b/src/components/Template/StepComponents/ry/glsd.vue
index 4fb1a19..bc78d50 100644
--- a/src/components/Template/StepComponents/ry/glsd.vue
+++ b/src/components/Template/StepComponents/ry/glsd.vue
@@ -1,6 +1,6 @@
 <!-- 过滤(手动)  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_glsd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_glsd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/glzd.vue b/src/components/Template/StepComponents/ry/glzd.vue
index a634121..c5d5348 100644
--- a/src/components/Template/StepComponents/ry/glzd.vue
+++ b/src/components/Template/StepComponents/ry/glzd.vue
@@ -1,6 +1,6 @@
 <!-- 过滤(自动) -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_glzd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_glzd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/hb.vue b/src/components/Template/StepComponents/ry/hb.vue
index db21307..6137523 100644
--- a/src/components/Template/StepComponents/ry/hb.vue
+++ b/src/components/Template/StepComponents/ry/hb.vue
@@ -1,6 +1,6 @@
 <!-- 合并 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_hb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_hb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/hwhy.vue b/src/components/Template/StepComponents/ry/hwhy.vue
index 5171e3e..a632769 100644
--- a/src/components/Template/StepComponents/ry/hwhy.vue
+++ b/src/components/Template/StepComponents/ry/hwhy.vue
@@ -1,6 +1,6 @@
 <!-- 恒温混匀 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_hwhy'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_hwhy'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
diff --git a/src/components/Template/StepComponents/ry/jb.vue b/src/components/Template/StepComponents/ry/jb.vue
index 9d8fd31..5b7af09 100644
--- a/src/components/Template/StepComponents/ry/jb.vue
+++ b/src/components/Template/StepComponents/ry/jb.vue
@@ -1,6 +1,6 @@
 <!-- 搅拌 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jb'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jb'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
@@ -46,7 +46,7 @@ export default {
                         fillType: "preFill",
                     },
                     text5: {
-                        label: "实际转速为",
+                        label: "实际转速设置为",
                         type: "text",
                     },
                     sjzs: {
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index f4aad70..f400e47 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -1,6 +1,6 @@
 <!-- 解冻  -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jd'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jd'" @resetRecord="resetRecord" :form-config="formConfig"
         @select="select"
         :formData="formData" />
 </template>
@@ -66,12 +66,12 @@ export default {
                         fillType: "preFill",
                         otherCode: "yjwdOther",
                     },
-                    yjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "preFill",
-                        otherCode: "yjhjOther",
-                    },
+                    // yjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "preFill",
+                    //     otherCode: "yjhjOther",
+                    // },
                     text5: {
                         label: "，实际条件为",
                         type: "text",
@@ -84,13 +84,13 @@ export default {
                         otherCode: "sjwdOther",
                         compareTo: "yjwd",
                     },
-                    sjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "actFill",
-                        otherCode: "sjhjOther",
-                        compareTo: "yjhj",
-                    },
+                    // sjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "actFill",
+                    //     otherCode: "sjhjOther",
+                    //     compareTo: "yjhj",
+                    // },
                      text6: {
                         label: "，放置",
                         type: "text",
@@ -179,12 +179,12 @@ export default {
                         fillType: "preFill",
                         otherCode: "yjwdOther",
                     },
-                    yjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "preFill",
-                        otherCode: "yjhjOther",
-                    },
+                    // yjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "preFill",
+                    //     otherCode: "yjhjOther",
+                    // },
                     text5: {
                         label: "，实际条件为",
                         type: "text",
@@ -197,13 +197,13 @@ export default {
                         otherCode: "sjwdOther",
                         compareTo: "yjwd",
                     },
-                    sjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "actFill",
-                        otherCode: "sjhjOther",
-                        compareTo: "yjhj",
-                    },
+                    // sjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "actFill",
+                    //     otherCode: "sjhjOther",
+                    //     compareTo: "yjhj",
+                    // },
                      text6: {
                         label: "，放置",
                         type: "text",
diff --git a/src/components/Template/StepComponents/ry/jr.vue b/src/components/Template/StepComponents/ry/jr.vue
index 8fc5f24..6b8a72e 100644
--- a/src/components/Template/StepComponents/ry/jr.vue
+++ b/src/components/Template/StepComponents/ry/jr.vue
@@ -1,6 +1,6 @@
 <!-- 加热 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/jrjb.vue b/src/components/Template/StepComponents/ry/jrjb.vue
index 96d35e0..ad6344a 100644
--- a/src/components/Template/StepComponents/ry/jrjb.vue
+++ b/src/components/Template/StepComponents/ry/jrjb.vue
@@ -1,6 +1,6 @@
 <!-- 加热搅拌 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jrjb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jrjb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -31,7 +31,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"actFill",
                         },
                         text2:{
-                            label:"仪器,设置预计温度为",
+                            label:"仪器，设置预计温度为",
                             type:"text",
                         },
                         yjwd:{
@@ -49,7 +49,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             copyFrom:"yjwd"
                         },
                         text4:{
-                            label:"，设置预计转速为",
+                            label:"°C，设置预计转速为",
                             type:"text",
                         },
                         yjzs2:{
@@ -63,7 +63,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill", 
                         },
                         text5:{
-                            label:"实际转速为",
+                            label:"实际转速设置为",
                             type:"text",
                         },
                         sjzs:{
diff --git a/src/components/Template/StepComponents/ry/jrry.vue b/src/components/Template/StepComponents/ry/jrry.vue
index cc26caa..8797088 100644
--- a/src/components/Template/StepComponents/ry/jrry.vue
+++ b/src/components/Template/StepComponents/ry/jrry.vue
@@ -1,6 +1,6 @@
 <!-- 加入溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jrry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jrry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -29,7 +29,7 @@ export default {
                         type: "yq",
                     },
                     text2: {
-                        label: "仪器,吸取",
+                        label: "仪器，取",
                         type: "text",
                     },
                     srry: {
diff --git a/src/components/Template/StepComponents/ry/js.vue b/src/components/Template/StepComponents/ry/js.vue
index 6ba19ac..fd066ef 100644
--- a/src/components/Template/StepComponents/ry/js.vue
+++ b/src/components/Template/StepComponents/ry/js.vue
@@ -1,6 +1,6 @@
 <!-- 计数 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_js'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_js'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/jz.vue b/src/components/Template/StepComponents/ry/jz.vue
index 4549ee3..96ffed1 100644
--- a/src/components/Template/StepComponents/ry/jz.vue
+++ b/src/components/Template/StepComponents/ry/jz.vue
@@ -1,6 +1,6 @@
 <!-- 静置  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/kb.vue b/src/components/Template/StepComponents/ry/kb.vue
index 4ba76a0..ebad144 100644
--- a/src/components/Template/StepComponents/ry/kb.vue
+++ b/src/components/Template/StepComponents/ry/kb.vue
@@ -1,6 +1,6 @@
 <!-- 空白 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/kbsjgsp.vue b/src/components/Template/StepComponents/ry/kbsjgsp.vue
index bce9d21..36e8bdf 100644
--- a/src/components/Template/StepComponents/ry/kbsjgsp.vue
+++ b/src/components/Template/StepComponents/ry/kbsjgsp.vue
@@ -1,6 +1,6 @@
 <!-- 空白（试剂/供试品） -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kbsjgsp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kbsjgsp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/kbyq.vue b/src/components/Template/StepComponents/ry/kbyq.vue
index 0f1827c..c4d1733 100644
--- a/src/components/Template/StepComponents/ry/kbyq.vue
+++ b/src/components/Template/StepComponents/ry/kbyq.vue
@@ -1,6 +1,6 @@
 <!-- 空白（仪器） -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kbyq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_kbyq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/lx.vue b/src/components/Template/StepComponents/ry/lx.vue
index 7af11b2..47204ad 100644
--- a/src/components/Template/StepComponents/ry/lx.vue
+++ b/src/components/Template/StepComponents/ry/lx.vue
@@ -1,6 +1,6 @@
 <!-- 离心 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_lx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_lx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/mj.vue b/src/components/Template/StepComponents/ry/mj.vue
index dcef8b3..2319385 100644
--- a/src/components/Template/StepComponents/ry/mj.vue
+++ b/src/components/Template/StepComponents/ry/mj.vue
@@ -1,6 +1,6 @@
 <!-- 灭菌 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_mj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_mj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/qcyy.vue b/src/components/Template/StepComponents/ry/qcyy.vue
index 05caed1..14d6899 100644
--- a/src/components/Template/StepComponents/ry/qcyy.vue
+++ b/src/components/Template/StepComponents/ry/qcyy.vue
@@ -1,6 +1,6 @@
 <!-- 取出原药 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_qcyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_qcyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/qywz.vue b/src/components/Template/StepComponents/ry/qywz.vue
index 98a3362..381d7d7 100644
--- a/src/components/Template/StepComponents/ry/qywz.vue
+++ b/src/components/Template/StepComponents/ry/qywz.vue
@@ -1,6 +1,6 @@
 <!-- 取用物质 -->
 <template>
-    <StepFormPackage @onDialogSubmit="onDialogSubmit" :prefixKey="stepIndex+'_'+'ry_qywz'" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" @onDialogSubmit="onDialogSubmit" :prefixKey="stepIndex+'_'+'ry_qywz'" ref = "stepFormPackageRef" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/rj.vue b/src/components/Template/StepComponents/ry/rj.vue
new file mode 100644
index 0000000..e1431e9
--- /dev/null
+++ b/src/components/Template/StepComponents/ry/rj.vue
@@ -0,0 +1,109 @@
+<!-- 融解  -->
+<template>
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_rj'" @resetRecord="resetRecord" :form-config="formConfig"
+        @select="select"
+        :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+        sn: {
+            type: String,
+            default: 'rj',
+        },
+    },
+
+    components: {
+        StepFormPackage
+    },
+    methods: {
+        select(data) {
+            const {value,key} = data;
+            if(key==='sjccwz'){
+                this.updateWcData("sjwd",value);
+            }
+        }
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将",
+                        type: "text",
+                    },
+                    ypmc:{
+                        type:"input",
+                        fillType:"preFill",
+                    },
+                    sj:{
+                        type:"sj",
+                        fillType:"actFill",
+                    },
+                    text2: {
+                        label: "预计放置于",
+                        type: "text",
+                    },
+                    ccwz: {
+                        type: "input",
+                        // options: this.getDictOptions("business_ccwz"),
+                        fillType: "preFill",
+                        otherCode: "ccwzOther",
+                    },
+                    text3: {
+                        label: "实际放置于",
+                        type: "text",
+                    },
+                    sjccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "actFill",
+                        otherCode: "sjccwzOther",
+                        compareTo: "ccwz",
+                    },
+                    text4: {
+                        label: "位置，其环境条件预计为",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    text5: {
+                        label: "，实际条件为",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                     text6: {
+                        label: "进行融解",
+                        type: "text",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ry/rs.vue b/src/components/Template/StepComponents/ry/rs.vue
index f7d33cd..b2a6218 100644
--- a/src/components/Template/StepComponents/ry/rs.vue
+++ b/src/components/Template/StepComponents/ry/rs.vue
@@ -1,6 +1,6 @@
 <!-- 染色 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_rs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_rs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/sy.vue b/src/components/Template/StepComponents/ry/sy.vue
index 423a21d..d44d803 100644
--- a/src/components/Template/StepComponents/ry/sy.vue
+++ b/src/components/Template/StepComponents/ry/sy.vue
@@ -1,6 +1,6 @@
 <!-- 水浴 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_sy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_sy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -39,7 +39,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         text3:{
-                            label:"°C，实际温度为",
+                            label:"°C，实际温度设置为",
                             type:"text",
                         },
                         actTemp:{
diff --git a/src/components/Template/StepComponents/ry/tjphcz.vue b/src/components/Template/StepComponents/ry/tjphcz.vue
index d004a6f..8a6f532 100644
--- a/src/components/Template/StepComponents/ry/tjphcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphcz.vue
@@ -1,6 +1,6 @@
 <!-- 调节PH(传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tjphcz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tjphcz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -96,6 +96,7 @@ export default {
                     ph: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo: "rm",
                     },
                     button1: {
                         type: "button",
diff --git a/src/components/Template/StepComponents/ry/tjphfcz.vue b/src/components/Template/StepComponents/ry/tjphfcz.vue
index 2cfcc99..bbf6fdc 100644
--- a/src/components/Template/StepComponents/ry/tjphfcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphfcz.vue
@@ -1,6 +1,6 @@
 <!-- 调节PH(非传值) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tjphfcz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tjphfcz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -96,6 +96,7 @@ export default {
                     ph: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo: "rm",
                     },
                  
                     text8: {
diff --git a/src/components/Template/StepComponents/ry/tpjydd.vue b/src/components/Template/StepComponents/ry/tpjydd.vue
index c843860..5e3a99f 100644
--- a/src/components/Template/StepComponents/ry/tpjydd.vue
+++ b/src/components/Template/StepComponents/ry/tpjydd.vue
@@ -1,6 +1,6 @@
 <!-- 天平校验(单点) -->
 <template>
-    <StepFormPackage 
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" 
         ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tpjydd'" @resetRecord = "resetRecord" 
         @clickButton="handleClickButton"
         :form-config="formConfig" :formData = "formData" />
@@ -105,8 +105,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         jgpd:{
-                            label:"通过/不通过",
-                            type:"span",
+                            type:"input",
+                            fillType:"actFill",
+                            disabled:true,
                         },
                         text9:{
                             label:"。",
diff --git a/src/components/Template/StepComponents/ry/tpjysd.vue b/src/components/Template/StepComponents/ry/tpjysd.vue
index 8847d43..6b827d6 100644
--- a/src/components/Template/StepComponents/ry/tpjysd.vue
+++ b/src/components/Template/StepComponents/ry/tpjysd.vue
@@ -1,7 +1,7 @@
 <!-- 天平校验(双点) -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tpjysd'" @resetRecord="resetRecord"
-        @clickButton="handleClickButton" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel="fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'ry_tpjysd'"
+        @resetRecord="resetRecord" @clickButton="handleClickButton" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -112,8 +112,9 @@ export default {
                         type: "text",
                     },
                     dfmjgpd: {
-                        label: "通过/不通过",
-                        type: "span",
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
                     }
                 }
             },
@@ -202,8 +203,9 @@ export default {
                         type: "text",
                     },
                     jgpd: {
-                        label: "通过/不通过",
-                        type: "span",
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
                     },
                     text9: {
                         label: "。",
diff --git a/src/components/Template/StepComponents/ry/wxhy.vue b/src/components/Template/StepComponents/ry/wxhy.vue
index 44856cd..21f830a 100644
--- a/src/components/Template/StepComponents/ry/wxhy.vue
+++ b/src/components/Template/StepComponents/ry/wxhy.vue
@@ -1,6 +1,6 @@
 <!-- 涡旋混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_wxhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_wxhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/xzrq.vue b/src/components/Template/StepComponents/ry/xzrq.vue
index bffd19c..b1d9d4e 100644
--- a/src/components/Template/StepComponents/ry/xzrq.vue
+++ b/src/components/Template/StepComponents/ry/xzrq.vue
@@ -1,6 +1,6 @@
 <!-- 选择容器 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_xzrq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_xzrq'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/ym.vue b/src/components/Template/StepComponents/ry/ym.vue
index 02f8606..9000e24 100644
--- a/src/components/Template/StepComponents/ry/ym.vue
+++ b/src/components/Template/StepComponents/ry/ym.vue
@@ -1,6 +1,6 @@
 <!-- 研磨 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_ym'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_ym'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -37,7 +37,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"actFill",
                         },
                         text3:{
-                            label:"仪器，吸取",
+                            label:"仪器，加入",
                             type:"text",
                         },
                         ry1:{
diff --git a/src/components/Template/StepComponents/ry/zlfz.vue b/src/components/Template/StepComponents/ry/zlfz.vue
index bc9bb68..6745b51 100644
--- a/src/components/Template/StepComponents/ry/zlfz.vue
+++ b/src/components/Template/StepComponents/ry/zlfz.vue
@@ -1,16 +1,17 @@
 <!-- 质量分装 -->
 <template>
-    <StepFormPackage
-    @onRegentSubmit = "onRegentSubmit"
-     ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zlfz'" @resetRecord="resetRecord" :form-config="formConfig"
-     @onSubPackageSubmit="onSubPackageSubmit"
-        :formData="formData" />
+    <StepFormPackage :fieldItemLabel="fieldItemLabel" @onRegentSubmit="onRegentSubmit" ref="stepFormPackageRef"
+        :prefixKey="stepIndex + '_' + 'ry_zlfz'" @resetRecord="resetRecord" :form-config="formConfig"
+        @beforeReagentSubmit="beforeReagentSubmit" @onSubPackageSubmit="onSubPackageSubmit" :formData="formData" />
 </template>
 
 <script>
 import StepFormPackage from '@/components/Template/StepFormPackage.vue';
 import stepMixins from '@/components/Template/mixins/stepMixins.js';
-
+import {isMassUnit,compareMass} from "@/utils/massTool";
+import {
+    sj_subpackage,
+} from '@/api/business/sj/sj'
 export default {
     mixins: [stepMixins],
     components: {
@@ -40,8 +41,8 @@ export default {
                     }
                 },
                 {
-                    config:{
-                        zlfz:{
+                    config: {
+                        zlfz: {
                             type: "zlfz",
                         }
                     }
@@ -50,31 +51,96 @@ export default {
         }
     },
     methods: {
-        onRegentSubmit(data){
-            console.log(data,"onRegentSubmit")
-            const {key,selectInfo} = data;
-            if(key === 'gsp'){//供试品弹窗确定
-                this.$refs.stepFormPackageRef.updateZlfzData("zlfz",{mybh:selectInfo.selectedId});
-                // this.formData[key] = data;
+        beforeReagentSubmit(data) {
+            const { selectData, callback} = data;
+            if (!isMassUnit(selectData.kcdw)) {
+                callback.prevent('源药库存量为非质量单位，请重新选择。')
+            }
+        },
+        onRegentSubmit(data) {
+            console.log(data, "onRegentSubmit")
+            const { key, selectInfo } = data;
+            if (key === 'gsp') {//供试品弹窗确定
+                this.$nextTick(() => {
+                    this.$refs.stepFormPackageRef.updateZlfzData("zlfz", { mybh: selectInfo.selectedId });
+                })
+            }
+        },
+        async onSubPackageSubmit(data) {
+            const { key } = data;
+            if (key === 'zlfz') {
+                this.$refs.stepFormPackageRef.getFormData().then(res => {
+                    if (res) {
+                        const { zlfz } = res;
+                        const gspInfo = res.selectInfo_gsp || {};
+                        const { kc, kcdw, gg, ggdw, bh } = gspInfo;
+                        const dw = zlfz.formData.dw;
+                        const errMsg = "分装后小份容量之和大于母液容量，是否确认分装？"
+                        const totalVolume = zlfz.fzList.reduce((acc, cur) => acc + Number(cur.actnum), 0);
+                        const compareResult = compareMass(totalVolume, dw, Number(kc), kcdw);
+                        const fzInfo = {
+                            ...zlfz.formData,
+                            gg,
+                            ggdw,
+                            bh,
+                            fzList: zlfz.fzList,
+                        };
+                        if (compareResult > 0 || !kc) {//没有填写实际溶液体积的也需要提示错误信息
+                            this.$modal.confirm(errMsg, '提示', {
+                                confirmButtonText: this.$t('form.saveConfirm'),
+                                cancelButtonText: this.$t('form.cancel'),
+                                type: 'warning'
+                            }).then(() => {
+                                this.submitEmit(fzInfo);
+                            }).catch(() => {
+                                // 取消操作，不执行任何操作
+                            });
+                            return;
+                        }
+                        this.submitEmit(fzInfo);
+
+                    }
+                }).catch(err => {
+                    console.log(err, "err")
+                    this.$message.error("请填写分装信息");
+                })
+
 
             }
         },
-        async onSubPackageSubmit(data){
-            const {key} = data;
-            if(key === 'zlfz'){
-                const formData = await this.$refs.stepFormPackageRef.getFormData();
-                if(formData){
-                    const {zlfz} = formData;
-                    const fzInfo = {
-                        ...zlfz.formData,
-                        fzList:zlfz.fzList,
-                    };
-                    this.$refs.stepFormPackageRef.updateFormData("fzInfo",fzInfo);
-                    this.$message.success("质量分装成功");
-                    this.justUpdateFilledFormData();
+        async submitEmit(fzInfo) {
+            this.$refs.stepFormPackageRef.updateFormData("fzInfo", fzInfo);
+            const { dw, bh, gg, ggdw, fzList = [] } = fzInfo;
+            if (!fzList.length) {
+                this.$message.error("请填写分装信息");
+                return;
+            }
+            const list = fzList.map((item) => {
+                return {
+                    bh: item.preCode,
+                    kc: item.actnum,
+                    kcdw: dw,
                 }
-                
+            })
+            let postData = {
+                studyId: this.templateData.studyId,
+                studyFormId: this.templateData.id,
+                bh,
+                gg,
+                ggdw,
+                studySubjectId: this.templateData.studySubjectId,
+                studyId: this.templateData.studyId,
+                studyFormId: this.templateData.id,
+                list: list
+            }
+            const res = await sj_subpackage(postData)
+            if (res.code === 200) {
+                this.$message.success('分装成功')
+                this.justUpdateFilledFormData();
+            } else {
+                this.$message.error('分装失败')
             }
+
         }
     }
 }
diff --git a/src/components/Template/StepComponents/ry/zy.vue b/src/components/Template/StepComponents/ry/zy.vue
index 6449e8c..c3c6839 100644
--- a/src/components/Template/StepComponents/ry/zy.vue
+++ b/src/components/Template/StepComponents/ry/zy.vue
@@ -1,6 +1,6 @@
 <!-- 正压 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ry/zyhy.vue b/src/components/Template/StepComponents/ry/zyhy.vue
index aa222f4..38355f3 100644
--- a/src/components/Template/StepComponents/ry/zyhy.vue
+++ b/src/components/Template/StepComponents/ry/zyhy.vue
@@ -1,6 +1,6 @@
 <!-- 振摇混匀 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zyhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_zyhy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
@@ -49,7 +49,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             fillType:"preFill",
                         },
                         text3:{
-                            label:"，实际转速为",
+                            label:"，实际转速设置为",
                             type:"text",
                         },
                         sjzs:{
diff --git a/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue b/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue
index 15292e7..1c3e711 100644
--- a/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue
+++ b/src/components/Template/StepComponents/spyjzzb/fy_spyjzzb.vue
@@ -1,6 +1,6 @@
 <!-- 孵育 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'fy_spyjzzb'" @resetRecord="resetRecord" :form-config="formConfig"
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'fy_spyjzzb'" @resetRecord="resetRecord" :form-config="formConfig"
         :formData="formData" />
 </template>
 
diff --git a/src/components/Template/StepComponents/spyjzzb/jryjry.vue b/src/components/Template/StepComponents/spyjzzb/jryjry.vue
index bd6614f..7957cd2 100644
--- a/src/components/Template/StepComponents/spyjzzb/jryjry.vue
+++ b/src/components/Template/StepComponents/spyjzzb/jryjry.vue
@@ -1,6 +1,6 @@
 <!-- 加入匀浆溶液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_jryjry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_jryjry'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/spyjzzb/jszz.vue b/src/components/Template/StepComponents/spyjzzb/jszz.vue
index e0c8a98..ba63018 100644
--- a/src/components/Template/StepComponents/spyjzzb/jszz.vue
+++ b/src/components/Template/StepComponents/spyjzzb/jszz.vue
@@ -1,6 +1,6 @@
 <!-- 剪碎组织 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_jszz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_jszz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue b/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue
index 761bd5d..1edfc3f 100644
--- a/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue
+++ b/src/components/Template/StepComponents/spyjzzb/jz_spyjzzb.vue
@@ -1,6 +1,6 @@
 <!-- 静置  -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jz_spyjzzb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'jz_spyjzzb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/spyjzzb/yjbc.vue b/src/components/Template/StepComponents/spyjzzb/yjbc.vue
index ae37414..5ab34a1 100644
--- a/src/components/Template/StepComponents/spyjzzb/yjbc.vue
+++ b/src/components/Template/StepComponents/spyjzzb/yjbc.vue
@@ -1,6 +1,6 @@
 <!-- 匀浆保存 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_yjbc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_yjbc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue b/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue
index 4d1452b..a0028f0 100644
--- a/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue
+++ b/src/components/Template/StepComponents/spyjzzb/yjyfz2.vue
@@ -1,6 +1,6 @@
 <!-- 匀浆液分装2 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_yjyfz2'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_yjyfz2'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/spyjzzb/ymyj.vue b/src/components/Template/StepComponents/spyjzzb/ymyj.vue
index 1ac1b9f..7a7bad4 100644
--- a/src/components/Template/StepComponents/spyjzzb/ymyj.vue
+++ b/src/components/Template/StepComponents/spyjzzb/ymyj.vue
@@ -1,6 +1,6 @@
 <!-- 研磨匀浆 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_ymyj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'spyjzzb_ymyj'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/stepNameConfig.js b/src/components/Template/StepComponents/stepNameConfig.js
new file mode 100644
index 0000000..7fd6e5c
--- /dev/null
+++ b/src/components/Template/StepComponents/stepNameConfig.js
@@ -0,0 +1,208 @@
+const result = {
+  czdd: "操作地点",
+  czhj: "操作环境",
+  xzrq: "选择容器",
+  jrry: "加入溶液",
+  tpjysd: "天平校验（双点）",
+  tpjydd: "天平校验（单点）",
+  zlfz: "质量分装",
+  qywz: "取用物质",
+  clcz: "称量（传值）",
+  clfcz: "称量（非传值）",
+  bdtj: "标定（体积）",
+  bdzl: "标定（质量）",
+  tjphcz: "调节PH（传值）",
+  tjphfcz: "调节PH（非传值）",
+  lx: "离心",
+  ym: "研磨",
+  ddhy: "颠倒混匀",
+  jrjb: "加热搅拌",
+  jb: "搅拌",
+  cs: "超声",
+  sy: "水浴",
+  zy: "正压",
+  dc: "氮吹",
+  glzd: "过滤（自动）",
+  glsd: "过滤（手动）",
+  jz: "静置",
+  jd: "解冻",
+  fy: "孵育",
+  qcyy: "取出原药",
+  frdrq: "复溶（多容器）",
+  fr: "复溶",
+  hb: "合并",
+  rs: "染色",
+  js: "计数",
+  mj: "灭菌",
+  fs: "复苏",
+  fb: "封板",
+  wxhy: "涡旋混匀",
+  zyhy: "振摇混匀",
+  hwhy: "恒温混匀",
+  kbyq: "空白（仪器）",
+  kbsjgsp: "空白（试剂/供试品）",
+  kb: "空白",
+  jr: "加热",
+  fz: "分装",
+  jrry_b: "加入溶液",
+  cl: "称量",
+  lx_b: "离心",
+  cs_b: "超声",
+  ddhy_b: "颠倒混匀",
+  wxhy_b: "涡旋混匀",
+  zyhy_b: "振摇混匀",
+  hwhy_b: "恒温混匀",
+  jb_b: "搅拌",
+  jrjb_b: "加热搅拌",
+  sy_b: "水浴",
+  zy_b: "正压",
+  dc_b: "氮吹",
+  glzd_b: "过滤（自动）",
+  glsd_b: "过滤（手动）",
+  jz_b: "静置",
+  jd_b: "解冻",
+  fy_b: "孵育",
+  fr_b: "复溶",
+  jd_swypfx: "解冻",
+  jryp: "加入样品",
+  ysfy: "衍生反应",
+  hhspe: "活化（SPE）",
+  phspe: "平衡（SPE）",
+  syspe: "上样（SPE）",
+  lxspe: "淋洗（SPE）",
+  xtspe: "洗脱（SPE）",
+  zyfc: "转移（分层）",
+  jszz: "剪碎组织",
+  cqzz: "称取组织",
+  jryjry: "加入匀浆溶液",
+  ymyj: "研磨匀浆",
+  yjyfz2: "匀浆液分装2",
+  yjyfz3: "匀浆液分装3",
+  yjbc: "匀浆保存",
+  yjyhh: "匀浆液混合",
+  fy_spyjzzb: "孵育",
+  jz_spyjzzb: "静置",
+  ddhy_qxwdx: "颠倒混匀",
+  hwph: "恒温平衡",
+  qxfz: "全血分装",
+  qxjz: "全血静置",
+  qxlx: "全血离心",
+  qxqy: "全血取样",
+  jzhlx: "静置后离心",
+  fq2: "分取2",
+  fq3: "分取3",
+  hh: "混合",
+  qx: "清洗",
+  zc: "暂存",
+  qy: "弃液",
+  sjjy: "试剂加样",
+  jryp_pcr: "加入样品",
+  bzyp: "补足样品",
+  jz_pcr: "静置",
+  nscyp: "NSC样品",
+  qrhy: "轻柔混匀",
+  pebwfz: "PE板位放置",
+  tgbwfz: "天根板位放置",
+  lsbwfz: "罗氏板位放置",
+  tqsj: "提取上机",
+  lssj: "罗氏上机",
+  yqzt: "仪器暂停",
+  ecsj: "二次上机",
+  czclcl: "磁珠残留处理",
+  ypzy: "样品转移",
+  lx_pcr: "离心",
+  hsypfz: "核酸样品分装",
+  ypbc: "样品保存",
+  jd_pcr: "解冻",
+  sjjyst: "试剂加样（手提）",
+  ddhy_pcr: "颠倒混匀",
+  wxhy_pcr: "涡旋混匀",
+  sy_pcr: "水浴",
+  sslx: "瞬时离心",
+  xfzcl: "吸附柱处理",
+  lxdy: "离心（倒液）",
+  xfzzysjg: "吸附柱转移（收集管）",
+  xfzzylxg: "吸附柱转移（离心管）",
+  xt: "洗脱",
+  ecxt: "二次洗脱",
+  ndcd: "浓度测定",
+  jrry_pcrcjg: "加入溶液",
+  jszz_pcryj: "剪碎组织",
+  cqzz_pcryj: "称取组织",
+  jryjry_pcryj: "加入匀浆溶液",
+  xs: "稀释",
+  sjjy_pcrfxyp: "试剂加样",
+  jryp_pcrfxyp: "加入样品",
+  fmlx: "封膜离心",
+  pcrsj: "PCR上机",
+  pbsz: "排版设置",
+  cbygxz: "参比荧光选择",
+  yxpcry: "运行PCR仪",
+  cdnsypfz: "cDNA样品分装",
+  bb: "包被",
+  xb: "洗板",
+  fb_jcb: "封闭",
+  jy: "加样",
+  zh: "中和",
+  jjcsj: "加检测试剂",
+  sj: "酸解",
+  sjjy_jcb: "酸解加样",
+  zhfy: "中和孵育",
+  ecsj_jcb: "二次酸解",
+  xs_jcb: "显色",
+  zz: "终止",
+  jc: "检测",
+  dbmby: "读板（酶标仪）",
+  dbhxfgxt: "读板（化学发光系统）",
+  dbdhxfgxt: "读板（电化学发光系统）",
+  dbygxt: "读板（荧光系统）",
+  dzacl: "读值（ACL）",
+  qb: "取板",
+  jzks: "静置开始",
+  fyxks: "孵育箱开始",
+  ycfyks: "摇床孵育开始",
+  ycks: "摇床开始",
+  js_jcb: "结束",
+  fm: "覆膜",
+  pg: "拍干",
+  czqx: "磁珠清洗",
+  czzx: "磁珠重悬",
+  ychy: "摇床混匀",
+  czzy: "磁珠转移",
+  sjbj: "试剂标记",
+  qxb: "取细胞",
+  qjz: "取菌株",
+  fr_xbjzpz: "复溶",
+  lxqy: "离心（弃液）",
+  cd: "吹打",
+  xbzy: "细胞转移",
+  jzzy: "菌株转移",
+  dypyy: "倒原培养液",
+  xd: "洗涤",
+  xh: "消化",
+  zzxh: "终止消化",
+  copy: "CO2培养",
+  gc: "观察",
+  cdmd: "测定密度",
+  ds: "低渗",
+  gd: "固定",
+  cdxs: "传代/稀释",
+  gc_xb: "观察",
+  xdlc: "洗涤（2次）",
+  bzpyy: "补足培养液",
+  xh_xb: "消化",
+  jrrydh: "加入溶液（多行）",
+  gd_xb: "固定",
+  rs_xb: "染色",
+  bpqr: "破片确认",
+  dp: "滴片",
+  bprs: "破片染色",
+  cx: "冲洗",
+  lg: "晾干",
+  hygh: "混匀固化",
+  hwzd: "恒温振荡",
+  jbcpyj: "加表层培养基",
+  xs_ptjhfxyp: "稀释"
+};
+
+export default result
diff --git a/src/components/Template/StepComponents/swypfx/hhspe.vue b/src/components/Template/StepComponents/swypfx/hhspe.vue
index 47a8569..6c86e8d 100644
--- a/src/components/Template/StepComponents/swypfx/hhspe.vue
+++ b/src/components/Template/StepComponents/swypfx/hhspe.vue
@@ -1,6 +1,6 @@
 <!-- 活化（SPE） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_hhspe'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_hhspe'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/swypfx/jd_swypfx.vue b/src/components/Template/StepComponents/swypfx/jd_swypfx.vue
new file mode 100644
index 0000000..7f9a4f8
--- /dev/null
+++ b/src/components/Template/StepComponents/swypfx/jd_swypfx.vue
@@ -0,0 +1,101 @@
+<!-- 解冻-改成了融解  -->
+<template>
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_jd'" @resetRecord="resetRecord" :form-config="formConfig"
+        @select="select"
+        :formData="formData" />
+</template>
+
+<script>
+import StepFormPackage from '@/components/Template/StepFormPackage.vue';
+import stepMixins from '@/components/Template/mixins/stepMixins.js';
+
+export default {
+    mixins: [stepMixins],
+    props: {
+        sn: {
+            type: String,
+            default: 'jd_swypfx',
+        },
+    },
+
+    components: {
+        StepFormPackage
+    },
+    methods: {
+        select(data) {
+            const {value,key} = data;
+            if(key==='sjccwz'){
+                this.updateWcData("sjwd",value);
+            }
+        }
+    },
+    computed: {
+        formConfig() {
+            let config = [{
+                config: {
+                    text1: {
+                        label: "将上述样品预计放置于",
+                        type: "text",
+                    },
+                    ccwz: {
+                        type: "input",
+                        // options: this.getDictOptions("business_ccwz"),
+                        fillType: "preFill",
+                        otherCode: "ccwzOther",
+                    },
+                    text3: {
+                        label: "实际放置于",
+                        type: "text",
+                    },
+                    sjccwz: {
+                        type: "select",
+                        options: this.getDictOptions("business_ccwz"),
+                        fillType: "actFill",
+                        otherCode: "sjccwzOther",
+                        compareTo: "ccwz",
+                    },
+                    text4: {
+                        label: "位置，其环境条件预计为",
+                        type: "text",
+                    },
+                    yjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "preFill",
+                        otherCode: "yjwdOther",
+                    },
+                    text5: {
+                        label: "，实际条件为",
+                        type: "text",
+                    },
+                    sjwd: {
+                        type: "select",
+                        options: this.getDictOptions("business_cctj"),
+                        multiple: true,
+                        fillType: "actFill",
+                        otherCode: "sjwdOther",
+                        compareTo: "yjwd",
+                    },
+                     text6: {
+                        label: "进行融解",
+                        type: "text",
+                    },
+                    text9: {
+                        type: "text",
+                        label: "。",
+                    },
+                    remark: {
+                        type: "input",
+                        fillType: "actFill",
+                    }
+
+                }
+            }]
+            return config
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/swypfx/jryp.vue b/src/components/Template/StepComponents/swypfx/jryp.vue
index 5a09156..98bbc07 100644
--- a/src/components/Template/StepComponents/swypfx/jryp.vue
+++ b/src/components/Template/StepComponents/swypfx/jryp.vue
@@ -1,6 +1,6 @@
 <!-- 加入样品 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_jryp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_jryp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/swypfx/zyfc.vue b/src/components/Template/StepComponents/swypfx/zyfc.vue
index ae4e3a1..8f86f52 100644
--- a/src/components/Template/StepComponents/swypfx/zyfc.vue
+++ b/src/components/Template/StepComponents/swypfx/zyfc.vue
@@ -1,6 +1,6 @@
 <!-- 转移（分层） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_zyfc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'swypfx_zyfc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/bpqr.vue b/src/components/Template/StepComponents/xb/bpqr.vue
index 4785a9e..62bd27e 100644
--- a/src/components/Template/StepComponents/xb/bpqr.vue
+++ b/src/components/Template/StepComponents/xb/bpqr.vue
@@ -1,6 +1,6 @@
 <!-- 破片确认 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" @select="select" :prefixKey="stepIndex+'_'+'xb_bpqr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" @select="select" :prefixKey="stepIndex+'_'+'xb_bpqr'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -52,13 +52,43 @@ export default {
                         otherCode: "ccwzOther",
                     },
                     text3: {
-                        label: "冰冻时长为",
+                        label: "冰冻时长预计为",
                         type: "text",
                     },
                     sj: {
                         fillType: "actFill",
                         type: "input",
                     },
+                    text6:{
+                        type:"text",
+                        label:"冰冻",
+                    },
+                    startDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button1:{
+                        type:"button",
+                        buttonName:"开始",
+                    },
+                    text7:{
+                        type:"text",
+                        label:"冰冻",
+                    },
+                    endDate: {
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
+                    },
+                    button2:{
+                        type:"button",
+                        buttonName:"结束",
+                    },
+                    text8: {
+                        type: "text",
+                        label: "。",
+                    }
                 }
             }]
             return config
diff --git a/src/components/Template/StepComponents/xb/bprs.vue b/src/components/Template/StepComponents/xb/bprs.vue
index c1e9c55..3362dd9 100644
--- a/src/components/Template/StepComponents/xb/bprs.vue
+++ b/src/components/Template/StepComponents/xb/bprs.vue
@@ -1,6 +1,6 @@
 <!-- 破片染色 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_bprs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_bprs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/bzpyy.vue b/src/components/Template/StepComponents/xb/bzpyy.vue
index a997823..653a10c 100644
--- a/src/components/Template/StepComponents/xb/bzpyy.vue
+++ b/src/components/Template/StepComponents/xb/bzpyy.vue
@@ -1,6 +1,6 @@
 <!-- 补足培养液 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_bzpyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_bzpyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/cx.vue b/src/components/Template/StepComponents/xb/cx.vue
index c30c5e3..5d44257 100644
--- a/src/components/Template/StepComponents/xb/cx.vue
+++ b/src/components/Template/StepComponents/xb/cx.vue
@@ -1,6 +1,6 @@
 <!-- 冲洗 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_cx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_cx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/dp.vue b/src/components/Template/StepComponents/xb/dp.vue
index f32b8f4..e3b0eac 100644
--- a/src/components/Template/StepComponents/xb/dp.vue
+++ b/src/components/Template/StepComponents/xb/dp.vue
@@ -1,6 +1,6 @@
 <!-- 滴片 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_dp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_dp'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/gc_xb.vue b/src/components/Template/StepComponents/xb/gc_xb.vue
index 0119a3f..813b6d9 100644
--- a/src/components/Template/StepComponents/xb/gc_xb.vue
+++ b/src/components/Template/StepComponents/xb/gc_xb.vue
@@ -1,6 +1,6 @@
 <!-- 观察 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_gc_xb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_gc_xb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/jrrydh.vue b/src/components/Template/StepComponents/xb/jrrydh.vue
index 983a0f0..81d8387 100644
--- a/src/components/Template/StepComponents/xb/jrrydh.vue
+++ b/src/components/Template/StepComponents/xb/jrrydh.vue
@@ -1,6 +1,6 @@
 <!-- 加入溶液（多行） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_jrrydh'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_jrrydh'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/lg.vue b/src/components/Template/StepComponents/xb/lg.vue
index 9d9165a..de46ad7 100644
--- a/src/components/Template/StepComponents/xb/lg.vue
+++ b/src/components/Template/StepComponents/xb/lg.vue
@@ -1,6 +1,6 @@
 <!-- 晾干 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_lg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_lg'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/rs_xb.vue b/src/components/Template/StepComponents/xb/rs_xb.vue
index 538dcbd..330ec8a 100644
--- a/src/components/Template/StepComponents/xb/rs_xb.vue
+++ b/src/components/Template/StepComponents/xb/rs_xb.vue
@@ -1,6 +1,6 @@
 <!-- 染色 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_rs_xb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_rs_xb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/xdlc.vue b/src/components/Template/StepComponents/xb/xdlc.vue
index 590de63..083d212 100644
--- a/src/components/Template/StepComponents/xb/xdlc.vue
+++ b/src/components/Template/StepComponents/xb/xdlc.vue
@@ -1,6 +1,6 @@
 <!-- 洗涤（2次） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_xdlc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_xdlc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xb/xh_xb.vue b/src/components/Template/StepComponents/xb/xh_xb.vue
index 2f68db3..43fa94c 100644
--- a/src/components/Template/StepComponents/xb/xh_xb.vue
+++ b/src/components/Template/StepComponents/xb/xh_xb.vue
@@ -1,6 +1,6 @@
 <!-- 消化 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_xh_xb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xb_xh_xb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/cd.vue b/src/components/Template/StepComponents/xbjzpz/cd.vue
index 5a97bdf..3358512 100644
--- a/src/components/Template/StepComponents/xbjzpz/cd.vue
+++ b/src/components/Template/StepComponents/xbjzpz/cd.vue
@@ -1,6 +1,6 @@
 <!-- 吹打 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_cd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_cd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/cdmd.vue b/src/components/Template/StepComponents/xbjzpz/cdmd.vue
index 54031ad..6dd6ee2 100644
--- a/src/components/Template/StepComponents/xbjzpz/cdmd.vue
+++ b/src/components/Template/StepComponents/xbjzpz/cdmd.vue
@@ -1,6 +1,8 @@
 <!-- 测定密度 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_cdmd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel="fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'xbjzpz_cdmd'"
+        @onCdmdUpdate="onCdmdUpdate"
+        @resetRecord="resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -10,17 +12,29 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
 export default {
     mixins: [stepMixins],
     props: {
-		sn: {
-			type: String,
-			default: 'cdmd',
-		},
-	},
+        sn: {
+            type: String,
+            default: 'cdmd',
+        },
+    },
     components: {
         StepFormPackage
     },
+    methods: {
+        onCdmdUpdate(data){
+            const {formData} = data;
+            const flag = formData.every(item => !!item.xbmd);
+            if(flag){
+                const count = formData.length;
+                const sum = formData.reduce((acc, cur) => acc + cur.xbmd, 0);
+                const avg = sum / count;
+                this.$refs.stepFormPackageRef.updateFormData("gs", avg);
+            }
+        }
+    },
     computed: {
         formConfig() {
-            let config =  [{
+            let config = [{
                 config: {
                     text1: {
                         label: "使用倒置显微镜",
@@ -42,45 +56,56 @@ export default {
                         label: "次测定，每次滴片体积预计为",
                         type: "text",
                     },
-                    yjtj:{
+                    yjtj: {
                         fillType: "preFill",
                         type: "inputNumber",
                     },
-                    yjtjdw:{
+                    yjtjdw: {
                         fillType: "preFill",
                         type: "select",
                         selectTo: "sjtjdw",
-                        options:this.getDictOptions('business_tjdw'),  
+                        options: this.getDictOptions('business_tjdw'),
                     },
-                    text4:{
+                    text4: {
                         label: "，实际滴片体积为",
                         type: "text",
                     },
-                    sjtj:{
+                    sjtj: {
                         fillType: "actFill",
                         type: "inputNumber",
-                        compareTo:"yjtj",
-                        copyFrom:"yjtj"
+                        compareTo: "yjtj",
+                        copyFrom: "yjtj"
                     },
-                    sjtjdw:{
+                    sjtjdw: {
                         fillType: "preFill",
                         type: "select",
-                        options: this.getDictOptions('business_tjdw'),  
+                        options: this.getDictOptions('business_tjdw'),
                     },
-                    text5:{
+                    text5: {
                         label: "平均细胞密度为",
                         type: "text",
                     },
                     gs: {
                         fillType: "actFill",
                         type: "inputNumber",
+                        disabled: true,
                     },
-                    text6:{
+
+                    text6: {
                         label: "个/mL。",
                         type: "text",
                     },
+
+                }
+            },
+            {
+                config: {
+                    cdmds: {
+                        type: "cdmd"
+                    },
                 }
-            }]
+            }
+            ]
             return config
         }
     },
diff --git a/src/components/Template/StepComponents/xbjzpz/cdxs.vue b/src/components/Template/StepComponents/xbjzpz/cdxs.vue
index d3c980d..9caee08 100644
--- a/src/components/Template/StepComponents/xbjzpz/cdxs.vue
+++ b/src/components/Template/StepComponents/xbjzpz/cdxs.vue
@@ -1,6 +1,6 @@
 <!-- 传代/稀释 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_cdxs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_cdxs'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/copy.vue b/src/components/Template/StepComponents/xbjzpz/copy.vue
index d52d4d9..11171e1 100644
--- a/src/components/Template/StepComponents/xbjzpz/copy.vue
+++ b/src/components/Template/StepComponents/xbjzpz/copy.vue
@@ -1,6 +1,6 @@
 <!-- CO2培养 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_copy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_copy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/dypyy.vue b/src/components/Template/StepComponents/xbjzpz/dypyy.vue
index db63860..49f20dd 100644
--- a/src/components/Template/StepComponents/xbjzpz/dypyy.vue
+++ b/src/components/Template/StepComponents/xbjzpz/dypyy.vue
@@ -1,6 +1,6 @@
 <!-- 倒原培养液 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_dypyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_dypyy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue b/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue
index 33f08b0..ab0b349 100644
--- a/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue
+++ b/src/components/Template/StepComponents/xbjzpz/fr_xbjzpz.vue
@@ -1,6 +1,6 @@
 <!-- 复溶 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_fr_xbjzpz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_fr_xbjzpz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/gc.vue b/src/components/Template/StepComponents/xbjzpz/gc.vue
index 0e7cd46..1357aa8 100644
--- a/src/components/Template/StepComponents/xbjzpz/gc.vue
+++ b/src/components/Template/StepComponents/xbjzpz/gc.vue
@@ -1,6 +1,6 @@
 <!-- 观察 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_gc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_gc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/jzzy.vue b/src/components/Template/StepComponents/xbjzpz/jzzy.vue
index 1164550..4b2e9b9 100644
--- a/src/components/Template/StepComponents/xbjzpz/jzzy.vue
+++ b/src/components/Template/StepComponents/xbjzpz/jzzy.vue
@@ -1,6 +1,6 @@
 <!-- 菌株转移 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_jzzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_jzzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/lxqy.vue b/src/components/Template/StepComponents/xbjzpz/lxqy.vue
index 6b2dc79..573e10e 100644
--- a/src/components/Template/StepComponents/xbjzpz/lxqy.vue
+++ b/src/components/Template/StepComponents/xbjzpz/lxqy.vue
@@ -1,6 +1,6 @@
 <!-- 离心（弃液） -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_lxqy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_lxqy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/qjz.vue b/src/components/Template/StepComponents/xbjzpz/qjz.vue
index c605f0b..ab34a53 100644
--- a/src/components/Template/StepComponents/xbjzpz/qjz.vue
+++ b/src/components/Template/StepComponents/xbjzpz/qjz.vue
@@ -1,6 +1,6 @@
 <!-- 取菌株 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_qjz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_qjz'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/qxb.vue b/src/components/Template/StepComponents/xbjzpz/qxb.vue
index fe30bff..7de718c 100644
--- a/src/components/Template/StepComponents/xbjzpz/qxb.vue
+++ b/src/components/Template/StepComponents/xbjzpz/qxb.vue
@@ -1,6 +1,6 @@
 <!-- 取细胞 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_qxb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_qxb'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/xbzy.vue b/src/components/Template/StepComponents/xbjzpz/xbzy.vue
index 0d8319b..d3d49da 100644
--- a/src/components/Template/StepComponents/xbjzpz/xbzy.vue
+++ b/src/components/Template/StepComponents/xbjzpz/xbzy.vue
@@ -1,6 +1,6 @@
 <!-- 细胞转移 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_xbzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_xbzy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/xbjzpz/xd.vue b/src/components/Template/StepComponents/xbjzpz/xd.vue
index e97531d..5c6cc7a 100644
--- a/src/components/Template/StepComponents/xbjzpz/xd.vue
+++ b/src/components/Template/StepComponents/xbjzpz/xd.vue
@@ -4,7 +4,7 @@
 <!-- 低渗 -->
 <!-- 固定 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_xd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'xbjzpz_xd'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ypfq/fq2.vue b/src/components/Template/StepComponents/ypfq/fq2.vue
index cf24a01..0db35bb 100644
--- a/src/components/Template/StepComponents/ypfq/fq2.vue
+++ b/src/components/Template/StepComponents/ypfq/fq2.vue
@@ -1,6 +1,6 @@
 <!-- 分取2 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ypfq_fq2'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ypfq_fq2'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/ypfq/hh.vue b/src/components/Template/StepComponents/ypfq/hh.vue
index 9273c07..d843147 100644
--- a/src/components/Template/StepComponents/ypfq/hh.vue
+++ b/src/components/Template/StepComponents/ypfq/hh.vue
@@ -1,6 +1,6 @@
 <!-- 混合 -->
 <template>
-    <StepFormPackage ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ypfq_hh'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ypfq_hh'" @resetRecord = "resetRecord" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/zzqx/qx.vue b/src/components/Template/StepComponents/zzqx/qx.vue
index cc9beb2..f237c41 100644
--- a/src/components/Template/StepComponents/zzqx/qx.vue
+++ b/src/components/Template/StepComponents/zzqx/qx.vue
@@ -1,6 +1,6 @@
 <!-- 清洗 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'zzqx_qx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'zzqx_qx'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/zzqx/qy.vue b/src/components/Template/StepComponents/zzqx/qy.vue
index dccd533..2835a2d 100644
--- a/src/components/Template/StepComponents/zzqx/qy.vue
+++ b/src/components/Template/StepComponents/zzqx/qy.vue
@@ -1,6 +1,6 @@
 <!-- 弃液 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'zzqx_qy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'zzqx_qy'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepComponents/zzqx/zc.vue b/src/components/Template/StepComponents/zzqx/zc.vue
index 2d9fb8a..492caeb 100644
--- a/src/components/Template/StepComponents/zzqx/zc.vue
+++ b/src/components/Template/StepComponents/zzqx/zc.vue
@@ -1,6 +1,6 @@
 <!-- 暂存 -->
 <template>
-    <StepFormPackage ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'zzqx_zc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
+    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref = "stepFormPackageRef" :prefixKey="stepIndex+'_'+'zzqx_zc'" @resetRecord = "resetRecord" :form-config="formConfig" :formData = "formData" />
 </template>
 
 <script>
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 099af63..17bbb39 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -31,6 +31,7 @@
                 <template v-else-if="sItem.type === 'button'">
                     <HandleFormItem 
                         type="button" 
+                        :field-key="prefixKey+'_' + key"
                         :item="getButtonItem(sItem)"
                         @clickButton="(e)=>handleClickButton(e,item,key)" />
                 </template>
@@ -39,7 +40,9 @@
                     <HandleFormItem class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+ '_' + key"
                         :type="sItem.type" :error="errors[key]"
                         @onRegentSubmit="(data)=>onRegentSubmit(data,key,sItem)"
+                        @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, key)"
                         @update:error="errors[key] = false"  :item="getRegentItem(sItem)"
+                        :orange-bg="regentIsExpired(key)"
                         :value="formFields[key]" />
                 </template>
                 <template v-else-if="sItem.type === 'text'">
@@ -53,9 +56,15 @@
                         @onSubPackageSubmit="onSubPackageSubmit(key) "
                         :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @update="(data)=>onSubPackageUpdate(data,key)" :subData = "formFields[key]" :ref="'zlSubPackageRef_'+key" />
                 </template>
+                <template v-else-if="isShowJcb(sItem,key)">
+                    <JcbComp @update="(data)=>onJcbUpdate(data,key)" :type = "sItem.type" :ref="'jcbComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" @resetRecord = "resetRecord" :item="sItem" :formData="formData[key]" />
+                </template>
+                <template v-else-if="sItem.type === 'cdmd'">
+                    <CdmdComp @update="(data)=>onCdmdUpdate(data,key)" :type = "sItem.type" :cs="formFields.cs" :ref="'cdmdComp_'+key" :stepIndex="stepIndex" :prefixKey="prefixKey+'_'+index" :formData="formData[key]" />
+                </template>
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
-                    <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div>
+                    <!-- <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div> -->
                     <HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
                         v-model="formFields[sItem.otherCode]" @copy="onCopy(sItem, key)"
                         :error="errors[sItem.otherCode]" @update:error="errors[sItem.otherCode] = false"
@@ -70,16 +79,20 @@
 <script>
 import HandleFormItem from '@/components/Template/HandleFormItem.vue'
 import formPackageMixins from '@/components/Template/mixins/formPackageMixins.js'
+import JcbComp from '@/components/Template/StepComponents/JcbComp.vue'
+import CdmdComp from '@/components/Template/StepComponents/CdmdComp.vue'
 import ZLSubPackage from '@/components/Template/StepComponents/ZLSubPackage.vue'
 import { isShowOther } from "@/utils/formPackageCommon.js";
 import { EventBus } from "@/utils/eventBus";
-import { isRegent} from "@/utils/index.js";
+import { isRegent,justUpdateFilledFormData} from "@/utils/index.js";
 import moment from 'moment'
 export default {
     inject: ['templateFillType','templateData'],
     components: {
         HandleFormItem,
-        ZLSubPackage
+        ZLSubPackage,
+        JcbComp,
+        CdmdComp,
     },
     mixins: [formPackageMixins],
     props: {
@@ -121,6 +134,11 @@ export default {
         }
     },
     methods: {
+        
+        isShowJcb(item,key){
+            const {stepTableFormData = []} = this.formData[key] || {};
+            return item.type === 'qb' || (item.type === 'dcjcb' && stepTableFormData.length > 0);
+        },
         // 子组件提交处理方法
         onSubPackageSubmit(key){
             this.$emit("onSubPackageSubmit", {key,formData:this.formFields});
@@ -154,6 +172,20 @@ export default {
         onSubPackageUpdate(data,key){
             this.formFields[key] = data;
         },
+        // 子组件数据更新处理方法
+        onJcbUpdate(data,key){
+            this.formFields[key] = data.jcbInfo;
+            this.$nextTick(() => {
+                justUpdateFilledFormData();
+            });
+        },
+        onCdmdUpdate(data,key){
+            this.formFields[key] = data;
+            this.$nextTick(() => {
+                justUpdateFilledFormData();
+                this.$emit("onCdmdUpdate", {key,formData:this.formFields[key]});
+            });
+        },
         // 重写子组件校验钩子方法，检查ZLSubPackage的表单验证
         validateSubComponents() {
             const refs = [];
@@ -171,6 +203,20 @@ export default {
                                 refs.push(zlSubPackageRef);
                                 
                             }
+                        }else if(sItem.type === 'qb'){
+                            const refName = `jcbComp_${key}`;
+                            const jcbCompRef = this.$refs[refName];
+                            // 检查ZLSubPackage组件的表单验证
+                            if (jcbCompRef) {
+                                refs.push(jcbCompRef);
+                            }
+                        }else if(sItem.type === 'cdmd'){
+                            const refName = `cdmdComp_${key}`;
+                            const cdmdCompRef = this.$refs[refName];
+                            // 检查ZLSubPackage组件的表单验证
+                            if (cdmdCompRef) {
+                                refs.push(cdmdCompRef);
+                            }
                         }
                     }
                 }
diff --git a/src/components/Template/mixins/formPackageMixins.js b/src/components/Template/mixins/formPackageMixins.js
index 364a4ee..36806cb 100644
--- a/src/components/Template/mixins/formPackageMixins.js
+++ b/src/components/Template/mixins/formPackageMixins.js
@@ -1,6 +1,8 @@
 import _ from 'lodash'
 import { getuuid, isEqual, isValueEmpty } from '@/utils/index.js'
 import { isShowOtherByCheckboxTree } from '@/utils/formPackageCommon.js'
+import moment from 'moment'
+
 export default {
   inject: ['getZdxgjl', 'updateZdxgjl'],
   watch: {
@@ -50,6 +52,9 @@ export default {
       const currentConfig = this.allFieldsConfig[key]
       if (currentConfig?.selectTo) {
         this.formFields[currentConfig?.selectTo] = val
+        if (this.errors[currentConfig?.selectTo]) {
+        this.$set(this.errors, currentConfig?.selectTo, false)
+      }
       }
       this.onValueChangeCompareTo(key, val)
       this.formFields[key] = val
@@ -59,10 +64,21 @@ export default {
         this.$set(this.errors, key, false)
       }
     },
-
+    //是否过期
+    regentIsExpired(key) {
+      const { yxq, sxrq } = this.formFields[`selectInfo_${key}`] || {};
+      const rq = sxrq || yxq;
+      if (rq) {
+        const time = moment(rq);
+        return time.isBefore(moment());
+      } else {
+        return false;
+      }
+    },
     //试剂/仪器等弹窗提交
     onRegentSubmit(data, inputValue, key, item) {
       this.updateFormData(key, inputValue)
+      this.formFields[`selectInfo_${key}`] = data.selectInfo;
       this.$emit('onRegentSubmit', {
         selectInfo: data,
         inputValue,
@@ -70,6 +86,9 @@ export default {
         config: item
       })
     },
+    onBeforeReagentSubmit(data, callback, key) {
+        this.$emit('beforeReagentSubmit', { selectData: data, callback, key, formFields: this.formFields })
+    },
     getRegentItem(item, fieldCode = 'type') {
       const type = item[fieldCode]
       const fillType =
@@ -374,11 +393,21 @@ export default {
         }
       })
       // 处理selectInfo_开头的字段，步骤表单需要保留selectInfo_开头的字段
-      const selectInfoKeys = Object.keys(formData).filter((key) =>
-        key.startsWith('selectInfo_')
-      )
+      // 优先使用this.formFields中以selectInfo_开头的字段
+      let selectInfoKeys = []
+      if (this.formFields) {
+        selectInfoKeys = Object.keys(this.formFields).filter((key) =>
+          key.startsWith('selectInfo_')
+        )
+      }
+      // 如果this.formFields中没有，则使用formData中的
+      if (selectInfoKeys.length === 0 && formData) {
+        selectInfoKeys = Object.keys(formData).filter((key) =>
+          key.startsWith('selectInfo_')
+        )
+      }
       selectInfoKeys.forEach((key) => {
-        result[key] = formData[key]
+        result[key] = this.formFields[key] || formData[key] || ''
       })
       // 更新表单字段
       this.formFields = { ...result }
@@ -557,7 +586,7 @@ export default {
           if (o.type === 'span' || o.type === 'text' || o.type === 'button') {
             continue
           }
-          if (o.fillType === this.templateFillType && !o.disabled) {
+          if (o.fillType === this.templateFillType) {
             let prefix = ''
             if (
               o.type === 'input' ||
@@ -594,6 +623,7 @@ export default {
 
       return new Promise((resolve, reject) => {
         if (validateResult.valid && subComponentValidateResult.valid) {
+          console.log(this.formFields, 'this.formFields')
           resolve(this.formFields)
         } else if (!validateResult.valid) {
           // this.$message.error("表单内容未填完,请填写后再提交");
diff --git a/src/components/Template/mixins/stepMixins.js b/src/components/Template/mixins/stepMixins.js
index 1b6fc21..f038245 100644
--- a/src/components/Template/mixins/stepMixins.js
+++ b/src/components/Template/mixins/stepMixins.js
@@ -1,167 +1,240 @@
-import { getuuid ,justUpdateFilledFormData} from '@/utils/index.js'
+import { getuuid, justUpdateFilledFormData } from '@/utils/index.js'
 import { EventBus } from '@/utils/eventBus'
 import { getLatestSn, getLatestSnArr } from '@/api/template'
 export default {
-  inject: ['templateFillType'],
-  dicts: [
-    'business_tjdw',
-    'business_czhj',
-    'business_rqcz',
-    'business_zldw',
-    'business_yqscdw',
-    'business_zsdw',
-    'business_wddw',
-    'business_ccwz',
-    'business_ggdw',
-    'business_hjxx',
-    'business_zzzc',
-    'business_step_pcr',
-    'business_fycx',
-    'business_step_pcrfxyp',
-    'business_cctj'
-  ],
-  props: {
-    formData: {
-      type: Object,
-      default: () => ({})
-    },
-    stepIndex: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      uuid: getuuid(),
-      fzInfo:{},
-    }
-  },
-  mounted() {
-    EventBus.$on('dialogSubPackageSubmit', (data) => {
-      this.onSubPackageSubmit(data)
-    })
-    EventBus.$on('subPackageDialogPrintTag', (data) => {
-      this.onPrintTag(data)
-    })
-  },
-  destroyed() {
-    EventBus.$off('dialogSubPackageSubmit')
-    EventBus.$off('subPackageDialogPrintTag')
-  },
+	inject: {
+		templateFillType: { default: 'preFill' },
+		templateData: { default: {} },
+		templateSn: { default: '' },
+		getStepData: { default: () => null },
+		getJcbData: { default: () => null },
+		getMybh: { default: () => null },
+		getMybhByIndex: { default: (index) => null }
+	},
+	dicts: [
+		'business_tjdw',
+		'business_czhj',
+		'business_rqcz',
+		'business_zldw',
+		'business_yqscdw',
+		'business_zsdw',
+		'business_wddw',
+		'business_ccwz',
+		'business_ggdw',
+		'business_hjxx',
+		'business_zzzc',
+		'business_step_pcr',
+		'business_fycx',
+		'business_step_pcrfxyp',
+		'business_cctj'
+	],
+	props: {
+		formData: {
+			type: Object,
+			default: () => ({})
+		},
+		stepIndex: {
+			type: String,
+			default: ''
+		},
+		formIndex: {
+			type: Number,
+			default: 0
+		},
+		formType: {
+			type: String,
+			default: ''
+		},
+		fieldItemLabel: {
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			uuid: getuuid(),
+			fzInfo: {},
+			localFormData: {},
+		}
+	},
+	mounted() {
+		EventBus.$on('dialogSubPackageSubmit', (data) => {
+			this.onSubPackageSubmit(data)
+		})
+		EventBus.$on('subPackageDialogPrintTag', (data) => {
+			this.onPrintTag(data)
+		})
+	},
+	destroyed() {
+		EventBus.$off('dialogSubPackageSubmit')
+		EventBus.$off('subPackageDialogPrintTag')
+	},
 
-  methods: {
-    //回填编号 preField 前缀 updateField 需要更新的字段
-    async handleBackfillCode(preField,updateField){
-        const updateValue = this.formData[updateField];
-        if (this.templateFillType === 'actFill' && !updateValue) {
-            const stepFormData = this.getFilledFormData();
-            const preValue = stepFormData[preField];
-            const result = await this.getLatestSn({
-                pre: preValue,
-            })
-            this.$refs.stepFormPackageRef.updateFormData(updateField,result[0])
-            this.justUpdateFilledFormData();
-        }
-    },
-    justUpdateFilledFormData(){
-        justUpdateFilledFormData();
-    },
-    //获取最新的多个编号
-    async getLatestSnArr(params) {
-      const res = await getLatestSnArr(params)
-      if (res.code === 200) {
-        return res.data
-      }
-      return []
-    },
-    async getLatestSn(params) {
-      const defaultParams = {
-        count: 1,
-        type: 1,
-        pre: ''
-      }
-      const finalParams = { ...defaultParams, ...params }
-      const res = await getLatestSn(finalParams)
-      if (res.code === 200) {
-        return res.data
-      }
-      return []
-    },
-    // 打印标签
-    onPrintTag(data) {
-      this.$emit('printTag')
-    },
-    onSubPackageSubmit(data) {
-      if (data.uuid === this.uuid) {
-        delete data.uuid //删除uuid字段，不然会导致下次匹配的时候匹配到错误的uuid
-        this.$refs.stepFormPackageRef.updateFormData('fzInfo',data)
-        this.justUpdateFilledFormData();
-      }
-    },
-    // 点击按钮
-    onHandleClickButton(e, item, key) {
-      const {
-        buttonName = '',
-        myCodeFields = [],
-        maxVolumeField = '',
-        maxVolumeUnitField = ''
-      } = e
+	methods: {
+		//处理jcb更新
+		commonHandleJcbUpdate() {
+			this.localFormData = this.formData;
+			if (!this.formData.jcb && this.templateFillType === 'actFill') {
+				setTimeout(() => {
+					const qbData = this.getQbData();
+					this.localFormData = { ...this.localFormData, jcb: qbData };
+					justUpdateFilledFormData();
+				}, 3000);
+			}
+		},
+		//获取取板数据
+		getQbData() {
+			let qbData = [];
+			if (this.templateSn === "LBA003" || this.templateSn === "ADA003") {//只有lba003才会有取板步骤，所以检测板数据从取板数据里面获取；
+				const stepData = this.getStepData() || [];
+				const filterData = stepData.filter((item) => item.type === "qb");
+				const allQbData = [];
+				filterData.forEach((item) => {
+					const { stepTableFormData = [] } = item.formData.qb || {};
+					const parseData = JSON.parse(JSON.stringify(stepTableFormData));
+					allQbData.push(...parseData);
+				})
+				qbData = [...new Map(allQbData.map(item => [item.mc, item])).values()]
+			} else if (this.templateSn === "LBA002" || this.templateSn === "ADA002") {//lba002没有取板步骤，所以检测板数据从检测板数据里面获取；
+				const { stepTableFormData = [] } = this.getJcbData() || {};
+				qbData = stepTableFormData;
+			}
 
-      if (buttonName === '分装') {
-        const fields = []
-        const stepFormData = this.getFilledFormData()
-        if (!myCodeFields.length || !maxVolumeField || !maxVolumeUnitField) {
-          console.warn('请配制分装参数')
-          return
-        }
-        const fzInfo = stepFormData.fzInfo || this.formData.fzInfo;
-        const maxVolume = stepFormData[maxVolumeField]
-        const maxVolumeUnit = stepFormData[maxVolumeUnitField]
-        myCodeFields.forEach((key) => {
-          fields.push(stepFormData[key])
-        })
-        EventBus.$emit('showSubPackageDialog', {
-          mybh: fields.join(''),
-          fzType: 'step',
-          ...fzInfo,
-          maxVolume,
-          maxVolumeUnit,
-          uuid: this.uuid,
-        })
-      }
-    },
+			return { stepTableFormData: JSON.parse(JSON.stringify(qbData)) }
+		},
+		//回填编号 preField 前缀 updateField 需要更新的字段
+		async handleBackfillCode(preField, updateField) {
+			const updateValue = this.formData[updateField];
+			if (this.templateFillType === 'actFill' && !updateValue) {
+				const stepFormData = this.getFilledFormData();
+				const preValue = stepFormData[preField];
+				const result = await this.getLatestSn({
+					pre: preValue,
+				})
+				this.$refs.stepFormPackageRef.updateFormData(updateField, result[0])
+				this.justUpdateFilledFormData();
+			}
+		},
+		justUpdateFilledFormData() {
+			justUpdateFilledFormData();
+		},
+		//获取最新的多个编号
+		async getLatestSnArr(params) {
+			const res = await getLatestSnArr(params)
+			if (res.code === 200) {
+				return res.data
+			}
+			return []
+		},
+		async getLatestSn(params) {
+			const defaultParams = {
+				count: 1,
+				type: 1,
+				pre: ''
+			}
+			const finalParams = { ...defaultParams, ...params }
+			const res = await getLatestSn(finalParams)
+			if (res.code === 200) {
+				return res.data
+			}
+			return []
+		},
+		// 打印标签
+		onPrintTag(data) {
+			this.$emit('printTag')
+		},
+		onSubPackageSubmit(data) {
+			if (data.uuid === this.uuid) {
+				delete data.uuid //删除uuid字段，不然会导致下次匹配的时候匹配到错误的uuid
+				this.$refs.stepFormPackageRef.updateFormData('fzInfo', data)
+				this.justUpdateFilledFormData();
+			}
+		},
+		// 点击按钮
+		onHandleClickButton(e, item, key) {
+			const {
+				buttonName = '',
+				myCodeFields = [],
+				maxVolumeField = '',
+				maxVolumeUnitField = ''
+			} = e
 
-    async getFormData() {
-        const data = await this.$refs.stepFormPackageRef.getFormData();
-        data.fzInfo = data.fzInfo || this.formData.fzInfo;
-        return data
-    },
-    getFilledFormData() {
-        const data = this.$refs.stepFormPackageRef?.getFilledFormData();
-        data.fzInfo = data.fzInfo || this.formData.fzInfo;
-        return data
-    },
-    getSjResource() {
-        const data = this.$refs.stepFormPackageRef?.getSjResource();
-        data.fzInfo = data.fzInfo || this.formData.fzInfo;
-        return data
-    },
-    //试验配制条件options
-    getDictOptions(dictType) {
-      return this.dict.type[dictType] || []
-    },
-    resetRecord() {
-      this.$refs.stepFormPackageRef.resetRecord()
-    },
-    //更新温层数据
-    updateWcData(key, value) {
-      const options = this.getDictOptions('business_ccwz')
-      const selectedOption = options.find((item) => item.value === value)
-      if (selectedOption) {
-        this.$refs.stepFormPackageRef.updateFormData(key, [
-          selectedOption.raw.remark
-        ])
-      }
-    }
-  }
+			if (buttonName === '分装') {
+				const stepFormData = this.getFilledFormData()
+				const fzInfo = stepFormData.fzInfo || this.formData.fzInfo;
+				let fields = [], options = []
+				let maxVolume, maxVolumeUnit;
+				if (this.getMybh || this.getMybhByIndex) {//某些表单的步骤需要分装表单上的数据
+					let result = {};
+					if (this.getMybh) {
+						result = this.getMybh()
+					} else if (this.getMybhByIndex) {
+						result = this.getMybhByIndex(this.formIndex, this.formType)
+					}
+					const { mybh, mybhOptions = [], maxVolume: max, maxVolumeUnit: unit } = result
+					// if ((!mybh && !mybhOptions.length) || !max || !unit) {
+					// 	this.$message.warning('请先填写分装数据')
+					// 	return
+					// }
+					options = mybhOptions
+					fields.push(mybh)
+					maxVolume = max || ''
+					maxVolumeUnit = unit || ''
+				} else {
+					if (!myCodeFields.length || !maxVolumeField || !maxVolumeUnitField) {
+						this.$message.warning('请配制分装参数')
+						return
+					}
+					maxVolume = stepFormData[maxVolumeField]
+					maxVolumeUnit = stepFormData[maxVolumeUnitField]
+					myCodeFields.forEach((key) => {
+						fields.push(stepFormData[key])
+					})
+				}
+				EventBus.$emit('showSubPackageDialog', {
+					mybh: fields.join(''),
+					id: this.stepIndex,
+					fzType: 'step',
+					...fzInfo,
+					maxVolume,
+					mybhOptions: options,
+					maxVolumeUnit,
+					uuid: this.uuid,
+				})
+			}
+		},
+
+		async getFormData() {
+			const data = await this.$refs.stepFormPackageRef.getFormData();
+			data.fzInfo = data.fzInfo || this.formData.fzInfo;
+			return data
+		},
+		getFilledFormData() {
+			const data = this.$refs.stepFormPackageRef?.getFilledFormData();
+			data.fzInfo = data.fzInfo || this.formData.fzInfo;
+			return data
+		},
+		getSjResource() {
+			const data = this.$refs.stepFormPackageRef?.getSjResource();
+			data.fzInfo = data.fzInfo || this.formData.fzInfo;
+			return data
+		},
+		//试验配制条件options
+		getDictOptions(dictType) {
+			return this.dict.type[dictType] || []
+		},
+		resetRecord() {
+			this.$refs.stepFormPackageRef.resetRecord()
+		},
+		//更新温层数据
+		updateWcData(key, value) {
+			const options = this.getDictOptions('business_ccwz')
+			const selectedOption = options.find((item) => item.value === value)
+			if (selectedOption) {
+				this.$refs.stepFormPackageRef.updateFormData(key, [
+					selectedOption.raw.remark
+				])
+			}
+		}
+	}
 }
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 1885b0a..90e6d45 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -163,7 +163,7 @@ export default {
             })
             const {total,unit} = addTj(cols,units)
 
-            let defaultData = { mybh: fields.join(""), maxVolume: total, maxVolumeUnit: unit, rowIndex: this.rowIndex }
+            let defaultData = { mybh: fields.join(""), maxVolume: total,id: innerRow.id, maxVolumeUnit: unit, rowIndex: this.rowIndex }
             if (innerRow.fzsj) {
                 defaultData = {...innerRow.fzsj,...defaultData}
             }
diff --git a/src/lang/en.js b/src/lang/en.js
index 9ae4f95..a7a2e1d 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -83,7 +83,7 @@ import systemLog from './en/system/systemLog'
 import storageLocation from './en/system/storageLocation'
 export default {
   system: {
-    name: 'WestChina-Frontier PharmaTech ELN',
+    name: 'WCFP Electronic Laboratory Notebook',
     title: 'HXHQ',
     tip: 'Prompt',
     logOut: 'Are You Sure To Log Out And Exit The System?',
diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js
index 204e18f..961bdd9 100644
--- a/src/lang/en/business/study/studyFormPlan.js
+++ b/src/lang/en/business/study/studyFormPlan.js
@@ -11,7 +11,7 @@ export default {
   next: 'Next',
   pre: 'Pre',
   save: 'Save',
-  submit: 'Submit',
+  submit: 'Submit Audit',
   bdnr: 'Record Information',
   qmxx: 'Signature information',
   qmr: 'Signed By',
diff --git a/src/lang/en/template/dj.js b/src/lang/en/template/dj.js
index 74e5544..bab65c4 100644
--- a/src/lang/en/template/dj.js
+++ b/src/lang/en/template/dj.js
@@ -3,8 +3,8 @@ export default {
   dj001: {
     syts: '试验天数',
     fhfw: '复核范围',
-    fhlr: '复核内容',
-  }, 
+    fhlr: '复核内容'
+  },
   //dj002复用dj003
   dj003: {
     yplx: '样品类型',
@@ -21,6 +21,6 @@ export default {
     yjczxx: '移交处置信息',
     yjsj: '移交时间',
     hqsj: '获取时间',
-    dsfs: '递送方式',
-  }, 
+    dsfs: '递送方式'
+  }
 }
diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
index d6108c6..ce4ba9a 100644
--- a/src/lang/en/template/dl.js
+++ b/src/lang/en/template/dl.js
@@ -61,7 +61,7 @@ export default {
     s9hhybh: 'S9混合液编号',
     s9hhyyjjrl: 'S9混合液预计加入量',
     pbsbh: 'PBS编号',
-    pbsryyjjrl: '0.2mol PBS溶液预计加入量',
+    pbsryyjjrl: 'PBS溶液预计加入量',
     jlzsl: '剂量组数量',
     wcButton: 'Finsh',
     jlzmc: '剂量组名称  ',
@@ -288,7 +288,7 @@ export default {
   },
   dl018: {
     xbxx: '细胞信息',
-    sydd: '试验地点',
+    sydd: '测定地点',
     czsj: '操作时间',
     qxbd: '前序表单',
     dlbz: '备注',
diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js
index 770dd52..af464cf 100644
--- a/src/lang/en/template/lba.js
+++ b/src/lang/en/template/lba.js
@@ -47,7 +47,7 @@ export default {
     dwbh: '动物编号',
     zzlx: '组织类型',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量'
+    ysyjrybjrl: '预设匀浆溶液加入量',
+    sjyjrybjrl: '实际匀浆溶液加入量'
   }
 }
diff --git a/src/lang/en/template/pcr.js b/src/lang/en/template/pcr.js
index 08dfea0..77d71ff 100644
--- a/src/lang/en/template/pcr.js
+++ b/src/lang/en/template/pcr.js
@@ -37,6 +37,7 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: 'Analysis Batch Number',
+    clsj: '处理时间',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
     sxbs: '稀释倍数',
@@ -75,6 +76,7 @@ export default {
     ypmc: '样品名称',
     cjgz: '采集管重',
     lzzcz: '连组织称重',
+    lzzgz: '连组织管重',
     zzzl: '组织重量',
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
@@ -97,8 +99,15 @@ export default {
     yjyjry: '已加匀浆溶液',
     ypmc: '样品名称',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    ysyjryjrl: '预设匀浆溶液加入量',
+    sjyjryjrl: '实际匀浆溶液加入量',
+  },
+  pcr011: {
+    sj: '试剂',
+    ysjyztj: '预设加样总体积',
+    sjypjytj: '实际样品加样体积',
+    yssjjrtj: '预设试剂加入体积',
+    sjsjjrtj: '实际试剂加入体积',
   },
   pcr012: {
     sjwj: '数据文件',
diff --git a/src/lang/en/template/sp.js b/src/lang/en/template/sp.js
index 31a22ae..4892205 100644
--- a/src/lang/en/template/sp.js
+++ b/src/lang/en/template/sp.js
@@ -58,7 +58,10 @@ export default {
   sp007: {
     title: '生物样品分析样本处理表',
     ybsm: 'Sample Description',
-    bt: 'Title'
+    bt: 'Title',
+    clhxx: '处理后信息',
+    hjsj: '处理后样品放入进样环境时间',
+    cfwz: '存放位置'
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
diff --git a/src/lang/en/template/xb.js b/src/lang/en/template/xb.js
index d4fe6b6..d14c73a 100644
--- a/src/lang/en/template/xb.js
+++ b/src/lang/en/template/xb.js
@@ -1,7 +1,7 @@
 //细胞
 export default {
   xb001: {
-    jcsj: '检测时间',
+    jcsj: '操作时间',
     czbz: 'Operation Workflow',
     qtbz: '其他步骤',
     fj: 'Attachment',
@@ -11,6 +11,5 @@ export default {
     ks: 'Start',
     js: 'End',
     fysc: '孵育时长（hr: min）'
-  }, 
- 
+  }
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 284ee34..b6a1758 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -83,7 +83,7 @@ import storageLocation from './zh/system/storageLocation'
 
 export default {
   system: {
-    name: '华西海圻ELN系统',
+    name: '华西海圻实验室电子记录系统',
     title: '华西海圻管理系统',
     tip: '提示',
     logOut: '确认注销并退出系统吗？',
diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js
index d4379cc..4002a40 100644
--- a/src/lang/zh/business/resource/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj.js
@@ -88,7 +88,7 @@ export default {
   rkwz: '入库位置',
   rktj: '入库条件',
   zytj: '转移条件',
-  rkl: '入库净重',
+  rkl: '入库量',
   ghr1Id: '归还人',
   ghr2Id: '归还人2',
   jsr1Id: '接收人',
diff --git a/src/lang/zh/business/study/studyFormPlan.js b/src/lang/zh/business/study/studyFormPlan.js
index c7e3e7e..e253310 100644
--- a/src/lang/zh/business/study/studyFormPlan.js
+++ b/src/lang/zh/business/study/studyFormPlan.js
@@ -11,7 +11,7 @@ export default {
   next: '下一步',
   pre: '上一步',
   save: '保存',
-  submit: '提交',
+  submit: '提交审核',
   bdnr: '表单内容',
   qmxx: '签名信息',
   qmr: '签名人',
diff --git a/src/lang/zh/template/dj.js b/src/lang/zh/template/dj.js
index 74e5544..bab65c4 100644
--- a/src/lang/zh/template/dj.js
+++ b/src/lang/zh/template/dj.js
@@ -3,8 +3,8 @@ export default {
   dj001: {
     syts: '试验天数',
     fhfw: '复核范围',
-    fhlr: '复核内容',
-  }, 
+    fhlr: '复核内容'
+  },
   //dj002复用dj003
   dj003: {
     yplx: '样品类型',
@@ -21,6 +21,6 @@ export default {
     yjczxx: '移交处置信息',
     yjsj: '移交时间',
     hqsj: '获取时间',
-    dsfs: '递送方式',
-  }, 
+    dsfs: '递送方式'
+  }
 }
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
index 1e523c2..c1eae5f 100644
--- a/src/lang/zh/template/dl.js
+++ b/src/lang/zh/template/dl.js
@@ -62,7 +62,7 @@ export default {
     s9hhybh: 'S9混合液编号',
     s9hhyyjjrl: 'S9混合液预计加入量',
     pbsbh: 'PBS编号',
-    pbsryyjjrl: '0.2mol PBS溶液预计加入量',
+    pbsryyjjrl: 'PBS溶液预计加入量',
     jlzsl: '剂量组数量',
     wcButton: '完成',
     jlzmc: '剂量组名称  ',
@@ -282,7 +282,7 @@ export default {
   },
   dl018: {
     xbxx: '细胞信息',
-    sydd: '试验地点',
+    sydd: '测定地点',
     czsj: '操作时间',
     qxbd: '前序表单',
     dlbz: '备注',
diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js
index 0df0810..272c1fa 100644
--- a/src/lang/zh/template/lba.js
+++ b/src/lang/zh/template/lba.js
@@ -47,7 +47,7 @@ export default {
     dwbh: '动物编号',
     zzlx: '组织类型',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量'
+    ysyjrybjrl: '预设匀浆溶液加入量',
+    sjyjrybjrl: '实际匀浆溶液加入量'
   }
 }
diff --git a/src/lang/zh/template/pcr.js b/src/lang/zh/template/pcr.js
index 62e26b5..ef3b959 100644
--- a/src/lang/zh/template/pcr.js
+++ b/src/lang/zh/template/pcr.js
@@ -36,6 +36,7 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: '处理批编号',
+    clsj: '处理时间',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
     sxbs: '稀释倍数',
@@ -74,9 +75,10 @@ export default {
     ypmc: '样品名称',
     cjgz: '采集管重',
     lzzcz: '连组织称重',
+    lzzgz: '连组织管重',
     zzzl: '组织重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    ysyjryjrl: '预设匀浆溶液加入量',
+    sjyjryjrl: '实际匀浆溶液加入量',
   },
    pcr009: {
     clsj: '处理时间',
@@ -99,6 +101,13 @@ export default {
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
   },
+  pcr011: {
+    sj: '试剂',
+    ysjyztj: '预设加样总体积',
+    sjypjytj: '实际样品加样体积',
+    yssjjrtj: '预设试剂加入体积',
+    sjsjjrtj: '实际试剂加入体积',
+  },
   pcr012: {
     sjwj: '数据文件',
     hsndcdwjm: '核酸浓度测定文件名',
diff --git a/src/lang/zh/template/sp.js b/src/lang/zh/template/sp.js
index 0812b65..cc372ea 100644
--- a/src/lang/zh/template/sp.js
+++ b/src/lang/zh/template/sp.js
@@ -58,7 +58,10 @@ export default {
   sp007: {
     title: '生物样品分析样本处理表',
     ybsm: '样本说明',
-    bt: '标题'
+    bt: '标题',
+    clhxx: '处理后信息',
+    hjsj: '处理后样品放入进样环境时间',
+    cfwz: '存放位置'
   },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
diff --git a/src/lang/zh/template/xb.js b/src/lang/zh/template/xb.js
index 4fd7225..efe629f 100644
--- a/src/lang/zh/template/xb.js
+++ b/src/lang/zh/template/xb.js
@@ -1,7 +1,7 @@
 //细胞
 export default {
   xb001: {
-    jcsj: '检测时间',
+    jcsj: '操作时间',
     czbz: '操作步骤',
     qtbz: '其他步骤',
     fj: '附件',
@@ -11,6 +11,5 @@ export default {
     ks: '开始',
     js: '结束',
     fysc: '孵育时长（hr: min）'
-  }, 
- 
+  }
 }
diff --git a/src/utils/massTool.js b/src/utils/massTool.js
new file mode 100644
index 0000000..6c803b1
--- /dev/null
+++ b/src/utils/massTool.js
@@ -0,0 +1,36 @@
+// massUnitUtils.js
+const toGramFactor = {
+    'pg': 1e-12,
+    'ng': 1e-9,
+    'ug': 1e-6,
+    'mg': 0.001,
+    'g': 1,
+    'kg': 1000
+};
+
+const validUnits = Object.keys(toGramFactor);
+
+export function isMassUnit(unit) {
+    if (typeof unit !== 'string') return false;
+    return validUnits.includes(unit.toLowerCase());
+}
+
+function toGrams(value, unit) {
+    if (typeof value !== 'number' || isNaN(value)) {
+        throw new Error('值必须是有效数字');
+    }
+    const lowerUnit = unit.toLowerCase();
+    if (!isMassUnit(lowerUnit)) {
+        throw new Error(`无效的质量单位: ${unit}`);
+    }
+    return value * toGramFactor[lowerUnit];
+}
+
+export function compareMass(value1, unit1, value2, unit2) {
+    const grams1 = toGrams(value1, unit1);
+    const grams2 = toGrams(value2, unit2);
+    
+    if (grams1 > grams2) return 1;
+    if (Math.abs(grams1 - grams2) < 1e-12) return 0;
+    return -1;
+}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 748c514..69a8f45 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -245,7 +245,7 @@ service.interceptors.response.use(
     console.log('err' + error)
     let { message } = error
     if (message == 'Network Error') {
-      message = '后端接口连接异常'
+      message = '网络异常，请检查网络'
     } else if (message.includes('timeout')) {
       message = '系统接口请求超时'
     } else if (message.includes('Request failed with status code')) {
diff --git a/src/utils/tpph.js b/src/utils/tpph.js
new file mode 100644
index 0000000..96718a6
--- /dev/null
+++ b/src/utils/tpph.js
@@ -0,0 +1,229 @@
+/**
+ * 天平+PH获取
+ */
+import axios from 'axios'
+import { Message } from 'element-ui'
+
+export async function getBalance(
+  cmd,
+  format,
+  comPort,
+  baudRate,
+  byteSize,
+  parity
+) {
+  let val = {}
+  let url = `http://localhost/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
+  // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}`
+  await axios
+    .get(
+      url,
+      {},
+      {
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+    )
+    .then((res) => {
+      if (res.status !== 200) {
+        Message.error('获取天平失败')
+        return
+      }
+      let data = res.data
+      if (data.code !== 200) {
+        Message.error(data.msg || '获取天平数据失败')
+        return
+      }
+      val = parseBalanceData(data.data)
+      debugger
+    })
+  debugger
+  return await val
+}
+
+export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) {
+  let val = {}
+  let url = `http://localhost/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
+  // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}`
+  await axios
+    .get(
+      url,
+      {},
+      {
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+    )
+    .then((res) => {
+      debugger
+      if (res.status !== 200) {
+        Message.error('获取PH失败')
+        return
+      }
+      let data = res.data
+      if (data.code !== 200) {
+        Message.error(data.msg || '获取PH数据失败')
+        return
+      }
+      val = parseBalanceData(data.data)
+      debugger
+    })
+  debugger
+  return await val
+}
+
+export function parseBalanceData(rawData, targetUnit = 'g', precision) {
+  // 初始化返回结果，固定字段结构
+  const result = {
+    success: false,
+    value: '',
+    originalValue: '',
+    originalUnit: '',
+    targetUnit: targetUnit.toLowerCase(),
+    message: ''
+  }
+
+  // 1. 空值校验：原始数据为空/纯空格，直接返回
+  if (!rawData || rawData.trim() === '') {
+    result.message = '【解析失败】原始称量数据为空!'
+    return result
+  }
+
+  const trimedData = rawData.trim() // 预处理：去除首尾空格，避免干扰
+
+  // 2. 负数检测：精准匹配「任意空格+负号+任意空格+数字」的场景
+  const negativeReg = /(\s*)?-(\s*)?\d+/
+  if (negativeReg.test(rawData)) {
+    result.message = '【解析失败】原始称量数据包含负数，不支持解析!'
+    return result
+  }
+  //2.1 原始数据返回不带计量单位，不支持解析
+  if (!trimedData.includes('g')) {
+    result.message = '【解析失败】原始数据返回不带计量单位，不支持解析!'
+  }
+
+  try {
+    // 3. 格式配置化：移除k的匹配，仅保留g/kg
+    const parseFormats = [
+      {
+        reg: /N\s*(?:[+-]\s*)?(\d+(?:\.\d+)?)\s*([gG]|[kK][gG])/i,
+        desc: 'N + 任意空格 + 可选±号 + 数值 + g/kg'
+      },
+      {
+        reg: /S\s+S\s*(?:[+-]\s*)?(\d+(?:\.\d+)?)\s*([gG]|[kK][gG])/i,
+        desc: 'S S + 任意空格 + 可选±号 + 数值 + g/kg'
+      },
+      //添加一种新格式：G 5.00001g
+      {
+        reg: /G\s*(?:[+-]\s*)?(\d+(?:\.\d+)?)\s*([gG]|[kK][gG])/i,
+        desc: 'G + 任意空格 + 可选±号 + 数值 + g/kg'
+      }
+    ]
+
+    // 4. 遍历格式配置，匹配第一个符合的格式
+    let matchedFormat = null
+    let matchResult = null
+    for (const format of parseFormats) {
+      matchResult = trimedData.match(format.reg)
+      if (matchResult && matchResult.length >= 3) {
+        matchedFormat = format
+        break
+      }
+    }
+
+    // 5. 未匹配到任何格式，直接返回
+    if (!matchedFormat) {
+      result.message = '【解析失败】未匹配到任何预设格式'
+      return result
+    }
+
+    // 6. 提取匹配结果：数值（分组1）+ 原始单位（分组2）
+    const originalValue = matchResult[1].trim()
+    let originalUnit = matchResult[2].trim().toLowerCase() // 单位转小写统一格式
+    // 赋值到结果对象
+    result.originalValue = originalValue
+    result.originalUnit = originalUnit
+    result.message = `【解析成功】匹配到${matchedFormat.desc}，提取数值：${originalValue}，单位：${originalUnit}`
+
+    // 7. 数值有效性校验
+    const num = parseFloat(originalValue)
+    if (isNaN(num)) {
+      result.message = `【换算失败】提取的数值 "${originalValue}" 不是有效数字`
+      return result
+    }
+
+    // 8. 单位换算核心逻辑
+    const unitToGram = { g: 1, kg: 1000 }
+    const originalCoeff = unitToGram[result.originalUnit] || 1
+    const targetCoeff = unitToGram[result.targetUnit] || 1
+    let convertedValue = (num * originalCoeff) / targetCoeff
+
+    // 9. 数值格式化：保留原始精度（仅当传入precision时，按指定位数截取，不四舍五入）
+    if (typeof precision === 'number' && precision >= 0) {
+      // 截取指定位数（避免四舍五入）
+      const splitNum = convertedValue.toString().split('.')
+      if (splitNum.length === 1) {
+        convertedValue = splitNum[0] + '.' + '0'.repeat(precision)
+      } else {
+        convertedValue = splitNum[0] + '.' + splitNum[1].slice(0, precision)
+      }
+      result.value = convertedValue
+    } else {
+      // 保留原始精度（不做任何四舍五入和去0）
+      result.value = convertedValue.toString()
+    }
+
+    // 10. 组装成功结果
+    result.success = true
+
+    // 11. 优化提示信息
+    const baseMsg = result.message.replace('【解析成功】', '【成功】')
+    if (result.originalUnit === result.targetUnit) {
+      result.message = `${baseMsg} → 最终值：${result.value} ${result.targetUnit}`
+    } else {
+      result.message = `${baseMsg} → 换算至${result.targetUnit}：${result.value} ${result.targetUnit}`
+    }
+  } catch (error) {
+    result.message = `【系统错误】解析换算失败：${error.message}`
+    console.error('解析失败堆栈：', error)
+  }
+
+  return result
+}
+
+export function extractPHValue(rawData) {
+  const result = {
+    success: false,
+    value: '',
+    message: ''
+  }
+
+  // 空值校验
+  if (!rawData || rawData.trim() === '') {
+    result.message = '【解析失败】原始数据为空'
+    return result
+  }
+
+  try {
+    // 正则表达式匹配 pH 值
+    const phRegex = /^pH\s+(\d+(?:\.\d+)?)\s+pH$/im
+    const match = rawData.match(phRegex)
+
+    if (match && match.length >= 2) {
+      // 成功提取 pH 值
+      result.success = true
+      result.value = match[1] // 捕获组中的数值
+      result.message = `【解析成功】提取到 pH 值：${result.value}`
+    } else {
+      // 未匹配到 pH 值
+      result.message = '【解析失败】未找到有效的 pH 值'
+    }
+  } catch (error) {
+    result.message = `【系统错误】解析失败：${error.message}`
+    console.error('解析失败堆栈：', error)
+  }
+
+  return result
+}
diff --git a/src/views/business/comps/select/SelectStudy.vue b/src/views/business/comps/select/SelectStudy.vue
index 29ccfb5..bb2127a 100644
--- a/src/views/business/comps/select/SelectStudy.vue
+++ b/src/views/business/comps/select/SelectStudy.vue
@@ -53,6 +53,8 @@ export default {
     showStudy() {
       if (!this.disabled) {
         this.$refs.selectStudyDialog.show({ needPre: this.needPre })
+         this.$emit('change', _.merge({},  { key: this.selectkey }))
+        this.$emit('input',null)
       }
     },
     handleChange(obj) {
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index a8c0f68..ecb4cee 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -381,6 +381,7 @@ export default {
       //分发给子组件的fillType
       templateData: this.templateData,
       templateFillType: this.fillType,
+      templateSn: this.sn,
       getZdxgjl: () => this.zdxgjl,
       getSubmittedCodes: () => this.submittedCodes,
       getFhyjjl: () => this.fhyjjl,
diff --git a/src/views/business/comps/template/comps/dj/DJ001.vue b/src/views/business/comps/template/comps/dj/DJ001.vue
index 3174b58..ecbd973 100644
--- a/src/views/business/comps/template/comps/dj/DJ001.vue
+++ b/src/views/business/comps/template/comps/dj/DJ001.vue
@@ -11,9 +11,9 @@
 					<!-- 操作步骤 -->
 					<LineLabel label="template.common.operationSteps" />
 					<div class="template-form-item">
-						<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" 
-							ref="operateStepRef" :formConfig="operateConfig" :formData="formData" />
-						<BaseInfoFormPackage v-if="fillType !== 'preFill'" fieldItemLabel="template.dj.dj001.fhfw" 
+						<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" ref="operateStepRef"
+							:formConfig="operateConfig" :formData="formData" />
+						<BaseInfoFormPackage v-if="fillType !== 'preFill'" fieldItemLabel="template.dj.dj001.fhfw"
 							ref="fhfwCheckBoxRef" :formConfig="fhfwCheckBoxConfig" :formData="formData" />
 						<div class="template-form-item" v-if="fillType === 'preFill'">
 							<span>{{ $t('template.dj.dj001.fhfw')  }}</span>
@@ -27,33 +27,22 @@
 								:prefixKey="`operateTable`"
 							>
 								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete
-									:row="row"
-									:rowIndex="rowIndex"
-									:columns="columns"
-									@deleteRow="() => deleteTableRow(rowIndex, 'operateTableRef')"
-								></TableOpertaionDelete>
+									<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+										@deleteRow="() => deleteTableRow(rowIndex, 'operateTableRef')">
+									</TableOpertaionDelete>
 								</template>
 							</CustomTable>
 						</div>
 						<div class="template-form-item" v-if="fillType === 'preFill'">
 							<span>{{ $t('template.dj.dj001.fhlr') }}</span>
-							<CustomTable
-								:columns="fhlrColumns"
-								ref="fhlrTableRef"
-								:showOperation="fillType === 'preFill'"
-								:showAddRow="fillType === 'preFill'"
-								:formData="{ stepTableFormData: formData.stepTableFormData_1 }"
-								:isBorder="false"
-								:prefixKey="`fhlrTable`"
-							>
+							<CustomTable :columns="fhlrColumns" ref="fhlrTableRef"
+								:showOperation="fillType === 'preFill'" :showAddRow="fillType === 'preFill'"
+								:formData="{ stepTableFormData: formData.stepTableFormData_1 }" :isBorder="false"
+								:prefixKey="`fhlrTable`">
 								<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete
-									:row="row"
-									:rowIndex="rowIndex"
-									:columns="columns"
-									@deleteRow="() => deleteTableRow(rowIndex, 'fhlrTableRef')"
-								></TableOpertaionDelete>
+									<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+										@deleteRow="() => deleteTableRow(rowIndex, 'fhlrTableRef')">
+									</TableOpertaionDelete>
 								</template>
 							</CustomTable>
 						</div>
@@ -130,7 +119,7 @@ export default {
 						},
 					}
 				},
-				
+
 			]
 		},
 		//操作步骤配制
@@ -146,7 +135,7 @@ export default {
 						},
 					}
 				},
-				
+
 			]
 		},
 		//复核范围配制
@@ -166,11 +155,11 @@ export default {
 							type: "checkboxTree",
 							fillType: 'actFill',
 							options: Array.isArray(this.fhlrCheckOptions) ? this.fhlrCheckOptions : []
-							
+
 						},
 					}
 				},
-				
+
 			]
 		},
 		//复核范围
@@ -204,8 +193,8 @@ export default {
 				fhfwCheck: { checkedValues: [], otherValues: {} },
 				fhlrCheck: { checkedValues: [], otherValues: {} },
 			},
-			fhfwCheckOptions:[],
-			fhlrCheckOptions:[],
+			fhfwCheckOptions: [],
+			fhlrCheckOptions: [],
 			isFirstTableDataRecorded: false,
 		};
 	},
@@ -213,25 +202,29 @@ export default {
 		this.getTableData()
 	},
 	methods: {
+		// 删除表格行
+		async deleteTableRow(rowIndex, refName) {
+			this.$refs[refName].deleteRow(rowIndex)
+		},
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(
 				[
-				 "baseInfoRef",  "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
+					"baseInfoRef", "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
 				]
 			)
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
 			let content = await this.validFormFields([
-				"baseInfoRef",  "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
+				"baseInfoRef", "operateStepRef", "operateTableRef", "fhlrTableRef", "fhfwCheckBoxRef"
 			]);
 			return content;
 		},
 		getResource() {
 			//使用的试剂、仪器
 			// const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp =  []
+			this.resourceTmp = []
 			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
@@ -241,7 +234,7 @@ export default {
 			console.log(content);
 		},
 		// 删除表格行
-		deleteRow(rowIndex,type) {
+		deleteRow(rowIndex, type) {
 			const tableRef1 = this.$refs['operateTableRef'];
 			const tableRef2 = this.$refs['tableSecondRef'];
 			if (type == 'firstTable' && tableRef1) {
@@ -258,12 +251,12 @@ export default {
 				// 修复：增加空值保护
 				const stepTableFormData = formData.stepTableFormData || this.formData.stepTableFormData || [];
 				const stepTableFormData_1 = formData.stepTableFormData_1 || this.formData.stepTableFormData_1 || [];
-				
+
 				// 处理数据为checkboxTree期望的格式（包含children结构）
 				const firstList = stepTableFormData
 					.filter(item => item && item.fhfw && item.fhfw.trim()) // 严格过滤空值
-					.map(item => ({ 
-						label: item.fhfw, 
+					.map(item => ({
+						label: item.fhfw,
 						value: item.fhfw,
 						children: [] // 必须包含children字段，否则checkboxTree会报错
 					}))
@@ -274,8 +267,8 @@ export default {
 
 				const secondList = stepTableFormData_1
 					.filter(item => item && item.fhlr && item.fhlr.trim()) // 严格过滤空值
-					.map(item => ({ 
-						label: item.fhlr, 
+					.map(item => ({
+						label: item.fhlr,
 						value: item.fhlr,
 						children: [] // 必须包含children字段
 					}))
@@ -284,11 +277,11 @@ export default {
 					});
 
 				// 响应式更新
-				this.$nextTick(()=>{
+				this.$nextTick(() => {
 					this.fhfwCheckOptions = firstList;
 					this.fhlrCheckOptions = secondList;
 				})
-				
+
 			} catch (error) {
 				// 异常时重置为空数组，避免页面崩溃
 				this.fhfwCheckOptions = [];
@@ -298,5 +291,4 @@ export default {
 	}
 };
 </script>
-<style rel="stylesheet/scss" lang="scss">
-</style>
\ No newline at end of file
+<style rel="stylesheet/scss" lang="scss"></style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/comps/dl/DL003.vue b/src/views/business/comps/template/comps/dl/DL003.vue
index 56417b4..85031c6 100644
--- a/src/views/business/comps/template/comps/dl/DL003.vue
+++ b/src/views/business/comps/template/comps/dl/DL003.vue
@@ -368,6 +368,7 @@ export default {
     },
     getResource() {
       let content = this.getFilledFormData();
+      let formData = this.formData;
       //生成resource
       let tmpResource = []
       let tmpYq = []
@@ -388,7 +389,7 @@ export default {
               nddw: '',
               ly: 'ELN配制',
               sxrq: null,
-              kc: item.jzjrtj + header1.targetDiluentVolumeUnit,
+              kc: item.jzjrtj,
               kcdw: header1.targetDiluentVolumeUnit,
               syl: null,
               type: null, //生成的时候传null
@@ -456,16 +457,16 @@ export default {
           }
         }
         tmpYq.push({
-          mc: content.pykssjmc,
-          xh: content.pykssjxh,
+          mc: content.pykssjmc || formData.pykssjmc,
+          xh: content.pykssjxh || formData.pykssjxh,
           bh: content.fssygbh,
-          jzrq: content.pykssjjzrq,
+          jzrq: content.pykssjjzrq || formData.pykssjjzrq,
         })
         tmpYq.push({
-          mc: content.pyxmc,
-          xh: content.pyxxh,
+          mc: content.pyxmc || formData.pyxmc,
+          xh: content.pyxxh || formData.pyxxh,
           bh: content.pyx,
-          jzrq: content.pyxjzrq,
+          jzrq: content.pyxjzrq || formData.pyxjzrq,
         })
         this.yqResourceTmp = tmpYq
       }
diff --git a/src/views/business/comps/template/comps/dl/DL006.vue b/src/views/business/comps/template/comps/dl/DL006.vue
index 98cfded..3b6b395 100644
--- a/src/views/business/comps/template/comps/dl/DL006.vue
+++ b/src/views/business/comps/template/comps/dl/DL006.vue
@@ -476,6 +476,7 @@ export default {
     },
     getResource() {
       let content = this.getFilledFormData();
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       let addYq = []
@@ -548,10 +549,10 @@ export default {
           }
         }
         tmpYq.push({
-          mc: content.pyxbhmc,
-          xh: content.pyxbhxh,
+          mc: content.pyxbhmc || formData.pyxbhmc,
+          xh: content.pyxbhxh || formData.pyxbhxh,
           bh: content.pyxbh,
-          jzrq: content.pyxbhjzrq,
+          jzrq: content.pyxbhjzrq || formData.pyxbhjzrq,
         })
       }
       const stepResource = this.$refs.stepRef.getStepResource()
@@ -662,6 +663,7 @@ export default {
     },
     //完成
     clickFinish() {
+      let that=this
       // 获取表单数据
       const { jzs, jlzsl, pxms, qsbh, stepTableFormData = [] } = this.getFilledFormData();
       // 初始化列配制数组
@@ -671,6 +673,7 @@ export default {
       columns.push({
         prop: 'jlzb',
         label: 'template.dl.dl006.jlzb',
+            width: 150,
         bodyType: 'input',
         bodyFillType: 'preFill', // 修复：原bodyTypeFillType拼写错误
       });
@@ -684,7 +687,7 @@ export default {
             bodyType: 'checkbox',
             isNeedCheck: true,
             bodyFillType: 'actFill', // 修复：actFill改为preFill，与数据填充类型匹配
-            width: 300,
+            width: 250,
             checkboxLabel:'',
             headerColumns: [
               {
@@ -731,9 +734,12 @@ export default {
         prop: 'gspcdqk',
         label: 'template.dl.dl006.gspcdqk',
         bodyType: 'input',
+            width: 150,
+
         bodyFillType: 'actFill', // 修复：原bodyTypeFillType拼写错误
       });
 
+      debugger
       // 关键修复1：先更新列配制，确保表格能识别字段
       this.rawCzxxColumns = [...columns]; // 解构赋值触发响应式更新
       this.$nextTick(() => { // 等待列配制更新完成后再赋值数据
@@ -752,6 +758,7 @@ export default {
             const rowData = {
               jlzb: stepTableFormData[doseIndex]?.jlzmc || '', 
               gspcdqk: '',
+              id:that.getuuid()
               // 初始化动态列字段，避免undefined
             };
             newDataSource.push(rowData);
diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue
index 4ccdb6c..e6c5a86 100644
--- a/src/views/business/comps/template/comps/dl/DL008.vue
+++ b/src/views/business/comps/template/comps/dl/DL008.vue
@@ -471,6 +471,7 @@ export default {
 
     // 处理成像情况前序表单选择
     handleCxqkQxbdSelect(row) {
+      let that=this
       // 重置加载标记，允许重新加载数据
       this.isDataLoaded = false
 
@@ -494,10 +495,17 @@ export default {
         }
 
         // 2. 生成表格数据
-        const tableData = this.generateTableData(
+        const tableData1 = this.generateTableData(
           stepTableFormData_1,
           dynamicColumns.columnKeys
         )
+        let tmp=[]
+        _.forEach(tableData1,function(item){
+            let a=item
+            a.id=that.getuuid()
+            tmp.push(a)
+        })
+       const  tableData=tmp
         if (tableData.length === 0) {
           this.clearCxqkTable()
           return
@@ -521,7 +529,7 @@ export default {
       if (columnKeys.length === 0) {
         return null
       }
-
+debugger
       const columns = [
         {
           label: 'template.dl.dl008.jlzb',
diff --git a/src/views/business/comps/template/comps/dl/DL009.vue b/src/views/business/comps/template/comps/dl/DL009.vue
index d8bf347..cb3b0e1 100644
--- a/src/views/business/comps/template/comps/dl/DL009.vue
+++ b/src/views/business/comps/template/comps/dl/DL009.vue
@@ -586,6 +586,7 @@ export default {
 
     // 处理结果信息前序表单选择
     handleJgxxQxbdSelect(row, savedYqsyData) {
+      let that=this
       // 重置加载标记，允许重新加载数据
       this.isDataLoaded = false
 
@@ -614,10 +615,19 @@ export default {
         }
 
         // 2. 生成表格数据
-        const tableData = this.generateJgxxTableData(
+        const tableData1 = this.generateJgxxTableData(
           stepTableFormData_1,
           dynamicColumns.columnKeys
         )
+
+          let tmp=[]
+        _.forEach(tableData1,function(item){
+            let a=item
+            a.id=that.getuuid()
+            tmp.push(a)
+        })
+        const  tableData=tmp
+
         if (tableData.length === 0) {
           this.clearJgxxTable()
           return
diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue
index 9e95fda..e1f51c2 100644
--- a/src/views/business/comps/template/comps/dl/DL010.vue
+++ b/src/views/business/comps/template/comps/dl/DL010.vue
@@ -216,22 +216,6 @@ export default {
             }
           }
         },
-        {
-          type: 'cellItem',
-          label: 'template.dl.dl010.jprq',
-          config: {
-            startDate: {
-              label: 'template.dl.dl010.jprqKssj',
-              type: 'input',
-              disabled: true
-            },
-            endDate: {
-              label: 'template.dl.dl010.jprqJssj',
-              type: 'input',
-              disabled: true
-            }
-          }
-        }
       ]
     },
     // 采集信息列表
@@ -426,7 +410,8 @@ export default {
           sjlhnzsjyjrl: '', // 实际0.9%氯化钠注射液加入量（空）
           sjgs: '', // 收集骨髓（空）
           lx: '', // 离心（空）
-          sjjrxq: '' // 实际加入血清（空）
+          sjjrxq: '', // 实际加入血清（空）
+          id: this.getuuid()
         }
       })
 
diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue
index 15463f8..3804c2e 100644
--- a/src/views/business/comps/template/comps/dl/DL011.vue
+++ b/src/views/business/comps/template/comps/dl/DL011.vue
@@ -84,6 +84,7 @@ import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import moment from 'moment'
+import { getLatestSn } from '@/api/template'
 import { uniqeYqOne, uniqeResource } from '@/utils/calUnitTools'
 import { EventBus } from '@/utils/eventBus'
 
@@ -107,6 +108,14 @@ export default {
     TableOpertaionDelete
   },
   mixins: [templateMixin],
+  provide() {
+    return {
+      getMybh: ()=>{
+        const data = this.$refs[refConf.xbxx].getFilledFormData()
+        return {mybh:data.fshxbbh+data.fshxbbhCodeSn,maxVolume:data.fshxbsjtj,maxVolumeUnit:data.fshxbsjtjUnit}
+      }
+    }
+  },
   props: {
     fillType: {
       type: String,
@@ -205,6 +214,7 @@ export default {
                     subType: 'button',
                     subKey: 'pykssjButton',
                     disabled: true,
+                    subDisabled: false,
                     buttonName: 'template.dl.dl011.pykssjButton'
                   }
                 : {
@@ -261,7 +271,7 @@ export default {
               fillType: 'actFill',
               copyFrom: 'fshxbyjtj',
               compareTo: 'fshxbyjtj',
-              subOptions: this.getDictOptions('business_nddw'),
+              subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10
             }
           }
@@ -279,7 +289,7 @@ export default {
       this.$nextTick(() => {
         this.$refs[refConf.pyxx]?.updateFormData(
           'pytjText',
-          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±1%',
           { isUpdateRecord: false, signData: null }
         )
       })
@@ -289,16 +299,19 @@ export default {
     if (this.fillType !== 'actFill') return
 
     const data = this.getFilledFormDataByRefs([refConf.xbxx])
-    const { fshxbbhCodeSn } = data || {}
+    const { fshxbbh, fshxbbhCodeSn } = data || {}
 
     // 如果已经有 fshxbbhCodeSn 值，说明是回显数据，不需要重新生成
-    if (fshxbbhCodeSn) return
+    if (fshxbbhCodeSn || !fshxbbh) return
 
-    this.$nextTick(() => {
-      const updateData = {}
-      const formattedDate = moment().format('YYMMDD')
-      updateData['fshxbbhCodeSn'] = formattedDate + '-' + '0001'
-      this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
+    this.$nextTick(async () => {
+      try {
+        const res = await getLatestSn({ pre: fshxbbh, type: 1, count: 1 })
+        if (res.code !== 200 || !res.data?.length) return
+        this.$refs[refConf.xbxx].batchUpdateFormData({ fshxbbhCodeSn: res.data[0] })
+      } catch (e) {
+        this.$message.error('复苏后细胞编号生成失败，请重试')
+      }
     })
   },
   data() {
@@ -355,6 +368,7 @@ export default {
     },
     getResource() {
       const content = this.getFilledFormData()
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       //生成细胞
@@ -397,10 +411,10 @@ export default {
       })
       //使用仪器
       tmpYq.push({
-        mc: content.pyxbh_mc,
-        xh: content.pyxbh_xh,
+        mc: content.pyxbh_mc || formData.pyxbh_mc,
+        xh: content.pyxbh_xh || formData.pyxbh_xh,
         bh: content.pyxbh,
-        jzrq: content.pyxbh_jzrq
+        jzrq: content.pyxbh_jzrq || formData.pyxbh_jzrq,
       })
       //使用的试剂、仪器
       const stepResource = this.$refs.stepRef.getStepResource()
@@ -411,9 +425,6 @@ export default {
       this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
       return this.resourceTmp
     },
-    onRegentSubmit(e) {
-      // 预留方法，如果需要处理试剂提交事件可以在这里添加
-    },
     // 保存
     async onSave() {
       const formData = this.getStepResource()
diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue
index 0abc403..3c7c440 100644
--- a/src/views/business/comps/template/comps/dl/DL012.vue
+++ b/src/views/business/comps/template/comps/dl/DL012.vue
@@ -49,8 +49,10 @@ import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import moment from 'moment'
+import { getLatestSn } from '@/api/template'
 import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools";
 import { EventBus } from "@/utils/eventBus";
+import { justUpdateFilledFormData } from "@/utils/index";
 
 const refConf = {
   base: 'baseInfoRef',
@@ -72,6 +74,15 @@ export default {
     TableOpertaionDelete
   },
   mixins: [templateMixin],
+  provide() {
+    return {
+      getMybh: () => {
+        const data = this.$refs[refConf.xbxx].getFilledFormData();
+        const mybhs = this.transformMybh(data);
+        return { mybhOptions:mybhs, maxVolume: data.zbhxbsjtj, maxVolumeUnit: data.zbhxbsjtjUnit }
+      }
+    }
+  },
   props: {
     fillType: {
       type: String,
@@ -189,6 +200,7 @@ export default {
         xbzbqbh: {
           label: 'template.dl.dl012.xbzbqbh',
           type: 'xb',
+          checkType: "checkbox",
           fillType: 'actFill'
         },
         zbxbs: {
@@ -229,7 +241,7 @@ export default {
               subType: 'select',
               subKey: 'fshxbyjtjUnit',
               fillType: 'preFill',
-              subOptions: this.getDictOptions('business_nddw'),
+              subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10,
               // selectTo: 'zbhxbsjtjUnit'
             },
@@ -239,7 +251,7 @@ export default {
               subType: 'select',
               subKey: 'zbhxbsjtjUnit',
               fillType: 'actFill',
-              subOptions: this.getDictOptions('business_nddw'),
+              subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10,
               compareTo: 'zbhxbyjtj',
               copyFrom: 'zbhxbyjtj'
@@ -261,7 +273,7 @@ export default {
       this.$nextTick(() => {
         this.$refs[refConf.pyxx]?.updateFormData(
           'pytjText',
-          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±1%',
           { isUpdateRecord: false, signData: null }
         )
       })
@@ -269,41 +281,7 @@ export default {
 
     // 仅在 actFill 时，根据 zbxbs 生成 zbhxbbh_1/2/3... 写入 formData
     if (this.fillType === 'actFill') {
-      const data = this.getFilledFormDataByRefs([refConf.xbxx])
-      const { zbxbs, zbhxbbh_1 } = data || {}
-      if (!zbxbs) return
-
-      let count = 1
-      try {
-        count = Number(zbxbs)
-      } catch (error) {
-        count = 1
-      }
-
-      // 先写入 this.formData，让 xbxxConfig computed 感知到新字段并生成对应表单项
-      const updateData = {}
-      const formattedDate = moment().format('YYMMDD')
-      for (let index = 1; index <= count; index++) {
-        const zbhxbbhKey = 'zbhxbbh_' + index
-        const codeSnKey = 'zbhxbbhCodeSn_' + index
-
-        if (!data[zbhxbbhKey]) {
-          this.$set(this.formData, zbhxbbhKey, zbhxbbh_1)
-          updateData[zbhxbbhKey] = zbhxbbh_1
-        }
-        if (!data[codeSnKey]) {
-          const codeSnVal = formattedDate + '-' + `${index}`.padStart(4, '0')
-          this.$set(this.formData, codeSnKey, codeSnVal)
-          updateData[codeSnKey] = codeSnVal
-        }
-      }
-
-      // 等配制更新后，同步到子组件的 formFields
-      if (Object.keys(updateData).length > 0) {
-        this.$nextTick(() => {
-          this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
-        })
-      }
+      this.generateZbhxbbhFields()
     }
   },
   data() {
@@ -313,23 +291,85 @@ export default {
     }
   },
   methods: {
+    transformMybh(obj) {
+      const result = [];
+
+      // 获取所有以 zbhxbbh_ 开头的key
+      const bhKeys = Object.keys(obj).filter(key => key.startsWith('zbhxbbh_'));
+
+      bhKeys.forEach(bhKey => {
+        const index = bhKey.split('_')[1];
+        const codeSnKey = `zbhxbbhCodeSn_${index}`;
+
+        if (obj[codeSnKey]) {
+          result.push({
+            label: `${obj[bhKey]}${obj[codeSnKey]}`,
+            value: `${obj[bhKey]}${obj[codeSnKey]}`
+          });
+        }
+      });
+
+      return result;
+    },
+    // 根据 zbxbs 调用接口生成对应数量的制备后细胞编号（已有的不重复生成）
+    async generateZbhxbbhFields() {
+      const data = this.getFilledFormDataByRefs([refConf.xbxx])
+      const { zbxbs, zbhxbbh_1 } = data || {}
+      if (!zbxbs || !zbhxbbh_1) return
+
+      const count = Number(zbxbs) || 1
+
+      // 检查是否已经生成过（所有编号都已存在则跳过）
+      const allExist = Array.from({ length: count }, (_, i) => `zbhxbbhCodeSn_${i + 1}`)
+        .every(key => !!data[key])
+      if (allExist) return
+      try {
+        const res = await getLatestSn({ pre: zbhxbbh_1, type: 1, count })
+        if (res.code !== 200) return
+        const snArr = res.data
+        if (!snArr || snArr.length === 0) return
+
+        const updateData = {}
+        for (let index = 1; index <= count; index++) {
+          const zbhxbbhKey = 'zbhxbbh_' + index
+          const codeSnKey = 'zbhxbbhCodeSn_' + index
+
+          // 先写入 formData，让 xbxxConfig computed 感知到新字段并渲染对应表单项
+          if (!data[zbhxbbhKey]) {
+            this.$set(this.formData, zbhxbbhKey, zbhxbbh_1)
+            updateData[zbhxbbhKey] = zbhxbbh_1
+          }
+          if (!data[codeSnKey]) {
+            const codeSnVal = snArr[index - 1] || ''
+            this.$set(this.formData, codeSnKey, codeSnVal)
+            updateData[codeSnKey] = codeSnVal
+          }
+        }
+
+        if (Object.keys(updateData).length > 0) {
+          this.$nextTick(() => {
+            this.$refs[refConf.xbxx]?.batchUpdateFormData(updateData);
+            justUpdateFilledFormData();
+          })
+        }
+      } catch (e) {
+        this.$message.error('细胞编号生成失败，请重试')
+      }
+    },
     onTableRegentSubmit(data) {
       if (data.key === 'xbzbqbh') {
-        this.$refs.xbxxRef.updateFormData('xbzbqbh_tj', data.selectInfo.row.tj)
-        this.$refs.xbxxRef.updateFormData('xbzbqbh_dw', data.selectInfo.row.tjdw)
+        const selectedRows = data.selectInfo?.selectedRows || []
+        const firstRow = selectedRows[0] || {}
+        this.$refs.xbxxRef.updateFormData('xbzbqbh_tj', firstRow.tj)
+        this.$refs.xbxxRef.updateFormData('xbzbqbh_dw', firstRow.tjdw)
       }
       if (data.key === 'pyxbh') {
-        this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc)
-        this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh)
-        this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq)
+        const row = data.selectInfo?.row || {}
+        this.$refs.pyxxRef.updateFormData('pyxbh_mc', row.mc)
+        this.$refs.pyxxRef.updateFormData('pyxbh_xh', row.xh)
+        this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', row.jzrq)
       }
-      //通知后端保存数据
-      const params = {
-        type: "fieldChanged",
-        newRecord: null,
-        resourceList: null,
-      }
-      EventBus.$emit('onModifyRecord', params);
+      justUpdateFilledFormData();
     },
     handleClickButton(e, signData) {
       console.log(e)
@@ -340,6 +380,7 @@ export default {
           moment().format('YYYY/MM/DD HH:mm'),
           { isUpdateRecord: true, signData }
         )
+        justUpdateFilledFormData();
       }
     },
     // 删除表格行
@@ -360,6 +401,7 @@ export default {
     },
     getResource() {
       const content = this.getFilledFormData()
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       //生成细胞
@@ -404,10 +446,10 @@ export default {
       })
       //使用仪器
       tmpYq.push({
-        mc: content.pyxbh_mc,
-        xh: content.pyxbh_xh,
+        mc: content.pyxbh_mc || formData.pyxbh_mc,
+        xh: content.pyxbh_xh || formData.pyxbh_xh,
         bh: content.pyxbh,
-        jzrq: content.pyxbh_jzrq,
+        jzrq: content.pyxbh_jzrq || formData.pyxbh_jzrq,
       })
       //使用的试剂、仪器
       const stepResource = this.$refs.stepRef.getStepResource()
@@ -415,9 +457,6 @@ export default {
       this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
       return this.resourceTmp;
     },
-    onRegentSubmit(e) {
-      // 预留方法，如果需要处理试剂提交事件可以在这里添加
-    },
     // 保存
     async onSave() {
       const formData = this.getStepResource()
diff --git a/src/views/business/comps/template/comps/dl/DL013.vue b/src/views/business/comps/template/comps/dl/DL013.vue
index 52672c0..7a756c2 100644
--- a/src/views/business/comps/template/comps/dl/DL013.vue
+++ b/src/views/business/comps/template/comps/dl/DL013.vue
@@ -18,6 +18,7 @@
 
           <LineLabel label="template.dl.dl007.yqsyxx" />
           <CustomTable
+            fieldItemLabel="template.dl.dl007.yqsyxx"
             :columns="yqsyColumns"
             :ref="refConf.yqsy"
             @onRegentSubmit="(e) => onRegentSubmit(e)"
@@ -40,7 +41,7 @@
           <LineLabel label="template.dl.dl013.xbxx" />
           <div class="template-form-item">
             <BaseInfoFormPackage
-              fieldItemLabel=""
+              fieldItemLabel="template.dl.dl013.xbxx"
               label=""
               :ref="refConf.xbxx"
               :formConfig="xbxxConfig"
@@ -52,7 +53,7 @@
           <LineLabel label="template.dl.dl013.cdxx" />
           <div class="template-form-item">
             <BaseInfoFormPackage
-              fieldItemLabel=""
+              fieldItemLabel="template.dl.dl013.cdxx"
               label=""
               :ref="refConf.cdxx"
               :formConfig="cdxxConfig"
@@ -81,12 +82,13 @@
               >
             </div>
             <BaseInfoFormPackage
-              fieldItemLabel=""
+              fieldItemLabel="template.dl.dl013.cdxx"
               label=""
               :ref="`cdxx${index}Ref`"
               :formConfig="getCdxxTimeConfig(index)"
               :formData="cdxxItem"
               @blur="(e) => onBlur(e, index)"
+              :prefixKey="'paralle' + cdxxItem.id"
             />
           </div>
 
@@ -100,10 +102,12 @@
         </div>
       </div>
     </div>
+    <EditSign ref="editSignDL013Ref" @cancel="signCancel" @callback="signCallback" />
   </div>
 </template>
 
 <script>
+import EditSign from "../../dialog/EditSign.vue";//电子签名弹窗
 import BaseInfoFormPackage from '@/components/Template/BaseInfoFormPackage'
 import TableOpertaionDelete from '@/components/Template/operation/TableOpertaionDelete.vue'
 import CustomTable from '@/components/Template/CustomTable.vue'
@@ -113,6 +117,7 @@ import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import { getuuid } from '@/utils/index.js'
 import { EventBus } from '@/utils/eventBus'
+import moment from "moment";
 
 const refConf = {
   base: 'baseInfoRef',
@@ -131,7 +136,8 @@ export default {
     TableList,
     Step,
     CustomTable,
-    TableOpertaionDelete
+    TableOpertaionDelete,
+    EditSign
   },
   mixins: [templateMixin],
   props: {
@@ -269,7 +275,7 @@ export default {
               subType: 'select',
               subKey: 'xbxytjUnit',
               fillType: 'actFill',
-              subOptions: this.getDictOptions('business_nddw'),
+              subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10
             }
           }
@@ -306,7 +312,8 @@ export default {
   data() {
     return {
       formData: {},
-      refConf
+      refConf,
+      deleteIndex:-1
     }
   },
   mounted() {
@@ -427,27 +434,15 @@ export default {
         (config) => config.id === cdxxItem.id
       )
       if (configIndex !== -1) {
-        // 创建新数组，确保响应式更新
-        const newConfigs = [...this.formData.cdxxConfigs]
-        newConfigs.splice(configIndex, 1)
-        this.$set(this.formData, 'cdxxConfigs', newConfigs)
         
-        // 更新测定次数
-        this.$refs[refConf.cdxx]?.updateFormData('cdcs', newConfigs.length, {
-          isUpdateRecord: false,
-          signData: null
-        })
-        
-        this.$nextTick(() => {
-          // 更新平均细胞密度
-          this.updatePjxbmd()
-          // 通知后端保存数据
-          EventBus.$emit('onModifyRecord', {
-            type: 'fieldChanged',
-            newRecord: null,
-            resourceList: null
-          })
-        })
+        let content = this.getFilledFormData()
+        let thisItem = content.cdxxConfigs[configIndex]
+        if(!thisItem.xsbs && !thisItem.zsg && !thisItem.ysg && !thisItem.zxg && !thisItem.yxg){
+          this.doDeleteParalleConfig(configIndex,null)
+        }else{
+          this.deleteIndex = configIndex
+          this.$refs.editSignDL013Ref.show();
+        }
       }
     },
     // 新增测定信息
@@ -635,7 +630,65 @@ export default {
     async onSave() {
       const formData = this.getStepResource()
       console.log(formData, 'formData')
-    }
+    },
+
+
+    checkDelete(index){
+			let content = this.getFilledFormData()
+			let thisItem = content.paralleConfigs[index]
+			if(!thisItem.jcb && !thisItem.jg && !thisItem.sjwjm){
+				this.doDeleteParalleConfig(index,null)
+			}else{
+				this.deleteIndex = index
+				this.$refs.editSignLAB006Ref.show();
+			}
+		},
+		// 处理电子签名取消事件
+		signCancel() {
+		},
+		// 处理电子签名确认回调事件
+		signCallback(data) {
+			let content = this.getFilledFormData()
+			let record = [
+				{
+					"userNameCn": data.qmrMc,
+					"userNameEn": data.qmrMcEn,
+					"key": "paralle",
+					"fieldCn": this.$t('template.dl.dl013.cdxx','zh_CN'),
+					"fieldEn": this.$t('template.dl.dl013.cdxx','en_US'),
+					// "oldValue": content.paralleConfigs[this.deleteIndex].jcb+";"+content.paralleConfigs[this.deleteIndex].jg+";"+(content.paralleConfigs[this.deleteIndex].jg==='接受'?''(content.paralleConfigs[this.deleteIndex].jgOther+";"))+content.paralleConfigs[this.deleteIndex].sjwjm,
+					"oldValue": '稀释倍数:'+content.cdxxConfigs[this.deleteIndex].xsbs+";左上格(个):"+content.cdxxConfigs[this.deleteIndex].zsg+";右上格(个):"+content.cdxxConfigs[this.deleteIndex].ysg+";左下格(个):"+content.cdxxConfigs[this.deleteIndex].zxg+";右下格(个):"+content.cdxxConfigs[this.deleteIndex].yxg,
+					"value": "",
+					"title": "修改",
+					"time": moment().format("YYYY-MM-DD HH:mm:ss"),
+					"reason": data.remark
+				}
+			]
+			this.doDeleteParalleConfig(this.deleteIndex,record)
+		},
+		doDeleteParalleConfig(configIndex,newRecord){
+			// 创建新数组，确保响应式更新
+      const newConfigs = [...this.formData.cdxxConfigs]
+      newConfigs.splice(configIndex, 1)
+      this.$set(this.formData, 'cdxxConfigs', newConfigs)
+      
+      // 更新测定次数
+      this.$refs[refConf.cdxx]?.updateFormData('cdcs', newConfigs.length, {
+        isUpdateRecord: false,
+        signData: null
+      })
+      
+      this.$nextTick(() => {
+        // 更新平均细胞密度
+        this.updatePjxbmd()
+        // 通知后端保存数据
+        EventBus.$emit('onModifyRecord', {
+          type: 'fieldChanged',
+          newRecord: newRecord,
+          resourceList: null
+        })
+      })
+		},
   }
 }
 </script>
diff --git a/src/views/business/comps/template/comps/dl/DL014.vue b/src/views/business/comps/template/comps/dl/DL014.vue
index cc1c8ba..8ef646e 100644
--- a/src/views/business/comps/template/comps/dl/DL014.vue
+++ b/src/views/business/comps/template/comps/dl/DL014.vue
@@ -15,7 +15,7 @@
           <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 
           <LineLabel label="template.dl.dl007.yqsyxx" />
-          <CustomTable :columns="yqsyColumns" :ref="refConf.yqsy" @onRegentSubmit="(e) => onRegentSubmit(e)"
+          <CustomTable fieldItemLabel="template.dl.dl007.yqsyxx" :columns="yqsyColumns" :ref="refConf.yqsy" @onRegentSubmit="(e) => onRegentSubmit(e)"
             :showOperation="fillType === 'actFill'" :showAddRow="fillType === 'actFill'" :formData="formData"
             :prefixKey="`yqsyTable`">
             <template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -25,17 +25,17 @@
           </CustomTable>
 
           <LineLabel label="template.dl.dl014.xbxx" />
-          <BaseInfoFormPackage :ref="refConf.xbInfo" :formConfig="xbInfoFormConfig" :formData="formData" />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl014.xbxx" :ref="refConf.xbInfo" :formConfig="xbInfoFormConfig" :formData="formData" />
 
           <!-- 剂量组配制信息 -->
           <LineLabel label="template.dl.dl014.jlzpzxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.jlzInfo" :formConfig="jlzInfoFormConfig"
+            <BaseInfoFormPackage fieldItemLabel="template.dl.dl014.jlzpzxx" label="" :ref="refConf.jlzInfo" :formConfig="jlzInfoFormConfig"
               :formData="formData" @select="onSftjs9Change" @clickButton="handleJlzzsButton"
               @onRegentSubmit="(data) => onTableRegentSubmit(data)" @blur="onJlzInfoBlur" />
 
             <!-- 剂量组名称列表 -->
-            <CustomTable :columns="jlzmcTableColumns" :ref="refConf.jlzmcTable" :showOperation="false"
+            <CustomTable fieldItemLabel="template.dl.dl014.jlzpzxx" :columns="jlzmcTableColumns" :ref="refConf.jlzmcTable" :showOperation="false"
               :showAddRow="false" :formData="jlzmcTableFormData" :prefixKey="`jlzmcTable`" @blur="onJlzmcTableBlur">
             </CustomTable>
 
@@ -47,11 +47,11 @@
             </div>
 
             <!-- 培养液 -->
-            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyy" :formConfig="pyyFormConfig"
+            <BaseInfoFormPackage fieldItemLabel="template.dl.dl014.jlzpzxx" label="" :ref="refConf.pyy" :formConfig="pyyFormConfig"
               @onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
 
             <!-- 剂量组列表 -->
-            <CustomTable :columns="jlzTableColumns" :ref="refConf.jlzTable" :showOperation="false" :showAddRow="false"
+            <CustomTable fieldItemLabel="template.dl.dl014.jlzpzxx" :columns="jlzTableColumns" :ref="refConf.jlzTable" :showOperation="false" :showAddRow="false"
               :formData="jlzTableFormData" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
               :prefixKey="`jlzTable`">
               <template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -374,6 +374,7 @@ export default {
           bodyFillType: 'preFill',
           bodyMaxlength: 10,
           headerSelectKey: 'ysplyjrlUnit',
+          headerSelectTo: 'sjplyjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           width: 180,
           fillType: 'preFill'
@@ -384,7 +385,7 @@ export default {
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
           bodyMaxlength: 10,
-          headerSelectKey: 'ysplyjrlUnit',
+          headerSelectKey: 'sjplyjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           copyFrom: 'ysplyjrl',
           compareTo: 'ysplyjrl',
@@ -403,6 +404,7 @@ export default {
             bodyFillType: 'preFill',
             bodyMaxlength: 10,
             headerSelectKey: 'yss9hhyjrlUnit',
+            headerSelectTo: 'sjs9hhyjrlUnit',
             headerOptions: this.getDictOptions('business_tjdw'),
             width: 220,
             fillType: 'preFill'
@@ -443,6 +445,7 @@ export default {
           bodyFillType: 'preFill',
           bodyMaxlength: 10,
           headerSelectKey: 'ysgspjrlUnit',
+          headerSelectTo: 'sjgspjrlUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           width: 180,
           fillType: 'preFill'
@@ -644,13 +647,17 @@ export default {
     },
     getResource() {
       const content = this.getFilledFormData()
+      let formData = this.formData;
       let tmpResource = []
       let tmpYq = []
       let sjs9hhyjrltotal=0
+      let sjplyjrltotal=0
       for (var i = 0; i < content.jlzTableData.length; i++) {
         let item = content.jlzTableData[i]
         sjs9hhyjrltotal=sjs9hhyjrltotal+parseFloat(item.sjs9hhyjrl)
-        //混悬液
+        
+        sjplyjrltotal=sjplyjrltotal+parseFloat(item.sjplyjrl)
+        //悬液
         tmpResource.push({
           mc: null,
           bh: item.xybh,
@@ -665,7 +672,7 @@ export default {
           syl: null,
           type: 1, //生成的时候传null
           elnType: null,  //生成的时候传 his.product
-          syldw: content[i+'_xybh_dw'],
+          syldw: content[i+'_xybh_dw'] || formData[i+'_xybh_dw'],
           yxzq: null,
           yxzqdw: null,
         })
@@ -720,10 +727,10 @@ export default {
         sxrq: null,
         kc: null,
         kcdw: null,
-        syl: null,
+        syl: sjplyjrltotal,
         type: 1, //使用的时候传对应的值
         elnType: null, //传null
-        syldw: content.pyysj_dw,
+        syldw: content.jlzHeaderSelectFields.sjplyjrlUnit,
         yxzq: null,
         yxzqdw: null,
       })
@@ -832,7 +839,8 @@ export default {
         const newJlzmcRows = []
         for (let i = 0; i < jlzzs; i++) {
           newJlzmcRows.push({
-            jlzzmc: ''
+            jlzzmc: '',
+            id:this.getuuid(),
           })
         }
 
@@ -895,7 +903,8 @@ export default {
             gspbh: '',
             ysgspjrl: '',
             sjgspjrl: '',
-            gyhzqk: ''
+            gyhzqk: '',
+            id:this.getuuid(),
           })
         }
       })
diff --git a/src/views/business/comps/template/comps/dl/DL015.vue b/src/views/business/comps/template/comps/dl/DL015.vue
index 93b4fc8..e428457 100644
--- a/src/views/business/comps/template/comps/dl/DL015.vue
+++ b/src/views/business/comps/template/comps/dl/DL015.vue
@@ -29,6 +29,7 @@
 
           <LineLabel label="template.dl.dl015.xbxx" />
           <BaseInfoFormPackage
+            fieldItemLabel="template.dl.dl015.xbxx"
             :ref="refConf.xbInfo"
             :formConfig="xbInfoFormConfig"
             :formData="formData"
@@ -38,6 +39,7 @@
           <!-- 换液情况 -->
           <LineLabel label="template.dl.dl015.hyqk" />
           <CustomTable
+            fieldItemLabel="template.dl.dl015.hyqk"
             :columns="hyqkColumns"
             :ref="refConf.hyqk"
             @onRegentSubmit="(e) => onRegentSubmit(e)"
@@ -360,7 +362,8 @@ export default {
             hyqqtqk: '', // 换液前其他情况
             qqpyy: '', // 倾去培养液
             pbsxd: '', // PBS洗涤
-            pyybrl: '' // 培养液补入量
+            pyybrl: '', // 培养液补入量
+            id:this.getuuid(),
           }))
 
           // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue
index 564c9de..854e0d5 100644
--- a/src/views/business/comps/template/comps/dl/DL016.vue
+++ b/src/views/business/comps/template/comps/dl/DL016.vue
@@ -11,17 +11,15 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
-          <BaseInfoFormPackage fieldItemLabel="template.dl.dl016.xbxx" label="template.dl.dl016.xbxx"
-						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData" @onRegentSubmit="onRegentSubmit"
-						/>
+					<BaseInfoFormPackage fieldItemLabel="template.dl.dl016.xbxx" label="template.dl.dl016.xbxx"
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
+						@onRegentSubmit="onRegentSubmit" />
 
           <LineLabel label="template.dl.dl016.qcxjjyqk" />
 					<CustomTable
-							@headerSelectChange="onHeaderSelectChange"
-							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
+							fieldItemLabel="template.dl.dl016.qcxjjyqk"
 							:showAddRow="false" :showOperation="false"
-							ref="qcxjjyqkTableRef" :columns="stepColumns" :formData="tableFormData">
+							ref="qcxjjyqkTableRef" :columns="stepColumns" :formData="formData">
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl016.czbz" />
@@ -49,10 +47,10 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
 
 export default {
 	name: "DL016",
-  dicts: [
-        'business_dl_qsxjbltj','business_tjdw','business_nddw'
-    ],
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
+	dicts: [
+		'business_dl_qsxjbltj', 'business_tjdw', 'business_nddw'
+	],
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -61,13 +59,6 @@ export default {
 		},
 	},
 	computed: {
-    // 表格数据
-    tableFormData() {
-      return {
-        stepTableFormData: this.formData.stepTableFormData || [],
-        headerSelectFields: {}
-      }
-    },
 		// 备注表单配制
 		remarkConig() {
 			return [
@@ -132,7 +123,7 @@ export default {
 				}
 			]
 		},
-    // 细胞信息
+		// 细胞信息
 		swypyjInfoFormConfig() {
 			return [
 				{
@@ -142,16 +133,16 @@ export default {
 							label: 'template.dl.dl016.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
-              qxbdType:'DL014',
-							filledCodes:['bdmc','bdbh'],
+							qxbdType: 'DL014',
+							filledCodes: ['bdmc', 'bdbh'],
 						},
-            bltj: {
+						bltj: {
 							label: 'template.dl.dl016.bltj',
 							type: 'select',
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
-              showOtherLabel:false
+							showOtherLabel: false
 						},
 					}
 				}
@@ -166,7 +157,7 @@ export default {
 					bodyType: "input",
 					bodyFillType: "actFill",
 					width: 180,
-          bodyDisabled: true,
+					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl016.xybh",
@@ -189,14 +180,12 @@ export default {
           // bodyType: 'inputNumber',
           label: "template.dl.dl016.qsxjjrl",
             prop: 'qsxjjrl',
-            width: 280,
+            width: 180,
             headerSelectKey: 'qsxjjrldw',
             fillType: "preFill",
             headerOptions: this.getDictOptions('business_tjdw'),
             bodyType: 'inputNumber',
             bodyFillType: 'actFill',
-            copyFrom: 'ysqyl',
-            compareTo: 'ysqyl',
 				}
 			]
 		},
@@ -207,69 +196,38 @@ export default {
 		};
 	},
 	methods: {
-    onRegentSubmit(e) {
-      const { selectInfo, key, rowIndex } = e
-      const { row } = selectInfo
-      if (key === 'qxbd') {
-        try {
-          // 解析前序表单的内容
-          const bdnr = JSON.parse(row.bdnr)
-          // 获取剂量组列表数据
-          const stepTableFormData = bdnr.jlzTableData || []
-
-          if (stepTableFormData.length === 0) {
-            // 清空当前的换液情况列表数据
-            this.$set(this.formData, 'stepTableFormData', [])
-            this.$message.warning('前序表单中没有剂量组数据')
-            return
-          }
+		onRegentSubmit(e) {
+			const { selectInfo, key, rowIndex } = e
+			const { row } = selectInfo
+			if (key === 'qxbd') {
+				try {
+					// 解析前序表单的内容
+					const bdnr = JSON.parse(row.bdnr)
+					// 获取剂量组列表数据
+					const stepTableFormData = bdnr.jlzTableData || []
 
           // 从剂量组数据中提取剂量组别和悬液编号
           const itemData = stepTableFormData.map(item => ({
             jlzb: item.jlzb || '', // 剂量组别
             xybh: item.xybh || '', // 悬液编号
             qsxjjrl: '', //
+			id:this.getuuid(),
           }))
-          // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-          this.$set(this.formData, 'stepTableFormData', itemData)
-
-          this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
+          this.$refs.qcxjjyqkTableRef.updateDataSource(itemData);
         } catch (error) {
           console.error('解析前序表单数据失败:', error)
           this.$message.error('解析前序表单数据失败')
         }
       }
     },
-    //选择table header下拉框也要更新体积
-		onHeaderSelectChange(data){
-			const {key, headerSelectFields,dataSource=[]} = data;
-			const keys = [
-				'targetStartSolutionVolumeUnit',
-				'targetDiluentVolumeUnit',
-				'targetSolutionConcentrationUnit',
-				'targetSolutionVolumeUnit',
-			]
-			if(keys.includes(key)){
-				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
-				const params = {
-					subTargetStartSolution,
-					headerSelectFields
-				}
-				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
-			}
-		},
-    beforeSaveRecord(data){
-			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
-			this.onCommonVerifyNdException(formFields,data);
-		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef", "remarkRef"])
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"]);
-      return content;
+			let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef", "remarkRef"]);
+			return content;
 		},
 		getResource() {
 			//使用的试剂、仪器
@@ -292,5 +250,4 @@ export default {
 	}
 };
 </script>
-<style rel="stylesheet/scss" lang="scss">
-</style>
+<style rel="stylesheet/scss" lang="scss"></style>
diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue
index 8b79c72..b321f7d 100644
--- a/src/views/business/comps/template/comps/dl/DL017.vue
+++ b/src/views/business/comps/template/comps/dl/DL017.vue
@@ -17,11 +17,9 @@
 
           <LineLabel label="template.dl.dl017.xbczqk" />
 					<CustomTable
-							@headerSelectChange="onHeaderSelectChange"
-							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
+							fieldItemLabel="template.common.operationSteps"
 							:showAddRow="false" :showOperation="false"
-							ref="stepTableRef" :columns="stepColumns" :formData="tableFormData">
+							ref="stepTableRef" :columns="stepColumns" :formData="formData">
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl017.czbz" />
@@ -62,13 +60,6 @@ export default {
 		},
 	},
 	computed: {
-    // 表格数据
-    tableFormData() {
-      return {
-        stepTableFormData: this.formData.stepTableFormData,
-        headerSelectFields: {}
-      }
-    },
 		// 备注表单配制
 		remarkConig() {
 			return [
@@ -206,56 +197,56 @@ export default {
 				},{
 					label: "template.dl.dl017.ddpyy",
 					prop: "ddpyy",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.xd",
 					prop: "xd",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.sj",
 					prop: "sj",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.ds",
 					prop: "ds",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.dy1gd",
 					prop: "dy1gd",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.dy2gd",
 					prop: "dy2gd",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.dy3gd",
 					prop: "dy3gd",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
 				},{
 					label: "template.dl.dl017.dy4gd",
 					prop: "dy4gd",
-					width: 180,
+					width: 100,
 					bodyType: "checkbox",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
@@ -282,13 +273,6 @@ export default {
           // 获取剂量组列表数据
           const stepTableFormData = bdnr.jlzTableData || []
 
-          if (stepTableFormData.length === 0) {
-            // 清空当前的细胞操作情况列表数据
-            this.$set(this.formData, 'stepTableFormData', [])
-            this.$message.warning('前序表单中没有剂量组数据')
-            return
-          }
-
           // 从剂量组数据中提取剂量组别和悬液编号
           const itemData = stepTableFormData.map(item => ({
             jlzb: item.jlzb || '',
@@ -303,60 +287,17 @@ export default {
             dy1gd: '',
             dy2gd: '',
             dy3gd: '',
-            dy4gd: ''
+            dy4gd: '',
+			id:this.getuuid(),
           }))
 
-          // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-          this.$set(this.formData, 'stepTableFormData', itemData)
-
-          this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
+		  this.$refs.stepTableRef.updateDataSource(itemData);
         } catch (error) {
-          this.$set(this.formData, 'stepTableFormData', [])
           console.error('解析前序表单数据失败:', error)
           this.$message.error('解析前序表单数据失败')
         }
       }
     },
-    //选择table header下拉框也要更新体积
-		onHeaderSelectChange(data){
-			const {key, headerSelectFields,dataSource=[]} = data;
-			const keys = [
-				'targetStartSolutionVolumeUnit',
-				'targetDiluentVolumeUnit',
-				'targetSolutionConcentrationUnit',
-				'targetSolutionVolumeUnit',
-			]
-			if(keys.includes(key)){
-				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
-				const params = {
-					subTargetStartSolution,
-					headerSelectFields
-				}
-				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
-			}
-		},
-    beforeSaveRecord(data){
-			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
-			this.onCommonVerifyNdException(formFields,data);
-		},
-    configComplete(val) {
-			const { rowData, headerSelectFields } = val;
-			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
-			let postData = {
-				mc: null,
-				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
-				nddw: headerSelectFields.actSolutionConcentrationUnit,
-				studySubjectId: this.formData.studySubjectId,
-				studyFormId:this.formData.id,
-				studyId:this.formData.studyId,
-				kc: total,
-				kcdw: unit,
-			}
-			this.configCompleteRequest(postData);
-		},
-
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
index 957c9c8..f839b30 100644
--- a/src/views/business/comps/template/comps/dl/DL018.vue
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -17,10 +17,10 @@
 
           <LineLabel label="template.dl.dl018.xbczqk" />
 					<CustomTable
-							fieldItemLabel="template.common.operationSteps"
+							fieldItemLabel="template.dl.dl018.xbczqk"
               @clickButton="handleClickButton"
 							:showAddRow="false" :showOperation="false"
-							ref="stepTableRef" :prefixKey = "`tableSecond`" :columns="stepColumns" :formData="tableFormData">
+							ref="stepTableRef" :prefixKey = "`tableSecond`" :columns="stepColumns" :formData="formData">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 									<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow(rowIndex,'secondTable')" ></TableOpertaionDelete>
 								</template>
@@ -65,13 +65,6 @@ export default {
 		},
 	},
 	computed: {
-    // 表格数据
-    tableFormData() {
-      return {
-        stepTableFormData: this.formData.stepTableFormData || [],
-        headerSelectFields: {}
-      }
-    },
 		// 备注表单配制
 		remarkConig() {
 			return [
@@ -193,6 +186,7 @@ export default {
 					bodySubFillType: 'actFill',
 					bodyFillType: 'actFill',
 					bodyDisabled: true,
+					bodySubDisabled:this.fillType !== 'actFill',
 					width: 280,
 					bodyMaxlength: 50,
 				},
@@ -205,6 +199,7 @@ export default {
 					bodySubKey: 'rsjs1',
 					bodySubFillType: 'actFill',
 					bodyFillType: 'actFill',
+					bodySubDisabled:this.fillType !== 'actFill',
 					bodyDisabled: true,
 					width: 280,
 					bodyMaxlength: 50,
@@ -256,11 +251,10 @@ export default {
 	},
 	methods: {
     //开始介绍按钮回调
-		handleClickButton(e, rowIndex) {
+		handleClickButton(e, rowIndex,colIndex,key,data) {
 			const arrStr = typeof e === 'string' ? e.slice(0, -1) : '';
 			const updateData = { [arrStr]: moment().format('YYYY/MM/DD HH:mm') };
-			this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, updateData);
-			// console.log(this.getFilledFormData())
+			this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, updateData,{signData:data,updateFields:[arrStr]});
 		},
     onRegentSubmit(e) {
       const { selectInfo, key, rowIndex } = e
@@ -272,13 +266,6 @@ export default {
           // 获取剂量组列表数据
           const stepTableFormData = bdnr.jlzTableData || []
 
-          if (stepTableFormData.length === 0) {
-            // 清空当前的换液情况列表数据
-            this.$set(this.formData, 'stepTableFormData', [])
-            this.$message.warning('前序表单中没有剂量组数据')
-            return
-          }
-
           // 从剂量组数据中提取剂量组别和悬液编号
           const itemData = stepTableFormData.map(item => ({
             jlzb: item.jlzb || '', // 剂量组别
@@ -290,37 +277,15 @@ export default {
             zy: '', //
             yx: '', //
             tj: '', //
+			id:this.getuuid(),
           }))
-          // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-          this.$set(this.formData, 'stepTableFormData', itemData)
-
-          this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
+          this.$refs.stepTableRef.updateDataSource(itemData);
         } catch (error) {
-          this.$set(this.formData, 'stepTableFormData', [])
           console.error('解析前序表单数据失败:', error)
           this.$message.error('解析前序表单数据失败')
         }
       }
     },
-    //选择table header下拉框也要更新体积
-		onHeaderSelectChange(data){
-			const {key, headerSelectFields,dataSource=[]} = data;
-			const keys = [
-				'targetStartSolutionVolumeUnit',
-				'targetDiluentVolumeUnit',
-				'targetSolutionConcentrationUnit',
-				'targetSolutionVolumeUnit',
-			]
-			if(keys.includes(key)){
-				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
-				const params = {
-					subTargetStartSolution,
-					headerSelectFields
-				}
-				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
-			}
-		},
-
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
diff --git a/src/views/business/comps/template/comps/dl/DL019.vue b/src/views/business/comps/template/comps/dl/DL019.vue
index 6d36e9a..6a78d1c 100644
--- a/src/views/business/comps/template/comps/dl/DL019.vue
+++ b/src/views/business/comps/template/comps/dl/DL019.vue
@@ -17,11 +17,9 @@
 
           <LineLabel label="template.dl.dl019.xbczqk" />
 					<CustomTable
-							@headerSelectChange="onHeaderSelectChange"
-							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
+							fieldItemLabel="template.dl.dl019.xbczqk"
 							:showAddRow="false" :showOperation="false"
-							ref="stepTableRef" :columns="stepColumns" :formData="tableFormData">
+							ref="stepTableRef" :columns="stepColumns" :formData="formData">
 							<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
 									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
@@ -68,13 +66,6 @@ export default {
 		},
 	},
 	computed: {
-    // 表格数据
-    tableFormData() {
-      return {
-        stepTableFormData: this.formData.stepTableFormData || [],
-        headerSelectFields: {}
-      }
-    },
 		// 备注表单配制
 		remarkConig() {
 			return [
@@ -221,70 +212,21 @@ export default {
           // 获取剂量组列表数据
           const stepTableFormData = bdnr.jlzTableData || []
 
-          if (stepTableFormData.length === 0) {
-            // 清空当前的换液情况列表数据
-            this.$set(this.formData, 'stepTableFormData', [])
-            this.$message.warning('前序表单中没有剂量组数据')
-            return
-          }
-
           // 从剂量组数据中提取剂量组别和悬液编号
           const itemData = stepTableFormData.map(item => ({
             jlzb: item.jlzb || '', // 剂量组别
             xybh: item.xybh || '', // 悬液编号
             bplsh1: '', //
             bplsh2: '', //
+			id:this.getuuid(),
           }))
-          // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-          this.$set(this.formData, 'stepTableFormData', itemData)
-
-          this.$message.success(`已从前序表单加载 ${itemData.length} 条剂量组数据`)
+          this.$refs.stepTableRef.updateDataSource(itemData);
         } catch (error) {
           console.error('解析前序表单数据失败:', error)
           this.$message.error('解析前序表单数据失败')
         }
       }
     },
-    //选择table header下拉框也要更新体积
-		onHeaderSelectChange(data){
-			const {key, headerSelectFields,dataSource=[]} = data;
-			const keys = [
-				'targetStartSolutionVolumeUnit',
-				'targetDiluentVolumeUnit',
-				'targetSolutionConcentrationUnit',
-				'targetSolutionVolumeUnit',
-			]
-			if(keys.includes(key)){
-				const {targetStartSolution,subTargetStartSolution} = this.$refs.swypyjInfoRef?.getFilledFormData();
-				const params = {
-					subTargetStartSolution,
-					headerSelectFields
-				}
-				this.batchUpdateTargetStartSolutionVolume(dataSource,targetStartSolution,params)
-			}
-		},
-    beforeSaveRecord(data){
-			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
-			this.onCommonVerifyNdException(formFields,data);
-		},
-    configComplete(val) {
-			const { rowData, headerSelectFields } = val;
-			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
-			let postData = {
-				mc: null,
-				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
-				nddw: headerSelectFields.actSolutionConcentrationUnit,
-				studySubjectId: this.formData.studySubjectId,
-				studyFormId:this.formData.id,
-				studyId:this.formData.studyId,
-				kc: total,
-				kcdw: unit,
-			}
-			this.configCompleteRequest(postData);
-		},
-
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
diff --git a/src/views/business/comps/template/comps/dl/DL020.vue b/src/views/business/comps/template/comps/dl/DL020.vue
index ca60b8e..abe5d69 100644
--- a/src/views/business/comps/template/comps/dl/DL020.vue
+++ b/src/views/business/comps/template/comps/dl/DL020.vue
@@ -2,21 +2,21 @@
 <template>
 	<div>
 		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
+					src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
 					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
 					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.xbxx" label="template.dl.dl020.xbxx"
-						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData"
-						/>
+						ref="swypyjInfoRef" :formConfig="swypyjInfoFormConfig" :formData="formData" />
 
-          <LineLabel label="template.dl.dl020.czbz" />
-          <Step ref="stepRef" :formData="formData.stepData"></Step>
+					<LineLabel label="template.dl.dl020.czbz" />
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
 					<BaseInfoFormPackage fieldItemLabel="template.dl.dl020.dlbz" label="template.dl.dl020.dlbz"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -116,11 +116,11 @@ export default {
 					type: "cellItem",
 					config: {
 						qxbd: {
-							span:1,
+							span: 1,
 							label: 'template.dl.dl020.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
-							filledCodes:['bdmc','bdbh'],
+							filledCodes: ['bdmc', 'bdbh'],
 						},
 					}
 				},
@@ -129,16 +129,16 @@ export default {
 	},
 	data() {
 		return {
-			formData: {},
 		};
 	},
 	mounted() {
+		console.log(this.formData,"formData")
 	},
 	methods: {
 		//获取已填写的表单数据
-		async getFilledFormData() {
-      let content = await this.validFormFields(["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"]);
-			return content;
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "stepRef", "remarkRef"]);
+		
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
@@ -180,6 +180,7 @@ export default {
 .print-btn {
 	margin-bottom: 20px;
 }
+
 .config-header-end {
 	display: flex;
 	justify-content: flex-end;
diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue
index 325998f..9901c82 100644
--- a/src/views/business/comps/template/comps/dl/DL021.vue
+++ b/src/views/business/comps/template/comps/dl/DL021.vue
@@ -176,7 +176,6 @@ export default {
 	},
 	data() {
 		return {
-			formData: {},
 		};
 	},
 	mounted() {
diff --git a/src/views/business/comps/template/comps/dl/DL022.vue b/src/views/business/comps/template/comps/dl/DL022.vue
index e9a0aab..556f978 100644
--- a/src/views/business/comps/template/comps/dl/DL022.vue
+++ b/src/views/business/comps/template/comps/dl/DL022.vue
@@ -13,7 +13,7 @@
 					<LineLabel label="template.dl.dl022.jbqk" />
 					<!-- 观察情况 -->
 					<div class="template-form-item">
-						<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+						<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.dl.dl022.jbqk"
 							:formConfig="stepFormConfig" @blur="onHandleBlur" :formData="formData"
 							@onRegentSubmit="onRegentSubmit" />
 						<div style="color:#999;font-size:14px;">
@@ -304,6 +304,7 @@ export default {
 		onAddRow() {
 			this.$refs.tableRef.addRow({
 				jblx: [{ value: undefined }],
+				id: getuuid(),
 			})
 		},
 		onFormSelect(fields) {
@@ -343,12 +344,13 @@ export default {
 		},
 		getResource() {
 			let content = this.getFilledFormData();
+			let formData = this.formData;
 			let tmpYq = []
 			tmpYq.push({
-				mc: content.wxjmc,
-				xh: content.wxjxh,
+				mc: content.wxjmc || formData.wxjmc,
+				xh: content.wxjxh || formData.wxjxh,
 				bh: content.xwj,
-				jzrq: content.wxjjzrq,
+				jzrq: content.wxjjzrq || formData.wxjjzrq,
 			})
 
 			this.resourceTmp = []
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
index 7232e25..c921e06 100644
--- a/src/views/business/comps/template/comps/dl/DL023.vue
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -22,9 +22,9 @@
 
 					<LineLabel label="template.dl.dl023.czjl" />
 					<!-- 操作记录 -->
-					<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+					<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.dl.dl023.czjl"
 						@select="onSelect" @clickButton="handleClickButton" :formConfig="stepFormConfig"
-						@blur="onHandleBlur" :formData="formData" />
+						 :formData="formData" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -250,73 +250,6 @@ export default {
 				this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, params)
 			}
 		},
-		onFormSelect(fields) {
-			this.onHandleBlur(fields)
-		},
-		//选择table header下拉框也要更新体积
-		onHeaderSelectChange(data) {
-			const { key, headerSelectFields, dataSource = [] } = data;
-			const keys = [
-				'targetStartSolutionVolumeUnit',
-				'targetDiluentVolumeUnit',
-				'targetSolutionConcentrationUnit',
-				'targetSolutionVolumeUnit',
-			]
-			if (keys.includes(key)) {
-				const { targetStartSolution, subTargetStartSolution } = this.$refs.swypyjInfoRef?.getFilledFormData();
-				const params = {
-					subTargetStartSolution,
-					headerSelectFields
-				}
-				this.batchUpdateTargetStartSolutionVolume(dataSource, targetStartSolution, params)
-			}
-		},
-		beforeSaveRecord(data) {
-			const formFields = this.$refs.swypyjInfoRef?.getFilledFormData();
-			this.onCommonVerifyNdException(formFields, data);
-		},
-		configComplete(val) {
-			const { rowData, headerSelectFields } = val;
-			//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			const { total, unit } = addTj([rowData.actStartSolutionVolume, rowData.actDiluentVolume], [headerSelectFields.actStartSolutionVolumeUnit, headerSelectFields.actDiluentVolumeUnit])
-			let postData = {
-				mc: null,
-				bh: rowData.targetSolutionCode + rowData.subTargetSolutionCode,
-				nd: rowData.actSolutionConcentration,//实际目标溶液浓度
-				nddw: headerSelectFields.actSolutionConcentrationUnit,
-				studySubjectId: this.formData.studySubjectId,
-				studyFormId: this.formData.id,
-				studyId: this.formData.studyId,
-				kc: total,
-				kcdw: unit,
-			}
-			this.configCompleteRequest(postData);
-		},
-		//分装回调
-		subPackageSubmit(data) {
-			const { fzsj, rowData, headerSelectFields } = data;
-			const { fzList = [], dw = "", mybh } = fzsj;
-			if (fzList && fzList.length > 0) {
-				const list = fzList.map((item) => {
-					return {
-						bh: mybh + item.preCode + 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,
-					studySubjectId: this.formData.studySubjectId,
-					studyFormId: this.formData.id,
-					list: list
-				}
-				this.subPackageRequest(postData);
-			}
-		},
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(["baseInfoRef", "swypyjInfoRef", "remarkRef", "tableRef"])
diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue
index a7177d2..d88d88b 100644
--- a/src/views/business/comps/template/comps/dl/DL024.vue
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -14,9 +14,8 @@
           <LineLabel label="template.dl.dl024.xbpyxx" />
           <!-- 操作记录 -->
           <div class="template-form-item">
-          <BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+          <BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.dl.dl024.xbpyxx"
             :formConfig="stepFormConfig"
-             @blur="onHandleBlur"
               @clickButton="handleClickButton"
                @onRegentSubmit="onRegentSubmit"
             :formData="formData" />
@@ -26,7 +25,7 @@
               :formData="tableFormData"
               operationWidth = "80px"
               :prefixKey = "`table`"
-              fieldItemLabel = "template.dl.dl024.gcqk"
+              fieldItemLabel = "template.dl.dl024.xbpyxx"
               :showAddRow="false"
               :showOperation="false"
             >
@@ -213,33 +212,18 @@ export default {
           const bdnr = JSON.parse(row.bdnr)
           // 获取剂量组列表数据
           const stepTableFormData = bdnr.stepTableFormData || []
-
-          if (stepTableFormData.length === 0) {
-            // 清空当前的换液情况列表数据
-            this.$set(this.formData, 'stepTableFormData', [])
-            this.$message.warning('前序表单中没有细胞编号数据')
-            return
-          }
           // 从剂量组数据中提取细胞编号
           const itemData = stepTableFormData.map(item => ({
             xbbh: item.targetSolutionCode+item.subTargetSolutionCode, // 细胞编号
+			id:this.getuuid(),
           }))
-          // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
-          this.$set(this.formData, 'stepTableFormData', itemData)
-
-		  
+		  this.$refs.tableRef.updateDataSource(itemData);
 		  this.$refs.swypyjInfoRef.updateFormData('pykssj', bdnr.pykssj);
-
-          this.$message.success(`已从前序表单加载 ${itemData.length} 条细胞编号数据`)
         } catch (error) {
-          this.$set(this.formData, 'stepTableFormData', [])
           console.error('解析前序表单数据失败:', error)
           this.$message.error('解析前序表单数据失败')
         }
     },
-    onFormSelect(fields){
-			this.onHandleBlur(fields)
-		},
 		//获取已填写的表单数据
 		getFilledFormData() {
 			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef","remarkRef","tableRef"])
diff --git a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
index df22582..5cd3401 100644
--- a/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
+++ b/src/views/business/comps/template/comps/gsp/DMYPPZJLB.vue
@@ -36,6 +36,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -71,6 +72,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 配制条件
 		storageFormConfig() {
@@ -125,19 +134,6 @@ export default {
 							type: "input",
 							disabled: true,
 						},
-						methodCode: {
-							label: 'template.common.methodCode',
-							type: "input",
-							fillType: "preFill",
-							maxlength: 50
-						},
-						versionNum: {
-							label: 'template.common.versionNumber',
-							type: "inputNumber",
-							fillType: "preFill",
-							prepend: "V",
-							maxlength: 50
-						},
 
 					}
 				},
diff --git a/src/views/business/comps/template/comps/gsp/GSP001.vue b/src/views/business/comps/template/comps/gsp/GSP001.vue
index 9458edd..eb1f255 100644
--- a/src/views/business/comps/template/comps/gsp/GSP001.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP001.vue
@@ -35,6 +35,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -69,6 +70,18 @@ export default {
 			type: String,
 			default: 'preFill',
 		},
+		sn: {
+			type: String,
+			default: '',
+		},
+	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
 	},
 	computed: {
 		// 配制条件
@@ -110,7 +123,61 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			return [
+			return this.sn==='GG005'?[
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.testConfigurationConditions',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther", otherCodeCompareTo: "preOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.common.configurationTime',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]:[
 				{
 					type: "cardItem",
 					config: {
@@ -156,7 +223,7 @@ export default {
 							label: 'template.common.actualFill',
 							type: "select",
 							fillType: "actFill",
-							otherCode: "actOther",otherCodeCompareTo: "preOther",
+							otherCode: "actOther", otherCodeCompareTo: "preOther",
 							multiple: true,
 							compareTo: "pre",
 							options: this.getDictOptions('business_pztj')
@@ -327,8 +394,8 @@ export default {
 				for (let i = 0; i < this.formData.formConfigs.length; i++) {
 					const formData = this.$refs[`formConfigStepFormPackageRef_${i}`][0].getFilledFormData();
 					const stepData = this.$refs[`formStepRef_${i}`][0].getFilledFormData();
-					if(this.formData.startDate&&formData.effectivePeriod&&formData.effectivePeriodUnit){
-					   formData.expireDate=getExpireDate(this.formData.startDate, formData.effectivePeriod, formData.effectivePeriodUnit)
+					if (this.formData.startDate && formData.effectivePeriod && formData.effectivePeriodUnit) {
+						formData.expireDate = getExpireDate(this.formData.startDate, formData.effectivePeriod, formData.effectivePeriodUnit)
 					}
 					formConfigsData.push({
 						...formData,
diff --git a/src/views/business/comps/template/comps/gsp/GSP002.vue b/src/views/business/comps/template/comps/gsp/GSP002.vue
index 203c908..b596423 100644
--- a/src/views/business/comps/template/comps/gsp/GSP002.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP002.vue
@@ -126,7 +126,74 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			return [
+			return this.sn==='GG006'?[
+				{
+					type: 'cardItem',
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: 'input',
+							disabled: true
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: 'input',
+							disabled: true
+						},
+					}
+				},
+				{
+					type: 'conditionItem',
+					label: 'template.common.testConfigurationConditions',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: 'select',
+							multiple: true,
+							fillType: 'preFill',
+							options: this.getDictOptions('business_pztj'),
+							otherCode: 'preOther'
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: 'select',
+							fillType: 'actFill',
+							otherCode: 'actOther',
+							multiple: true,
+							options: this.getDictOptions('business_pztj'),
+							compareTo: 'pre'
+						}
+					}
+				},
+				{
+					type: 'conditionItem',
+					label: 'template.sp.sp00456.rqcz',
+					config: {
+						containerMaterial: {
+							label: 'template.sp.sp00456.rqcz',
+							type: 'select',
+							options: this.getDictOptions('business_rqcz'),
+							fillType: 'actFill',
+							multiple: true,
+							otherCode: 'containerMaterialOther'
+						}
+					}
+				},
+				{
+					type: 'cellItem',
+					label: 'template.common.configurationTime',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: 'input'
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: 'input'
+						}
+					}
+				}
+			]:[
 				{
 					type: 'cardItem',
 					config: {
@@ -206,7 +273,7 @@ export default {
 						}
 					}
 				}
-			];
+			]
 		},
 		paralleStepFormConfig() {
 			return [
diff --git a/src/views/business/comps/template/comps/gsp/GSP003.vue b/src/views/business/comps/template/comps/gsp/GSP003.vue
index 6c2261d..098ba5b 100644
--- a/src/views/business/comps/template/comps/gsp/GSP003.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP003.vue
@@ -41,6 +41,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -76,6 +77,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 计算公式
 		calcFormConfig() {
diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue
index 05da277..43ef846 100644
--- a/src/views/business/comps/template/comps/gsp/GSP005.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP005.vue
@@ -40,13 +40,13 @@
 							</div>
 							<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
 								:ref="`formZlConfigFormPackageRef_${zlIndex}`" :formConfig="formZlConfig"
+								:prefixKey="'formzl_' + zlIndex"
 								@beforeReagentSubmit="(data) => onTableBeforeReagentZlSubmit(data, zlIndex, formZlConfig)"
 								@onRegentSubmit="(data) => onTableRegentZlSubmit(zlIndex, data)"
-								@clickButton="(data) => onClickButtonZl(zlIndex, data)"
-								:formData="formzlConfig" />
+								@clickButton="(data) => onClickButtonZl(zlIndex, data)" :formData="formzlConfig" />
 							<Step class="mt-0 s-container" :ref="`formZlStepRef_${zlIndex}`"
 								:formData="formzlConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
-								:prefixKey="'form_' + zlIndex"></Step>
+								:formIndex="zlIndex" formType="formZl" :prefixKey="'form_' + zlIndex"></Step>
 							<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
 								@click="zlJspz(zlIndex)">{{ $t('template.gsp.GSP005.jspz') }}</el-button>
 						</div>
@@ -69,12 +69,13 @@
 							</div>
 							<BaseInfoFormPackage fieldItemLabel="template.common.operationSteps"
 								:ref="`formRyConfigFormPackageRef_${ryIndex}`" :formConfig="formRyConfig"
+								:prefixKey="'formry_' + ryIndex"
 								@beforeReagentSubmit="(data) => onTableBeforeReagentRySubmit(data, ryIndex, formRyConfig)"
 								@onRegentSubmit="(data) => onTableRegentRySubmit(ryIndex, data)"
 								:formData="formryConfig" />
 							<Step class="mt-0 s-container" :ref="`formRyStepRef_${ryIndex}`"
 								:formData="formryConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
-								:prefixKey="'form_' + ryIndex"></Step>
+								:formIndex="ryIndex" formType="formRy" :prefixKey="'form_' + ryIndex"></Step>
 							<el-button class="print-btn" v-if="fillType === 'actFill'" type="primary"
 								@click="ryJspz(ryIndex)">{{ $t('template.gsp.GSP005.jspz') }}</el-button>
 						</div>
@@ -113,6 +114,20 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index, type) => {
+				if (type === 'formZl') {
+					const data = this.$refs[`formZlConfigFormPackageRef_${index}`][0].getFilledFormData()
+					return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+
+				} else {
+					const data = this.$refs[`formRyConfigFormPackageRef_${index}`][0].getFilledFormData()
+					return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+				}
+			}
+		}
+	},
 	computed: {
 		// 备注表单配制
 		remarkConig() {
@@ -181,7 +196,7 @@ export default {
 							label: 'template.common.actualFill',
 							type: "select",
 							fillType: "actFill",
-							otherCode: "actOther",otherCodeCompareTo: "preOther",
+							otherCode: "actOther", otherCodeCompareTo: "preOther",
 							multiple: true,
 							compareTo: "pre",
 							options: this.getDictOptions('business_pztj')
@@ -352,7 +367,7 @@ export default {
 							fourthType: "button",
 							fourthKey: "sywzsjclzButtonValue",
 							fourthFillType: "actFill",
-							fourthButtonName:"获取值",
+							fourthButtonName: "获取值",
 							isClearForm: true,
 							thirdOptions: this.getDictOptions('business_zldw'),
 							maxlength: 10
@@ -631,8 +646,8 @@ export default {
 		}
 	},
 	methods: {
-		onClickButtonZl(zlIndex, data){
-             alert('todo')
+		onClickButtonZl(zlIndex, data) {
+			this.$refs[`formZlConfigFormPackageRef_${zlIndex}`][0].updateFormData('sywzsjclzValue', 1)
 		},
 		//溶液开始配制
 		ryKspz(zlIndex) {
@@ -701,7 +716,7 @@ export default {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) {
+			if (key === "rjbhphSub" && selectData.row.kcdw !== formFields.rjsjtjUnit) {
 				callback.prevent('浓度单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
 		},
@@ -724,13 +739,13 @@ export default {
 			const { selectData, callback, key, formFields } = data;
 			debugger
 			//溶剂编号/批号
-			if (key === "rjbhphSub" && !isCommonUnit(selectData.row.nddw, [formFields.rjsjndUnit])) {
+			if (key === "rjbhphSub" && selectData.row.kcdw !== formFields.rjsjtjUnit) {
+				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
+			}
+			//试验物质编号/批号
+			if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) {
 				callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
 			}
-			// //试验物质编号/批号
-			// if (key === "sywzbhphSub" && !isCommonUnit(selectData.row.kcdw, [formFields.sywzsjclzUnit])) {
-			// 	callback.prevent('库存单位与预制不符，请重新选择或申请废止并重新预制。');
-			// }
 		},
 		onTableRegentZlSubmit(zlIndex, data) {
 			if (data.key === 'sywzbhphSub') {
@@ -892,6 +907,7 @@ export default {
 				if (tableListZl && tableListZl.length > 0) {
 					for (let i = 0; i < tableListZl.length; i++) {
 						let item = tableListZl[i]
+						debugger
 						tmpResource.push({
 							mc: item.targetName,
 							bh: item.targetCode + item.targetCodeSn,
diff --git a/src/views/business/comps/template/comps/gsp/GSP009.vue b/src/views/business/comps/template/comps/gsp/GSP009.vue
index cec9da4..1ba82ad 100644
--- a/src/views/business/comps/template/comps/gsp/GSP009.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP009.vue
@@ -256,6 +256,7 @@ export default {
 		},
 		getResource() {
 			let content = this.getFilledFormData();
+			let formData = this.formData;
 			//生成resource
 			let tmpResource = []
 			if (this.fillType === "actFill") {
@@ -263,7 +264,9 @@ export default {
 				if (content.paralleConfigs && content.paralleConfigs.length > 0) {
 					for (let i = 0; i < content.paralleConfigs.length; i++) {
 						let paralleConfigs = content.paralleConfigs[i]
+						let paralleConfigsForm = formData.paralleConfigs[i]
 						//使用量 
+						debugger
 						tmpResource.push({
 							mc: null,
 							bh: paralleConfigs.xz,
@@ -275,9 +278,9 @@ export default {
 							sxrq: null,
 							kc: null,
 							kcdw: null,
-							type: paralleConfigs.xzlx,
+							type: paralleConfigs.xzlx || paralleConfigsForm.xzlx,
 							syl: null,
-							syldw: paralleConfigs.kcdw,
+							syldw: paralleConfigs.kcdw || paralleConfigsForm.kcdw,
 							yxzq: null,
 							yxzqdw: null,
 						})
diff --git a/src/views/business/comps/template/comps/gsp/GSP010.vue b/src/views/business/comps/template/comps/gsp/GSP010.vue
index f586835..41ac26b 100644
--- a/src/views/business/comps/template/comps/gsp/GSP010.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP010.vue
@@ -32,6 +32,7 @@
 								:formData="formConfig" />
 							<Step class="mt-0 s-container" :ref="`formStepRef_${ladderIndex}`"
 								:formData="formConfig.stepData" :fieldItemLabel="$t('template.common.jtpz')"
+								:formIndex="ladderIndex"
 								:prefixKey="'form_' + ladderIndex"></Step>
 						</div>
 					</div>
@@ -67,6 +68,14 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getMybhByIndex: (index) => {
+				const data = this.$refs[`formConfigStepFormPackageRef_${index}`][0].getFilledFormData()
+				return { mybh: data.targetCode + data.targetCodeSn, maxVolume: data.targetActVolume, maxVolumeUnit: data.targetActVolumeUnit }
+			}
+		}
+	},
 	computed: {
 		// 备注表单配制
 		remarkConig() {
diff --git a/src/views/business/comps/template/comps/gsp/GSP015.vue b/src/views/business/comps/template/comps/gsp/GSP015.vue
index 139cc57..43dcb8f 100644
--- a/src/views/business/comps/template/comps/gsp/GSP015.vue
+++ b/src/views/business/comps/template/comps/gsp/GSP015.vue
@@ -15,84 +15,126 @@
 					<el-button class="mt-20" v-if="fillType === 'preFill'" type="primary"
 						@click="onAdd('ybsmDataList')">新增</el-button>
 					<el-button class="mt-20" v-if="fillType === 'actFill'" type="primary"
-						@click="onExport">导出</el-button>
-					<div v-for="(item, index) in formData.ybsmDataList" :key="item.id" class="template-form-item">
-						<div class="config-header">
-							<div></div>
-							<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ybsmDataList')">
-								<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
-									icon="el-icon-delete">{{
-										$t('template.common.deleteBtn')
-									}}</el-button>
-							</el-popconfirm>
-						</div>
-						<BaseInfoFormPackage fieldItemLabel="取样进样信息" :ref="`ybsmFormPackageRef${index}`"
-							@clickButton="(e,d,key,formFields) => handleClickButton(e,d,key,formFields,index)"
-							:formConfig="ybsmFormConfig" :formData="item" />
-						<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
-							:showOperation="fillType === 'actFill' || fillType === 'preFill'"
-							:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
-							fieldItemLabel="取样进样信息" :formData="item">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
-									@configComplete="(e)=>onConfigComplete(e,'qy')"
-									@printTag="(e)=>onPrintTag(e,index)"
-									:fillType="fillType"
-									:showFz="false"
-									:showKspz="false"
-									@deleteRow="() => deleteTableRow(rowIndex, index)">
-								</TableOpertaion>
-							</template>
-						</CustomTable>
-						<CustomTable :ref="`jyTableRef${index}`" :columns="yjColumns" prefix="jy"
-							fieldItemLabel="取样进样信息" @blur="(e) => onHandleTableBlur(e, index, 'jyTableRef')"
-							:showOperation="fillType === 'actFill'" :showAddRow="false"
-							:formData="{ stepTableFormData: item.jyStepTableFormData || [], headerSelectFields: item.jyHeaderSelectFields || {} }">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
-									@configComplete="(e)=>onConfigComplete(e,'jy')"
-									@printTag="(e)=>onPrintTag(e,index)"
-									:fillType="fillType"
-									:showFz="false"
-									:showKspz="false"
-									@deleteRow="() => deleteTableRow(rowIndex, index)">
-								</TableOpertaion>
-							</template>
-						</CustomTable>
-					</div>
+						@click="onExportXqjyxx">导出</el-button>
+					<vue-html2pdf :show-layout="true" pdf-content-width="100%" pdf-format="a2" :pdf-quality="2"
+						:float-layout="false" pdf-orientation="landscape" :paginate-elements-by-height="0"
+						:enable-download="false" :preview-modal="false" filename="取样进样信息" :html-to-pdf-options="{
+							margin: [10, 5, 10, 5], // 格式: [上, 右, 下, 左] (单位: mm)
+							// 或者使用对象格式
+							// margin: { top: 20, right: 15, bottom: 20, left: 15 },
+							filename: 'document.pdf',
+							image: {
+								type: 'jpeg',
+								quality: 2
+							},
+							enableLinks: false,
+							html2canvas: {
+								scale: 2,
+								useCORS: true
+							},
+							jsPDF: {
+								unit: 'mm',           // 单位: mm
+								format: 'a2',          // 纸张大小
+								orientation: 'landscape' // 方向
+							}
+						}" ref="html2PdfXqjyxx" @beforeDownload="handleBeforeDownload" @progress="onProgressXqjyxx">
+						<section slot="pdf-content">
+							<div v-for="(item, index) in formData.ybsmDataList" :key="item.id"
+								class="template-form-item">
+								<div class="config-header">
+									<div></div>
+									<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ybsmDataList')">
+										<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
+											icon="el-icon-delete">{{
+												$t('template.common.deleteBtn')
+											}}</el-button>
+									</el-popconfirm>
+								</div>
+								<BaseInfoFormPackage fieldItemLabel="取样进样信息" :ref="`ybsmFormPackageRef${index}`"
+									@clickButton="(e, d, key, formFields) => handleClickButton(e, d, key, formFields, index)"
+									:formConfig="ybsmFormConfig" :formData="item" />
+								<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns" prefix="qy"
+									:showOperation="fillType === 'actFill' || fillType === 'preFill'"
+									:showAddRow="fillType === 'preFill'" @onAddRow="() => addTableRow(index)"
+									fieldItemLabel="取样进样信息" :formData="item">
+									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
+											@configComplete="(e) => onConfigComplete(e, 'qy')"
+											@printTag="(e) => onPrintTag(e, index)" :fillType="fillType" :showFz="false"
+											:showKspz="false" @deleteRow="() => deleteTableRow(rowIndex, index)">
+										</TableOpertaion>
+									</template>
+								</CustomTable>
+								<CustomTable :ref="`jyTableRef${index}`" :columns="yjColumns" prefix="jy"
+									fieldItemLabel="取样进样信息" @blur="(e) => onHandleTableBlur(e, index, 'jyTableRef')"
+									:showOperation="fillType === 'actFill'" :showAddRow="false"
+									:formData="{ stepTableFormData: item.jyStepTableFormData || [], headerSelectFields: item.jyHeaderSelectFields || {} }">
+									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
+											@configComplete="(e) => onConfigComplete(e, 'jy')"
+											@printTag="(e) => onPrintTag(e, index)" :fillType="fillType" :showFz="false"
+											:showKspz="false" @deleteRow="() => deleteTableRow(rowIndex, index)">
+										</TableOpertaion>
+									</template>
+								</CustomTable>
+							</div>
+						</section>
+					</vue-html2pdf>
 					<LineLabel label="二次稀释信息" />
 					<el-button class="mt-20" v-if="fillType === 'preFill'" type="primary"
 						@click="onAdd('ecDataList')">新增</el-button>
 					<el-button class="mt-20" v-if="fillType === 'actFill'" type="primary"
-						@click="onExport('ec')">导出</el-button>
-					<div v-for="(item, index) in formData.ecDataList" :key="item.id" class="template-form-item">
-						<div class="config-header">
-							<div></div>
-							<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ecDataList')">
-								<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
-									icon="el-icon-delete">{{
-										$t('template.common.deleteBtn')
-									}}</el-button>
-							</el-popconfirm>
-						</div>
-						<BaseInfoFormPackage fieldItemLabel="二次稀释信息" :ref="`ecFormPackageRef${index}`"
-							:formConfig="ecFormConfig" :formData="item" />
-						<CustomTable :ref="`ecTableRef${index}`" :columns="yjColumns" prefix="ec"
-							fieldItemLabel="二次稀释信息" @blur="(e) => onHandleTableBlur(e, index, 'ecTableRef')"
-							:showOperation="fillType === 'preFill' || fillType === 'actFill'"
-							@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
-							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
-									@configComplete="(e)=>onConfigComplete(e,'jy')"
-									@printTag="(e)=>onPrintTag(e,index)"
-									:fillType="fillType"
-									:showFz="false"
-									:showKspz="false"
-									@deleteRow="() => deleteTableRow(rowIndex, index)">
-								</TableOpertaion>
-							</template>
-						</CustomTable>
-					</div>
+						@click="onExportEcxsxx()">导出</el-button>
+					<vue-html2pdf :show-layout="true" pdf-content-width="100%" pdf-format="a2" :pdf-quality="2"
+						:float-layout="false" pdf-orientation="landscape" :paginate-elements-by-height="0"
+						:enable-download="false" :preview-modal="false" filename="二次稀释信息" :html-to-pdf-options="{
+							margin: [10, 5, 10, 5], // 格式: [上, 右, 下, 左] (单位: mm)
+							// 或者使用对象格式
+							// margin: { top: 20, right: 15, bottom: 20, left: 15 },
+							filename: 'document.pdf',
+							image: {
+								type: 'jpeg',
+								quality: 2
+							},
+							enableLinks: false,
+							html2canvas: {
+								scale: 2,
+								useCORS: true
+							},
+							jsPDF: {
+								unit: 'mm',           // 单位: mm
+								format: 'a2',          // 纸张大小
+								orientation: 'landscape' // 方向
+							}
+						}" ref="html2PdfEcxsxx" @beforeDownload="handleBeforeDownload" @progress="onProgressEcxsxx">
+						<section slot="pdf-content">
+							<div v-for="(item, index) in formData.ecDataList" :key="item.id" class="template-form-item">
+								<div class="config-header">
+									<div></div>
+									<el-popconfirm title="确认删除当前数据？" @confirm="deleteConfig(item, 'ecDataList')">
+										<el-button slot="reference" v-if="fillType === 'preFill'" type="text"
+											icon="el-icon-delete">{{
+												$t('template.common.deleteBtn')
+											}}</el-button>
+									</el-popconfirm>
+								</div>
+								<BaseInfoFormPackage fieldItemLabel="二次稀释信息" :ref="`ecFormPackageRef${index}`"
+									:formConfig="ecFormConfig" :formData="item" />
+								<CustomTable :ref="`ecTableRef${index}`" :columns="yjColumns" prefix="ec"
+									fieldItemLabel="二次稀释信息" @blur="(e) => onHandleTableBlur(e, index, 'ecTableRef')"
+									:showOperation="fillType === 'preFill' || fillType === 'actFill'"
+									@onAddRow="() => addEcTableRow(index, 'ecTableRef')" :formData="item">
+									<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+										<TableOpertaion :row="row" :rowIndex="rowIndex" :columns="columns"
+											@configComplete="(e) => onConfigComplete(e, 'jy')"
+											@printTag="(e) => onPrintTag(e, index)" :fillType="fillType" :showFz="false"
+											:showKspz="false" @deleteRow="() => deleteTableRow(rowIndex, index)">
+										</TableOpertaion>
+									</template>
+								</CustomTable>
+							</div>
+						</section>
+					</vue-html2pdf>
 					<Step :ref="`stepRef`" :formData="formData.stepData || []"></Step>
 
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
@@ -108,6 +150,7 @@
 import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion";
 
+import VueHtml2pdf from 'vue-html2pdf'
 import LineLabel from "@/components/Template/LineLabel";
 import TableList from "@/components/Template/Table";
 import Step from "@/components/Template/Step";
@@ -118,7 +161,9 @@ import { getuuid, justUpdateFilledFormData } from "@/utils/index";
 import { isCommonUnit } from "@/utils/conTools";
 import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import { volumeConverter } from "@/utils/volConverter";//体积单位转换
+import { getToken } from "@/utils/auth"
 import moment from "moment";//时间处理
+import { studyFormFill_exportTbByFileUrl } from "@/api/business/study/studyFormFill"
 import { getBaseInfoFormConfig, getRemarkFormConfig, getYbsmFormConfig, getQyTableColumns, getJyTableColumns, getEcFormConfig } from "../../formConfig/gsp/gsp015";
 const refConfig = {
 	baseInfoRef: "baseInfoRef",
@@ -128,7 +173,7 @@ const refConfig = {
 const compRefs = Object.values(refConfig);
 export default {
 	name: "SP0021",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion },
+	components: { BaseInfoFormPackage, LineLabel, VueHtml2pdf, TableList, Step, CustomTable, TableOpertaion },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -170,56 +215,123 @@ export default {
 		return {
 			refConfig,
 			currentIndex: -1,
+			appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
+			baseUrl: process.env.VUE_APP_FILE_DOMAIN,
+			uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址
 		};
 	},
 	mounted() {
 
 	},
 	methods: {
-		onConfigComplete(e,type){
-			const {rowData,headerSelectFields} = e;
+		//获取文件blog
+		async handleBeforeDownload({ html2pdf, options, pdfContent }) {
+			this.$modal.loading()
+			// 1. 使用 html2pdf 手动构建 PDF，并获取底层的 jsPDF 实例
+			const pdf = await html2pdf()
+				.set(options)      // 应用你的配制选项
+				.from(pdfContent)  // 指定 PDF 内容
+				.toPdf()           // 转换为 PDF
+				.get('pdf');       // 获取 jsPDF 实例
+
+			// 2. 从 jsPDF 实例中输出 Blob 对象
+			const blob = pdf.output('blob');
+
+			// 3. 将 Blob 上传到你的服务器
+			await this.uploadPdfToServer(blob);
+
+			// 注意：如果你还想让文件自动下载，可以在这里调用 .save()
+			// pdf.save('my-document.pdf');
+		},
+		//上传到服务器
+		async uploadPdfToServer(blob) {
+			let that=this
+			const formData = new FormData();
+			formData.append('file', blob, 'hxhq-export-form.pdf');
+			try {
+				const response = await fetch(this.uploadFileUrl, {
+					method: 'POST',
+					headers: {
+						Authorization: "Bearer " + getToken(),
+					},
+					body: formData
+				});
+				// 检查响应状态
+				if (!response.ok) {
+					// 如果响应不成功，可以尝试获取错误信息
+					const errorData = await response.json().catch(() => ({}));
+					throw new Error(errorData.message || `HTTP error! status: ${response.status}`);
+				}
+				// 获取 JSON 数据
+				const data = await response.json();
+				// console.log('返回的JSON数据:', data);
+				if (data.code == 200) {
+					studyFormFill_exportTbByFileUrl(
+						{
+							url: data.data.url,
+							studyFormFillId:that.formData.id,
+							version: that.appTitle,
+							lang: that.$store.getters.language.split("_")[0]
+						}
+					).then(response => {
+						window.open(that.baseUrl + response.msg)
+					}).finally(() => {
+						this.$modal.closeLoading()
+					})
+				} else {
+					this.$modal.msgError(data.msg)
+					this.$modal.closeLoading()
+				}
+			} catch (error) {
+				this.$modal.msgError("导出失败，稍后再试")
+				this.$modal.closeLoading()
+			}
+		},
+		onConfigComplete(e, type) {
+			const { rowData, headerSelectFields } = e;
 			let params = {
 				studySubjectId: this.formData.studySubjectId,
 				studyId: this.formData.studyId,
 				studyFormId: this.formData.id,
 			};
-			if(type === 'qy'){
-				 params = {
+			if (type === 'qy') {
+				params = {
 					...params,
-					bh:rowData.qybh,//编号
-					nd:rowData.sjzjnd,//浓度
-					nddw:headerSelectFields.sjzjnddw,//浓度单位
-					kc:rowData.sjqyl,//库存
-					kcdw:headerSelectFields.sjqydw,//库存单位
+					bh: rowData.qybh,//编号
+					nd: rowData.sjzjnd,//浓度
+					nddw: headerSelectFields.sjzjnddw,//浓度单位
+					kc: rowData.sjqyl,//库存
+					kcdw: headerSelectFields.sjqydw,//库存单位
 				}
-			}else if(type === 'jy'){
-				 params = {
+			} else if (type === 'jy') {
+				params = {
 					...params,
-					bh:rowData.jybh,//编号
-					nd:rowData.sjjynd,//浓度
-					nddw:headerSelectFields.sjjynddw,//浓度单位
-					kc:rowData.ztj,//库存
-					kcdw:headerSelectFields.ztjdw,//库存单位
+					bh: rowData.jybh,//编号
+					nd: rowData.sjjynd,//浓度
+					nddw: headerSelectFields.sjjynddw,//浓度单位
+					kc: rowData.ztj,//库存
+					kcdw: headerSelectFields.ztjdw,//库存单位
 				}
 			}
 			this.configCompleteRequest(params)
 		},
-		onPrintTag(e,index){
-			console.log(e,index,"onPrintTag")
+		onPrintTag(e, index) {
+			console.log(e, index, "onPrintTag")
 		},
-		handleClickButton(item,signData,key,formFields,index){
+		handleClickButton(item, signData, key, formFields, index) {
 			const ref = this.$refs[`ybsmFormPackageRef${index}`][0];
-			if(key === "startButton"){
-				ref.updateFormData("qysj",moment().format("YYYY/MM/DD HH:mm:ss"),{ isUpdateRecord: true, signData })
-			}else if(key === "endButton"){
+			if (key === "startButton") {
+				ref.updateFormData("qysj", moment().format("YYYY/MM/DD HH:mm:ss"), { isUpdateRecord: true, signData })
+			} else if (key === "endButton") {
 				const qysj = formFields.qysj;
-				if(!qysj){
+				if (!qysj) {
 					this.$message.error("请先记录开始时间");
 					return;
 				}
-				const subQysj = qysj.substr(0,19)
+				const subQysj = qysj.substr(0, 19)
 				const endTime = moment().format("YYYY/MM/DD HH:mm:ss");
-				ref.updateFormData("qysj",`${subQysj} ~ ${endTime}`,{ isUpdateRecord: true, signData })
+				ref.updateFormData("qysj", `${subQysj} ~ ${endTime}`, { isUpdateRecord: true, signData })
 			}
 		},
 		onHandleTableBlur(e, index, refName) {
@@ -234,7 +346,7 @@ export default {
 				const { bdtjdw, qytjdw, jytjdw, qynddw, ztjdw, sjjynddw } = headerSelectFields || {};
 
 				//将标定体积的单位转换成和终体积单位一致再计算；
-			
+
 
 				if (!!bdtj && !!qytj) {
 					const transBdtj = volumeConverter.convert(bdtj + bdtjdw, ztjdw);//转换后的标定体积
@@ -277,8 +389,43 @@ export default {
 			this.addEcTableRow(index, "jyTableRef");
 
 		},
-		onExport() {
-
+		//生成进度
+		onProgressXqjyxx(progress) {
+			console.log(`生成进度: ${progress}%`)
+			this.removePageBreak()
+			if (progress == 100) {
+				this.$modal.closeLoading()
+			} else {
+				this.$modal.loading()
+			}
+		},
+		//移除分页空白
+		removePageBreak() {
+			document.querySelectorAll('.html2pdf__page-break').forEach(el => {
+				el.remove()
+			})
+		},
+		onExportXqjyxx() {
+			this.$modal.loading()
+			setTimeout(() => {
+				this.$refs.html2PdfXqjyxx.generatePdf()
+			}, 200);
+		},
+		//生成进度
+		onProgressEcxsxx(progress) {
+			console.log(`生成进度: ${progress}%`)
+			this.removePageBreak()
+			if (progress == 100) {
+				this.$modal.closeLoading()
+			} else {
+				this.$modal.loading()
+			}
+		},
+		onExportEcxsxx() {
+			this.$modal.loading()
+			setTimeout(() => {
+				this.$refs.html2PdfEcxsxx.generatePdf()
+			}, 200);
 		},
 		//删除样本说明
 		deleteConfig(item, type = "ybsmDataList") {
diff --git a/src/views/business/comps/template/comps/lba/LBA002.vue b/src/views/business/comps/template/comps/lba/LBA002.vue
index 2cc9496..6ef86c2 100644
--- a/src/views/business/comps/template/comps/lba/LBA002.vue
+++ b/src/views/business/comps/template/comps/lba/LBA002.vue
@@ -60,6 +60,11 @@ export default {
 			default: 'preFill',
 		},
 	},
+	provide() {
+		return {
+			getJcbData:()=>this.$refs.tableRef.getFilledFormData()
+		}
+	},
 	computed: {
 		// 备注表单配制
 		remarkConig() {
@@ -160,7 +165,7 @@ export default {
 				bodySubType: 'span',
 				bodySubKey: 'bh',
 				bodyFillType: 'preFill',
-				width: 280,
+				width: 380,
 			}]
 		},
 	},
diff --git a/src/views/business/comps/template/comps/lba/LBA006.vue b/src/views/business/comps/template/comps/lba/LBA006.vue
index 451b20d..0afc25d 100644
--- a/src/views/business/comps/template/comps/lba/LBA006.vue
+++ b/src/views/business/comps/template/comps/lba/LBA006.vue
@@ -273,7 +273,7 @@ export default {
 					"fieldCn": this.$t('template.lba.lba006.fxxx','zh_CN'),
 					"fieldEn": this.$t('template.lba.lba006.fxxx','en_US'),
 					// "oldValue": content.paralleConfigs[this.deleteIndex].jcb+";"+content.paralleConfigs[this.deleteIndex].jg+";"+(content.paralleConfigs[this.deleteIndex].jg==='接受'?''(content.paralleConfigs[this.deleteIndex].jgOther+";"))+content.paralleConfigs[this.deleteIndex].sjwjm,
-					"oldValue": content.paralleConfigs[this.deleteIndex].jcb+";"+content.paralleConfigs[this.deleteIndex].jg+";"+content.paralleConfigs[this.deleteIndex].jgOther+";"+content.paralleConfigs[this.deleteIndex].sjwjm,
+					"oldValue": '检测板:'+content.paralleConfigs[this.deleteIndex].jcb+";结果:"+content.paralleConfigs[this.deleteIndex].jg+(content.paralleConfigs[this.deleteIndex].jg=='接受'?'':('('+content.paralleConfigs[this.deleteIndex].jgOther+')'))+";数据文件名:"+content.paralleConfigs[this.deleteIndex].sjwjm,
 					"value": "",
 					"title": "修改",
 					"time": moment().format("YYYY-MM-DD HH:mm:ss"),
diff --git a/src/views/business/comps/template/comps/lba/LBA008.vue b/src/views/business/comps/template/comps/lba/LBA008.vue
index bf69295..50e72dc 100644
--- a/src/views/business/comps/template/comps/lba/LBA008.vue
+++ b/src/views/business/comps/template/comps/lba/LBA008.vue
@@ -144,6 +144,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -247,7 +260,8 @@ export default {
 				list.push({
 					dwbh: item[0],
 					zzlx: item[1],
-					targetStartSolutionVolumePrecision: 3
+					targetStartSolutionVolumePrecision: 3,
+					id:this.getuuid(),
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
diff --git a/src/views/business/comps/template/comps/pcr/PCR005.vue b/src/views/business/comps/template/comps/pcr/PCR005.vue
index ca06d32..c540d99 100644
--- a/src/views/business/comps/template/comps/pcr/PCR005.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR005.vue
@@ -148,6 +148,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -187,7 +200,7 @@ export default {
 				},
 				{
 					type: "cellItem",
-					label: 'template.common.configurationTime',
+					label: 'template.pcr.pcr005.clsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -256,7 +269,8 @@ export default {
 					sxbs: item[2],
 					ysypxytj: item[3],
 					targetDiluentVolumePrecision: 3,
-					actSolutionVolumePrecision: 3
+					actSolutionVolumePrecision: 3,
+					id:this.getuuid(),
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
diff --git a/src/views/business/comps/template/comps/pcr/PCR007.vue b/src/views/business/comps/template/comps/pcr/PCR007.vue
index c5741d4..3587b6e 100644
--- a/src/views/business/comps/template/comps/pcr/PCR007.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR007.vue
@@ -211,6 +211,7 @@ export default {
 				list.push({
 					ypmc: item[0],
 					cyqypgsjyjtjtj: item[1],
+					id:this.getuuid(),
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
diff --git a/src/views/business/comps/template/comps/pcr/PCR008.vue b/src/views/business/comps/template/comps/pcr/PCR008.vue
index 0bf7f6b..427ec41 100644
--- a/src/views/business/comps/template/comps/pcr/PCR008.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR008.vue
@@ -127,6 +127,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -320,12 +333,12 @@ export default {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
 						console.log(item)
-						let lzzcz = item.lzzcz
+						let lzzgz = item.lzzgz
 						let cjgz = item.cjgz
 						let tabZzzl;
 						// 组织重量 =  连组织称重 减去 采集管重
-						if(lzzcz && cjgz) {
-							let temp = subTj([lzzcz, cjgz], [content.headerSelectFields.lzzczUnit, content.headerSelectFields.cjgzUnit])
+						if(lzzgz && cjgz) {
+							let temp = subTj([lzzgz, cjgz], [content.headerSelectFields.lzzgzUnit, content.headerSelectFields.cjgzUnit])
 							let zzzl = temp.total
 							let zzzlUnit = temp.unit
 							tabZzzl = volumeConverter.convert(zzzl + zzzlUnit, content.headerSelectFields.zzzlUnit)
diff --git a/src/views/business/comps/template/comps/pcr/PCR009.vue b/src/views/business/comps/template/comps/pcr/PCR009.vue
index 0dd3d11..7053030 100644
--- a/src/views/business/comps/template/comps/pcr/PCR009.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR009.vue
@@ -252,7 +252,8 @@ export default {
 				list.push({
 					ypmc: item[0],
 					zzz: item[1],
-					targetStartSolutionVolumePrecision: 3
+					targetStartSolutionVolumePrecision: 3,
+					id:this.getuuid(),
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
diff --git a/src/views/business/comps/template/comps/pcr/PCR010.vue b/src/views/business/comps/template/comps/pcr/PCR010.vue
index 76fac94..48f5f00 100644
--- a/src/views/business/comps/template/comps/pcr/PCR010.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR010.vue
@@ -129,6 +129,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -258,8 +271,8 @@ export default {
 						let cqzl = item.cqzl * bs
 						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
 
-						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
-						tableList[i].ysyjrybjrl = ysyjrybjrl
+						let ysyjryjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjryjrlUnit)
+						tableList[i].ysyjryjrl = ysyjryjrl
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);
diff --git a/src/views/business/comps/template/comps/pcr/PCR011.vue b/src/views/business/comps/template/comps/pcr/PCR011.vue
index 5536cd1..223444e 100644
--- a/src/views/business/comps/template/comps/pcr/PCR011.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR011.vue
@@ -58,7 +58,7 @@ import { EventBus } from "@/utils/eventBus";
 import { volumeConverter } from "@/utils/volConverter";//体积单位转换
 import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
-import { getPCR010Config } from "../../formConfig/PCRTableConfig.js";
+import { getPCR011Config } from "../../formConfig/PCRTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
 import ImportExcelDialog from '../../dialog/ImportExcelDialog'
@@ -74,7 +74,7 @@ export default {
 	},
 	computed: {
 		tableStepColumns() {
-			return getPCR010Config(this);
+			return getPCR011Config(this);
 		},
 		// 配制条件
 		storageFormConfig() {
@@ -129,6 +129,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -177,7 +190,7 @@ export default {
 					type: 'step',
 					config: {
 						yjry: {
-							label: 'template.pcr.pcr010.yjry',
+							label: 'template.pcr.pcr011.sj',
 							type: 'input',
 							fillType: 'preFill',
 							subType: 'sj',
@@ -185,17 +198,7 @@ export default {
 							subFillType: 'actFill',
 							maxlength: 20
 						},
-						bs: {
-							label: 'template.pcr.pcr010.bs',
-							type: 'inputNumber',
-							fillType: 'actFill',
-							maxlength: 20
-						},
-						dztpbh: {
-							label: 'template.pcr.pcr010.dztpbh',
-							type: 'yq',
-							fillType: 'actFill',
-						},
+
 					}
 				}
 			]
@@ -216,7 +219,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称'], 'PCR分析组织匀浆表-常规导入模板')
+			this.exportExcel(['样品名称'], 'PCR分析核酸提取样品处理表导入模板')
 		},
 		showImportExcelDialog() {
 			this.$refs.ImportExcelDialog.show()
@@ -227,7 +230,8 @@ export default {
 			excelData.forEach(item => {
 				list.push({
 					ypmc: item[0],
-					targetStartSolutionVolumePrecision: 3
+					targetStartSolutionVolumePrecision: 3,
+					id:this.getuuid(),
 				})
 			})
 			this.$refs.stepTableRef.addRows(list)
@@ -248,18 +252,19 @@ export default {
 		updateTable() {
 			let content = this.getFilledFormData();
 
-			let bs = content.bs
 			content
 			if (this.fillType === "actFill") {
 				let tableList = content.stepTableFormData
 				if (tableList && tableList.length > 0) {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
-						let cqzl = item.cqzl * bs
-						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
+						let temp = subTj([item.ysjyztj, item.sjypjytj], [content.headerSelectFields.ysjyztjUnit, content.headerSelectFields.sjypjytjUnit])
+
+						let yssjjrtj = temp.total
+						let yssjjrtjUnit = temp.unit
+						yssjjrtj = volumeConverter.convert(yssjjrtj + yssjjrtjUnit, content.headerSelectFields.yssjjrtjUnit)
+						tableList[i].yssjjrtj = yssjjrtj
 
-						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
-						tableList[i].ysyjrybjrl = ysyjrybjrl
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);
diff --git a/src/views/business/comps/template/comps/pcr/PCR012.vue b/src/views/business/comps/template/comps/pcr/PCR012.vue
index 8f0369a..9a6c775 100644
--- a/src/views/business/comps/template/comps/pcr/PCR012.vue
+++ b/src/views/business/comps/template/comps/pcr/PCR012.vue
@@ -130,6 +130,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue
index 4773b2d..1a0a798 100644
--- a/src/views/business/comps/template/comps/sp/SP001.vue
+++ b/src/views/business/comps/template/comps/sp/SP001.vue
@@ -46,6 +46,14 @@ export default {
 	name: "SP001",
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable },
 	mixins: [templateMixin],
+	provide() {
+		return {
+			getMybh: ()=>{
+				const data = this.$refs['stepFormPackageRef'].getFilledFormData()
+				return {mybh:data.targetCode+data.targetCodeSn,maxVolume:data.targetActVolume,maxVolumeUnit:data.targetActVolumeUnit}
+			}
+		}
+	},
 	props: {
 		fillType: {
 			type: String,
@@ -96,8 +104,8 @@ export default {
 		},
 		// 试验基本信息表单配制
 		baseInfoFormConfig() {
-			//毒理002没得方法编号和版本号
-			let baseConfig = this.sn=='DL002'?
+			//毒理002+GG003+GG004没得方法编号和版本号
+			let baseConfig = this.sn=='DL002' || this.sn=='GG003' || this.sn=='GG004'?
 			{
 				studyMc: {
 					label: 'template.common.testName',
diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue
index 026f090..4e13241 100644
--- a/src/views/business/comps/template/comps/sp/SP00456.vue
+++ b/src/views/business/comps/template/comps/sp/SP00456.vue
@@ -83,7 +83,7 @@
 								:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 								:tableColumns="ladderStepColumns" :prefixKey="'ladder_1_' + ladderIndex"
 								:configType="'ladder'" :ref="`ladderRef_1_${ladderIndex}`"
-								:fieldItemLabel="'template.lba.lba005.zkpz'"
+								:fieldItemLabel="getTableLabel('ladder')"
 								@deleteConfig="deleteConfig('ladderConfigs_1', ladderConfig)" :fillType="fillType" />
 						</div>
 
@@ -94,7 +94,7 @@
 								:showOperation="fillType === 'actFill' || fillType === 'preFill'"
 								:tableColumns="paralleStepColumns1" :prefixKey="'paralle_1_' + paralleIndex"
 								:configType="'paralle'" :ref="`paralleRef_1_${paralleIndex}`"
-								:fieldItemLabel="'template.lba.lba005.zkpz'"
+								:fieldItemLabel="getTableLabel('paralle')"
 								@deleteConfig="deleteConfig('paralleConfigs_1', paralleConfig)" :fillType="fillType" />
 						</div>
 					</template>
@@ -212,6 +212,7 @@ export default {
 	data() {
 		const labArr = ["LBA005", "LBA007","ADA005","ADA007"];
 		const pcr234Arr = ["PCR002", "PCR003", "PCR004"];
+		const pcr34Arr = ["PCR003", "PCR004"];
 		const sn = this.sn || '';
 		return {
 			subSolutionVisible: false,
@@ -225,8 +226,10 @@ export default {
 			currentRowData: {},//当前点击的行数据
 			isLba: labArr.includes(this.sn),
 			isSp: sn.startsWith('SP'),//是否是色谱
+			isPcr: sn.startsWith('PCR'),//是否是PCR
 			isGsp: sn.startsWith('GSP'),//是否是供试品
 			isPcr234: pcr234Arr.includes(this.sn),//是否是PCR234
+			isPcr34: pcr34Arr.includes(this.sn),//是否是PCR34
 		};
 	},
 	mounted() {
diff --git a/src/views/business/comps/template/comps/sp/SP007.vue b/src/views/business/comps/template/comps/sp/SP007.vue
index 05ac0b4..44e4bd1 100644
--- a/src/views/business/comps/template/comps/sp/SP007.vue
+++ b/src/views/business/comps/template/comps/sp/SP007.vue
@@ -18,10 +18,15 @@
 						ref="ybRef" :formConfig="ybFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
-						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					
 					<BaseInfoFormPackage fieldItemLabel="template.lba.lba003.fj" label="template.lba.lba003.fj"
 						ref="fjRef" :formConfig="getFjFormConfig" :formData="formData" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.sp.sp007.clhxx" label="template.sp.sp007.clhxx"
+					ref="clhxxRef" :formConfig="clhxxConfig" :formData="formData" @clickButton="handleClickButton" />
+
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+					ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				
 				</div>
 			</div>
@@ -41,7 +46,8 @@ import { getLatestSn } from '@/api/template';
 import { EventBus } from "@/utils/eventBus";
 import { uniqeResource } from "@/utils/calUnitTools";
 import { debounce } from 'lodash-es';
-import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig} from "../../formConfig/sp/SP007";
+import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig,getClhxxFormConfig} from "../../formConfig/sp/SP007";
+import moment from "moment";
 
 export default {
 	name: "SP007",
@@ -74,6 +80,10 @@ export default {
 		getFjFormConfig() {
 			return getfjFormConfig(this);
 		},
+		//处理后信息
+		clhxxConfig() {
+			return getClhxxFormConfig(this);
+		},
 		
 	},
 	data() {
@@ -84,6 +94,10 @@ export default {
 	mounted() {
 	},
 	methods: {
+		// 点击按钮
+		handleClickButton(item,signData){
+			this.$refs.clhxxRef.updateFormData("hjsj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData});
+		},
 		//打印标签
 		printTag() {
 			const printConfig = this.getBasePrintConfig();
@@ -96,11 +110,11 @@ export default {
 	
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef","clhxxRef"])
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"]);
+			let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef","clhxxRef"]);
 			return content;
 		},
 		getResource() {
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index 1227f4f..dcbf299 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -251,6 +251,7 @@ export default {
 				return {
 					checked: undefined,
 					tagValue: item[0],
+					id:this.getuuid(),
 				}
 			})
 			this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex, { dwbh: tagData });
diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue
index 5ad34f7..a24e73f 100644
--- a/src/views/business/comps/template/comps/yp/YP005.vue
+++ b/src/views/business/comps/template/comps/yp/YP005.vue
@@ -271,6 +271,7 @@ export default {
 				return {
 					checked:undefined,
 					tagValue:item[0],
+					id:this.getuuid(),
 				}
 			})
 			this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex,{zz:tagData});
diff --git a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
index f75d0a5..a14d1e7 100644
--- a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
@@ -98,6 +98,7 @@ export default {
             if(data && data.uuid) {//为了标识eventBus的事件id
                 this.uuid = data.uuid
             }
+            this.selectedId = "";
             this.visible = true
             setTimeout(() => {
                 if(this.$refs.selectSjRef){
diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
index 12aebcd..42a452e 100644
--- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -134,6 +134,9 @@ export default {
                 this.selectedCode = 'id'
                 this.qxbdType = data.qxbdType || '';
             }
+            this.selectedId = "";
+            this.otherReagent = "";
+            this.otherChecked = false;
             this.checkType = checkType;
             this.mixType = mixType;
             this.sourceFrom = sourceFrom;
@@ -185,8 +188,13 @@ export default {
                 ly: row.ly,
                 nddw: row.nddw,
                 sxrq: row.sxr,
+                yxq: row.yxq,
                 ndz: (row.nd||"")+(row.nddw||""),
                 type: Number(this.selectType),
+                kc: row.kc,
+                kcdw: row.kcdw,
+                gg: row.gg,
+                ggdw: row.ggdw,
             }
             const {qxbdType,checkType} = this;
             if(qxbdType){
@@ -206,10 +214,16 @@ export default {
             this.$emit('submit', selectedValue, row);
             let callbackData = { selectInfo, uuid: this.uuid, selectedId: selectedValue, row,selectType:this.selectType,checkType };
             if(this.checkType === "checkbox"){
+                let selectedInfo = "";
+                if(this.otherChecked && this.otherReagent){
+                    selectedInfo = this.otherReagent;
+                }else{
+                    selectedInfo = row.map((item)=>(item.bdbh||item.bh)).join(",");
+                }
                 callbackData = {
                     uuid: this.uuid,
                     selectedRows: row,
-                    selectedId:row.map((item)=>item.bdbh).join(","),
+                    selectedId:selectedInfo,
                     checkType
                 }
             }
diff --git a/src/views/business/comps/template/dialog/SelectReagentDialog.vue b/src/views/business/comps/template/dialog/SelectReagentDialog.vue
index ca697e5..638da0a 100644
--- a/src/views/business/comps/template/dialog/SelectReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectReagentDialog.vue
@@ -134,6 +134,8 @@ export default {
             if(data && data.uuid) {//为了标识eventBus的事件id
                 this.uuid = data.uuid
             }
+            this.selectedId = ""
+            this.currentRow = {}
             this.visible = true
             this.studyFormId = studyFormId
             this.showTableData()
@@ -157,6 +159,7 @@ export default {
         },
         onCancel() {
             this.visible = false
+          
             this.$emit('cancel');
         },
         onSubmit() {
diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue
index b2cdd0a..5ad7543 100644
--- a/src/views/business/comps/template/dialog/SubPackageDialog.vue
+++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue
@@ -5,12 +5,14 @@
             <div class="header-container">
                 <div class="header-item">
                     <div class="header-title">包装编号</div>
-                    <HandleFormItem :fieldKey="formData.mybh + '_mybh'" :isFieldsRecord="false" :item="inputItem"
+                    <HandleFormItem :fieldKey="formData.mybh +id+ '_mybh'" :isFieldsRecord="false" :item="inputItem"
+                        :type = "mybhOptions.length ? 'select' : 'input'"
+                        @change="onChangeMybh"
                         :error="formErrors.mybh" v-model="formData.mybh" />
                 </div>
                 <div class="header-item">
                     <div class="header-title">分装数量</div>
-                    <HandleFormItem :isFieldsRecord="false" :fieldKey="formData.mybh + '_fzsl'" @blur="onBlurFzsl"
+                    <HandleFormItem :isFieldsRecord="false" :fieldKey="formData.mybh +id+ '_fzsl'" @blur="onBlurFzsl"
                         :item="integerInputNumberItem" type="inputNumber" :error="formErrors.fzsl"
                         v-model="formData.fzsl" />
                 </div>
@@ -20,13 +22,13 @@
                     <span>分装编号</span>
                     <span class="ml-20">单位：</span>
                     <div class="unit-select">
-                        <HandleFormItem :fieldKey="formData.mybh + '_dw'" :isFieldsRecord="false" :item="unitItem"
+                        <HandleFormItem :fieldKey="formData.mybh +id+ '_dw'" :isFieldsRecord="false" :item="unitItem"
                             type="select" :error="formErrors.dw" @blur="(e) => onCommonBlur(e, 'dw')"
                             v-model="formData.dw" />
                     </div>
                     <span class="ml-20">每份包装量：</span>
                     <div class="unit-select">
-                        <HandleFormItem :fieldKey="formData.mybh + '_mfbzl'" type="inputNumber"
+                        <HandleFormItem :fieldKey="formData.mybh +id+ '_mfbzl'" type="inputNumber"
                             :error="formErrors.mfbzl" :isFieldsRecord="false" :item="inputNumberItem"
                             v-model="formData.mfbzl" />
                     </div>
@@ -103,13 +105,15 @@ export default {
             uuid: "",//事件id
             originalData: {},//原始数据
             uuid: getuuid(),//事件id
+            mybhOptions: [],//母液编号选项
+            id: "",//分装id
         }
     },
     computed: {
         unitItem() {
             return {
                 type: "select",
-                fillType: "preFill",
+                fillType: "actFill",
                 options: this.dict.type.business_tjdw
             }
         }
@@ -157,6 +161,16 @@ export default {
                 this.fzListErrors = new Array(this.fzList.length).fill(false);
                 delete cloneData.fzList;
             }
+            const { mybhOptions=[] } = cloneData;
+            if(mybhOptions.length){
+                this.mybhOptions = mybhOptions
+                this.inputItem.options = mybhOptions;
+                this.inputItem.disabled = false;
+            }else{
+                this.inputItem.disabled = true;
+            }
+            this.id = data.id;
+
 
             this.formData = cloneData;
             // 重置错误状态
@@ -378,7 +392,7 @@ export default {
                     this.fzList.push({
                         num: "",
                         subCode: codes[i],
-                        preCode: `-set${codes[i]}`
+                        preCode: `${this.formData.mybh}-set${codes[i]}`
                     });
                     // 同步初始化错误状态数组
                     this.fzListErrors.push(false);
@@ -386,6 +400,13 @@ export default {
             }
 
         },
+        // 分装编号改变时，根据编号获取分装数据
+        onChangeMybh(e,type) {
+            if(type === "change" && this.formData.fzsl){
+                this.onBlurFzsl(this.formData.fzsl)
+            }
+          
+        },
         onAverage() {
             const { mfbzl } = this.formData;
             this.fzList.forEach((item, index) => {
diff --git a/src/views/business/comps/template/formConfig/PCRTableConfig.js b/src/views/business/comps/template/formConfig/PCRTableConfig.js
index a660c7e..5482ddd 100644
--- a/src/views/business/comps/template/formConfig/PCRTableConfig.js
+++ b/src/views/business/comps/template/formConfig/PCRTableConfig.js
@@ -785,12 +785,12 @@ export const getPCR008Config = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: 'template.pcr.pcr008.lzzcz',
-      prop: 'lzzcz',
+      label: 'template.pcr.pcr008.lzzgz',
+      prop: 'lzzgz',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'lzzczUnit',
+      headerSelectKey: 'lzzgzUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
@@ -954,12 +954,12 @@ export const getPCR010Config = ($this) => {
       bodySubPlaceholder: 'template.common.xswsPlaceholder'
     },
     {
-      label: 'template.pcr.pcr009.ysyjrybjrl',
-      prop: 'ysyjrybjrl',
+      label: 'template.pcr.pcr009.ysyjryjrl',
+      prop: 'ysyjryjrl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'ysyjrybjrlUnit',
+      headerSelectKey: 'ysyjryjrlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
@@ -975,17 +975,82 @@ export const getPCR010Config = ($this) => {
       headerSelectTo: 'actStartSolutionVolumeUnit'
     },
     {
-      label: 'template.pcr.pcr009.sjyjrybjrl',
-      prop: 'sjyjrybjrl',
+      label: 'template.pcr.pcr009.sjyjryjrl',
+      prop: 'sjyjryjrl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'sjyjrybjrlUnit',
+      headerSelectKey: 'sjyjryjrlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
-      copyFrom: 'ysyjrybjrl', //复制哪个字段
+      copyFrom: 'ysyjryjrl', //复制哪个字段
       bodyMaxlength: 10
     }
   ]
 }
+
+// PCR010
+export const getPCR011Config = ($this) => {
+  return [
+    {
+      label: 'template.pcr.pcr010.ypmc',
+      prop: 'ypmc',
+      width: 280,
+      bodyType: 'input',
+      fillType: 'preFill',
+      otherCode: 'bhOther',
+      bodyFillType: 'preFill'
+    },
+    {
+      label: 'template.pcr.pcr011.ysjyztj',
+      prop: 'ysjyztj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'ysjyztjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'preFill',
+      bodyMaxlength: 10,
+      bodyDisabled: true,
+    },
+    {
+      label: 'template.pcr.pcr011.sjypjytj',
+      prop: 'sjypjytj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjypjytjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+     {
+      label: 'template.pcr.pcr011.yssjjrtj',
+      prop: 'yssjjrtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'yssjjrtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+    {
+      label: 'template.pcr.pcr011.sjsjjrtj',
+      prop: 'sjsjjrtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjsjjrtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+  ]
+}
+
diff --git a/src/views/business/comps/template/formConfig/formConfig.js b/src/views/business/comps/template/formConfig/formConfig.js
index 7029d17..4190c0a 100644
--- a/src/views/business/comps/template/formConfig/formConfig.js
+++ b/src/views/business/comps/template/formConfig/formConfig.js
@@ -67,6 +67,13 @@ export const getSjColumns = () => {
       label: 'page.business.resource.sj.sjbh'
     },
     {
+      prop: 'kcl',
+      label: 'page.business.resource.sj.kcl',
+      formatter: (row) => {
+        return row.kc + row.kcdw
+      }
+    },
+    {
       prop: 'nd',
       label: 'page.business.resource.sj.sjnd'
     },
@@ -96,6 +103,13 @@ export const getGspColumns = () => {
       label: 'page.business.resource.sj.sjbh'
     },
     {
+      prop: 'kcl',
+      label: 'page.business.resource.sj.kcl',
+      formatter: (row) => {
+        return row.kc + row.kcdw
+      }
+    },
+    {
       prop: 'yxq',
       label: '有效期'
     },
@@ -117,6 +131,13 @@ export const getGyzjColumns = () => {
       label: 'page.business.resource.sj.sjbh'
     },
     {
+      prop: 'kcl',
+      label: 'page.business.resource.sj.kcl',
+      formatter: (row) => {
+        return row.kc + row.kcdw
+      }
+    },
+    {
       prop: 'nd',
       label: 'page.business.resource.sj.sjnd'
     },
diff --git a/src/views/business/comps/template/formConfig/gsp/gsp015.js b/src/views/business/comps/template/formConfig/gsp/gsp015.js
index c6703b7..11a676d 100644
--- a/src/views/business/comps/template/formConfig/gsp/gsp015.js
+++ b/src/views/business/comps/template/formConfig/gsp/gsp015.js
@@ -115,21 +115,21 @@ export const getQyTableColumns = ($this) => {
         {
             label: '取样编号',
             prop: 'qybh',
-            width: 280,
+            width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
         },
         {
             label: '制剂编号',
             prop: 'zjbh',
-            width: 280,
+            width: 200,
             bodyType: 'gsp',
             bodyFillType: 'actFill',
         },
         {
             label: '预设制剂浓度',
             prop: 'yszjnd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'yszjnddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -140,7 +140,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '实际制剂浓度',
             prop: 'sjzjnd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'sjzjnddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -176,7 +176,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '预设取样量',
             prop: 'ysqyl',
-            width: 280,
+            width: 200,
             headerSelectKey: 'ysqyldw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -188,7 +188,7 @@ export const getQyTableColumns = ($this) => {
         {
             label: '实际取样量',
             prop: 'sjqyl',
-            width: 280,
+            width: 200,
             headerSelectKey: 'sjqydw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -206,21 +206,21 @@ export const getJyTableColumns = ($this) => {
         {
             label: '进样编号',
             prop: 'jybh',
-            width: 280,
+            width: 200,
             bodyType: 'input',
             bodyFillType: 'preFill',
         },
         {
             label: '取样编号',
             prop: 'qybh',
-            width: 280,
+            width: 200,
             bodyType: 'gsp',
             bodyFillType: 'actFill',
         },
         {
             label: '取样浓度',
             prop: 'qynd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'qynddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
@@ -230,7 +230,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '取样体积',
             prop: 'qytj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'qytjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -240,7 +240,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '标定体积',
             prop: 'bdtj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'bdtjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -250,7 +250,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '进样体积',
             prop: 'jytj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'jytjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -260,7 +260,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '稀释倍数',
             prop: 'xsbs',
-            width: 280,
+            width: 200,
             bodyType: 'inputNumber',
             bodyFillType: 'actFill',
             bodySubType: "inputNumber",
@@ -273,7 +273,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '终体积',
             prop: 'ztj',
-            width: 280,
+            width: 200,
             headerSelectKey: 'ztjdw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_tjdw'),
@@ -289,7 +289,7 @@ export const getJyTableColumns = ($this) => {
         {
             label: '实际进样浓度',
             prop: 'sjjynd',
-            width: 280,
+            width: 200,
             headerSelectKey: 'sjjynddw',
             fillType: "preFill",
             headerOptions: $this.getDictOptions('business_nddw'),
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index 9cf7c8c..b47b1b2 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -539,48 +539,60 @@ export const getBaseInfoFormConfig = ($this) => {
   const labArr = ['LBA005', 'LBA007', 'ADA005', 'ADA007']
   const isLba = labArr.includes(sn)
   const isSp = sn.startsWith('SP') //是否是色谱
+  let baseConfig =
+  {
+    type: 'cardItem',
+    config: (isSp || $this.isPcr || isLba)
+      ? {
+        studyMc: {
+          label: 'template.common.testName',
+          type: 'input',
+          disabled: true
+        },
+        studySn: {
+          label: 'template.common.testNumber',
+          type: 'input',
+          disabled: true
+        },
+        methodCode: {
+          label: 'template.common.methodCode',
+          type: 'input',
+          fillType: 'preFill',
+          maxlength: 50
+        },
+        versionNum: {
+          label: 'template.common.versionNumber',
+          type: 'inputNumber',
+          fillType: 'preFill',
+          prepend: 'V',
+          maxlength: 50
+        },
+      } :
+      {
+        studyMc: {
+          label: 'template.common.testName',
+          type: 'input',
+          disabled: true
+        },
+        studySn: {
+          label: 'template.common.testNumber',
+          type: 'input',
+          disabled: true
+        }
+      }
+  }
+  if ($this.isPcr34) {//pcr34有处理批编号
+    baseConfig.config.clpbh = {
+      label: 'template.pcr.pcr005.clpbh',
+      type: 'input',
+      fillType: 'actFill',
+      maxlength: 50
+    }
+  }
+
   return [
-    {
-      type: 'cardItem',
-      config: isSp
-        ? {
-            studyMc: {
-              label: 'template.common.testName',
-              type: 'input',
-              disabled: true
-            },
-            studySn: {
-              label: 'template.common.testNumber',
-              type: 'input',
-              disabled: true
-            },
-            methodCode: {
-              label: 'template.common.methodCode',
-              type: 'input',
-              fillType: 'preFill',
-              maxlength: 50
-            },
-            versionNum: {
-              label: 'template.common.versionNumber',
-              type: 'inputNumber',
-              fillType: 'preFill',
-              prepend: 'V',
-              maxlength: 50
-            }
-          }
-        : {
-            studyMc: {
-              label: 'template.common.testName',
-              type: 'input',
-              disabled: true
-            },
-            studySn: {
-              label: 'template.common.testNumber',
-              type: 'input',
-              disabled: true
-            }
-          }
-    },
+    baseConfig
+    ,
     {
       type: 'conditionItem',
       label: isLba
@@ -608,19 +620,19 @@ export const getBaseInfoFormConfig = ($this) => {
     },
     isSp
       ? {
-          type: 'conditionItem',
-          label: 'template.sp.sp00456.rqcz',
-          config: {
-            containerMaterial: {
-              label: 'template.sp.sp00456.rqcz',
-              type: 'select',
-              options: $this.getDictOptions('business_rqcz'),
-              fillType: 'actFill',
-              multiple: true,
-              otherCode: 'containerMaterialOther'
-            }
+        type: 'conditionItem',
+        label: 'template.sp.sp00456.rqcz',
+        config: {
+          containerMaterial: {
+            label: 'template.sp.sp00456.rqcz',
+            type: 'select',
+            options: $this.getDictOptions('business_rqcz'),
+            fillType: 'actFill',
+            multiple: true,
+            otherCode: 'containerMaterialOther'
           }
         }
+      }
       : {},
     {
       type: 'cellItem',
diff --git a/src/views/business/comps/template/formConfig/sp/SP0020.js b/src/views/business/comps/template/formConfig/sp/SP0020.js
index 610149f..094f1e5 100644
--- a/src/views/business/comps/template/formConfig/sp/SP0020.js
+++ b/src/views/business/comps/template/formConfig/sp/SP0020.js
@@ -31,14 +31,22 @@ const getOptions = (sn) => {
       { label: '精密度与准确性', value: '精密度与准确性' },
       { label: '检测限', value: '检测限' },
       { label: '提取精密度', value: '提取精密度' },
-      { label: '提取前样品稳定性', value: '提取前样品稳定性' },
-      { label: '提取后样品稳定性', value: '提取后样品稳定性' },
-      { label: 'cDNA样品稳定性', value: 'cDNA样品稳定性' },
+      { label: '提取前样品冰浴放置稳定性', value: '提取前样品冰浴放置稳定性' },
+      { label: '提取前样品反复冻融稳定性', value: '提取前样品反复冻融稳定性' },
+      { label: '提取前样品长期冻存稳定性', value: '提取前样品长期冻存稳定性' },
       { label: '方法适用性', value: '方法适用性' },
       { label: '基因组DNA残留测定', value: '基因组DNA残留测定' },
       { label: '稀释线性', value: '稀释线性' },
-      { label: '反复动态稳定性', value: '反复动态稳定性' },
-      { label: '标准工作液稳定性', value: '标准工作液稳定性' }
+      { label: '提取前组织样品裂解液中冰浴放置稳定性', value: '提取前组织样品裂解液中冰浴放置稳定性' },
+      { label: '标准工作液稳定性', value: '标准工作液稳定性' },
+      { label: '提取前组织样品裂解液中反复冻融稳定性', value: '提取前组织样品裂解液中反复冻融稳定性' },
+      { label: '提取前组织样品裂解液中长期冻存稳定性', value: '提取前组织样品裂解液中长期冻存稳定性' },
+      { label: '提取后样品室温（10~30℃）放置稳定性', value: '提取后样品室温（10~30℃）放置稳定性' },
+      { label: '提取后样品2~8℃放置稳定性', value: '提取后样品2~8℃放置稳定性' },
+      { label: '提取后样品反复冻融稳定性', value: '提取后样品反复冻融稳定性' },
+      { label: '提取后样品长期冻存稳定性', value: '提取后样品长期冻存稳定性' },
+      { label: 'cDNA样品室温（10~30℃）放置稳定性', value: 'cDNA样品室温（10~30℃）放置稳定性' },
+      { label: 'cDNA样品2~8℃放置稳定性', value: 'cDNA样品2~8℃放置稳定性' }
     ]
   }
 
@@ -123,7 +131,7 @@ export const getFxpsjwjFormConfig = () => {
         },
         fxpsjlj: {
           type: 'input',
-          label: '分析批数据路径',
+          label: '分析批数据存储路径',
           span: 1,
           fillType: 'actFill',
           maxlength: 150
diff --git a/src/views/business/comps/template/formConfig/sp/SP007.js b/src/views/business/comps/template/formConfig/sp/SP007.js
index 080c684..4049623 100644
--- a/src/views/business/comps/template/formConfig/sp/SP007.js
+++ b/src/views/business/comps/template/formConfig/sp/SP007.js
@@ -158,3 +158,30 @@ export const getfjFormConfig = () => {
     }
   ]
 }
+//处理后信息
+export const getClhxxFormConfig = ($this) => {
+  return [
+    {
+      type: 'cellItem',
+      config: {
+        hjsj: {
+          label: 'template.sp.sp007.hjsj',
+          type: 'input',
+          fillType: 'actFill',
+          maxlength: 200,
+          subType: 'button',
+          subKey: 'hjsjButton',
+          buttonName: 'template.yp.yp002.hqsj',
+          disabled: true,
+          subDisabled: $this.fillType !== 'actFill'
+        },
+        cfwz: {
+          label: 'template.sp.sp007.cfwz',
+          type: 'input',
+          fillType: 'actFill',
+          maxlength: 100
+        }
+      }
+    }
+  ]
+}
diff --git a/src/views/business/comps/template/formConfig/xb/xb001.js b/src/views/business/comps/template/formConfig/xb/xb001.js
index f10f685..1d252bc 100644
--- a/src/views/business/comps/template/formConfig/xb/xb001.js
+++ b/src/views/business/comps/template/formConfig/xb/xb001.js
@@ -296,7 +296,7 @@ export const getStepFivth = ($this) => {
           fillType: 'preFill'
         },
         text4: {
-          label: '℃，实际温度',
+          label: '℃，实际温度设置',
           type: 'text'
         },
         sjwd: {
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 1e3d518..6d9c539 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -73,7 +73,8 @@ export default {
     'business_dl_uav', // 毒理-紫外照射操作记录表-UVA-DL023
     'business_pcr_fxffypzbb', //PCR-编号-分析方法学样品制备表
     'business_dl_xbx', //毒理-紫外照射操作记录表-细胞系
-    'business_dl_dwzs' //毒理-紫外照射操作记录表-动物种属
+    'business_dl_dwzs', //毒理-紫外照射操作记录表-动物种属
+    'business_dl_sjqqtqk' //毒理-细胞收集/低渗及固定操作记录表-收集前其他情况
   ],
   props: {
     templateData: {
@@ -278,6 +279,9 @@ export default {
     this.setTemplateData({})
   },
   methods: {
+    getuuid() {
+      return getuuid()
+    },
     // 只是更新已填写的表单数据，不触发校验
     justUpdateFilledFormData() {
       const params = {
@@ -430,7 +434,7 @@ export default {
       })
       const validFormData = await Promise.all(refs).catch((err) => {
         // this.$message.error(err);
-        if (err.errorType && err.errorType === 'step') {
+        if (err && err.errorType && err.errorType === 'step') {
           this.$message.error('请添加步骤')
           return
         }
diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue
index 33ec576..e13a7d7 100644
--- a/src/views/business/form/drug/comp/tbbdList.vue
+++ b/src/views/business/form/drug/comp/tbbdList.vue
@@ -124,7 +124,7 @@
                   v-hasPermi="['business:drugFormFill:qrfz']">{{
                     $t('page.business.study.studyFormFill.qrfz') }}</el-button>
                 <!-- 观察 -->
-                <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
+                <el-button type="text" v-if="scope.row.bdzt === 1&& scope.row.showGc == 10" @click="gc(scope.row)"
                   v-hasPermi="['business:drugFormFill:gc']">{{
                     $t('page.business.study.studyFormFill.gc') }}</el-button>
               </template>
diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue
index 6ebf115..552d4f6 100644
--- a/src/views/business/form/nonTrial/comp/tbbdList.vue
+++ b/src/views/business/form/nonTrial/comp/tbbdList.vue
@@ -122,7 +122,7 @@
                   v-hasPermi="['business:nonTrialFormFill:qrfz']">{{
                     $t('page.business.study.studyFormFill.qrfz') }}</el-button>
                 <!-- 观察 todo 观察按钮只在系统模板为细胞复苏记录表才展示) -->
-                <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
+                <el-button type="text" v-if="scope.row.bdzt === 1&& scope.row.showGc == 10" @click="gc(scope.row)"
                   v-hasPermi="['business:nonTrialFormFill:gc']">{{
                     $t('page.business.study.studyFormFill.gc') }}</el-button>
               </template>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Gd.vue b/src/views/business/resource/gsp/comps/ffjl/Gd.vue
index ad59156..e00e4d4 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Gd.vue
@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plgd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             gd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jd.vue b/src/views/business/resource/gsp/comps/ffjl/Jd.vue
index 27b5e7e..e3875c4 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jd.vue
@@ -130,11 +130,13 @@ export default {
           if (this.isBatch) {
             jdBatch(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             jd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue
index 2b980d3..b96db6c 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jq.vue
@@ -114,6 +114,7 @@ export default {
         if (valid) {
             jq(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
         }
diff --git a/src/views/business/resource/gsp/comps/ffjl/Js.vue b/src/views/business/resource/gsp/comps/ffjl/Js.vue
index 4cc1e2b..e91411f 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Js.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Js.vue
@@ -117,6 +117,7 @@ export default {
         if (valid) {
           js(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jy.vue b/src/views/business/resource/gsp/comps/ffjl/Jy.vue
index 4528292..bc106a6 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jy.vue
@@ -149,6 +149,7 @@ export default {
 
           jy(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/ffjl/Sd.vue b/src/views/business/resource/gsp/comps/ffjl/Sd.vue
index f55513c..6bc62ff 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Sd.vue
@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plsd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             sd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/gsp/Cc.vue b/src/views/business/resource/gsp/comps/gsp/Cc.vue
index 62cb895..ef0df4b 100644
--- a/src/views/business/resource/gsp/comps/gsp/Cc.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Cc.vue
@@ -176,6 +176,7 @@ export default {
           cc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$modal.closeLoading()
           }).finally(() => {
             this.$modal.closeLoading()
diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue
index 09cdcde..5dcac6e 100644
--- a/src/views/business/resource/gsp/comps/gsp/Cz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue
@@ -152,6 +152,7 @@ export default {
         if (valid) {
           cz(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
index ab4f552..b5750c7 100644
--- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
+++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
@@ -172,6 +172,7 @@ export default {
             plcz(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$modal.closeLoading()
             }).finally(() => {
               this.$modal.closeLoading()
diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue
index 9cf7967..cb8f9c7 100644
--- a/src/views/business/resource/gsp/comps/gsp/Ff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue
@@ -30,11 +30,10 @@
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gsp.zysx')" align="center" prop="zysx"
-                  width="130px" />
+                  width="130px" :show-overflow-tooltip="true"/>
                 <el-table-column :label="$t('page.business.resource.gsp.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.zytj" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')" />
+                      <BusinessSelect v-model="scope.row.zytj" dictType="business_zytj"></BusinessSelect>
                   </template>
                 </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" width="250px">
@@ -427,6 +426,7 @@ export default {
           } else {
             ff(params).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue
index f83eae9..275629e 100644
--- a/src/views/business/resource/gsp/comps/gsp/Gd.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Gd.vue
@@ -117,11 +117,13 @@ export default {
           if (this.isBatch) {
             plgd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             gd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/gsp/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue
index b9a705f..dfa39f3 100644
--- a/src/views/business/resource/gsp/comps/gsp/Gh.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Gh.vue
@@ -68,7 +68,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.zytj')" prop="ghzytj">
-              <el-input type="text" v-model="form.ghzytj" maxlength="50" />
+               <BusinessSelect v-model="form.ghzytj" dictType="business_zytj"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -172,10 +172,11 @@
 import { gh, info } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "GspGh",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser, BusinessSelect },
   data() {
     return {
       isBatch: false,
@@ -275,20 +276,12 @@ export default {
     },
     show(row) {
       this.reset()
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.form.ph = row.ph
-      this.form.gg = row.gg
-      this.form.ggdw = row.ggdw
-      this.form.yxq = row.yxq
-      this.form.jsrq = row.jsrq
-      this.form.ffrq = row.ffrq
-      this.form.cctj = row.cctj
-      this.form.kc = row.kc
-      this.form.kcdw = row.kcdw
-      this.form.zysx = row.zysx
-      this.open = true
+      info({id: row.id}).then(response => {
+        this.form = response.data
+        this.open = true
+      })
+
+
     },
     save() {
       this.$refs["form"].validate(valid => {
diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue
index 68ae9a1..bbc7d1d 100644
--- a/src/views/business/resource/gsp/comps/gsp/Js.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Js.vue
@@ -117,6 +117,7 @@ export default {
         if (valid) {
           js(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/gsp/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue
index 6bcd292..483c5c0 100644
--- a/src/views/business/resource/gsp/comps/gsp/Jy.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Jy.vue
@@ -175,6 +175,7 @@ export default {
         if (valid) {
           jy(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
 
diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue
index 526a2cb..2ec60f3 100644
--- a/src/views/business/resource/gsp/comps/gsp/Sd.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Sd.vue
@@ -116,11 +116,13 @@ export default {
           if (this.isBatch) {
             plsd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             sd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/gsp/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue
index 6f2045a..dc7b271 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xq.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue
@@ -136,6 +136,7 @@ export default {
   data() {
     return {
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       form: {},
       tzList: [],
       totalTz: 0,
@@ -160,7 +161,7 @@ export default {
   methods: {
     exportPDF() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'供试品导出',jcmcEn:'Test Item Export'})
         this.$modal.closeLoading()
diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue
index 9802c38..3336ad1 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue
@@ -226,6 +226,7 @@ export default {
         if (valid) {
           save(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
index 568997f..1e71361 100644
--- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
@@ -207,6 +207,7 @@ export default {
           params.list = this.selectList
           ysff(params).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
index 6aa3efc..cd553b1 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -214,6 +214,7 @@ export default {
         if (valid) {
           bj(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/rkjl/Gd.vue b/src/views/business/resource/gsp/comps/rkjl/Gd.vue
index e6aba73..78c629a 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Gd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Gd.vue
@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plgd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             gd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/rkjl/Jd.vue b/src/views/business/resource/gsp/comps/rkjl/Jd.vue
index b973659..314a39e 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Jd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Jd.vue
@@ -131,11 +131,13 @@ export default {
           if (this.isBatch) {
             jdBatch(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             jd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/rkjl/Js.vue b/src/views/business/resource/gsp/comps/rkjl/Js.vue
index b195366..1737d35 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Js.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Js.vue
@@ -117,6 +117,7 @@ export default {
         if (valid) {
           js(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/rkjl/Jy.vue b/src/views/business/resource/gsp/comps/rkjl/Jy.vue
index f985c18..186bb3f 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Jy.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Jy.vue
@@ -149,6 +149,7 @@ export default {
 
           jy(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue
index e72b361..98e5531 100644
--- a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue
@@ -118,8 +118,13 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.$emit('callback')
+      if(response.code == 200) {
+        this.$modal.msgSuccess("导入成功");
+        this.$emit('callback')
+        this.cancel()
+      } else {
+        this.$modal.alertError(response.msg);
+      }
     },
     // 提交上传文件
     submitFileForm() {
diff --git a/src/views/business/resource/gsp/comps/rkjl/Sd.vue b/src/views/business/resource/gsp/comps/rkjl/Sd.vue
index 78a4d0d..4e4ecd4 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Sd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Sd.vue
@@ -141,11 +141,13 @@ export default {
           if (this.isBatch) {
             plsd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           } else {
             sd(this.form).then(response => {
               this.open = false
+              this.$modal.msgSuccess(this.$t('form.operationSuccess'))
               this.$emit('callback')
             })
           }
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
index 663a666..f6d4f80 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
@@ -54,8 +54,8 @@
           <!-- 有效期 -->
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
-              <el-date-picker v-model="form.yxq" type="date" format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd" :placeholder="$t('form.placeholderInput')">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd  HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -221,6 +221,7 @@ export default {
         if (valid) {
           xz(this.form).then(response => {
             this.open = false
+            this.$modal.msgSuccess(this.$t('form.operationSuccess'))
             this.$emit('callback')
           })
         }
diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
index 4771aef..ab72bfe 100644
--- a/src/views/business/resource/gyzj/comps/ffjlList.vue
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -80,6 +80,11 @@
             <el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:gyzj:ffjldc']">{{
               $t('form.export') }}</el-button>
           </el-col>
+          <el-col :span="1.5" style="float: right;">
+            {{ $t('page.business.resource.gyzj.ckl') }}：{{ ckldw != '' ? ckl : '--' }}{{ ckldw }} ；
+            {{ $t('page.business.resource.gyzj.rkl') }}：{{ rkldw != '' ? rkl : '--' }}{{ rkldw }} ；
+            {{ $t('page.business.resource.gyzj.syl') }}：{{ syldw != '' ? syl : '--' }}{{ syldw }} ；
+          </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -211,7 +216,7 @@
 </template>
 
 <script>
-import { list } from "@/api/business/gyzj/gyzjFfjl"
+import { list, yltj } from "@/api/business/gyzj/gyzjFfjl"
 import Sd from "./ffjl/Sd";
 import Jy from "./ffjl/Jy";
 import Js from "./ffjl/Js";
@@ -252,6 +257,12 @@ export default {
         startDateRk: null,
         endDateRk: null,
       },
+      ckl: '',
+      rkl: '',
+      syl: '',
+      ckldw: '',
+      rkldw: '',
+      syldw: '',
     }
   },
   computed: {
@@ -263,6 +274,73 @@ export default {
     this.getList()
   },
   methods: {
+    getyltj() {
+      yltj(this.queryParams).then(response => {
+        let that=this
+        // {
+        //     "rkl": 0,
+        //     "ckldw": "mL",
+        //     "syldw": "mL",
+        //     "ckl": 0,
+        //     "syl": 0,
+        //     "count": 1,
+        //     "rkldw": ""
+        // },
+        let tmpRklUnit = []
+        let tmpCklUnit = []
+        let tmpSylUnit = []
+        _.forEach(deepClone(response.data), function (item) {
+          //入库量
+          let _indexRkl = _.findIndex(tmpRklUnit, function (fitem) { return fitem.key == item.rkldw })
+          if (_indexRkl > -1) {
+            tmpRklUnit[_indexRkl] = tmpRklUnit[_indexRkl].count + item.count
+          } else {
+            tmpRklUnit.push({ key: item.rkldw, count: item.count })
+          }
+          //出库量
+          let _indexCkl = _.findIndex(tmpCklUnit, function (fitem) { return fitem.key == item.ckldw })
+          if (_indexCkl > -1) {
+            tmpCklUnit[_indexCkl] = tmpCklUnit[_indexCkl].count + item.count
+          } else {
+            tmpCklUnit.push({ key: item.ckldw, count: item.count })
+          }
+          //使用量
+          let _indexSyl = _.findIndex(tmpSylUnit, function (fitem) { return fitem.key == item.syldw })
+          if (_indexSyl > -1) {
+            tmpSylUnit[_indexSyl] = tmpSylUnit[_indexSyl].count + item.count
+          } else {
+            tmpSylUnit.push({ key: item.syldw, count: item.count })
+          }
+        })
+        //获取最多单位
+        let _ckldw = _.maxBy(tmpCklUnit, function (o) { return o.count; })
+        this.ckldw = _ckldw != null ? _ckldw.key : '';
+
+        let _rkldw = _.maxBy(tmpRklUnit, function (o) { return o.count; })
+        this.rkldw = _rkldw != null ? _rkldw.key : '';
+
+        let _syldw = _.maxBy(tmpSylUnit, function (o) { return o.count; })
+        this.syldw = _syldw != null ? _syldw.key : '';
+        //计算最终值 
+        let sylCalc = that.getCalc(that.syldw)
+        let cklCalc = that.getCalc(that.ckldw)
+        let rklCalc = that.getCalc(that.rkldw)
+        this.syl =_.divide( _.sumBy(deepClone(response.data), function (item) { return item.syl  }), sylCalc)
+        this.ckl =_.divide( _.sumBy(deepClone(response.data), function (item) { return item.ckl  }), cklCalc)
+        this.rkl =_.divide( _.sumBy(deepClone(response.data), function (item) { return item.rkl  }), rklCalc)
+      })
+    },
+     getCalc(toUnit) {
+      let unit = ['pL', 'nL', 'uL', 'mL', 'L']
+      let result = 1
+      for (var i = 1; i < unit.length; i++) {
+         result = result*1000
+        if (unit[i] == toUnit) {
+          break
+        }
+      }
+      return result
+    },
     exportExcel() {
       let that = this
       that.$modal.loading()
@@ -397,7 +475,7 @@ export default {
         a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
         a.click()
         that.$modal.closeLoading()
-        that.saveSimpleLog({name:'',nameEn:'',jcmc:'给药制剂发放回收导出',jcmcEn:'Formulation In-and-Out Record Export'})
+        that.saveSimpleLog({ name: '', nameEn: '', jcmc: '给药制剂发放回收导出', jcmcEn: 'Formulation In-and-Out Record Export' })
       }).finally(() => {
         that.$modal.closeLoading()
       })
@@ -469,6 +547,7 @@ export default {
       list(this.queryParams).then(response => {
         this.list = response.rows
         this.total = response.total
+        this.getyltj()
         this.loading = false
       })
     },
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
index efa40b7..96a6f70 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -3,8 +3,10 @@
     <!-- 发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.gyzj.fafang')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules"  :label-width="$i18n.locale === 'zh_CN'?'120px':'170px'" v-if="open">
-        <div class="sbzdtcma"> <input type="text"> <input   type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password> </div>
+      <el-form ref="form" :model="form" :rules="rules" :label-width="$i18n.locale === 'zh_CN' ? '120px' : '170px'"
+        v-if="open">
+        <div class="sbzdtcma"> <input type="text"> <input type="password" @contextmenu.native.prevent
+            @copy.native.prevent @cut.native.prevent show-password> </div>
         <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
@@ -83,7 +85,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.nd')">
                 <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -104,7 +106,7 @@
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.ckl')">
                 <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -122,7 +124,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz">
-               <SelectBalanceValue v-model="form.ckmz" :dw="form.ckmzdw" />
+                <SelectBalanceValue v-model="form.ckmz" :dw="form.ckmzdw" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -140,26 +142,26 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.lqr1')" prop="lqr1Id">
-              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
+              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" @change="validateForm" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.lqr1') + $t('form.password')" prop="lqr1mm">
-              <el-input   type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.lqr1mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.lqr2')" prop="lqr2Id">
-              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
+              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" @change="validateForm" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.lqr2') + $t('form.password')" prop="lqr2mm">
-              <el-input   type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.lqr2mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -172,21 +174,21 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr1') + $t('form.password')" prop="ffr1mm">
-              <el-input   type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.ffr1mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="form.ffr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr2')" prop="ffr2Id">
-              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" />
+              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" @change="validateForm" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr2') + $t('form.password')" prop="ffr2mm">
-              <el-input   type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="form.ffr2mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="form.ffr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -200,7 +202,8 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm') }}</el-button>
+        <el-button type="primary" @click="save" :disabled="isBatch && selectList.length == 0">{{ $t('form.confirm')
+        }}</el-button>
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
     </el-dialog>
@@ -218,7 +221,7 @@ import SelectBalanceValue from '@/views/business/comps/select/SelectBalanceValue
 
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect,SelectBalanceValue },
+  components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect, SelectBalanceValue },
   data() {
     return {
       isBatch: false,
@@ -298,17 +301,27 @@ export default {
   created() {
   },
   methods: {
+    validateForm() {
+      setTimeout(() => {
+        this.$refs["form"].validate(valid => {
+          if (valid) { }
+        })
+      }, 200)
+    },
     selectStudyChange(val) {
       this.form.mdMcs = val.name
       this.form.mdOther = val.mdOther
     },
     selectStudyChangeBatch(val) {
       let that = this
-      if (val && val.id && val.id !== '') {
-        const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key })
-        if (_index > -1) {
+      const _index = _.findIndex(that.selectList, function (o) { return o.id + '' === val.key })
+      if (_index > -1) {
+        if (val && val.id && val.id !== '') {
           that.selectList[_index].mdMcs = val.name
           that.selectList[_index].mdOther = val.mdOther
+        } else {
+          that.selectList[_index].mdMcs = null
+          that.selectList[_index].mdOther = null
         }
       }
     },
@@ -340,7 +353,7 @@ export default {
           sxrq: item.sxrq,
           ccwz: item.ccwz,
           zytj: null,
-          ckmz:null,
+          ckmz: null,
           mdIds: null,
           ckmz: null,
           mdMcs: null,
@@ -375,8 +388,8 @@ export default {
         ffr1mm: null,
         ffr2Id: null,
         ffr2Mc: null,
-        ckmz:null,
-        ckl:null,
+        ckmz: null,
+        ckl: null,
         ffr2mm: null,
         qmyy: this.$t('page.business.resource.gyzj.lqff'),
         qmrmm: null,
@@ -412,23 +425,27 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
-               for (var i = 0; i < params.list.length; i++) {
+              for (var i = 0; i < params.list.length; i++) {
                 if (!params.list[i].zytj || params.list[i].zytj == '') {
-                  this.$modal.msgError(params.list[i].mc + "转移条件不能为空")
-                  return
-                }
-                if (!params.list[i].ckmz || params.list[i].ckmz == '') {
-                  this.$modal.msgError(params.list[i].mc + "出库毛重不能为空")
+                  // this.$modal.msgError(params.list[i].mc + "转移条件不能为空")
+                  this.$modal.msgError( "转移条件不能为空")
                   return
                 }
                 if (!params.list[i].mdMcs || params.list[i].mdMcs == '') {
                   if (!params.list[i].mdOther || params.list[i].mdOther == '') {
-                    this.$modal.msgError(params.list[i].mc + "目的不能为空")
+                    // this.$modal.msgError(params.list[i].mc + "目的不能为空")
+                    this.$modal.msgError( "目的不能为空")
                   }
                   return
                 }
+                if (!params.list[i].ckmz || params.list[i].ckmz == '') {
+                  // this.$modal.msgError(params.list[i].mc + "出库毛重不能为空")
+                  this.$modal.msgError( "出库毛重不能为空")
+                  return
+                }
                 if (!params.list[i].remark || params.list[i].remark == '') {
-                  this.$modal.msgError(params.list[i].mc + "备注不能为空")
+                  // this.$modal.msgError(params.list[i].mc + "备注不能为空")
+                  this.$modal.msgError( "备注不能为空")
                   return
                 }
               }
diff --git a/src/views/business/resource/gyzj/comps/gyzj/SelectList.vue b/src/views/business/resource/gyzj/comps/gyzj/SelectList.vue
index 2588250..8cd81ea 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/SelectList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/SelectList.vue
@@ -6,6 +6,7 @@
        <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 2">{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>
               <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
               <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
               <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index 3bb2f68..b9cd79a 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -163,6 +163,7 @@ export default {
     return {
       form: {},
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       tzList: [],
       totalTz: 0,
       loadingTz: true,
@@ -186,7 +187,7 @@ export default {
   methods: {
    exportExcel() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index db642e3..68bbfd9 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -80,6 +80,10 @@
             <el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:mjy:ffjldc']">{{
               $t('form.export') }}</el-button>
           </el-col>
+          <el-col :span="1.5" style="float: right;">
+            {{$t('page.business.resource.mjy.jsl')}}：{{ jsldw!=''? jsl:'--' }}{{ jsldw }} ；
+            {{$t('page.business.resource.mjy.syl')}}：{{ syldw!=''? syl:'--' }}{{ syldw }} ；
+          </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -112,6 +116,12 @@
               {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
             </template>
           </el-table-column>
+           <el-table-column :label="$t('page.business.resource.mjy.jsl')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
+            <template slot-scope="scope">
+              {{ scope.row.jsl }} {{ scope.row.jsldw }}
+            </template>
+          </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.syl')" align="center"
             :width="$i18n.locale === 'zh_CN' ? '80px' : '120px'">
             <template slot-scope="scope">
@@ -178,13 +188,11 @@
                   $t('page.business.resource.mjy.guidang') }}</el-button>
               <template v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.gdsqrId">
                 <!-- 解档 -->
-                <el-button type="text" 
-                  v-hasPermi="['business:resource:mjy:ffjljd']">{{
-                    $t('page.business.resource.mjy.jiedang') }}</el-button>
+                <el-button type="text" v-hasPermi="['business:resource:mjy:ffjljd']">{{
+                  $t('page.business.resource.mjy.jiedang') }}</el-button>
                 <!-- 借阅 -->
-                <el-button type="text" @click="handleJy(scope.row)"
-                  v-hasPermi="['business:resource:mjy:ffjljy']">{{
-                    $t('page.business.resource.mjy.jieyue') }}</el-button>
+                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:mjy:ffjljy']">{{
+                  $t('page.business.resource.mjy.jieyue') }}</el-button>
               </template>
             </template>
           </el-table-column>
@@ -211,7 +219,7 @@
 </template>
 
 <script>
-import { list } from "@/api/business/mjy/mjyFfjl"
+import { list, yltj } from "@/api/business/mjy/mjyFfjl"
 import Sd from "./ffjl/Sd";
 import Jy from "./ffjl/Jy";
 import Js from "./ffjl/Js";
@@ -252,6 +260,10 @@ export default {
         startDateRk: null,
         endDateRk: null,
       },
+      jsl: '',
+      syl: '',
+      jsldw: '',
+      syldw: '',
     }
   },
   created() {
@@ -263,6 +275,59 @@ export default {
     ]),
   },
   methods: {
+    getyltj() {
+      yltj(this.queryParams).then(response => {
+        // {
+        //     "jsl": 0,
+        //     "jsldw": "mL",
+        //     "syldw": "mL",
+        //     "syl": 0,
+        //     "count": 1
+        // },
+        //单位统计
+        let tmpJslUnit = []
+        let tmpSylUnit = []
+        _.forEach(deepClone(response.data), function (item) {
+           //减少量
+          let _indexJsl= _.findIndex(tmpJslUnit, function (fitem) { return fitem.key == item.jsldw })
+          if (_indexJsl > -1) {
+            tmpJslUnit[_indexJsl] = tmpJslUnit[_indexJsl].count + item.count
+          } else {
+            tmpJslUnit.push({ key: item.jsldw, count: item.count })
+          }
+           //使用量
+          let _indexSyl = _.findIndex(tmpSylUnit, function (fitem) { return fitem.key == item.syldw })
+          if (_indexSyl > -1) {
+            tmpSylUnit[_indexSyl] = tmpSylUnit[_indexSyl].count + item.count
+          } else {
+            tmpSylUnit.push({ key: item.syldw, count: item.count })
+          }
+        })
+        //获取最多单位
+        let _jsldw=_.maxBy(tmpJslUnit, function(o) { return o.count; })
+        this.jsldw=_jsldw!=null?_jsldw.key:'';
+
+        let _syldw=_.maxBy(tmpSylUnit, function(o) { return o.count; })
+        this.syldw=_syldw!=null?_syldw.key:'';
+
+        //计算最终值
+        let jslCalc = this.getCalc(this.jsldw)
+        let sylCalc = this.getCalc(this.syldw)
+        this.syl=_.divide(_.sumBy(deepClone(response.data),function(item){return item.syl}), sylCalc)
+        this.jsl=_.divide(_.sumBy(deepClone(response.data),function(item){return item.jsl}), jslCalc)
+      })
+    },
+      getCalc(toUnit) {
+      let unit = ['pL', 'nL', 'uL', 'mL', 'L']
+      let result = 1
+      for (var i = 1; i < unit.length; i++) {
+         result = result*1000
+        if (unit[i] == toUnit) {
+          break
+        }
+      }
+      return result
+    },
     exportExcel() {
       let that = this
       that.$modal.loading()
@@ -397,7 +462,7 @@ export default {
         a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
         a.click()
         that.$modal.closeLoading()
-        that.saveSimpleLog({name:'',nameEn:'',jcmc:'麻精药发放回收导出',jcmcEn:'Controlled Drug In-and-Out Record Export'})
+        that.saveSimpleLog({ name: '', nameEn: '', jcmc: '麻精药发放回收导出', jcmcEn: 'Controlled Drug In-and-Out Record Export' })
       }).finally(() => {
         that.$modal.closeLoading()
       })
@@ -469,6 +534,7 @@ export default {
       list(this.queryParams).then(response => {
         this.list = response.rows
         this.total = response.total
+        this.getyltj()
         this.loading = false
       })
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index bde5a58..a78f7cc 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -161,6 +161,7 @@ export default {
     return {
       form: {},
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       tzList: [],
       totalTz: 0,
       loadingTz: true,
@@ -184,7 +185,7 @@ export default {
   methods: {
     exportExcel() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle  }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn  }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN  +response.msg)
         this.$modal.closeLoading()
       }).finally(() => {
diff --git a/src/views/business/resource/sj/comps/Xq.vue b/src/views/business/resource/sj/comps/Xq.vue
index 7256d25..09e825a 100644
--- a/src/views/business/resource/sj/comps/Xq.vue
+++ b/src/views/business/resource/sj/comps/Xq.vue
@@ -190,7 +190,7 @@ export default {
   methods: {
     exportPDF() {
       this.$modal.loading()
-      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.appTitle }).then(response => {
+      exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0],version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn }).then(response => {
         window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg)
         this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'试剂导出',jcmcEn:'Reagent Export'})
         this.$modal.closeLoading()
diff --git a/src/views/business/storageLocation/comps/StorageLocationImport.vue b/src/views/business/storageLocation/comps/StorageLocationImport.vue
index 3e62f5a..3e0ce0b 100644
--- a/src/views/business/storageLocation/comps/StorageLocationImport.vue
+++ b/src/views/business/storageLocation/comps/StorageLocationImport.vue
@@ -118,8 +118,13 @@ export default {
       this.upload.open = false
       this.upload.isUploading = false
       this.$refs.upload.clearFiles()
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
-      this.$emit('callback')
+      if(response.code == 200) {
+        this.$modal.msgSuccess("导入成功");
+        this.$emit('callback')
+        this.cancel()
+      } else {
+        this.$modal.alertError(response.msg);
+      }
     },
     // 提交上传文件
     submitFileForm() {
diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index 9f4ef24..1ba4284 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -344,6 +344,7 @@ export default {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
         this.form.bdnr = JSON.stringify(content)
+        this.form.qmyy=this.$t('page.business.study.studyFormFill.txbtjjl')
         this.openSubmit = true
       }
     }
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
index 3f6ce25..102972c 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -183,6 +183,7 @@ export default {
     return {
       watermarkText: '',
       appTitle: process.env.VUE_APP_TITLE,
+			appTitleEn: process.env.VUE_APP_TITLE_EN,
       baseUrl: process.env.VUE_APP_FILE_DOMAIN,
       uploadFileUrl: process.env.VUE_APP_BASE_API + '/file/upload', // 上传文件服务器地址
       opacity: 0.8,
@@ -403,7 +404,7 @@ export default {
               url: data.data.url,
               studyFormFillId: this.form.id,
               jcgjlx: this.jcgjlxExport,
-              version:this.appTitle,
+              version:this.$store.getters.language.split("_")[0]=='zh'?this.appTitle:this.appTitleEn,
               lang: this.$store.getters.language.split("_")[0]
             }
           ).then(response => {
diff --git a/src/views/business/study/comp/wzlb/bacteriaList.vue b/src/views/business/study/comp/wzlb/bacteriaList.vue
index 820a9ea..f5bfe5b 100644
--- a/src/views/business/study/comp/wzlb/bacteriaList.vue
+++ b/src/views/business/study/comp/wzlb/bacteriaList.vue
@@ -51,7 +51,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.study.cell.sxr')" align="center" prop="sxr"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studyName" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
diff --git a/src/views/business/study/comp/wzlb/cellList.vue b/src/views/business/study/comp/wzlb/cellList.vue
index e57cad2..6a99a2d 100644
--- a/src/views/business/study/comp/wzlb/cellList.vue
+++ b/src/views/business/study/comp/wzlb/cellList.vue
@@ -51,7 +51,7 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.study.cell.sxr')" align="center" prop="sxr"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.study.cell.sssy')" align="center" prop="studyName" width="150px" />
 
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 6eb27cf..80979b2 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -342,6 +342,7 @@ export default {
       let content = await this.$refs.templateTable.getFormData()
       if (content) {
         this.form.bdnr = JSON.stringify(content)
+        this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
         this.openSubmit = true
       }
     },
diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue
index babcd81..461f772 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -187,7 +187,7 @@ export default {
     resetApprove() {
       this.formApprove = {
         id: null,
-        qmyy: null,
+        qmyy: this.$t('page.business.study.studyFormPre.shtg'),
         remark: null,
         qmrmm: null
       }
@@ -196,7 +196,7 @@ export default {
      resetReject() {
       this.formReject = {
         id: null,
-        qmyy: null,
+        qmyy: this.$t('page.business.study.studyFormPre.shjj'),
         remark: null,
         qmrmm: null
       }
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index 196b9fb..5a84478 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -56,7 +56,7 @@
     <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px" v-if="openApprove">
-        <div class="sbzdtcma"> <input type="text"> <input type="password"  show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" style="margin-bottom: 10px;"
           type="success">
         </el-alert>
@@ -88,8 +88,8 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent show-password v-model="formApprove.qmrmm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                show-password v-model="formApprove.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -177,12 +177,15 @@ export default {
   },
   methods: {
     showTianbao() {
+
       if (this.searchForm.studySubjectId && this.searchForm.studySubjectId !== '') {
         this.$modal.loading()
         studyMethod_getReadAllMethodStatus({ userId: this.id, studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId }).then(response => {
           if (response.data.toUrl) {
             this.toRead(response.data)
           } else {
+            this.formApprove.remark = null
+            this.formApprove.qmrmm = null
             this.openApprove = true
           }
         }).finally(() => {
diff --git a/src/views/login.vue b/src/views/login.vue
index 04bcc73..36fc391 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -77,6 +77,8 @@ import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 import defaultSettings from '@/settings'
 
+import { getBalance,getPh } from "@/utils/tpph";
+
 export default {
   name: "Login",
   components: { LangSelect },
@@ -119,6 +121,10 @@ export default {
     }
   },
   created() {
+    let port = this.$route.query.port
+    if(port){
+      localStorage.setItem(`sb_port`, port);
+    }
     this.getCode();
     // this.getCookie();
   },
@@ -143,6 +149,12 @@ export default {
         force:false
       };
     },
+    async testGetTpph() {
+      let x = await getBalance()
+      debugger
+      let y = await getPh()
+      debugger
+    },
     handleLogin() {
       this.$refs.loginForm.validate(valid => {
         if (valid) {
diff --git a/vue.config.js b/vue.config.js
index bf3ddf1..b154aa0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,11 +35,18 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-          target: `http://39.99.251.173:8080`,
+        target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
+      },
+      '/tpphurl': {
+        target: 'http://192.168.0.68:9600',
+        changeOrigin: true,
+        pathRewrite: {
+          '^/tpphurl': '' // 确保路径重写正确
+        }
       }
     },
     disableHostCheck: true