diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 341a6fc..31f9d7a 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -740,7 +740,8 @@ export default {
 							})
 
 						} else {
-							if (isValueEmpty(mainValue)  && col.bodyType !== 'span' && col.bodyType !== 'button') {
+							if (isValueEmpty(mainValue) &&col.bodyFillType === this.templateFillType  && col.bodyType !== 'span' && col.bodyType !== 'button') {
+								console.log(col.bodyFillType,col.bodySubFillType,"bodySubFillType")
 								const errorItem = {
 									rowIndex,
 									colIndex,
diff --git a/src/components/Template/DecimalInput.vue b/src/components/Template/DecimalInput.vue
index fd5077b..1eb3897 100644
--- a/src/components/Template/DecimalInput.vue
+++ b/src/components/Template/DecimalInput.vue
@@ -92,17 +92,22 @@ export default {
         return;
       }
 
-      // 检查是否已经输入了完整的NA
-      if (this.isNA) {
-        // 如果已经输入了NA，无论输入什么，都保持NA不变
-        this.internalValue = 'NA';
-        this.$emit('input', 'NA');
-        return;
-      }
-
       const upperVal = val.toUpperCase();
       let cleaned = val;
       let matchedRule = null;
+
+      // 如果已经输入了完整的NA
+      if (this.isNA) {
+        // 只有输入完整NA时才保持不变，允许用户删除或输入其他值
+        if (upperVal === 'NA') {
+          this.internalValue = 'NA';
+          this.$emit('input', 'NA');
+          return;
+        } else {
+          // 用户删除了NA或输入其他值，重置状态并继续处理
+          this.isNA = false;
+        }
+      }
       
       // 检查是否匹配特殊模式（NA或FRACTION）
       // 优先检查完整的NA模式
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index 7f646d7..4028574 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -109,7 +109,7 @@
                     <el-button :disabled="getDisabled()" :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')"
                         size="small" type="primary">点击上传</el-button>
                     <span v-if="error" class="atta-tips">请上传附件</span>
-                    <div slot="tip" class="el-upload__tip">支持扩展名：.rar .zip .doc .docx .pdf .jpg，文件大小不超过2MB</div>
+                    <div slot="tip" class="el-upload__tip">支持扩展名：.{{allowedTypes.join('. ')}}，文件大小不超过2MB</div>
                 </el-upload>
             </template>
             <div v-else-if="type === 'checkboxTag'" class="flex1 checkbox-tag-wrapper"
@@ -341,8 +341,8 @@ export default {
                         picker.$emit('pick', new Date());
                     }
                 }]
-            }
-
+            },
+            allowedTypes: ["zip","rar","doc","docx","pdf","jpg"],
         }
     },
     watch: {
@@ -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) {
@@ -1744,16 +1742,16 @@ export default {
     .clickable,
     .el-date-editor,
     .el-checkbox__inner {
-        border-color: #ff5d5d !important;
+        border: 1px solid #ff5d5d !important;
         box-shadow: 0 0 6px #ffc3c3 !important;
 
         &:focus {
-            border-color: #ff5d5d !important;
+            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;
         }
     }
@@ -1761,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;
         }
     }
diff --git a/src/components/Template/Input.vue b/src/components/Template/Input.vue
deleted file mode 100644
index 8f347de..0000000
--- a/src/components/Template/Input.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-    <el-input
-        v-model="inputValue"
-        :maxlength="maxLength"
-        :disabled="disabled"
-        :readonly="readonly"
-        :clearable="clearable"
-        :show-password="showPassword"
-        :placeholder="placeholder || ('请输入' + label)"
-        :class="borderClass"
-        @blur="onBlur"
-        @focus="onFocus"
-        @change="onChange"
-        @clear="onClear"
-        @keyup.enter="onEnter"
-    />
-</template>
-
-<script>
-export default {
-    name: 'CustomInput',
-    props: {
-        // v-model 值
-        value: {
-            type: [String, Number],
-            default: ''
-        },
-        // 标签名称
-        label: {
-            type: String,
-            default: ''
-        },
-        // 最大长度
-        maxLength: {
-            type: Number,
-            default: null
-        },
-        // 是否禁用
-        disabled: {
-            type: Boolean,
-            default: false
-        },
-        // 是否只读
-        readonly: {
-            type: Boolean,
-            default: false
-        },
-        // 是否显示清除按钮
-        clearable: {
-            type: Boolean,
-            default: true
-        },
-        // 是否显示密码
-        showPassword: {
-            type: Boolean,
-            default: false
-        },
-        // 占位符
-        placeholder: {
-            type: String,
-            default: ''
-        },
-        // 边框类型
-        fillType: {
-            type: String,
-            default: '',
-            validator: value => {
-                return ['', 'actFill', 'green', 'preFill'].includes(value)
-            }
-        },
-        // 输入框尺寸
-        size: {
-            type: String,
-            default: 'default',
-            validator: value => {
-                return ['large', 'default', 'small'].includes(value)
-            }
-        }
-    },
-    data() {
-        return {
-            inputValue: this.value
-        }
-    },
-    computed: {
-        borderClass() {
-            const typeMap = {
-                actFill: 'orange-border',
-                green: 'green-border', 
-                preFill: 'blue-border'
-            }
-            return typeMap[this.fillType] || ''
-        }
-    },
-    watch: {
-        value(newVal) {
-            this.inputValue = newVal
-        },
-        inputValue(newVal) {
-            this.$emit('input', newVal)
-        }
-    },
-    methods: {
-        onBlur(event) {
-            this.$emit('blur', event)
-        },
-        onFocus(event) {
-            this.$emit('focus', event)
-        },
-        onChange(value) {
-            this.$emit('change', value)
-        },
-        onClear() {
-            this.$emit('clear')
-        },
-        onEnter(event) {
-            this.$emit('enter', event)
-        },
-        // 公开方法：清除输入
-        clear() {
-            this.inputValue = ''
-            this.$emit('input', '')
-            this.$emit('clear')
-        },
-        // 公开方法：聚焦
-        focus() {
-            this.$el.querySelector('input').focus()
-        },
-        // 公开方法：失焦
-        blur() {
-            this.$el.querySelector('input').blur()
-        }
-    },
-    filters: {
-        getFillType(type) {
-            const typeMap = {
-                actFill: 'orange-border',
-                green: 'green-border',
-                preFill: 'blue-border'
-            }
-            return typeMap[type] || ''
-        }
-    }
-}
-</script>
-
-<style lang="scss">
-// 基础样式增强
-:deep(.el-input) {
-    .el-input__inner {
-        transition: border-color 0.2s ease, box-shadow 0.2s ease;
-        
-        &:focus {
-            box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
-        }
-    }
-}
-
-// 橙色边框样式
-.orange-border {
-    :deep(.el-input__inner) {
-        border-color: #f9c588;
-
-        &:focus {
-            border-color: #f9c588;
-            box-shadow: 0 0 0 2px rgba(249, 197, 136, 0.2);
-        }
-
-        &:hover {
-            border-color: #f9c588;
-        }
-    }
-}
-
-// 绿色边框样式
-.green-border {
-    :deep(.el-input__inner) {
-        border-color: #67c23a;
-
-        &:focus {
-            border-color: #67c23a;
-            box-shadow: 0 0 0 2px rgba(103, 194, 58, 0.2);
-        }
-
-        &:hover {
-            border-color: #67c23a;
-        }
-    }
-}
-
-// 蓝色边框样式
-.blue-border {
-    :deep(.el-input__inner) {
-        border-color: #409eff;
-
-        &:focus {
-            border-color: #409eff;
-            box-shadow: 0 0 0 2px rgba(64, 158, 255, 0.2);
-        }
-
-        &:hover {
-            border-color: #409eff;
-        }
-    }
-}
-
-// 禁用状态样式
-:deep(.el-input.is-disabled) {
-    .el-input__inner {
-        background-color: #f5f7fa;
-        border-color: #e4e7ed;
-        color: #c0c4cc;
-    }
-}
-
-// 只读状态样式
-:deep(.el-input.is-readonly) {
-    .el-input__inner {
-        background-color: #fafafa;
-        cursor: not-allowed;
-    }
-}
-
-// 清除按钮样式
-:deep(.el-input__clear) {
-    color: #909399;
-    transition: color 0.2s ease;
-    
-    &:hover {
-        color: #409eff;
-    }
-}
-
-// 密码显示按钮样式
-:deep(.el-input__password) {
-    color: #909399;
-    transition: color 0.2s ease;
-    
-    &:hover {
-        color: #409eff;
-    }
-}
-
-// 输入框尺寸样式
-:deep(.el-input--large) {
-    .el-input__inner {
-        height: 40px;
-        font-size: 16px;
-    }
-}
-
-:deep(.el-input--small) {
-    .el-input__inner {
-        height: 32px;
-        font-size: 13px;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/components/Template/StepComponents/ZLSubPackage.vue b/src/components/Template/StepComponents/ZLSubPackage.vue
index 10400b5..264812f 100644
--- a/src/components/Template/StepComponents/ZLSubPackage.vue
+++ b/src/components/Template/StepComponents/ZLSubPackage.vue
@@ -13,8 +13,7 @@
                     <span class="ml-5">{{ item.unit }}</span>
                 </div>
                 <div class="header-item">
-                    <div class="header-title">分装编号</div>
-                    <div class="header-title">单位</div>
+                    <div class="header-title">分装单位</div>
                     <div class="unit-select">
                         <HandleFormItem :fieldKey = "prefixKey+stepIndex + 'dw'"  :item="unitItem" type="select" :error="formErrors.dw"
                             @blur="(e) => onCommonBlur(e, 'dw')" v-model="formData.dw" />
@@ -31,6 +30,9 @@
                     <el-button v-if = "templateFillType == 'preFill'" type="primary" plain @click="onReset">重置</el-button>
                     
                 </div>
+                <div class="header-item">
+                    <div class="header-title">分装编号</div>
+                </div>
             </div>
             <div class="content-container">
                 <div class="zl-header-container">
@@ -64,7 +66,7 @@ import { isValueEmpty,justUpdateFilledFormData } from '@/utils/index.js';
 export default {
     inject: ['templateFillType'],
     dicts: [
-        'business_tjdw',
+        'business_zldw',
     ],
     components: {
         HandleFormItem,
@@ -151,7 +153,7 @@ export default {
             return {
                 type: "select",
                 fillType: "preFill",
-                options: this.dict.type.business_tjdw
+                options: this.dict.type.business_zldw
             }
         },
         subConfig(){
diff --git a/src/components/Template/StepComponents/ry/bdtj.vue b/src/components/Template/StepComponents/ry/bdtj.vue
index 80bafed..d9354ab 100644
--- a/src/components/Template/StepComponents/ry/bdtj.vue
+++ b/src/components/Template/StepComponents/ry/bdtj.vue
@@ -69,9 +69,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             options:this.getDictOptions("business_tjdw"),
                             fillType:"preFill",
                         },
-                        text5:{
-                            label:"，划线。",
-                            type:"text",
+                        hx:{
+                            type:"input",
+                            fillType:"preFill",
                         },
 
                     }
diff --git a/src/components/Template/StepComponents/ry/bdzl.vue b/src/components/Template/StepComponents/ry/bdzl.vue
index eaac60f..fff483b 100644
--- a/src/components/Template/StepComponents/ry/bdzl.vue
+++ b/src/components/Template/StepComponents/ry/bdzl.vue
@@ -14,6 +14,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
         },
         computed: {
             formConfig() {
+                console.log(this.stepIndex,"stepIndex")
                 return [{
                     config:{
                         text1:{
@@ -47,7 +48,7 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"inputNumber",
                             fillType:"actFill",
                             compareTo:"rm",
-                            copyFrom:"rm"
+                            disabled:true,
                         },
                         button1:{
                             type:"button",
diff --git a/src/components/Template/StepComponents/ry/fy.vue b/src/components/Template/StepComponents/ry/fy.vue
index 94a672e..803561b 100644
--- a/src/components/Template/StepComponents/ry/fy.vue
+++ b/src/components/Template/StepComponents/ry/fy.vue
@@ -27,6 +27,11 @@ export default {
                         label: "使用",
                         type: "text",
                     },
+                    yqmc: {
+                        type: "input",
+                        fillType: "preFill",
+                    },
+                    
                     yq: {
                         type: "yq",
                         fillType: "actFill",
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index d24e2db..f400e47 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -66,12 +66,12 @@ export default {
                         fillType: "preFill",
                         otherCode: "yjwdOther",
                     },
-                    yjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "preFill",
-                        otherCode: "yjhjOther",
-                    },
+                    // yjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "preFill",
+                    //     otherCode: "yjhjOther",
+                    // },
                     text5: {
                         label: "，实际条件为",
                         type: "text",
@@ -84,13 +84,13 @@ export default {
                         otherCode: "sjwdOther",
                         compareTo: "yjwd",
                     },
-                    sjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "actFill",
-                        otherCode: "sjhjOther",
-                        compareTo: "yjhj",
-                    },
+                    // sjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "actFill",
+                    //     otherCode: "sjhjOther",
+                    //     compareTo: "yjhj",
+                    // },
                      text6: {
                         label: "，放置",
                         type: "text",
@@ -179,12 +179,12 @@ export default {
                         fillType: "preFill",
                         otherCode: "yjwdOther",
                     },
-                    yjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "preFill",
-                        otherCode: "yjhjOther",
-                    },
+                    // yjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "preFill",
+                    //     otherCode: "yjhjOther",
+                    // },
                     text5: {
                         label: "，实际条件为",
                         type: "text",
@@ -197,13 +197,13 @@ export default {
                         otherCode: "sjwdOther",
                         compareTo: "yjwd",
                     },
-                    sjhj: {
-                        type: "select",
-                        options: this.getDictOptions("business_hjxx"),
-                        fillType: "actFill",
-                        otherCode: "sjhjOther",
-                        compareTo: "yjhj",
-                    },
+                    // sjhj: {
+                    //     type: "select",
+                    //     options: this.getDictOptions("business_hjxx"),
+                    //     fillType: "actFill",
+                    //     otherCode: "sjhjOther",
+                    //     compareTo: "yjhj",
+                    // },
                      text6: {
                         label: "，放置",
                         type: "text",
diff --git a/src/components/Template/StepComponents/ry/tjphcz.vue b/src/components/Template/StepComponents/ry/tjphcz.vue
index 63e1d23..8a6f532 100644
--- a/src/components/Template/StepComponents/ry/tjphcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphcz.vue
@@ -96,6 +96,7 @@ export default {
                     ph: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo: "rm",
                     },
                     button1: {
                         type: "button",
diff --git a/src/components/Template/StepComponents/ry/tjphfcz.vue b/src/components/Template/StepComponents/ry/tjphfcz.vue
index 719baf6..bbf6fdc 100644
--- a/src/components/Template/StepComponents/ry/tjphfcz.vue
+++ b/src/components/Template/StepComponents/ry/tjphfcz.vue
@@ -96,6 +96,7 @@ export default {
                     ph: {
                         type: "inputNumber",
                         fillType: "actFill",
+                        compareTo: "rm",
                     },
                  
                     text8: {
diff --git a/src/components/Template/StepComponents/ry/tpjydd.vue b/src/components/Template/StepComponents/ry/tpjydd.vue
index 61e47c4..5e3a99f 100644
--- a/src/components/Template/StepComponents/ry/tpjydd.vue
+++ b/src/components/Template/StepComponents/ry/tpjydd.vue
@@ -105,8 +105,9 @@ import stepMixins from '@/components/Template/mixins/stepMixins.js';
                             type:"text",
                         },
                         jgpd:{
-                            label:"通过/不通过",
-                            type:"span",
+                            type:"input",
+                            fillType:"actFill",
+                            disabled:true,
                         },
                         text9:{
                             label:"。",
diff --git a/src/components/Template/StepComponents/ry/tpjysd.vue b/src/components/Template/StepComponents/ry/tpjysd.vue
index 071689c..6b827d6 100644
--- a/src/components/Template/StepComponents/ry/tpjysd.vue
+++ b/src/components/Template/StepComponents/ry/tpjysd.vue
@@ -1,7 +1,7 @@
 <!-- 天平校验(双点) -->
 <template>
-    <StepFormPackage :fieldItemLabel = "fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex+'_'+'ry_tpjysd'" @resetRecord="resetRecord"
-        @clickButton="handleClickButton" :form-config="formConfig" :formData="formData" />
+    <StepFormPackage :fieldItemLabel="fieldItemLabel" ref="stepFormPackageRef" :prefixKey="stepIndex + '_' + 'ry_tpjysd'"
+        @resetRecord="resetRecord" @clickButton="handleClickButton" :form-config="formConfig" :formData="formData" />
 </template>
 
 <script>
@@ -112,8 +112,9 @@ export default {
                         type: "text",
                     },
                     dfmjgpd: {
-                        label: "通过/不通过",
-                        type: "span",
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
                     }
                 }
             },
@@ -202,8 +203,9 @@ export default {
                         type: "text",
                     },
                     jgpd: {
-                        label: "通过/不通过",
-                        type: "span",
+                        type: "input",
+                        fillType: "actFill",
+                        disabled: true,
                     },
                     text9: {
                         label: "。",
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 8699887..8a60c1b 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -31,6 +31,7 @@
                 <template v-else-if="sItem.type === 'button'">
                     <HandleFormItem 
                         type="button" 
+                        :field-key="prefixKey+'_' + key"
                         :item="getButtonItem(sItem)"
                         @clickButton="(e)=>handleClickButton(e,item,key)" />
                 </template>
@@ -62,7 +63,7 @@
                 </template>
             
                 <div v-show="isShowOther(formFields[key])" class="flex flex1">
-                    <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div>
+                    <!-- <div class="other-title">{{sItem.otherLabel ? $t(sItem.otherLabel) : $t("template.common.other") }}</div> -->
                     <HandleFormItem sourceFrom = "step" class="step-row" :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
                         v-model="formFields[sItem.otherCode]" @copy="onCopy(sItem, key)"
                         :error="errors[sItem.otherCode]" @update:error="errors[sItem.otherCode] = false"
diff --git a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
index f75d0a5..a14d1e7 100644
--- a/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectInstrumentDialog.vue
@@ -98,6 +98,7 @@ export default {
             if(data && data.uuid) {//为了标识eventBus的事件id
                 this.uuid = data.uuid
             }
+            this.selectedId = "";
             this.visible = true
             setTimeout(() => {
                 if(this.$refs.selectSjRef){
diff --git a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
index 3205c70..42a452e 100644
--- a/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectMixReagentDialog.vue
@@ -134,6 +134,9 @@ export default {
                 this.selectedCode = 'id'
                 this.qxbdType = data.qxbdType || '';
             }
+            this.selectedId = "";
+            this.otherReagent = "";
+            this.otherChecked = false;
             this.checkType = checkType;
             this.mixType = mixType;
             this.sourceFrom = sourceFrom;
diff --git a/src/views/business/comps/template/dialog/SelectReagentDialog.vue b/src/views/business/comps/template/dialog/SelectReagentDialog.vue
index ca697e5..638da0a 100644
--- a/src/views/business/comps/template/dialog/SelectReagentDialog.vue
+++ b/src/views/business/comps/template/dialog/SelectReagentDialog.vue
@@ -134,6 +134,8 @@ export default {
             if(data && data.uuid) {//为了标识eventBus的事件id
                 this.uuid = data.uuid
             }
+            this.selectedId = ""
+            this.currentRow = {}
             this.visible = true
             this.studyFormId = studyFormId
             this.showTableData()
@@ -157,6 +159,7 @@ export default {
         },
         onCancel() {
             this.visible = false
+          
             this.$emit('cancel');
         },
         onSubmit() {