fix:[模板管理][DL007~DL015功能核验]

src/components/Template/BaseInfoFormPackage.vue

@@ -174,6 +174,9 @@
                             :style="{ 'width': sItem.labelWidth ? sItem.labelWidth + 'px' : '150px' }"
                             v-if="sItem.label">
                             {{ $t(sItem.label) }}</div>
+                        <div v-if="sItem.type === 'span'" class="flex1">
+                            {{ formFields[key] }}
+                        </div>
                         <div v-if="sItem.type === 'dateTime'" class="flex1">
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 type="dateTime" :item="sItem" v-model="formFields[key]" @copy="onCopy(sItem, key)"
@@ -184,6 +187,7 @@
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey + '_' + key"
                                 :type="sItem.type" :item="sItem" style="width: auto;flex:1" v-model="formFields[key]"
                                 @copy="onCopy(sItem, key)" @change="(e, type) => onSelectChange(key, e, type)"
+                                @remoteMethod="(query)=>remoteMethod(query, sItem,key)"
                                 :error="errors[key]" @update:error="errors[key] = false"
                                 :orange-bg="orangeBgFields[key]" />
                             <div v-show="isShowOther(formFields[key]) || isShowRadioSelect(formFields[key])" class="flex flex1 ml-10">
@@ -410,6 +414,9 @@ export default {
         };
     },
     methods: {
+        remoteMethod(query, sItem, key){
+            this.$emit('remoteMethod', { query, sItem, key, formFields: this.formFields })
+        },
         //是否显示radio后的select
         isShowRadioSelect(value){
             const arr = ["动物种属","细胞系"];
@@ -430,7 +437,8 @@ export default {
             return {
                 ...sItem,
                 key: sItem.subKey,
-                fillType: sItem.fourthFillType || sItem.fillType
+                disabled: sItem.subDisabled,
+                fillType: sItem.subFillType || sItem.fillType
             }
         },
         getFourthButtonItem(sItem) {
@@ -438,6 +446,7 @@ export default {
                 ...sItem,
                 key: sItem.fourthKey,
                 buttonName:sItem.fourthButtonName,
+                disabled: sItem.fourthDisabled,
                 fillType: sItem.fourthFillType || sItem.fillType
             }
         },

src/components/Template/CustomTable.vue

@@ -93,7 +93,7 @@
 								<template
 									v-if="col.bodyType === 'input' || col.bodyType === 'inputNumber' || col.bodyType === 'select' || col.bodyType === 'dateTimeRange' || col.bodyType === 'radio'">
 									<div class="flex flex1">
-										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 											:fieldItemLabel="fieldItemLabel" :type="col.bodyType"
 											@blur="onBlur(rowIndex, col.prop, $event)" @copy="onCopy(rowIndex, col)"
 											class="body-input" :item="getBodyItem(col, rowIndex)"
@@ -120,7 +120,7 @@
 											:class="{ 'full-row': row[col.prop] && row[col.prop].length == 1 }"
 											v-for="(opItem, itemIndex) in row[col.prop]" :key="itemIndex">
 											<HandleFormItem
-												:fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex + '_' + itemIndex"
+												:fieldKey="prefixKey + '_' + col.prop + '_' + row.id + '_' + itemIndex"
 												:fieldItemLabel="fieldItemLabel" type="input"
 												@blur="onOperableInputBlur(opItem, $event)" class="body-input"
 												:item="getBodyItem(col, rowIndex)" :value="opItem.value"
@@ -140,7 +140,7 @@
 								</div>
 
 								<div class="flex flex1" v-else-if="col.bodyType === 'clickable'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" type="clickable" class="body-clickable"
 										:item="getBodyItem(col, rowIndex)" :value="row[col.prop]"
 										:error="hasError(rowIndex, colIndex, col.prop)"
@@ -150,7 +150,7 @@
 										:orange-bg="hasOrangeBg(rowIndex, colIndex, col.prop)" />
 								</div>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodyType')">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodyType" class="body-clickable"
 										sourceFrom="customTable" :item="getBodyItem(col, rowIndex)"
 										:value="row[col.prop]" :error="hasError(rowIndex, colIndex, col.prop)"
@@ -167,7 +167,7 @@
 								<template v-else-if="col.bodyType === 'checkboxTag'">
 									<div class="flex flex-wrap"
 										:class="{ 'row-error-border': hasError(rowIndex, colIndex, col.prop) }">
-										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+										<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 											:fieldItemLabel="fieldItemLabel" type="checkboxTag" :value="row[col.prop]"
 											:item="getBodyItem(col, rowIndex)"
 											@change="onCheckboxTagChange(rowIndex, colIndex, col, $event)"
@@ -177,7 +177,7 @@
 									</div>
 								</template>
 								<template v-else-if="col.bodyType === 'checkbox'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.prop + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" type="checkbox" v-model="row[col.prop]"
 										:item="getBodyItem(col, rowIndex)"
 										@change="onCheckboxChange(rowIndex, colIndex, col, $event)"
@@ -204,7 +204,7 @@
 								v-if="isShowBodySub(col, row)">
 								<template
 									v-if="col.bodySubType === 'inputNumber' || col.bodySubType === 'input' || col.bodySubType === 'select'">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType"
 										@blur="onSubBlur(rowIndex, col.bodySubKey, $event)"
 										@copy="onCopy(rowIndex, col)" :item="getBodySubItem(col)"
@@ -225,7 +225,7 @@
 										@clickButton="(e, data) => handleClickButton(e, data, col.bodySubKey, rowIndex, colIndex)" />
 								</template>
 								<div class="flex flex1" v-else-if="isRegent(col, 'bodySubType')">
-									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + rowIndex"
+									<HandleFormItem :fieldKey="prefixKey + '_' + col.bodySubKey + '_' + row.id"
 										:fieldItemLabel="fieldItemLabel" :type="col.bodySubType" class="body-clickable"
 										sourceFrom="customTable" :item="getBodySubItem(col, rowIndex)"
 										:value="row[col.bodySubKey]"
@@ -1012,6 +1012,12 @@ export default {
 			this.checkCompareToOnDataLoad();
 			justUpdateFilledFormData();
 		},
+		pushDataSource(data=[]) {
+			this.localDataSource.push(...data);
+			this.localDataSource = [...this.localDataSource];
+			this.checkCompareToOnDataLoad();
+			justUpdateFilledFormData();
+		},
 		// 比较newData和oldData的值是否相等，只要有一对不相等就返回false
 		compareOldAndCurrentFormFields(newData, oldData) {
 			for (const key in newData) {
@@ -1062,6 +1068,7 @@ export default {
 				actSolutionConcentrationPrecision: 3,//小数点精度默认为3
 				targetDiluentVolumePrecision: 3,//小数点精度默认为3
 				targetStartSolutionVolumePrecision: 3,//小数点精度默认为3
+				id:getuuid(),
 			});
 			justUpdateFilledFormData()
 		},

src/components/Template/HandleFormItem.vue

@@ -19,6 +19,8 @@
             <el-select v-else-if="type === 'select'" class="flex1" :multiple="item.multiple"
                 :class="getFillTypeStyle() + (orangeBg ? ' orange-bg' : '')" v-model="inputValue"
                 :disabled="getDisabled()" :placeholder="getPlaceholder()" @remove-tag="onRemoveTag"
+                :remote = "true"
+                :remote-method="remoteMethod"
                 @visible-change="onSelectBlur" @change="onInputChange" filterable>
                 <el-option v-for="op in item.options" :key="op.value" :label="op.label" :value="op.value">
                 </el-option>
@@ -401,6 +403,10 @@ export default {
         EventBus.$off("onMixReagentSubmit", this.onMixReagentSubmit)
     },
     methods: {
+        remoteMethod(query) {
+            console.log(query,"qqq")
+            this.$emit('remoteMethod', query);
+        },
         handleFalse() {
             return false;
         },

src/views/business/comps/template/comps/dl/DL007.vue

@@ -221,11 +221,12 @@ export default {
               disabled: true
             },
             pyjssj: {
-              // TODO：这里要核对是否要将input改为dateTime还是禁用输入框
               label: 'template.dl.dl007.pyjssj',
               type: 'input',
               fillType: 'actFill',
               subType: 'button',
+              disabled: true,
+              subDisabled: this.fillType !== 'actFill',
               subKey: 'pyjssjButton',
               buttonName: 'template.dl.dl007.jsButton'
             }

src/views/business/comps/template/comps/dl/DL011.vue

@@ -198,6 +198,8 @@ export default {
               fillType: 'actFill',
               subType: 'button',
               subKey: 'pykssjButton',
+              subDisabled: this.fillType !== 'actFill',
+              disabled: true,
               buttonName: 'template.dl.dl011.pykssjButton'
             }
           }
@@ -214,7 +216,8 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_xbmc'),
               fillType: 'preFill',
-              otherCode: 'xbmcOther'
+              otherCode: 'xbmcOther',
+              otherMaxlength: 50
             },
             xbdcbh: {
               label: 'template.dl.dl011.xbdcbh',
@@ -248,8 +251,7 @@ export default {
               copyFrom: 'fshxbyjtj',
               compareTo: 'fshxbyjtj',
               subOptions: this.getDictOptions('business_nddw'),
-              maxlength: 10,
-              copyFrom: 'fshxbyjtj' //复制哪个字段
+              maxlength: 10
             }
           }
         }
@@ -257,12 +259,35 @@ export default {
     }
   },
   mounted() {
+    // 获取数据检查 pytjText 是否已有值
+    const pyxxData = this.getFilledFormDataByRefs([refConf.pyxx])
+    const { pytjText } = pyxxData || {}
+
+    // 只有在 pytjText 无值时才设置，避免重复设置
+    if (!pytjText) {
+      this.$nextTick(() => {
+        this.$refs[refConf.pyxx]?.updateFormData(
+          'pytjText',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          { isUpdateRecord: false, signData: null }
+        )
+      })
+    }
+
+    // 只在实际填报模式下生成编号
+    if (this.fillType !== 'actFill') return
+
+    const data = this.getFilledFormDataByRefs([refConf.xbxx])
+    const { fshxbbhCodeSn } = data || {}
+
+    // 如果已经有 fshxbbhCodeSn 值，说明是回显数据，不需要重新生成
+    if (fshxbbhCodeSn) return
+
     this.$nextTick(() => {
-      this.$refs[refConf.pyxx]?.updateFormData(
-        'pytjText',
-        '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
-        { isUpdateRecord: false, signData: null }
-      )
+      const updateData = {}
+      const formattedDate = moment().format('YYMMDD')
+      updateData['fshxbbhCodeSn'] = formattedDate + '-' + '0001'
+      this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
     })
   },
   data() {
@@ -301,28 +326,30 @@ export default {
       // 使用的试剂、仪器（来自复苏步骤）
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = [...(stepResource.yqResource || [])]
-      
+
       // 获取细胞信息
       const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了细胞冻存编号，添加到细胞细菌信息中
       if (xbxxData.xbdcbh) {
         const xbInfo = xbxxData.selectInfo_xbdcbh || {}
         // 细胞信息格式：不包含 type 字段（参考 StepFormPackage 中 xb 类型的处理）
-        this.xbxjTmp = [{
-          value: xbxxData.xbdcbh,
-          bh: xbInfo.bh || xbxxData.xbdcbh,
-          mc: xbInfo.mc || '',
-          xh: xbInfo.xh || '',
-          jzrq: xbInfo.jzrq || ''
-        }]
+        this.xbxjTmp = [
+          {
+            value: xbxxData.xbdcbh,
+            bh: xbInfo.bh || xbxxData.xbdcbh,
+            mc: xbInfo.mc || '',
+            xh: xbInfo.xh || '',
+            jzrq: xbInfo.jzrq || ''
+          }
+        ]
       } else {
         this.xbxjTmp = []
       }
-      
+
       // 获取培养信息
       const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了培养箱编号，添加到仪器信息中
       if (pyxxData.pyxbh) {
         const pyxInfo = pyxxData.selectInfo_pyxbh || {}
@@ -336,7 +363,7 @@ export default {
           jzrq: pyxInfo.jzrq || ''
         })
       }
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {

src/views/business/comps/template/comps/dl/DL012.vue

@@ -194,6 +194,8 @@ export default {
               fillType: 'actFill',
               subType: 'button',
               subKey: 'pykssjButton',
+              disabled: true,
+              subDisabled: this.fillType !== 'actFill',
               buttonName: 'template.dl.dl012.pykssjButton'
             }
           }
@@ -271,30 +273,49 @@ export default {
     }
   },
   mounted() {
-    this.$nextTick(() => {
-      this.$refs[refConf.pyxx]?.updateFormData(
-        'pytjText',
-        '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
-        { isUpdateRecord: false, signData: null }
-      )
-    })
-    const data = this.getFilledFormDataByRefs([refConf.xbxx, refConf.base])
-    console.log(data)
-    const { zbxbs, zbhxbbh_1, startDate } = data || {}
+    console.log(this.fillType, '===>fillType')
+
+    // 获取数据检查 pytjText 是否已有值
+    const pyxxData = this.getFilledFormDataByRefs([refConf.pyxx])
+    const { pytjText } = pyxxData || {}
+
+    // 只有在 pytjText 无值时才设置，避免重复设置
+    if (!pytjText) {
+      this.$nextTick(() => {
+        this.$refs[refConf.pyxx]?.updateFormData(
+          'pytjText',
+          '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+          { isUpdateRecord: false, signData: null }
+        )
+      })
+    }
+
+    // 只在实际填报模式下生成编号
+    const data = this.getFilledFormDataByRefs([refConf.xbxx])
+    const { zbxbs, zbhxbbh_1 } = data || {}
     if (!zbxbs) return
     try {
       this.zbxbs = Number(zbxbs)
     } catch (error) {
       this.zbxbs = 1
     }
+    if (this.fillType !== 'actFill') return
     this.$nextTick(() => {
       const updateData = {}
-      // Convert startDate from "2026-03-07 14:02:15" to "260307" (YYMMDD)
-      const formattedDate = startDate ? moment(startDate).format('YYMMDD') : ''
+      // 使用当前时间生成编号
+      const formattedDate = moment().format('YYMMDD')
       for (let index = 1; index <= this.zbxbs; index++) {
-        updateData['zbhxbbh_' + index] = zbhxbbh_1
-        updateData['zbhxbbhCodeSn_' + index] =
-          formattedDate + '-' + `${index}`.padStart(2, '0')
+        const zbhxbbhKey = 'zbhxbbh_' + index
+        const codeSnKey = 'zbhxbbhCodeSn_' + index
+
+        // 分别判断每个字段，只有无值时才设置
+        if (!data[zbhxbbhKey]) {
+          updateData[zbhxbbhKey] = zbhxbbh_1
+        }
+        if (!data[codeSnKey]) {
+          updateData[codeSnKey] =
+            formattedDate + '-' + `${index}`.padStart(4, '0')
+        }
       }
       this.$refs[refConf.xbxx].batchUpdateFormData(updateData)
     })
@@ -339,28 +360,30 @@ export default {
       // 使用的试剂、仪器（来自制备步骤）
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = [...(stepResource.yqResource || [])]
-      
+
       // 获取细胞信息
       const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了细胞制备前编号，添加到细胞细菌信息中
       if (xbxxData.xbzbqbh) {
         const xbInfo = xbxxData.selectInfo_xbzbqbh || {}
         // 细胞信息格式：不包含 type 字段
-        this.xbxjTmp = [{
-          value: xbxxData.xbzbqbh,
-          bh: xbInfo.bh || xbxxData.xbzbqbh,
-          mc: xbInfo.mc || '',
-          xh: xbInfo.xh || '',
-          jzrq: xbInfo.jzrq || ''
-        }]
+        this.xbxjTmp = [
+          {
+            value: xbxxData.xbzbqbh,
+            bh: xbInfo.bh || xbxxData.xbzbqbh,
+            mc: xbInfo.mc || '',
+            xh: xbInfo.xh || '',
+            jzrq: xbInfo.jzrq || ''
+          }
+        ]
       } else {
         this.xbxjTmp = []
       }
-      
+
       // 获取培养信息
       const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {}
-      
+
       // 如果选择了培养箱编号，添加到仪器信息中
       if (pyxxData.pyxbh) {
         const pyxInfo = pyxxData.selectInfo_pyxbh || {}
@@ -374,7 +397,7 @@ export default {
           jzrq: pyxInfo.jzrq || ''
         })
       }
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {

src/views/business/comps/template/comps/dl/DL013.vue

@@ -254,7 +254,9 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_xbmc'),
               fillType: 'actFill',
-              otherCode: 'xbmcOther'
+              otherCode: 'xbmcOther',
+              otherMaxlength: 50
+
             },
             xbbh: {
               label: 'template.dl.dl013.xbbh',
@@ -450,13 +452,28 @@ export default {
     },
     // 新增测定信息
     handleCdxxAdd() {
+      // 记录新增前的仪器使用信息
+      const yqsyTableRef = this.$refs[refConf.yqsy]
+      const beforeData = yqsyTableRef?.getDataSource() || []
+      
+      // 保存当前的仪器使用信息数据
+      const currentYqsyData = yqsyTableRef?.getFilledFormData() || {}
+      
+      // 确保formData中保留了仪器使用信息的数据
+      if (currentYqsyData.stepTableFormData && currentYqsyData.stepTableFormData.length > 0) {
+        // 使用$set确保响应式更新，但保留原有数据
+        this.$set(this.formData, 'yqsyTablestepTableFormData', currentYqsyData.stepTableFormData)
+        this.$set(this.formData, 'yqsyTableheaderSelectFields', currentYqsyData.headerSelectFields || {})
+        this.$set(this.formData, 'yqsyTableheaderFields', currentYqsyData.headerFields || {})
+      }
+      
       // 初始化测定信息配置列表
       if (!this.formData.cdxxConfigs) {
         this.$set(this.formData, 'cdxxConfigs', [])
       }
       
-      // 添加新的测定信息配置
-      this.formData.cdxxConfigs.push({
+      // 创建新的测定信息配置对象
+      const newCdxxItem = {
         id: getuuid(),
         xsbs: null,
         xbmd: null,
@@ -464,7 +481,10 @@ export default {
         ysg: null,
         zxg: null,
         yxg: null
-      })
+      }
+      
+      // 添加新的测定信息配置
+      this.formData.cdxxConfigs.push(newCdxxItem)
       
       // 更新测定次数
       this.$refs[refConf.cdxx]?.updateFormData(
@@ -476,13 +496,24 @@ export default {
         }
       )
       
+      // 检查新增后仪器使用信息是否还在
       this.$nextTick(() => {
-        // 通知后端保存数据
-        EventBus.$emit('onModifyRecord', {
-          type: 'fieldChanged',
-          newRecord: null,
-          resourceList: null
-        })
+        const afterData = yqsyTableRef?.getDataSource() || []
+        
+        // 如果数据被清空了，手动恢复
+        if (afterData.length === 0 && beforeData.length > 0) {
+          yqsyTableRef?.updateDataSource(beforeData)
+        }
+        
+        // 触发事件通知父组件数据已更新
+        setTimeout(() => {
+          EventBus.$emit('onModifyRecord', {
+            type: 'fieldChanged',
+            newRecord: null,
+            resourceList: null,
+            source: 'cdxxAdd'
+          })
+        }, 100)
       })
     },
     // 删除表格行

src/views/business/comps/template/comps/dl/DL014.vue

@@ -298,14 +298,16 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_qsxjbltj'),
               fillType: 'preFill',
-              otherCode: 'bltjOther'
+              otherCode: 'bltjOther',
+              otherMaxlength: 50
             },
             xbmc: {
               label: 'template.dl.dl014.xbmc',
               type: 'select',
               options: this.getDictOptions('business_dl_xbmc'),
               fillType: 'preFill',
-              otherCode: 'xbmcOther'
+              otherCode: 'xbmcOther',
+              otherMaxlength: 50
             }
           }
         }
@@ -317,7 +319,8 @@ export default {
         pxpb: {
           label: 'template.dl.dl014.pxpb',
           type: 'inputNumber',
-          fillType: 'preFill'
+          fillType: 'preFill',
+          maxlength: 2
         },
         sftjs9: {
           label: 'template.dl.dl014.sftjs9',
@@ -343,7 +346,8 @@ export default {
       const jlzzsConfig = {
         label: 'template.dl.dl014.jlzzs',
         type: 'inputNumber',
-        fillType: 'preFill'
+        fillType: 'preFill',
+        maxlength: 2
       }
 
       // 只在 preFill 模式下显示确认按钮
@@ -369,7 +373,8 @@ export default {
           label: 'template.dl.dl014.jlzzmc',
           prop: 'jlzzmc',
           bodyType: 'input',
-          bodyFillType: 'preFill'
+          bodyFillType: 'preFill',
+          bodyMaxlength: 20
         }
       ]
     },
@@ -399,7 +404,8 @@ export default {
           label: 'template.dl.dl014.jlzb',
           prop: 'jlzb',
           bodyType: 'input',
-          bodyFillType: 'preFill'
+          bodyFillType: 'preFill',
+          bodyMaxlength: 10
         },
         {
           label: 'template.dl.dl014.xybh',
@@ -584,7 +590,7 @@ export default {
       if (this.fillType === 'actFill') {
         const yqsyTableRef = this.$refs[refConf.yqsy]
         const yqsyTableData = yqsyTableRef?.getDataSource() || []
-        
+
         if (yqsyTableData.length === 0) {
           this.$message.warning(this.$t('template.dl.dl014.yqsyxxEmpty'))
           return Promise.reject(this.$t('template.dl.dl014.yqsyxxEmpty'))
@@ -892,6 +898,11 @@ export default {
         return
       }
 
+      // 保存当前的剂量组名称表格数据，防止被清空
+      if (jlzmcList.length > 0) {
+        this.$set(this.formData, 'jlzmcTableData', jlzmcList)
+      }
+
       // 生成剂量组列表数据
       const newRows = []
 
@@ -920,6 +931,17 @@ export default {
       // 直接修改 formData，CustomTable 会自动响应
       this.$set(this.formData, 'jlzTableData', newRows)
 
+      // 检查剂量组名称表格数据是否被清空
+      this.$nextTick(() => {
+        const jlzmcTableRef = this.$refs[refConf.jlzmcTable]
+        const currentJlzmcData = jlzmcTableRef?.getDataSource() || []
+
+        // 如果数据被清空了，手动恢复
+        if (currentJlzmcData.length === 0 && jlzmcList.length > 0) {
+          jlzmcTableRef?.updateDataSource(jlzmcList)
+        }
+      })
+
       this.$message.success(`已生成 ${newRows.length} 行剂量组数据`)
     },
     // 保存

src/views/business/comps/template/comps/dl/DL015.vue

@@ -16,8 +16,16 @@
             :formData="formData"
           />
 
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
-          <TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+          <TableList
+            label="template.common.reagentInfo"
+            :columns="sysjColumns"
+            :dataSource="resourceSj"
+          />
+          <TableList
+            label="template.common.instrumentInfo"
+            :columns="yqColumns"
+            :dataSource="yqResource"
+          />
 
           <LineLabel label="template.dl.dl015.xbxx" />
           <BaseInfoFormPackage
@@ -185,7 +193,7 @@ export default {
             qxbd: {
               label: 'template.dl.dl015.qxbd',
               type: 'qxbd',
-              qxbdType:'DL014',
+              qxbdType: 'DL014',
               fillType: 'actFill',
               filledCodes: ['bdmc', 'bdbh']
             },
@@ -194,7 +202,8 @@ export default {
               type: 'select',
               options: this.getDictOptions('business_dl_qsxjbltj'),
               fillType: 'preFill',
-              otherCode: 'bltjOther'
+              otherCode: 'bltjOther',
+              otherMaxlength: 50
             }
           }
         }
@@ -290,14 +299,14 @@ export default {
     // 获取已填写的表单数据
     getFilledFormData() {
       const baseData = this.getFilledFormDataByRefs(refNames)
-      
+
       // 确保换液情况数据被正确保存到 stepTableFormData
       const hyqkData = this.$refs[refConf.hyqk]?.getFilledFormData()
       if (hyqkData) {
         baseData.stepTableFormData = hyqkData.stepTableFormData || []
         baseData.headerSelectFields = hyqkData.headerSelectFields || {}
       }
-      
+
       return baseData
     },
     // 获取填写完成的表单数据
@@ -312,16 +321,16 @@ export default {
       const stepResource = this.$refs.stepRef.getStepResource()
       const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData()
       const hyqkList = hyqkData?.stepTableFormData || []
-      
+
       // 从操作步骤中提取试剂和仪器资源
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = stepResource.yqResource || []
-      
+
       // 从换液情况表格中提取悬液编号作为试剂资源
       // 用于去重的Set
       const xybhSet = new Set()
       const sjResourceFromHyqk = []
-      
+
       hyqkList.forEach((item) => {
         if (item.xybh && !xybhSet.has(item.xybh)) {
           xybhSet.add(item.xybh)
@@ -344,9 +353,9 @@ export default {
           })
         }
       })
-      
+
       this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {
@@ -370,7 +379,7 @@ export default {
           }
 
           // 从剂量组数据中提取剂量组别和悬液编号
-          const hyqkData = jlzTableData.map(item => ({
+          const hyqkData = jlzTableData.map((item) => ({
             jlzb: item.jlzb || '', // 剂量组别
             xybh: item.xybh || '', // 悬液编号
             hyqszqk: '', // 换液前生长情况
@@ -384,7 +393,9 @@ export default {
           // 使用 $set 更新 formData，触发 CustomTable 的响应式更新
           this.$set(this.formData, 'stepTableFormData', hyqkData)
 
-          this.$message.success(`已从前序表单加载 ${hyqkData.length} 条剂量组数据`)
+          this.$message.success(
+            `已从前序表单加载 ${hyqkData.length} 条剂量组数据`
+          )
         } catch (error) {
           console.error('解析前序表单数据失败:', error)
           // 解析失败时也清空当前的换液情况列表数据

src/views/business/comps/template/comps/dl/DL022.vue

@@ -244,6 +244,7 @@ export default {
 		onAddRow() {
 			this.$refs.tableRef.addRow({
 				jblx: [{value: undefined}],
+				id: getuuid(),
 			})
 		},
 		onFormSelect(fields) {

src/views/business/comps/template/comps/sp/SP0019.vue

@@ -23,6 +23,7 @@
 						</template>
 					</CustomTable>
 					<BaseInfoFormPackage class="mt-20" fieldItemLabel="色谱柱型号" label="色谱柱型号" ref="spzxhRef"
+						@remoteMethod="remoteMethod"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="溶液" />
 					<CustomTable 
@@ -55,8 +56,9 @@ import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
 import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
+import { public_sjList } from '@/api/business/public/public';
 
-import { getBaseInfoFormConfig, storageFormConfig, getYqColumns,getRyColumns,getYqphFormConfig } from "../../formConfig/sp/SP0019"
+import { getBaseInfoFormConfig, getStorageFormConfig, getYqColumns,getRyColumns,getYqphFormConfig } from "../../formConfig/sp/SP0019"
 
 export default {
 	name: "SP0019",
@@ -83,7 +85,7 @@ export default {
 		},
 		// 配置条件
 		storageFormConfig() {
-			return storageFormConfig;
+			return getStorageFormConfig(this);
 		},
 		// 备注表单配置
 		remarkConig() {
@@ -111,7 +113,8 @@ export default {
 	},
 	data() {
 		return {
-			formData: {}
+			formData: {},
+			spzxhOptions: [],
 		};
 	},
 	mounted() {
@@ -119,6 +122,22 @@ export default {
 
 	},
 	methods: {
+		async remoteMethod({ query, key }) {
+			if (key === "spzxh") {
+				const res = await public_sjList({
+					pageNum: 1,
+					pageSize: 10,
+					mc: query
+				});
+				if(res.code === 200){
+					const {rows = []} = res;
+					this.spzxhOptions = rows.map(item => ({
+						label: item.bh,
+						value: item.bh,
+					}));
+				}
+			}
+		},
 		onRegentSubmit(e){
 			const {selectInfo, key, col, rowIndex, colIndex, rowData} = e;
 			const {row} = selectInfo;
@@ -130,8 +149,17 @@ export default {
 				this.$refs.ryTableRef.updateDataSourceByRowIndex(rowIndex, params);
 			}
 		},
-		onYqSubmit(data, col, rowIndex, colIndex, row){
-			console.log(data, col, rowIndex, colIndex, row,"onRegentSubmit")
+		onYqSubmit(data){
+			const {selectInfo,rowIndex,key} = data;
+			const {row} = selectInfo;
+			if(key === "bh"){//一起编号
+				const params = {
+					mc: row.mc,
+					xh: row.xh,
+					jzrq: row.jzrq,
+				}
+				this.$refs.yqInfoTableRef.updateDataSourceByRowIndex(rowIndex, params);
+			}
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {

src/views/business/comps/template/comps/sp/SP0021.vue

@@ -19,30 +19,26 @@
 						<div class="config-header">
 							<div></div>
 							<el-popconfirm title="确认删除当前样本？" @confirm="deleteConfig(item)">
-								<el-button slot="reference" v-if="fillType === 'actFill'" type="text" icon="el-icon-delete" >{{
-									$t('template.common.deleteBtn')
-								}}</el-button>
+								<el-button slot="reference" v-if="fillType === 'actFill'" type="text"
+									icon="el-icon-delete">{{
+										$t('template.common.deleteBtn')
+									}}</el-button>
 							</el-popconfirm>
 						</div>
-						<BaseInfoFormPackage fieldItemLabel="样本说明"  :ref="`ybsmFormPackageRef${index}`"
-						:formConfig="ybsmFormConfig" @blur="onHandleBlur" :formData="item" />
-						<el-button  v-if="fillType === 'actFill'" type="primary" @click="onImportAnimal">导入动物</el-button>
-						<CustomTable 
-							:ref = "`ybsmTableRef${index}`" 
-							:columns="ybsmColumns" 
-							:showOperation="fillType === 'actFill'"
-							:showAddRow="fillType === 'actFill'"
-							:formData = "item">
+						<BaseInfoFormPackage fieldItemLabel="样本说明" :ref="`ybsmFormPackageRef${index}`"
+							:formConfig="ybsmFormConfig" @blur="onHandleBlur" :formData="item" />
+						<el-button v-if="fillType === 'actFill'" type="primary"
+							@click="onImportAnimal(item, index)">导入动物</el-button>
+						<CustomTable :ref="`ybsmTableRef${index}`" :columns="ybsmColumns"
+							:showOperation="fillType === 'actFill'" :showAddRow="fillType === 'actFill'"
+							:formData="item">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
-								<TableOpertaionDelete
-									:row="row"
-									:rowIndex="rowIndex"
-									:columns="columns"
-									@deleteRow="() => deleteTableRow(rowIndex, `ybsmTableRef${index}`)"
-								></TableOpertaionDelete>
+								<TableOpertaionDelete :row="row" :rowIndex="rowIndex" :columns="columns"
+									@deleteRow="() => deleteTableRow(rowIndex, `ybsmTableRef${index}`)">
+								</TableOpertaionDelete>
 							</template>
 						</CustomTable>
-						<Step :ref="`stepRef${index}`" :formData="item.stepData ||[]"></Step>
+						<Step :ref="`stepRef${index}`" :formData="item.stepData || []"></Step>
 					</div>
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						:ref="refConfig.remarkRef" :formConfig="remarkConig" :formData="formData" />
@@ -50,7 +46,8 @@
 			</div>
 		</div>
 		<!-- <button @click="onSave">保存</button> -->
-		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" :downloadArr="['动物编号']" @downloadExcelTemplate="downloadExcelTemplate" />
+		<ImportExcelDialog ref="ImportExcelDialog" @onLoadData="onLoadExcelData" :downloadArr="['动物编号']"
+			@downloadExcelTemplate="downloadExcelTemplate" />
 	</div>
 </template>
 
@@ -65,8 +62,8 @@ import Step from "@/components/Template/Step";
 import templateMixin from "../../mixins/templateMixin";
 import CustomTable from '@/components/Template/CustomTable.vue';
 import { uniqeResource } from "@/utils/calUnitTools";
-import {getuuid,justUpdateFilledFormData} from "@/utils/index";
-import { getBaseInfoFormConfig, getStorageFormConfig, getRemarkFormConfig, getYbsmFormConfig,getTableColumns } from "../../formConfig/sp/SP0021";
+import { getuuid, justUpdateFilledFormData } from "@/utils/index";
+import { getBaseInfoFormConfig, getStorageFormConfig, getRemarkFormConfig, getYbsmFormConfig, getTableColumns } from "../../formConfig/sp/SP0021";
 const refConfig = {
 	baseInfoRef: "baseInfoRef",
 	remarkRef: "remarkRef",
@@ -78,7 +75,7 @@ const refConfig = {
 const compRefs = Object.values(refConfig);
 export default {
 	name: "SP0021",
-	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete,ImportExcelDialog },
+	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete, ImportExcelDialog },
 	mixins: [templateMixin],
 	props: {
 		fillType: {
@@ -113,23 +110,24 @@ export default {
 		},
 	},
 	data() {
-			return {
-				refConfig,
-			};
-		},
+		return {
+			refConfig,
+			currentIndex: -1,
+		};
+	},
 	mounted() {
-		if(this.fillType === 'preFill' &&!this.formData.ybsmDataList){//预填的时候默认新增一个。
+		if (this.fillType === 'preFill' && !this.formData.ybsmDataList) {//预填的时候默认新增一个。
 			this.onAdd()
 		}
 	},
 	methods: {
 		//删除样本说明
-		deleteConfig(item){
+		deleteConfig(item) {
 			// 确保 ybsmDataList 存在
 			if (this.formData.ybsmDataList.length > 1) {
 				const configIndex = this.formData.ybsmDataList.findIndex(config => config.id === item.id);
-				console.log(configIndex,"configIndex")
-				if(configIndex>-1){
+				console.log(configIndex, "configIndex")
+				if (configIndex > -1) {
 					const newList = [...this.formData.ybsmDataList]
 					newList.splice(configIndex, 1);
 					this.$set(this.formData, 'ybsmDataList', newList);
@@ -141,19 +139,19 @@ export default {
 			} else {
 				this.$message.warning('至少保留一个样本说明项');
 			}
-			
+
 		},
 		//新增样本说明
-		onAdd(){
+		onAdd() {
 			if (!this.formData.ybsmDataList) {
 				this.$set(this.formData, 'ybsmDataList', []);
 			}
-			let defaultInfo  = {
+			let defaultInfo = {
 				id: getuuid(),
 				stepData: [],
 			}
-			if(this.fillType === "actFill"){
-				const {ybsmDataList} = this.formData
+			if (this.fillType === "actFill") {
+				const { ybsmDataList } = this.formData
 				defaultInfo.stepData = ybsmDataList[0]?.stepData || []
 			}
 			// 添加新的平行配制配置
@@ -161,21 +159,29 @@ export default {
 		},
 		onLoadExcelData(excelData) {
 			const data = excelData.splice(1);
+			const transData = data.map((item)=>{
+				return{
+					dwbh: item[0],
+					id: getuuid(),
+				}
+			})
+			this.$refs[`ybsmTableRef${this.currentIndex}`][0].pushDataSource(transData)
 			this.$refs.ImportExcelDialog.cancel()
 			setTimeout(() => {
 				justUpdateFilledFormData();
 			}, 100);
 		},
-		downloadExcelTemplate(arr){
+		downloadExcelTemplate(arr) {
 			this.exportExcel(arr)
 		},
 		// 导入动物
-		onImportAnimal(){
+		onImportAnimal(item, index) {
+			this.currentIndex = index;
 			this.$refs.ImportExcelDialog.show()
 		},
 		// 删除表格行
 		deleteTableRow(rowIndex, refName) {
-		this.$refs[refName].deleteRow(rowIndex)
+			this.$refs[refName][0].deleteRow(rowIndex)
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
@@ -202,18 +208,18 @@ export default {
 			// 基础表单验证
 			let content = await this.validFormFields(compRefs);
 			if (!content) return null;
-			
+
 			// 验证多个样本说明项
 			for (let index = 0; index < this.formData.ybsmDataList.length; index++) {
 				// 验证样本说明表单
 				const ybsmFormValid = await this.$refs[`ybsmFormPackageRef${index}`][0]?.getFormData() || true;
 				if (!ybsmFormValid) return null;
-				
+
 				// 验证步骤数据
 				const stepValid = await this.$refs[`stepRef${index}`][0]?.getFormData() || true;
 				if (!stepValid) return null;
 			}
-			
+
 			// 获取所有数据
 			return this.getFilledFormData();
 		},
@@ -272,6 +278,7 @@ export default {
 .print-btn {
 	margin-bottom: 20px;
 }
+
 .config-header {
 	display: flex;
 	justify-content: space-between;

src/views/business/comps/template/formConfig/sp/SP0019.js

@@ -43,19 +43,22 @@ export const getBaseInfoFormConfig = (formType) => {
     ]
 }
 
-export const storageFormConfig = [
-    {
-        type: 'step',
-        config: {
-            yqmxh: {
-                label: '色谱柱型号',
-                type: 'yq',
-                fillType: 'actFill',
-                filledCodes:['mc','bh'],
-            },
-        }
-    },
-]
+export const getStorageFormConfig = ($this)=>{
+    return[
+        {
+            type: 'step',
+            config: {
+                spzxh: {
+                    label: '色谱柱型号',
+                    type: 'select',
+                    fillType: 'actFill',
+                    options: $this.spzxhOptions,
+                    filledCodes:['mc','bh'],
+                },
+            }
+        },
+    ]
+}
 
 //仪器信息
 export const getYqColumns = ($this) => {