From c63178d0e7cfbcd28db4a8d8857ce58a3142b7f1 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Thu, 5 Mar 2026 22:31:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?[update]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPackage.vue | 27 +++-------
 src/components/Template/CustomTable.vue         | 69 +++++++------------------
 src/components/Template/HandleFormItem.vue      |  2 +-
 3 files changed, 29 insertions(+), 69 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPackage.vue b/src/components/Template/BaseInfoFormPackage.vue
index e212fcf..bb1719e 100644
--- a/src/components/Template/BaseInfoFormPackage.vue
+++ b/src/components/Template/BaseInfoFormPackage.vue
@@ -6,19 +6,12 @@
                 <div class="grid-container">
                     <div v-for="(sItem, key) in item.config" class="form-item"
                         :class="sItem.span == 1 ? 'full-row' : ''" :key="key">
-                        <template v-if="sItem.type === 'input'">
+                        <template v-if="sItem.type === 'input' || sItem.type === 'inputNumber'">
                             <div class="form-title">{{ $t(sItem.label) }}</div>
                             <HandleFormItem :field-item-label="fieldItemLabel" @blur="onBlur(key, $event)" :item="sItem"
                                 v-model="formFields[key]" :field-key="prefixKey + '_' + key" @copy="onCopy(sItem, key)"
                                 :error="errors[key]" @update:error="errors[key] = false"
-                                :orange-bg="orangeBgFields[key]" />
-                        </template>
-                        <template v-else-if="sItem.type === 'inputNumber'">
-                            <div class="form-title">{{ $t(sItem.label) }}</div>
-                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                type="inputNumber" @blur="onBlur(key, $event)" :item="sItem"
-                                @input="onInputNumberChange(key, $event)" v-model="formFields[key]"
-                                @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
+                                :type="sItem.type"
                                 :orange-bg="orangeBgFields[key]" />
                         </template>
                     </div>
@@ -102,9 +95,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <div v-else-if="sItem.type === 'input'" class="item-center">
+                            <div v-else-if="sItem.type === 'input'||sItem.type === 'textarea' || sItem.type === 'inputNumber'" class="item-center">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
+                                    :type="sItem.type"
                                     @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                                     :ref="key" :orange-bg="orangeBgFields[key]" />
                                 <span v-if="sItem.subType === 'text'" class="sub-text">{{ $t(sItem.subText) }}</span>
@@ -113,12 +107,6 @@
                                     @clickButton="(e, val, data) => handleClickButton(e, sItem, val, data)" />
 
                             </div>
-                            <div v-else-if="sItem.type === 'textarea'">
-                                <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
-                                    @blur="onBlur(key, $event)" type="textarea" :item="sItem" v-model="formFields[key]"
-                                    @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
-                                    :orange-bg="orangeBgFields[key]" />
-                            </div>
                             <div v-else-if="sItem.type === 'clickable'" class="flex1">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                     type="clickable" @clickable="handleClickable(sItem, key)" :error="errors[key]"
@@ -196,8 +184,9 @@
                                 </div>
                             </div>
                         </div>
-                        <div v-else-if="sItem.type === 'input'" class="flex flex1">
+                        <div v-else-if="sItem.type === 'input' || sItem.type === 'inputNumber'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
+                                :type="sItem.type"
                                 @blur="onBlur(key, $event)" class="flex1" :item="sItem" v-model="formFields[key]"
                                 @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
@@ -249,7 +238,7 @@
                                 <span v-else class="default-placeholder-text">请选择</span>
                             </div> -->
                         </div>
-                        <div v-else-if="sItem.type === 'inputNumber'" class="flex flex1">
+                        <!-- <div v-else-if="sItem.type === 'inputNumber'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 type="inputNumber" @blur="onBlur(key, $event)" class="flex1" :item="sItem"
                                 @input="onInputNumberChange(key, $event)" :value="formFields[key]"
@@ -278,7 +267,7 @@
                                 @beforeReagentSubmit="(data, callback) => onBeforeReagentSubmit(data, callback, sItem.subKey)"
                                 @onRegentSubmit="(data, inputValue) => onRegentSubmit(data, inputValue, sItem.subKey, sItem)"
                                 :item="getRegentItem(sItem, 'subType')" :value="formFields[sItem.subKey]" />
-                        </div>
+                        </div> -->
                         <div v-else-if="sItem.type === 'clickable'" class="flex flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 type="clickable" @clickable="handleClickable(sItem, key)" :error="errors[key]"
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index e3c3a69..fc94084 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -28,7 +28,6 @@
 							<div v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon"
 								:style="{ width: (templateFillType !== 'actFill') ? '60px' : 'auto' }">({{
 									headerSelectFields[col.headerSelectKey] }})</div>
-
 						</div>
 
 					</div>
@@ -58,29 +57,23 @@
 								<div v-if="!isBorder && col.label" class="mr-5">
 									{{ $t(col.label) }}
 								</div>
-								<template v-if="col.bodyType === 'input'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-										:fieldItemLabel="fieldItemLabel" type="input"
-										@blur="onBlur(rowIndex, col.prop, $event)" @copy="onCopy(rowIndex, col)"
-										class="body-input" :item="getBodyItem(col, rowIndex)" v-model="row[col.prop]"
-										@change="onBodyValueChange(rowIndex, colIndex, $event)"
-										:error="hasError(rowIndex, colIndex, col.prop)"
-										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-										@beforeSaveRecord="(data, callback) => beforeSaveRecord(data, callback, rowIndex, col, row)"
-										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
-								</template>
-								<template v-else-if="col.bodyType === 'inputNumber'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
-										:fieldItemLabel="fieldItemLabel" type="inputNumber"
-										@copy="onCopy(rowIndex, col)" class="body-input-number"
-										:item="getBodyItem(col, rowIndex)" v-model="row[col.prop]"
-										@blur="onBlur(rowIndex, col.prop, $event)"
-										@change="onBodyValueChange(rowIndex, colIndex, $event)"
-										:error="hasError(rowIndex, colIndex, col.prop)"
-										@beforeSaveRecord="(data, callback) => beforeSaveRecord(data, callback, rowIndex, col, row)"
-										@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
-										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+								<template
+									v-if="col.bodyType === 'input' || col.bodyType === 'inputNumber' || col.bodyType === 'select'">
+									<div class="flex flex1">
+										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+											: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]"
+											@change="onBodyValueChange(rowIndex, colIndex, $event, row, col.bodyType)"
+											:error="hasError(rowIndex, colIndex, col.prop)"
+											@update:error="onErrorUpdate(rowIndex, colIndex, col.prop, $event)"
+											@beforeSaveRecord="(data, callback) => beforeSaveRecord(data, callback, rowIndex, col, row)"
+											:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
+									</div>
+
 								</template>
+								<!-- 								
 								<template v-else-if="col.bodyType === 'select'">
 									<div class="flex flex1">
 										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
@@ -94,7 +87,7 @@
 
 									</div>
 
-								</template>
+								</template> -->
 								<div class="flex flex1" v-else-if="col.bodyType === 'clickable'">
 									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
 										:fieldItemLabel="fieldItemLabel" type="clickable" class="body-clickable"
@@ -158,39 +151,17 @@
 							</div>
 							<div class="m-l-5" :class="{ 'flex1': col.bodySubType !== 'button' }"
 								v-if="isShowBodySub(col, row)">
-								<template v-if="col.bodySubType === 'inputNumber'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
-										:fieldItemLabel="fieldItemLabel" type="inputNumber"
-										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
-										@copy="onCopy(rowIndex, col)" :item="getBodySubItem(col)"
-										v-model="row[col.bodySubKey]"
-										@change="onBodySubValueChange(rowIndex, colIndex, $event,)"
-										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
-										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
-										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
-								</template>
-								<template v-if="col.bodySubType === 'input'">
+								<template v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input'">
 									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
-										:fieldItemLabel="fieldItemLabel" type="input"
+										: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,)"
-										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
-										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
-										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
-								</template>
-								<template v-else-if="col.bodySubType === 'select'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
-										:fieldItemLabel="fieldItemLabel" type="select" class="body-select"
-										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
-										:item="getBodySubItem(col, rowIndex)" v-model="row[col.bodySubKey]"
-										@change="onBodySubValueChange(rowIndex, colIndex, $event, row, 'select')"
+										@change="onBodySubValueChange(rowIndex, colIndex, $event, row, col.bodySubType)"
 										:error="hasError(rowIndex, colIndex, col.bodySubKey)"
 										@update:error="onErrorUpdate(rowIndex, colIndex, col.bodySubKey, $event)"
 										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.bodySubKey)" />
 								</template>
-
 								<template v-else-if="col.bodySubType === 'span'">
 									<div class="body-span">
 										{{ row[col.bodySubKey] }}
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index cf619d4..38e8739 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -1673,7 +1673,7 @@ export default {
 .error-border {
 
     .el-input-group__prepend,
-    input,
+    .el-input__inner,
     textarea,
     .el-select,
     .clickable,

From 18fc7f8d1e966aacbe1635f3192fb6ca0e3b4016 Mon Sep 17 00:00:00 2001
From: ouqian <13568766802@163.com>
Date: Thu, 5 Mar 2026 23:06:49 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?[DL010=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/template/dl.js                         |   8 +-
 src/lang/zh/template/dl.js                         |  10 +-
 .../business/comps/template/comps/dl/DL008.vue     |  96 ++--
 .../business/comps/template/comps/dl/DL009.vue     |   1 +
 .../business/comps/template/comps/dl/DL010.vue     | 260 +++++++--
 .../business/comps/template/comps/yp/YP003.vue     | 591 +++++++++++----------
 6 files changed, 626 insertions(+), 340 deletions(-)

diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
index 7e0a10b..b2b62f4 100644
--- a/src/lang/en/template/dl.js
+++ b/src/lang/en/template/dl.js
@@ -87,7 +87,6 @@ export default {
     jprq: 'Dissection Date',
     jprqKssj: 'Start Time',
     jprqJssj: 'End Time',
-    sysj: 'Test Reagent',
     sjmc: 'Reagent Name',
     bh: 'Number',
     ph: 'Batch Number',
@@ -98,9 +97,16 @@ export default {
     mc: 'Name',
     zcqk: 'Status/Condition/Performance',
     sjxx: 'Collection Information',
+    rqxz: 'Container Selection',
     xzmb: 'Download Template',
     dr: 'Import',
     dwbh: 'Animal Number',
+    yslhnzsjyjrl: 'Preset 0.9% Sodium Chloride Injection Volume',
+    sjlhnzsjyjrl: 'Actual 0.9% Sodium Chloride Injection Volume',
+    sjgs: 'Bone Marrow Collection',
+    lx: 'Centrifugation',
+    ysjrxq: 'Preset Serum Addition',
+    sjjrxq: 'Actual Serum Addition',
     dwxb: 'Gender',
     dwzl: 'Animal Species',
     xcqkxzjd: 'Next Test/Calibration/Verification Date',
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
index c2757c6..49a6ed6 100644
--- a/src/lang/zh/template/dl.js
+++ b/src/lang/zh/template/dl.js
@@ -88,7 +88,6 @@ export default {
     jprq: '解剖日期',
     jprqKssj: '开始时间',
     jprqJssj: '结束时间',
-    sysj: '试验试剂',
     sjmc: '试剂名称',
     bh: '编号',
     ph: '批号',
@@ -98,10 +97,17 @@ export default {
     yqsybh: '仪器使用编号',
     mc: '名称',
     zcqk: '状态/情况/性能',
-    sjxx: '受集信息',
+    sjxx: '采集信息',
+    rqxz: '容器选择',
     xzmb: '下载模板',
     dr: '导入',
     dwbh: '动物编号',
+    yslhnzsjyjrl: '预设0.9%氯化钠注射液加入量',
+    sjlhnzsjyjrl: '实际0.9%氯化钠注射液加入量',
+    sjgs: '收集骨髓',
+    lx: '离心',
+    ysjrxq: '预设加入血清',
+    sjjrxq: '实际加入血清',
     dwxb: '性别',
     dwzl: '动物种类',
     xcqkxzjd: '下次测试/校准/检定日期',
diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue
index f51cebe..c8a8972 100644
--- a/src/views/business/comps/template/comps/dl/DL008.vue
+++ b/src/views/business/comps/template/comps/dl/DL008.vue
@@ -39,32 +39,31 @@
           <!-- 成像情况 -->
           <LineLabel label="template.dl.dl008.cxqk" />
           <div class="template-form-item">
-          <BaseInfoFormPackage
-            :ref="refConf.cxqkqxbb"
-            :formConfig="cxqkqxbbInfoFormConfig"
-            :formData="formData"
-            @clickButton="handleClickButton"
-            @onRegentSubmit="onRegentSubmit"
-          >
-          
-          </BaseInfoFormPackage>
-          <CustomTable
-            :columns="cxqkColumns"
-            :ref="refConf.cxqk"
-            @onRegentSubmit="(e) => onRegentSubmit(e)"
-            :showOperation="false"
-            :showAddRow="false"
-            :formData="cxqkFormData"
-            :prefixKey="`cxqkTable`"
-            :isBorder="true"
-            :showSort="false"
-          >
-          </CustomTable>
-          <BaseInfoFormPackage
-            :ref="refConf.cxqkwrqk"
-            :formConfig="cxqkwrqkConfig"
-            :formData="formData"
-          />
+            <BaseInfoFormPackage
+              :ref="refConf.cxqkqxbb"
+              :formConfig="cxqkqxbbInfoFormConfig"
+              :formData="formData"
+              @clickButton="handleClickButton"
+              @onRegentSubmit="onRegentSubmit"
+            >
+            </BaseInfoFormPackage>
+            <CustomTable
+              :columns="cxqkColumns"
+              :ref="refConf.cxqk"
+              @onRegentSubmit="(e) => onRegentSubmit(e)"
+              :showOperation="false"
+              :showAddRow="false"
+              :formData="cxqkFormData"
+              :prefixKey="`cxqkTable`"
+              :isBorder="true"
+              :showSort="false"
+            >
+            </CustomTable>
+            <BaseInfoFormPackage
+              :ref="refConf.cxqkwrqk"
+              :formConfig="cxqkwrqkConfig"
+              :formData="formData"
+            />
           </div>
 
           <BaseInfoFormPackage
@@ -153,11 +152,11 @@ export default {
               // 注意：这里选项为污染时需要填写信息，与别的选择中 '其他' 选项不一样
               label: 'template.dl.dl008.wrqk',
               type: 'select',
-              span:1,
+              span: 1,
               options: this.getDictOptions('business_dl_ameswrqk'),
               fillType: 'actFill',
               otherCode: 'cxqkwrqkOther',
-              showOtherLabel:false
+              showOtherLabel: false
             }
           }
         }
@@ -297,6 +296,7 @@ export default {
           config: {
             cxqkqxbd: {
               label: 'template.dl.dl007.qxbd',
+              qxbdType: 'DL006',
               type: 'qxbd',
               fillType: 'actFill',
               filledCodes: ['bdmc', 'bdbh']
@@ -312,9 +312,7 @@ export default {
       refConf
     }
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     // 删除表格行
     deleteTableRow(rowIndex, refName) {
@@ -362,9 +360,39 @@ export default {
       if (key === 'cxqkqxbd') {
         // MOCK:模拟数据回显
         const mockData = [
-          {"jlzb":"A","jzbh1":undefined,"jzbh2":undefined,"jzbh3":undefined,"jzbh4":undefined,"jzbh1Label":"001","jzbh2Label":"004","jzbh3Label":"007","jzbh4Label":"010"},
-          {"jlzb":"A","jzbh1":undefined,"jzbh2":undefined,"jzbh3":undefined,"jzbh4":undefined,"jzbh1Label":"002","jzbh2Label":"005","jzbh3Label":"008","jzbh4Label":"011"},
-          {"jlzb":"A","jzbh1":undefined,"jzbh2":undefined,"jzbh3":undefined,"jzbh4":undefined,"jzbh1Label":"003","jzbh2Label":"006","jzbh3Label":"009","jzbh4Label":"012"}
+          {
+            jlzb: 'A',
+            jzbh1: undefined,
+            jzbh2: undefined,
+            jzbh3: undefined,
+            jzbh4: undefined,
+            jzbh1Label: '001',
+            jzbh2Label: '004',
+            jzbh3Label: '007',
+            jzbh4Label: '010'
+          },
+          {
+            jlzb: 'A',
+            jzbh1: undefined,
+            jzbh2: undefined,
+            jzbh3: undefined,
+            jzbh4: undefined,
+            jzbh1Label: '002',
+            jzbh2Label: '005',
+            jzbh3Label: '008',
+            jzbh4Label: '011'
+          },
+          {
+            jlzb: 'A',
+            jzbh1: undefined,
+            jzbh2: undefined,
+            jzbh3: undefined,
+            jzbh4: undefined,
+            jzbh1Label: '003',
+            jzbh2Label: '006',
+            jzbh3Label: '009',
+            jzbh4Label: '012'
+          }
         ]
         this.$refs[refConf.cxqk].updateDataSource(mockData)
       }
diff --git a/src/views/business/comps/template/comps/dl/DL009.vue b/src/views/business/comps/template/comps/dl/DL009.vue
index aa4fd3b..da5400b 100644
--- a/src/views/business/comps/template/comps/dl/DL009.vue
+++ b/src/views/business/comps/template/comps/dl/DL009.vue
@@ -257,6 +257,7 @@ export default {
             jgxxQxbd: {
               label: 'template.dl.dl009.qxbd',
               type: 'qxbd',
+              qxbdType: 'DL006',
               fillType: 'actFill',
               filledCodes: ['bdmc', 'bdbh']
             }
diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue
index 13166ee..7946e31 100644
--- a/src/views/business/comps/template/comps/dl/DL010.vue
+++ b/src/views/business/comps/template/comps/dl/DL010.vue
@@ -58,12 +58,22 @@
           <LineLabel label="template.dl.dl010.sjxx" />
           <div class="template-form-item">
             <div class="sj-operation-btns">
-              <el-button size="small" type="primary">{{
-                $t('template.dl.dl010.xzmb')
-              }}</el-button>
-              <el-button size="small" type="success">{{
-                $t('template.dl.dl010.dr')
-              }}</el-button>
+              <el-button
+                size="small"
+                type="primary"
+                @click="
+                  () => {
+                    downloadExcelTemplate(downloadArr)
+                  }
+                "
+                >{{ $t('template.dl.dl010.xzmb') }}</el-button
+              >
+              <el-button
+                size="small"
+                type="success"
+                @click="handleImportExcel"
+                >{{ $t('template.dl.dl010.dr') }}</el-button
+              >
             </div>
             <CustomTable
               :columns="sjxxColumns"
@@ -85,6 +95,7 @@
                 ></TableOpertaionDelete>
               </template>
             </CustomTable>
+            <Step :ref="refConf.sjxxStep" :formData="formData.stepData" />
           </div>
 
           <BaseInfoFormPackage
@@ -97,6 +108,12 @@
         </div>
       </div>
     </div>
+    <ImportExcelDialog
+      ref="ImportExcelDialog"
+      @onLoadData="onLoadExcelData"
+      :downloadArr="downloadArr"
+      @downloadExcelTemplate="downloadExcelTemplate"
+    />
   </div>
 </template>
 
@@ -109,11 +126,13 @@ import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import moment from 'moment'
+import ImportExcelDialog from '../../dialog/ImportExcelDialog'
 
 const refConf = {
   base: 'baseInfoRef',
   sysj: 'sysjTableRef',
   yqsy: 'yqsyTableRef',
+  sjxxStep: 'sjxxStepRef',
   sjxx: 'sjxxTableRef',
   remark: 'remarkRef'
 }
@@ -127,7 +146,8 @@ export default {
     TableList,
     Step,
     CustomTable,
-    TableOpertaionDelete
+    TableOpertaionDelete,
+    ImportExcelDialog
   },
   mixins: [templateMixin],
   props: {
@@ -290,12 +310,6 @@ export default {
     yqsyColumns() {
       return [
         {
-          label: 'template.dl.dl010.yqbh',
-          prop: 'yqbh',
-          bodyType: 'yq',
-          bodyFillType: 'actFill'
-        },
-        {
           label: 'template.dl.dl010.yqmc',
           prop: 'yqmc',
           bodyType: 'input',
@@ -312,6 +326,12 @@ export default {
           disabled: true
         },
         {
+          label: 'template.dl.dl010.yqbh',
+          prop: 'yqbh',
+          bodyType: 'yq',
+          bodyFillType: 'actFill'
+        },
+        {
           label: 'template.dl.dl010.xccsjzjdrq',
           prop: 'jzrq',
           bodyType: 'input',
@@ -321,45 +341,69 @@ export default {
         }
       ]
     },
-    // 受集信息列表
+    // 采集信息列表
     sjxxColumns() {
       return [
         {
           label: 'template.dl.dl010.dwbh',
           prop: 'dwbh',
           bodyType: 'input',
-          bodyFillType: 'actFill'
+          bodyMaxlength: 50,
+          bodyFillType: 'preFill'
+        },
+        {
+          label: 'template.dl.dl010.yslhnzsjyjrl',
+          headerSelectKey: 'yslhnUnit',
+          headerOptions: this.getDictOptions('business_tjdw'),
+          prop: 'yslhnzsjyjrl',
+          bodyType: 'inputNumber',
+          bodyMaxlength: 10,
+          fillType: 'preFill',
+          bodyFillType: 'preFill'
         },
         {
-          label: 'template.dl.dl010.dwxb',
-          prop: 'dwxb',
-          bodyType: 'select',
+          label: 'template.dl.dl010.sjlhnzsjyjrl',
+          headerSelectKey: 'yslhnUnit',
+          headerOptions: this.getDictOptions('business_tjdw'),
+          prop: 'sjlhnzsjyjrl',
+          bodyMaxlength: 10,
+          bodyType: 'inputNumber',
           bodyFillType: 'actFill',
-          options: this.getDictOptions('sys_user_sex')
+          fillType: 'preFill'
         },
         {
-          label: 'template.dl.dl010.dwzl',
-          prop: 'dwzl',
-          bodyType: 'input',
+          label: 'template.dl.dl010.sjgs',
+          prop: 'sjgs',
+          bodyType: 'checkbox',
+          checkboxLabel: '',
           bodyFillType: 'actFill'
         },
         {
-          label: 'template.dl.dl010.xcqkxzjd',
-          prop: 'xcqk',
-          bodyType: 'input',
+          label: 'template.dl.dl010.lx',
+          prop: 'lx',
+          bodyType: 'checkbox',
+          checkboxLabel: '',
           bodyFillType: 'actFill'
         },
         {
-          label: 'template.dl.dl010.bz',
-          prop: 'bz',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
+          label: 'template.dl.dl010.ysjrxq',
+          prop: 'ysjrxq',
+          bodyType: 'inputNumber',
+          bodyFillType: 'preFill',
+          bodyMaxlength: 10,
+          fillType: 'preFill',
+          headerSelectKey: 'yslhnUnit',
+          headerOptions: this.getDictOptions('business_tjdw')
         },
         {
-          label: 'template.dl.dl010.sjsj',
-          prop: 'sjsj',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
+          label: 'template.dl.dl010.sjjrxq',
+          prop: 'sjjrxq',
+          bodyType: 'inputNumber',
+          bodyMaxlength: 10,
+          bodyFillType: 'actFill',
+          fillType: 'preFill',
+          headerSelectKey: 'yslhnUnit',
+          headerOptions: this.getDictOptions('business_tjdw')
         }
       ]
     }
@@ -367,25 +411,167 @@ export default {
   data() {
     return {
       formData: {},
-      refConf
+      refConf,
+      downloadArr: ['动物编号', '预设0.9%氯化钠注射液加入量', '预设加入血清']
     }
   },
   methods: {
+    downloadExcelTemplate(arr) {
+      this.exportExcel(arr, '骨髓收集记录表-采集信息导入模板')
+    },
+    // 模板导入成功 数据返回
+    onLoadExcelData(excelData) {
+      console.log(excelData, 'excelData')
+
+      if (excelData.length < 2) {
+        this.$message.error('Excel 数据为空')
+        return
+      }
+
+      // 第一行是表头
+      const headers = excelData[0]
+
+      // 定义表头与字段的映射关系
+      const headerMap = {
+        动物编号: 'dwbh',
+        '预设0.9%氯化钠注射液加入量': 'yslhnzsjyjrl',
+        预设加入血清: 'ysjrxq'
+      }
+
+      // 创建表头索引映射
+      const headerIndexMap = {}
+      headers.forEach((header, index) => {
+        const fieldName = headerMap[header]
+        if (fieldName) {
+          headerIndexMap[fieldName] = index
+        }
+      })
+
+      // 验证必需的表头是否存在
+      const requiredFields = ['dwbh', 'yslhnzsjyjrl', 'ysjrxq']
+      const missingFields = requiredFields.filter(
+        (field) => headerIndexMap[field] === undefined
+      )
+
+      if (missingFields.length > 0) {
+        const missingHeaders = missingFields.map((field) => {
+          return Object.keys(headerMap).find((key) => headerMap[key] === field)
+        })
+        this.$message.error(
+          `Excel 表头缺少必需列: ${missingHeaders.join('、')}`
+        )
+        return
+      }
+
+      // 移除表头行，处理数据行
+      const dataRows = excelData.slice(1)
+
+      // 数据验证函数
+      const validateDwbh = (value) => {
+        // 动物编号：限制50字以内
+        if (!value) return ''
+        const str = String(value).trim()
+        return str.length <= 50 ? str : ''
+      }
+
+      const validateNumber = (value) => {
+        // 数字字段：限制10位数以内的数字
+        if (!value) return ''
+        const str = String(value).trim()
+        // 匹配数字（可以包含小数点）
+        const numberRegex = /^-?\d{1,10}(\.\d+)?$/
+        return numberRegex.test(str) ? str : ''
+      }
+
+      // 将二维数组转换为对象数组，根据表头映射读取数据并验证
+      const list = dataRows.map((row, index) => {
+        const dwbh = validateDwbh(row[headerIndexMap.dwbh])
+        const yslhnzsjyjrl = validateNumber(row[headerIndexMap.yslhnzsjyjrl])
+        const ysjrxq = validateNumber(row[headerIndexMap.ysjrxq])
+
+        // 记录验证失败的行
+        if (!dwbh && row[headerIndexMap.dwbh]) {
+          console.warn(`第${index + 2}行：动物编号超过50字，已清空`)
+        }
+        if (!yslhnzsjyjrl && row[headerIndexMap.yslhnzsjyjrl]) {
+          console.warn(
+            `第${index + 2}行：预设0.9%氯化钠注射液加入量格式不正确，已清空`
+          )
+        }
+        if (!ysjrxq && row[headerIndexMap.ysjrxq]) {
+          console.warn(`第${index + 2}行：预设加入血清格式不正确，已清空`)
+        }
+
+        return {
+          dwbh, // 动物编号（验证后）
+          yslhnzsjyjrl, // 预设0.9%氯化钠注射液加入量（验证后）
+          ysjrxq, // 预设加入血清（验证后）
+          sjlhnzsjyjrl: '', // 实际0.9%氯化钠注射液加入量（空）
+          sjgs: '', // 收集骨髓（空）
+          lx: '', // 离心（空）
+          sjjrxq: '' // 实际加入血清（空）
+        }
+      })
+
+      // 使用 addRows 方法批量添加数据
+      this.$refs[refConf.sjxx].addRows(list)
+      // 关闭导入对话框
+      this.$refs.ImportExcelDialog.cancel()
+
+      // 提示用户
+      this.$message.success(`成功导入 ${list.length} 条数据`)
+
+      // 触发数据更新
+      setTimeout(() => {
+        this.justUpdateFilledFormData()
+      }, 100)
+    },
+    // 导入模板
+    handleImportExcel() {
+      this.$refs.ImportExcelDialog.show()
+    },
     // 删除表格行
     deleteTableRow(rowIndex, refName) {
       this.$refs[refName].deleteRow(rowIndex)
     },
     // 获取已填写的表单数据
     getFilledFormData() {
-      return this.getFilledFormDataByRefs(refNames)
+      const baseData = this.$refs.baseInfoRef.getFilledFormData()
+      const sysjData = this.$refs.sysjTableRef.getFilledFormData()
+      const yqsyData = this.$refs.yqsyTableRef.getFilledFormData()
+      const sjxxStepData = this.$refs.sjxxStepRef.getFilledFormData()
+      const sjxxData = this.$refs.sjxxTableRef.getFilledFormData()
+      const remarkData = this.$refs.remarkRef.getFilledFormData()
+
+      return {
+        ...baseData,
+        ...sysjData,
+        ...yqsyData,
+        ...sjxxStepData,
+        ...sjxxData,
+        ...remarkData
+      }
     },
     // 获取填写完成的表单数据
     async getFormData() {
-      return await this.validFormFields(refNames)
+      // 先校验再获取值
+      const validFlag = await this.validFields()
+      if (!validFlag) {
+        return false
+      }
+      return this.getFilledFormData()
     },
     // 只做校验
     async validFields() {
-      return await this.validFormFields(refNames)
+      const refsToValidate = [
+        'baseInfoRef',
+        'sysjTableRef',
+        'yqsyTableRef',
+        'sjxxStepRef',
+        'sjxxTableRef',
+        'remarkRef'
+      ]
+      return await this.validFormFields(refsToValidate)
     },
     getResource() {
       const sysjStepResource = this.$refs.sysjTableRef.getStepResource()
diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index 0b9e5e8..12bae2c 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -1,280 +1,339 @@
 <!-- 配体结合分析溶液配制记录表 -->
 <template>
-	<div>
-		<div class="detail-container">
-			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
-					src="@/assets/images/detail-title.png" /></div>
-			<div class="detail-content">
-				<div class="content">
-					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
-						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
-					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
-					
-					<LineLabel label="template.yp.yp003.ybxx" />
+  <div>
+    <div class="detail-container">
+      <div class="detail-title">
+        <img src="@/assets/images/detail-title.png" />{{ formData.bdmc
+        }}<img src="@/assets/images/detail-title.png" />
+      </div>
+      <div class="detail-content">
+        <div class="content">
+          <BaseInfoFormPackage
+            fieldItemLabel="template.common.baseInfo"
+            label="template.common.baseInfo"
+            ref="baseInfoRef"
+            :formConfig="baseInfoFormConfig"
+            :formData="formData"
+          />
+          <TableList
+            label="template.common.reagentInfo"
+            :columns="sysjColumns"
+            :dataSource="resource"
+          />
+          <TableList
+            label="template.common.instrumentInfo"
+            :columns="yqColumns"
+            :dataSource="yqResource"
+          />
 
-					<CustomTable
-						:ref="`tableRef`"
-						:columns="tableColumns"
-						:formData="formData"
-						operationWidth = "80px"
-						:prefixKey = "`table`"
-						fieldItemLabel = "template.yp.yp003.ybxx"
-						@clickButton="handleClickButton"
-						@onCheckboxTagChange="onCheckboxTagChange"
-						:showOperation="fillType === 'preFill'"
-					>
-						<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-							<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
-						</template>
-					</CustomTable>
-					
-					<LineLabel label="template.yp.yp003.fqxx" />
-					<Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPackage fieldItemLabel="template.yp.yp003.fqyq" label="template.yp.yp003.fqyq"
-						ref="fqyqRef" :formConfig="fqyqConig" :formData="formData" />
-					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
-						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
-				</div>
-			</div>
-		</div>
-		<!-- <button @click="onSave">保存</button> -->
-		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" :downloadArr="['动物编号']" @downloadExcelTemplate="downloadExcelTemplate" />
-	</div>
+          <LineLabel label="template.yp.yp003.ybxx" />
+
+          <CustomTable
+            :ref="`tableRef`"
+            :columns="tableColumns"
+            :formData="formData"
+            operationWidth="80px"
+            :prefixKey="`table`"
+            fieldItemLabel="template.yp.yp003.ybxx"
+            @clickButton="handleClickButton"
+            @onCheckboxTagChange="onCheckboxTagChange"
+            :showOperation="fillType === 'preFill'"
+          >
+            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
+              <TableOpertaionDelete
+                :row="row"
+                :rowIndex="rowIndex"
+                :columns="columns"
+                @deleteRow="deleteRow"
+              ></TableOpertaionDelete>
+            </template>
+          </CustomTable>
+
+          <LineLabel label="template.yp.yp003.fqxx" />
+          <Step ref="stepRef" :formData="formData.stepData"></Step>
+          <BaseInfoFormPackage
+            fieldItemLabel="template.yp.yp003.fqyq"
+            label="template.yp.yp003.fqyq"
+            ref="fqyqRef"
+            :formConfig="fqyqConig"
+            :formData="formData"
+          />
+          <BaseInfoFormPackage
+            fieldItemLabel="template.common.remark"
+            label="template.common.remark"
+            ref="remarkRef"
+            :formConfig="remarkConig"
+            :formData="formData"
+          />
+        </div>
+      </div>
+    </div>
+    <!-- <button @click="onSave">保存</button> -->
+    <ImportExcelDialog
+      ref="ImportExcelDialog"
+      @onLoadData="onLoadExcelData"
+      :downloadArr="['动物编号']"
+      @downloadExcelTemplate="downloadExcelTemplate"
+    />
+  </div>
 </template>
 
 <script>
-import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
-import LineLabel from "@/components/Template/LineLabel";
-import TableList from "@/components/Template/Table";
-import Step from "@/components/Template/Step";
-import templateMixin from "../../mixins/templateMixin";
-import CustomTable from '@/components/Template/CustomTable.vue';
-import { EventBus } from "@/utils/eventBus";
-import { uniqeResource } from "@/utils/calUnitTools";
+import BaseInfoFormPackage from '@/components/Template/BaseInfoFormPackage'
+import LineLabel from '@/components/Template/LineLabel'
+import TableList from '@/components/Template/Table'
+import Step from '@/components/Template/Step'
+import templateMixin from '../../mixins/templateMixin'
+import CustomTable from '@/components/Template/CustomTable.vue'
+import { EventBus } from '@/utils/eventBus'
+import { uniqeResource } from '@/utils/calUnitTools'
 import { debounce } from 'lodash-es'
-import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+import TableOpertaionDelete from '@/components/Template/operation/TableOpertaionDelete.vue'
 import ImportExcelDialog from '../../dialog/ImportExcelDialog'
 
 export default {
-	name: "YP003",
-	components: { ImportExcelDialog,BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
-	mixins: [templateMixin],
-	props: {
-		fillType: {
-			type: String,
-			default: 'preFill',
-		},
-	},
-	computed: {
-		// 分取要求	
-		fqyqConig() {
-			return [
-				{
-					type: "cellItem",
-					config: {
-						fqyq: {
-							label: "template.yp.yp003.sfyfzyq",
-							type: "fqyq",
-							fillType: "actFill",
-							span: 1,
-						}
-					}
-				}
-			]
-		},
-		// 备注表单配置
-		remarkConig() {
-			return [
-				{
-					type: "cellItem",
-					config: {
-						remark: {
-							label: "",
-							type: "textarea",
-							fillType: "actFill",
-							span: 1,
-							placeholder: 'template.common.remarkPlaceholder',
-							maxlength: 1000,
-							rows: 5
-						}
-					}
-				}
-			]
-		},
-		// 试验基本信息表单配置
-		baseInfoFormConfig() {
-			return [
-				{
-					type: "cardItem",
-					config: {
-						studyMc: {
-							label: 'template.common.testName',
-							type: "input",
-							disabled: true,
-						},
-						studySn: {
-							label: 'template.common.testNumber',
-							type: "input",
-							disabled: true,
-						},
-					}
-				},
-				{
-					type: "conditionItem",
-					label: 'template.common.processCondition',
-					config: {
-						pre: {
-							label: 'template.common.preFill',
-							type: "select",
-							multiple: true,
-							fillType: "preFill",
-							options: this.getDictOptions('business_pztj'),
-							otherCode: "preOther",
-						},
-						act: {
-							label: 'template.common.actualFill',
-							type: "select",
-							fillType: "actFill",
-							otherCode: "actOther",
-							multiple: true,
-							compareTo: "pre",
-							options: this.getDictOptions('business_pztj')
-						}
-					}
-				},
-				{
-					type: "conditionItem",
-					label: 'template.yp.yp003.yplx',
-					config: {
-						yplx: {
-							label: 'template.yp.yp003.yplx',
-							type: "select",
-							fillType: "preFill",
-							options: this.getDictOptions('business_yplx'),
-							otherCode: "yplxOther",
-						},
-					}
-				},
-				{
-					type: "cellItem",
-					label: 'template.lba.lba002.czsj',
-					config: {
-						startDate: {
-							label: 'template.common.startTime',
-							type: "input",
-						},
-						endDate: {
-							label: 'template.common.endTime',
-							type: "input",
-						},
-					}
-				}
-			]
-		},
-		// 样本信息
-		tableColumns() {
-			return [{
-				label: 'template.yp.yp003.cyd',
-				prop: 'cyd',
-				bodyType: 'input',
-				bodyFillType: 'actFill',
-				width: 100,
-				bodyMaxlength: 50,
-			},{
-				label: 'template.yp.yp003.dwbh',
-				prop: 'dwbh',
-				bodyType: 'checkboxTag',
-				bodyFillType: 'actFill',
-				bodySubType:"button",
-				bodySubFillType:"preFill",
-				bodySubButtonName:"template.common.importTemplate",
-				bodySubKey:"exportBtn",
-				showBodySub:this.fillType === "preFill",
-				width: 280,
-			},{
-				label: 'template.yp.yp003.ypsl',
-				prop: 'ypsl',
-				bodyType: 'input',
-				bodyDisabled: true,
-				bodyFillType: 'actFill',
-				width: 80,
-			}]
-		},
-	},
-	data() {
-		return {
-			formData: {},
-			currentRowIndex: -1,
-		};
-	},
-	mounted() {
-	},
-	methods: {
-		// 点击按钮
-		handleClickButton(key,rowIndex,colIndex,e,data){
-			if(key === "exportBtn"){
-				this.currentRowIndex = rowIndex;
-				this.$refs.ImportExcelDialog.show()
-			}
-		},
-		//获取已填写的表单数据
-		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef",  "tableRef", "stepRef", "fqyqRef","remarkRef"])
-		},
-		//获取填写完成的表单数据
-		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef",  "tableRef", "stepRef", "fqyqRef","remarkRef"]);
-			return content;
-		},
-		getResource() {
-			//使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp = stepResource.sjResource || []
-			this.yqResourceTmp = stepResource.yqResource || []
-			return this.resourceTmp;
-		},
-		//保存
-		async onSave() {
-			let content = await this.$refs.stepRef.getFormData();
-			console.log(content);
-		},
-		// 删除表格行
-		deleteRow(rowIndex) {
-			const tableRef = this.$refs['tableRef'];
-			if (tableRef) {
-				tableRef.deleteRow(rowIndex);
-			}
-		},
-
+  name: 'YP003',
+  components: {
+    ImportExcelDialog,
+    BaseInfoFormPackage,
+    LineLabel,
+    TableList,
+    Step,
+    CustomTable,
+    TableOpertaionDelete
+  },
+  mixins: [templateMixin],
+  props: {
+    fillType: {
+      type: String,
+      default: 'preFill'
+    }
+  },
+  computed: {
+    // 分取要求
+    fqyqConig() {
+      return [
+        {
+          type: 'cellItem',
+          config: {
+            fqyq: {
+              label: 'template.yp.yp003.sfyfzyq',
+              type: 'fqyq',
+              fillType: 'actFill',
+              span: 1
+            }
+          }
+        }
+      ]
+    },
+    // 备注表单配置
+    remarkConig() {
+      return [
+        {
+          type: 'cellItem',
+          config: {
+            remark: {
+              label: '',
+              type: 'textarea',
+              fillType: 'actFill',
+              span: 1,
+              placeholder: 'template.common.remarkPlaceholder',
+              maxlength: 1000,
+              rows: 5
+            }
+          }
+        }
+      ]
+    },
+    // 试验基本信息表单配置
+    baseInfoFormConfig() {
+      return [
+        {
+          type: 'cardItem',
+          config: {
+            studyMc: {
+              label: 'template.common.testName',
+              type: 'input',
+              disabled: true
+            },
+            studySn: {
+              label: 'template.common.testNumber',
+              type: 'input',
+              disabled: true
+            }
+          }
+        },
+        {
+          type: 'conditionItem',
+          label: 'template.common.processCondition',
+          config: {
+            pre: {
+              label: 'template.common.preFill',
+              type: 'select',
+              multiple: true,
+              fillType: 'preFill',
+              options: this.getDictOptions('business_pztj'),
+              otherCode: 'preOther'
+            },
+            act: {
+              label: 'template.common.actualFill',
+              type: 'select',
+              fillType: 'actFill',
+              otherCode: 'actOther',
+              multiple: true,
+              compareTo: 'pre',
+              options: this.getDictOptions('business_pztj')
+            }
+          }
+        },
+        {
+          type: 'conditionItem',
+          label: 'template.yp.yp003.yplx',
+          config: {
+            yplx: {
+              label: 'template.yp.yp003.yplx',
+              type: 'select',
+              fillType: 'preFill',
+              options: this.getDictOptions('business_yplx'),
+              otherCode: 'yplxOther'
+            }
+          }
+        },
+        {
+          type: 'cellItem',
+          label: 'template.lba.lba002.czsj',
+          config: {
+            startDate: {
+              label: 'template.common.startTime',
+              type: 'input'
+            },
+            endDate: {
+              label: 'template.common.endTime',
+              type: 'input'
+            }
+          }
+        }
+      ]
+    },
+    // 样本信息
+    tableColumns() {
+      return [
+        {
+          label: 'template.yp.yp003.cyd',
+          prop: 'cyd',
+          bodyType: 'input',
+          bodyFillType: 'actFill',
+          width: 100,
+          bodyMaxlength: 50
+        },
+        {
+          label: 'template.yp.yp003.dwbh',
+          prop: 'dwbh',
+          bodyType: 'checkboxTag',
+          bodyFillType: 'actFill',
+          bodySubType: 'button',
+          bodySubFillType: 'preFill',
+          bodySubButtonName: 'template.common.importTemplate',
+          bodySubKey: 'exportBtn',
+          showBodySub: this.fillType === 'preFill',
+          width: 280
+        },
+        {
+          label: 'template.yp.yp003.ypsl',
+          prop: 'ypsl',
+          bodyType: 'input',
+          bodyDisabled: true,
+          bodyFillType: 'actFill',
+          width: 80
+        }
+      ]
+    }
+  },
+  data() {
+    return {
+      formData: {},
+      currentRowIndex: -1
+    }
+  },
+  mounted() {},
+  methods: {
+    // 点击按钮
+    handleClickButton(key, rowIndex, colIndex, e, data) {
+      if (key === 'exportBtn') {
+        this.currentRowIndex = rowIndex
+        this.$refs.ImportExcelDialog.show()
+      }
+    },
+    //获取已填写的表单数据
+    getFilledFormData() {
+      return this.getFilledFormDataByRefs([
+        'baseInfoRef',
+        'tableRef',
+        'stepRef',
+        'fqyqRef',
+        'remarkRef'
+      ])
+    },
+    //获取填写完成的表单数据
+    async getFormData() {
+      let content = await this.validFormFields([
+        'baseInfoRef',
+        'tableRef',
+        'stepRef',
+        'fqyqRef',
+        'remarkRef'
+      ])
+      return content
+    },
+    getResource() {
+      //使用的试剂、仪器
+      const stepResource = this.$refs.stepRef.getStepResource()
+      this.resourceTmp = stepResource.sjResource || []
+      this.yqResourceTmp = stepResource.yqResource || []
+      return this.resourceTmp
+    },
+    //保存
+    async onSave() {
+      let content = await this.$refs.stepRef.getFormData()
+      console.log(content)
+    },
+    // 删除表格行
+    deleteRow(rowIndex) {
+      const tableRef = this.$refs['tableRef']
+      if (tableRef) {
+        tableRef.deleteRow(rowIndex)
+      }
+    },
 
-		showImportExcelDialog() {
-			this.$refs.ImportExcelDialog.show()
-		},
-		onLoadExcelData(excelData) {
-			const data = excelData.splice(1);
-			const tagData = data.map((item)=>{
-				return {
-					checked:undefined,
-					tagValue:item[0],
-				}
-			})
-			this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex,{dwbh:tagData});
-			this.$refs.tableRef.onErrorUpdate(this.currentRowIndex, 1, 'dwbh', false)
-			this.$refs.ImportExcelDialog.cancel()
-			setTimeout(() => {
-				this.justUpdateFilledFormData();
-			}, 100);
-		},
-		downloadExcelTemplate(arr){
-			this.exportExcel(arr)
-		},
-		onCheckboxTagChange(rowIndex,colIndex,data){
-			const num = data.filter((item)=>item.checked).length;
-			this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, {'ypsl':num})
-		}
-	}
-};
+    showImportExcelDialog() {
+      this.$refs.ImportExcelDialog.show()
+    },
+    onLoadExcelData(excelData) {
+      const data = excelData.splice(1)
+      const tagData = data.map((item) => {
+        return {
+          checked: undefined,
+          tagValue: item[0]
+        }
+      })
+      this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex, {
+        dwbh: tagData
+      })
+      this.$refs.tableRef.onErrorUpdate(this.currentRowIndex, 1, 'dwbh', false)
+      this.$refs.ImportExcelDialog.cancel()
+      setTimeout(() => {
+        this.justUpdateFilledFormData()
+      }, 100)
+    },
+    downloadExcelTemplate(arr) {
+      this.exportExcel(arr)
+    },
+    onCheckboxTagChange(rowIndex, colIndex, data) {
+      const num = data.filter((item) => item.checked).length
+      this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, { ypsl: num })
+    }
+  }
+}
 </script>
 <style rel="stylesheet/scss" lang="scss">
 </style>
\ No newline at end of file

From 67a4c9e8f27a2ff128c80d3b73832b25d578dfef Mon Sep 17 00:00:00 2001
From: ouqian <13568766802@163.com>
Date: Thu, 5 Mar 2026 23:15:11 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?YP003=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=9B=9E=E6=BB=9A]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/yp/YP003.vue     | 591 ++++++++++-----------
 1 file changed, 266 insertions(+), 325 deletions(-)

diff --git a/src/views/business/comps/template/comps/yp/YP003.vue b/src/views/business/comps/template/comps/yp/YP003.vue
index 12bae2c..0b9e5e8 100644
--- a/src/views/business/comps/template/comps/yp/YP003.vue
+++ b/src/views/business/comps/template/comps/yp/YP003.vue
@@ -1,339 +1,280 @@
 <!-- 配体结合分析溶液配制记录表 -->
 <template>
-  <div>
-    <div class="detail-container">
-      <div class="detail-title">
-        <img src="@/assets/images/detail-title.png" />{{ formData.bdmc
-        }}<img src="@/assets/images/detail-title.png" />
-      </div>
-      <div class="detail-content">
-        <div class="content">
-          <BaseInfoFormPackage
-            fieldItemLabel="template.common.baseInfo"
-            label="template.common.baseInfo"
-            ref="baseInfoRef"
-            :formConfig="baseInfoFormConfig"
-            :formData="formData"
-          />
-          <TableList
-            label="template.common.reagentInfo"
-            :columns="sysjColumns"
-            :dataSource="resource"
-          />
-          <TableList
-            label="template.common.instrumentInfo"
-            :columns="yqColumns"
-            :dataSource="yqResource"
-          />
+	<div>
+		<div class="detail-container">
+			<div class="detail-title"><img src="@/assets/images/detail-title.png">{{ formData.bdmc }}<img
+					src="@/assets/images/detail-title.png" /></div>
+			<div class="detail-content">
+				<div class="content">
+					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+					<TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+					
+					<LineLabel label="template.yp.yp003.ybxx" />
 
-          <LineLabel label="template.yp.yp003.ybxx" />
-
-          <CustomTable
-            :ref="`tableRef`"
-            :columns="tableColumns"
-            :formData="formData"
-            operationWidth="80px"
-            :prefixKey="`table`"
-            fieldItemLabel="template.yp.yp003.ybxx"
-            @clickButton="handleClickButton"
-            @onCheckboxTagChange="onCheckboxTagChange"
-            :showOperation="fillType === 'preFill'"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="deleteRow"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
-
-          <LineLabel label="template.yp.yp003.fqxx" />
-          <Step ref="stepRef" :formData="formData.stepData"></Step>
-          <BaseInfoFormPackage
-            fieldItemLabel="template.yp.yp003.fqyq"
-            label="template.yp.yp003.fqyq"
-            ref="fqyqRef"
-            :formConfig="fqyqConig"
-            :formData="formData"
-          />
-          <BaseInfoFormPackage
-            fieldItemLabel="template.common.remark"
-            label="template.common.remark"
-            ref="remarkRef"
-            :formConfig="remarkConig"
-            :formData="formData"
-          />
-        </div>
-      </div>
-    </div>
-    <!-- <button @click="onSave">保存</button> -->
-    <ImportExcelDialog
-      ref="ImportExcelDialog"
-      @onLoadData="onLoadExcelData"
-      :downloadArr="['动物编号']"
-      @downloadExcelTemplate="downloadExcelTemplate"
-    />
-  </div>
+					<CustomTable
+						:ref="`tableRef`"
+						:columns="tableColumns"
+						:formData="formData"
+						operationWidth = "80px"
+						:prefixKey = "`table`"
+						fieldItemLabel = "template.yp.yp003.ybxx"
+						@clickButton="handleClickButton"
+						@onCheckboxTagChange="onCheckboxTagChange"
+						:showOperation="fillType === 'preFill'"
+					>
+						<template slot="operation" slot-scope="{ row, rowIndex, columns }">
+							<TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
+						</template>
+					</CustomTable>
+					
+					<LineLabel label="template.yp.yp003.fqxx" />
+					<Step ref="stepRef" :formData="formData.stepData"></Step>
+					<BaseInfoFormPackage fieldItemLabel="template.yp.yp003.fqyq" label="template.yp.yp003.fqyq"
+						ref="fqyqRef" :formConfig="fqyqConig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+				</div>
+			</div>
+		</div>
+		<!-- <button @click="onSave">保存</button> -->
+		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" :downloadArr="['动物编号']" @downloadExcelTemplate="downloadExcelTemplate" />
+	</div>
 </template>
 
 <script>
-import BaseInfoFormPackage from '@/components/Template/BaseInfoFormPackage'
-import LineLabel from '@/components/Template/LineLabel'
-import TableList from '@/components/Template/Table'
-import Step from '@/components/Template/Step'
-import templateMixin from '../../mixins/templateMixin'
-import CustomTable from '@/components/Template/CustomTable.vue'
-import { EventBus } from '@/utils/eventBus'
-import { uniqeResource } from '@/utils/calUnitTools'
+import BaseInfoFormPackage from "@/components/Template/BaseInfoFormPackage";
+import LineLabel from "@/components/Template/LineLabel";
+import TableList from "@/components/Template/Table";
+import Step from "@/components/Template/Step";
+import templateMixin from "../../mixins/templateMixin";
+import CustomTable from '@/components/Template/CustomTable.vue';
+import { EventBus } from "@/utils/eventBus";
+import { uniqeResource } from "@/utils/calUnitTools";
 import { debounce } from 'lodash-es'
-import TableOpertaionDelete from '@/components/Template/operation/TableOpertaionDelete.vue'
+import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 import ImportExcelDialog from '../../dialog/ImportExcelDialog'
 
 export default {
-  name: 'YP003',
-  components: {
-    ImportExcelDialog,
-    BaseInfoFormPackage,
-    LineLabel,
-    TableList,
-    Step,
-    CustomTable,
-    TableOpertaionDelete
-  },
-  mixins: [templateMixin],
-  props: {
-    fillType: {
-      type: String,
-      default: 'preFill'
-    }
-  },
-  computed: {
-    // 分取要求
-    fqyqConig() {
-      return [
-        {
-          type: 'cellItem',
-          config: {
-            fqyq: {
-              label: 'template.yp.yp003.sfyfzyq',
-              type: 'fqyq',
-              fillType: 'actFill',
-              span: 1
-            }
-          }
-        }
-      ]
-    },
-    // 备注表单配置
-    remarkConig() {
-      return [
-        {
-          type: 'cellItem',
-          config: {
-            remark: {
-              label: '',
-              type: 'textarea',
-              fillType: 'actFill',
-              span: 1,
-              placeholder: 'template.common.remarkPlaceholder',
-              maxlength: 1000,
-              rows: 5
-            }
-          }
-        }
-      ]
-    },
-    // 试验基本信息表单配置
-    baseInfoFormConfig() {
-      return [
-        {
-          type: 'cardItem',
-          config: {
-            studyMc: {
-              label: 'template.common.testName',
-              type: 'input',
-              disabled: true
-            },
-            studySn: {
-              label: 'template.common.testNumber',
-              type: 'input',
-              disabled: true
-            }
-          }
-        },
-        {
-          type: 'conditionItem',
-          label: 'template.common.processCondition',
-          config: {
-            pre: {
-              label: 'template.common.preFill',
-              type: 'select',
-              multiple: true,
-              fillType: 'preFill',
-              options: this.getDictOptions('business_pztj'),
-              otherCode: 'preOther'
-            },
-            act: {
-              label: 'template.common.actualFill',
-              type: 'select',
-              fillType: 'actFill',
-              otherCode: 'actOther',
-              multiple: true,
-              compareTo: 'pre',
-              options: this.getDictOptions('business_pztj')
-            }
-          }
-        },
-        {
-          type: 'conditionItem',
-          label: 'template.yp.yp003.yplx',
-          config: {
-            yplx: {
-              label: 'template.yp.yp003.yplx',
-              type: 'select',
-              fillType: 'preFill',
-              options: this.getDictOptions('business_yplx'),
-              otherCode: 'yplxOther'
-            }
-          }
-        },
-        {
-          type: 'cellItem',
-          label: 'template.lba.lba002.czsj',
-          config: {
-            startDate: {
-              label: 'template.common.startTime',
-              type: 'input'
-            },
-            endDate: {
-              label: 'template.common.endTime',
-              type: 'input'
-            }
-          }
-        }
-      ]
-    },
-    // 样本信息
-    tableColumns() {
-      return [
-        {
-          label: 'template.yp.yp003.cyd',
-          prop: 'cyd',
-          bodyType: 'input',
-          bodyFillType: 'actFill',
-          width: 100,
-          bodyMaxlength: 50
-        },
-        {
-          label: 'template.yp.yp003.dwbh',
-          prop: 'dwbh',
-          bodyType: 'checkboxTag',
-          bodyFillType: 'actFill',
-          bodySubType: 'button',
-          bodySubFillType: 'preFill',
-          bodySubButtonName: 'template.common.importTemplate',
-          bodySubKey: 'exportBtn',
-          showBodySub: this.fillType === 'preFill',
-          width: 280
-        },
-        {
-          label: 'template.yp.yp003.ypsl',
-          prop: 'ypsl',
-          bodyType: 'input',
-          bodyDisabled: true,
-          bodyFillType: 'actFill',
-          width: 80
-        }
-      ]
-    }
-  },
-  data() {
-    return {
-      formData: {},
-      currentRowIndex: -1
-    }
-  },
-  mounted() {},
-  methods: {
-    // 点击按钮
-    handleClickButton(key, rowIndex, colIndex, e, data) {
-      if (key === 'exportBtn') {
-        this.currentRowIndex = rowIndex
-        this.$refs.ImportExcelDialog.show()
-      }
-    },
-    //获取已填写的表单数据
-    getFilledFormData() {
-      return this.getFilledFormDataByRefs([
-        'baseInfoRef',
-        'tableRef',
-        'stepRef',
-        'fqyqRef',
-        'remarkRef'
-      ])
-    },
-    //获取填写完成的表单数据
-    async getFormData() {
-      let content = await this.validFormFields([
-        'baseInfoRef',
-        'tableRef',
-        'stepRef',
-        'fqyqRef',
-        'remarkRef'
-      ])
-      return content
-    },
-    getResource() {
-      //使用的试剂、仪器
-      const stepResource = this.$refs.stepRef.getStepResource()
-      this.resourceTmp = stepResource.sjResource || []
-      this.yqResourceTmp = stepResource.yqResource || []
-      return this.resourceTmp
-    },
-    //保存
-    async onSave() {
-      let content = await this.$refs.stepRef.getFormData()
-      console.log(content)
-    },
-    // 删除表格行
-    deleteRow(rowIndex) {
-      const tableRef = this.$refs['tableRef']
-      if (tableRef) {
-        tableRef.deleteRow(rowIndex)
-      }
-    },
+	name: "YP003",
+	components: { ImportExcelDialog,BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
+	mixins: [templateMixin],
+	props: {
+		fillType: {
+			type: String,
+			default: 'preFill',
+		},
+	},
+	computed: {
+		// 分取要求	
+		fqyqConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						fqyq: {
+							label: "template.yp.yp003.sfyfzyq",
+							type: "fqyq",
+							fillType: "actFill",
+							span: 1,
+						}
+					}
+				}
+			]
+		},
+		// 备注表单配置
+		remarkConig() {
+			return [
+				{
+					type: "cellItem",
+					config: {
+						remark: {
+							label: "",
+							type: "textarea",
+							fillType: "actFill",
+							span: 1,
+							placeholder: 'template.common.remarkPlaceholder',
+							maxlength: 1000,
+							rows: 5
+						}
+					}
+				}
+			]
+		},
+		// 试验基本信息表单配置
+		baseInfoFormConfig() {
+			return [
+				{
+					type: "cardItem",
+					config: {
+						studyMc: {
+							label: 'template.common.testName',
+							type: "input",
+							disabled: true,
+						},
+						studySn: {
+							label: 'template.common.testNumber',
+							type: "input",
+							disabled: true,
+						},
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.common.processCondition',
+					config: {
+						pre: {
+							label: 'template.common.preFill',
+							type: "select",
+							multiple: true,
+							fillType: "preFill",
+							options: this.getDictOptions('business_pztj'),
+							otherCode: "preOther",
+						},
+						act: {
+							label: 'template.common.actualFill',
+							type: "select",
+							fillType: "actFill",
+							otherCode: "actOther",
+							multiple: true,
+							compareTo: "pre",
+							options: this.getDictOptions('business_pztj')
+						}
+					}
+				},
+				{
+					type: "conditionItem",
+					label: 'template.yp.yp003.yplx',
+					config: {
+						yplx: {
+							label: 'template.yp.yp003.yplx',
+							type: "select",
+							fillType: "preFill",
+							options: this.getDictOptions('business_yplx'),
+							otherCode: "yplxOther",
+						},
+					}
+				},
+				{
+					type: "cellItem",
+					label: 'template.lba.lba002.czsj',
+					config: {
+						startDate: {
+							label: 'template.common.startTime',
+							type: "input",
+						},
+						endDate: {
+							label: 'template.common.endTime',
+							type: "input",
+						},
+					}
+				}
+			]
+		},
+		// 样本信息
+		tableColumns() {
+			return [{
+				label: 'template.yp.yp003.cyd',
+				prop: 'cyd',
+				bodyType: 'input',
+				bodyFillType: 'actFill',
+				width: 100,
+				bodyMaxlength: 50,
+			},{
+				label: 'template.yp.yp003.dwbh',
+				prop: 'dwbh',
+				bodyType: 'checkboxTag',
+				bodyFillType: 'actFill',
+				bodySubType:"button",
+				bodySubFillType:"preFill",
+				bodySubButtonName:"template.common.importTemplate",
+				bodySubKey:"exportBtn",
+				showBodySub:this.fillType === "preFill",
+				width: 280,
+			},{
+				label: 'template.yp.yp003.ypsl',
+				prop: 'ypsl',
+				bodyType: 'input',
+				bodyDisabled: true,
+				bodyFillType: 'actFill',
+				width: 80,
+			}]
+		},
+	},
+	data() {
+		return {
+			formData: {},
+			currentRowIndex: -1,
+		};
+	},
+	mounted() {
+	},
+	methods: {
+		// 点击按钮
+		handleClickButton(key,rowIndex,colIndex,e,data){
+			if(key === "exportBtn"){
+				this.currentRowIndex = rowIndex;
+				this.$refs.ImportExcelDialog.show()
+			}
+		},
+		//获取已填写的表单数据
+		getFilledFormData() {
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "tableRef", "stepRef", "fqyqRef","remarkRef"])
+		},
+		//获取填写完成的表单数据
+		async getFormData() {
+			let content = await this.validFormFields(["baseInfoRef",  "tableRef", "stepRef", "fqyqRef","remarkRef"]);
+			return content;
+		},
+		getResource() {
+			//使用的试剂、仪器
+			const stepResource = this.$refs.stepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
+		},
+		//保存
+		async onSave() {
+			let content = await this.$refs.stepRef.getFormData();
+			console.log(content);
+		},
+		// 删除表格行
+		deleteRow(rowIndex) {
+			const tableRef = this.$refs['tableRef'];
+			if (tableRef) {
+				tableRef.deleteRow(rowIndex);
+			}
+		},
+
 
-    showImportExcelDialog() {
-      this.$refs.ImportExcelDialog.show()
-    },
-    onLoadExcelData(excelData) {
-      const data = excelData.splice(1)
-      const tagData = data.map((item) => {
-        return {
-          checked: undefined,
-          tagValue: item[0]
-        }
-      })
-      this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex, {
-        dwbh: tagData
-      })
-      this.$refs.tableRef.onErrorUpdate(this.currentRowIndex, 1, 'dwbh', false)
-      this.$refs.ImportExcelDialog.cancel()
-      setTimeout(() => {
-        this.justUpdateFilledFormData()
-      }, 100)
-    },
-    downloadExcelTemplate(arr) {
-      this.exportExcel(arr)
-    },
-    onCheckboxTagChange(rowIndex, colIndex, data) {
-      const num = data.filter((item) => item.checked).length
-      this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, { ypsl: num })
-    }
-  }
-}
+		showImportExcelDialog() {
+			this.$refs.ImportExcelDialog.show()
+		},
+		onLoadExcelData(excelData) {
+			const data = excelData.splice(1);
+			const tagData = data.map((item)=>{
+				return {
+					checked:undefined,
+					tagValue:item[0],
+				}
+			})
+			this.$refs.tableRef.updateDataSourceByRowIndex(this.currentRowIndex,{dwbh:tagData});
+			this.$refs.tableRef.onErrorUpdate(this.currentRowIndex, 1, 'dwbh', false)
+			this.$refs.ImportExcelDialog.cancel()
+			setTimeout(() => {
+				this.justUpdateFilledFormData();
+			}, 100);
+		},
+		downloadExcelTemplate(arr){
+			this.exportExcel(arr)
+		},
+		onCheckboxTagChange(rowIndex,colIndex,data){
+			const num = data.filter((item)=>item.checked).length;
+			this.$refs.tableRef.updateDataSourceByRowIndex(rowIndex, {'ypsl':num})
+		}
+	}
+};
 </script>
 <style rel="stylesheet/scss" lang="scss">
 </style>
\ No newline at end of file