feat:[模板管理]dj001

12、LBA/ADA：版本号都改为预制
13、配体结合分析组织匀浆表：预设/实际匀浆溶液补加入量改为预设/实际匀浆溶液加入量
14、Ames试验（掺入法）平皿编号/操作记录表：去掉0.2mol
15、骨髓收集记录表：去掉解剖日期
16、细胞复苏记录表/细胞制备记录表：这2个表培养条件中的0.5%改成1%
17、生物样品分析样本处理表：增加处理后信息

.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'

.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'

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;

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({

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({

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

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>

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

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模式

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>

src/components/Template/Input.vue

@@ -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>

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

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>

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>

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);

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>

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>
 

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
+<style lang="scss" scoped></style>

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

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>

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

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

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>

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>

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>

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

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>

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

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>

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: {

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>

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>

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>

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>

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"],

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>

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: {

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>

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>

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>

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>

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:{

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>

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: {

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>

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>

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>

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>

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>

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

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>

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>

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>

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>

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>

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>

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>

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>

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:{

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>

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"],

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>

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: {

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>

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>

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: {

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

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>

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>

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>

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>

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>

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>

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>
 

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>

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

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

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: {

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: {

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: {

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>

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>

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: {

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:{

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>

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>

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>

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>

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: {