feat:[模板管理][DL007~DL014优化]

src/lang/en/template/dl.js

@@ -30,6 +30,7 @@ const common = {
 export default {
   dl001: {},
   common,
+  czsj: 'Operation Time',
   dl003: {
     ...common,
     pytj: '培养条件',
@@ -127,6 +128,8 @@ export default {
     yslhnzsjyjrl: 'Preset 0.9% Sodium Chloride Injection Volume',
     sjlhnzsjyjrl: 'Actual 0.9% Sodium Chloride Injection Volume',
     sjgs: 'Bone Marrow Collection',
+    sj: 'Collection',
+    gusui: 'Bone Marrow',
     lx: 'Centrifugation',
     ysjrxq: 'Preset Serum Addition',
     sjjrxq: 'Actual Serum Addition',
@@ -148,7 +151,8 @@ export default {
     pyxbh: 'Incubator Number',
     pytjText: 'Culture Conditions',
     pykssj: 'Culture Start Time',
-    pykssjButton: 'Start'
+    pykssjButton: 'Start',
+    bqdy: 'Label Print'
   },
   dl012: {
     ...common,

src/lang/zh/template/dl.js

@@ -30,6 +30,7 @@ const common = {
 export default {
   dl001: {},
   common,
+  czsj: '操作时间',
   dl003: {
     ...common,
     pytj: '培养条件',
@@ -128,6 +129,8 @@ export default {
     yslhnzsjyjrl: '预设0.9%氯化钠注射液加入量',
     sjlhnzsjyjrl: '实际0.9%氯化钠注射液加入量',
     sjgs: '收集骨髓',
+    sj: '收集',
+    gusui: '骨髓',
     lx: '离心',
     ysjrxq: '预设加入血清',
     sjjrxq: '实际加入血清',
@@ -149,7 +152,8 @@ export default {
     pyxbh: '培养箱编号',
     pytjText: '培养条件',
     pykssj: '培养开始时间',
-    pykssjButton: '开始'
+    pykssjButton: '开始',
+    bqdy: '标签打印'
   },
   dl012: {
     ...common,

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

@@ -133,11 +133,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
           label: 'template.dl.dl007.sydd',
           config: {
             sydd: {
-              span: 1,
               label: 'template.dl.dl007.sydd',
               type: 'select',
               options: this.getDictOptions('business_sydd'),
@@ -148,7 +147,7 @@ export default {
         },
         {
           type: 'cellItem',
-          label: 'template.common.configurationTime',
+          label: 'template.dl.czsj',
           config: {
             startDate: {
               label: 'template.common.startTime',

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

@@ -181,11 +181,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
           label: 'template.dl.dl007.sydd',
           config: {
             sydd: {
-              span: 1,
               label: 'template.dl.dl007.sydd',
               type: 'select',
               options: this.getDictOptions('business_sydd'),
@@ -196,7 +195,7 @@ export default {
         },
         {
           type: 'cellItem',
-          label: 'template.common.configurationTime',
+          label: 'template.dl.czsj',
           config: {
             startDate: {
               label: 'template.common.startTime',

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

@@ -22,12 +22,6 @@
             :formData="formData"
           />
 
-          <BaseInfoFormPackage
-            :ref="refConf.czsj"
-            :formConfig="czsjFormConfig"
-            :formData="formData"
-          />
-
           <LineLabel label="template.dl.dl007.yqsyxx" />
           <CustomTable
             :columns="yqsyColumns"
@@ -96,7 +90,6 @@ import templateMixin from '../../mixins/templateMixin'
 const refConf = {
   base: 'baseInfoRef',
   cltj: 'cltjRef',
-  czsj: 'czsjRef',
   yqsy: 'yqsyTableRef',
   jgxxQxbd: 'jgxxQxbdRef',
   jgxx: 'jgxxTableRef',
@@ -165,10 +158,10 @@ export default {
     cltjFormConfig() {
       return [
         {
-          type: 'conditionItem',
+          type: 'cellItem',
+          label: 'template.dl.dl009.cltj',
           config: {
             cltj: {
-              span: 1,
               label: 'template.dl.dl009.cltj',
               type: 'select',
               options: this.getDictOptions('business_dl_amescltj'),
@@ -178,10 +171,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
+          label: 'template.dl.dl009.sydd',
           config: {
             sydd: {
-              span: 1,
               label: 'template.dl.dl009.sydd',
               type: 'select',
               options: this.getDictOptions('business_sydd'),
@@ -189,14 +182,10 @@ export default {
               otherCode: 'syddOther'
             }
           }
-        }
-      ]
-    },
-    // 操作时间表单配置
-    czsjFormConfig() {
-      return [
+        },
         {
           type: 'cellItem',
+          label: 'template.dl.dl009.czsj',
           config: {
             startDate: {
               label: 'template.dl.dl009.kssj',
@@ -212,6 +201,7 @@ export default {
         }
       ]
     },
+
     // 仪器使用信息
     yqsyColumns() {
       return [

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

@@ -16,44 +16,16 @@
             :formData="formData"
           />
 
-          <LineLabel label="template.dl.dl010.sysj" />
-          <CustomTable
+          <TableList
+            label="template.common.reagentInfo"
             :columns="sysjColumns"
-            :ref="refConf.sysj"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`sysjTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'sysjTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
-
-          <LineLabel label="template.dl.dl007.yqsyxx" />
-          <CustomTable
-            :columns="yqsyColumns"
-            :ref="refConf.yqsy"
-            @onRegentSubmit="(e) => onRegentSubmit(e)"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`yqsyTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'yqsyTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
+            :dataSource="resource"
+          />
+          <TableList
+            label="template.common.instrumentInfo"
+            :columns="yqColumns"
+            :dataSource="yqResource"
+          />
 
           <LineLabel label="template.dl.dl010.sjxx" />
           <div class="template-form-item">
@@ -130,8 +102,6 @@ import ImportExcelDialog from '../../dialog/ImportExcelDialog'
 
 const refConf = {
   base: 'baseInfoRef',
-  sysj: 'sysjTableRef',
-  yqsy: 'yqsyTableRef',
   sjxxStep: 'sjxxStepRef',
   sjxx: 'sjxxTableRef',
   remark: 'remarkRef'
@@ -195,11 +165,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
           label: 'template.dl.dl010.dwzs',
           config: {
             dwzs: {
-              span: 1,
               label: 'template.dl.dl010.dwzs',
               type: 'select',
               options: this.getDictOptions('business_dwzs'),
@@ -214,9 +183,9 @@ export default {
           config: {
             cjdd: {
               label: 'template.dl.dl010.cjdd',
-              type: 'input',
-              fillType: 'actFill',
-              maxlength: 200
+              type: 'select',
+              options: this.getDictOptions('business_cjdd'),
+              fillType: 'actFill'
             }
           }
         },
@@ -226,18 +195,17 @@ export default {
           config: {
             zpdd: {
               label: 'template.dl.dl010.zpdd',
-              type: 'input',
-              fillType: 'actFill',
-              maxlength: 200
+              type: 'select',
+              options: this.getDictOptions('business_zpdd'),
+              fillType: 'actFill'
             }
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
           label: 'template.dl.dl010.cjbw',
           config: {
             cjbw: {
-              span: 1,
               label: 'template.dl.dl010.cjbw',
               type: 'select',
               options: this.getDictOptions('business_cjbw'),
@@ -250,97 +218,20 @@ export default {
           type: 'cellItem',
           label: 'template.dl.dl010.jprq',
           config: {
-            jprqKssj: {
+            startDate: {
               label: 'template.dl.dl010.jprqKssj',
               type: 'input',
               disabled: true
             },
-            jprqJssj: {
+            endDate: {
               label: 'template.dl.dl010.jprqJssj',
               type: 'input',
-              fillType: 'actFill',
-              maxlength: 200
+              disabled: true
             }
           }
         }
       ]
     },
-    // 试验试剂信息
-    sysjColumns() {
-      return [
-        {
-          label: 'template.dl.dl010.sjmc',
-          prop: 'sjmc',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl010.bh',
-          prop: 'bh',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl010.ph',
-          prop: 'ph',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl010.ndhlcd',
-          prop: 'ndhlcd',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl010.ly',
-          prop: 'ly',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl010.sxr',
-          prop: 'sxr',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        }
-      ]
-    },
-    // 仪器使用信息
-    yqsyColumns() {
-      return [
-        {
-          label: 'template.dl.dl010.yqmc',
-          prop: 'yqmc',
-          bodyType: 'input',
-          bodyDisabled: true,
-          bodyFillType: 'actFill',
-          disabled: true
-        },
-        {
-          label: 'template.dl.dl010.yqxh',
-          prop: 'yqxh',
-          bodyType: 'input',
-          bodyDisabled: true,
-          bodyFillType: 'actFill',
-          disabled: true
-        },
-        {
-          label: 'template.dl.dl010.yqbh',
-          prop: 'yqbh',
-          bodyType: 'yq',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl010.xccsjzjdrq',
-          prop: 'jzrq',
-          bodyType: 'input',
-          bodyDisabled: true,
-          bodyFillType: 'actFill',
-          disabled: true
-        }
-      ]
-    },
     // 采集信息列表
     sjxxColumns() {
       return [
@@ -354,6 +245,7 @@ export default {
         {
           label: 'template.dl.dl010.yslhnzsjyjrl',
           headerSelectKey: 'yslhnUnit',
+          headerSelectTo: 'sjlhnUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           prop: 'yslhnzsjyjrl',
           bodyType: 'inputNumber',
@@ -363,10 +255,12 @@ export default {
         },
         {
           label: 'template.dl.dl010.sjlhnzsjyjrl',
-          headerSelectKey: 'yslhnUnit',
+          headerSelectKey: 'sjlhnUnit',
           headerOptions: this.getDictOptions('business_tjdw'),
           prop: 'sjlhnzsjyjrl',
           bodyMaxlength: 10,
+          compareTo: 'yslhnzsjyjrl',
+          copyFrom: 'yslhnzsjyjrl',
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
           fillType: 'preFill'
@@ -378,9 +272,14 @@ export default {
           checkboxLabel: '',
           bodyFillType: 'actFill',
           headerColumns: [
-            { type: 'span', label: '收集' },
-            { type: 'inputNumber', fillType: 'actFill', key: 'gs' },
-            { type: 'span', label: '骨髓' }
+            { type: 'span', label: 'template.dl.dl010.sj' },
+            {
+              type: 'inputNumber',
+              fillType: 'actFill',
+              maxLength: 10,
+              key: 'gs'
+            },
+            { type: 'span', label: 'template.dl.dl010.gusui' }
           ],
           span: 3
         },
@@ -398,7 +297,8 @@ export default {
           bodyFillType: 'preFill',
           bodyMaxlength: 10,
           fillType: 'preFill',
-          headerSelectKey: 'yslhnUnit',
+          headerSelectKey: 'ysjrxqUnit',
+          headerSelectTo: 'sjjrxqUnit',
           headerOptions: this.getDictOptions('business_tjdw')
         },
         {
@@ -408,7 +308,9 @@ export default {
           bodyMaxlength: 10,
           bodyFillType: 'actFill',
           fillType: 'preFill',
-          headerSelectKey: 'yslhnUnit',
+          compareTo: 'ysjrxq',
+          copyFrom: 'ysjrxq',
+          headerSelectKey: 'sjjrxqUnit',
           headerOptions: this.getDictOptions('business_tjdw')
         }
       ]
@@ -543,16 +445,12 @@ export default {
     // 获取已填写的表单数据
     getFilledFormData() {
       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
@@ -571,8 +469,6 @@ export default {
     async validFields() {
       const refsToValidate = [
         'baseInfoRef',
-        'sysjTableRef',
-        'yqsyTableRef',
         'sjxxStepRef',
         'sjxxTableRef',
         'remarkRef'
@@ -580,28 +476,14 @@ export default {
       return await this.validFormFields(refsToValidate)
     },
     getResource() {
-      const sysjStepResource = this.$refs.sysjTableRef.getStepResource()
-      const yqsyStepResource = this.$refs.yqsyTableRef.getStepResource()
+      const sjxxStepResource = this.$refs.sjxxStepRef.getStepResource()
       // 使用的试剂、仪器
-      this.resourceTmp = [
-        ...(sysjStepResource.sjResource || []),
-        ...(yqsyStepResource.sjResource || [])
-      ]
-      this.yqResourceTmp = yqsyStepResource.yqResource || []
+      this.resourceTmp = sjxxStepResource.sjResource || []
+      this.yqResourceTmp = sjxxStepResource.yqResource || []
       return this.resourceTmp
     },
     onRegentSubmit(e) {
-      const { selectInfo, key, rowIndex } = e
-      const { row } = selectInfo
-
-      if (key === 'yqbh') {
-        const params = {
-          yqmc: row.mc,
-          yqxh: row.xh,
-          jzrq: row.jzrq
-        }
-        this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
-      }
+      // 预留方法，如果需要处理试剂提交事件可以在这里添加
     },
     // 保存
     async onSave() {

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

@@ -16,48 +16,25 @@
             :formData="formData"
           />
 
-          <LineLabel label="template.dl.dl011.sysj" />
-          <CustomTable
+          <TableList
+            label="template.common.reagentInfo"
             :columns="sysjColumns"
-            :ref="refConf.sysj"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`sysjTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'sysjTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
-
-          <LineLabel label="template.dl.dl007.yqsyxx" />
-          <CustomTable
-            :columns="yqsyColumns"
-            :ref="refConf.yqsy"
-            @onRegentSubmit="(e) => onRegentSubmit(e)"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`yqsyTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'yqsyTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
+            :dataSource="resource"
+          />
+          <TableList
+            label="template.common.instrumentInfo"
+            :columns="yqColumns"
+            :dataSource="yqResource"
+          />
 
           <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl011.xbxx" />
           <div class="template-form-item">
+            <div class="config-header-end" v-if="fillType === 'actFill'">
+              <el-button type="primary" size="small">{{
+                $t('template.dl.dl011.bqdy')
+              }}</el-button>
+            </div>
             <BaseInfoFormPackage
               fieldItemLabel=""
               label=""
@@ -103,12 +80,9 @@ import LineLabel from '@/components/Template/LineLabel'
 import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
-import moment from 'moment'
 
 const refConf = {
   base: 'baseInfoRef',
-  sysj: 'sysjTableRef',
-  yqsy: 'yqsyTableRef',
   step: 'stepRef',
   remark: 'remarkRef',
   xbxx: 'xbxxRef',
@@ -177,9 +151,10 @@ export default {
           config: {
             sydd: {
               label: 'template.dl.dl011.sydd',
-              type: 'input',
-              fillType: 'actFill',
-              maxlength: 200
+              type: 'select',
+              options: this.getDictOptions('business_sydd'),
+              otherCode: 'syddOther',
+              fillType: 'actFill'
             }
           }
         },
@@ -187,12 +162,12 @@ export default {
           type: 'cellItem',
           label: '操作时间',
           config: {
-            kssj: {
+            startDate: {
               label: 'template.dl.dl011.kssj',
               type: 'input',
               disabled: true
             },
-            jssj: {
+            endDate: {
               label: 'template.dl.dl011.jssj',
               type: 'input',
               disabled: true
@@ -201,78 +176,6 @@ export default {
         }
       ]
     },
-    // 试验试剂信息
-    sysjColumns() {
-      return [
-        {
-          label: 'template.dl.dl011.sjmc',
-          prop: 'sjmc',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.bh',
-          prop: 'bh',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.ph',
-          prop: 'ph',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.ndhlcd',
-          prop: 'ndhlcd',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.ly',
-          prop: 'ly',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.sxr',
-          prop: 'sxr',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        }
-      ]
-    },
-    // 仪器使用信息
-    yqsyColumns() {
-      return [
-        {
-          label: 'template.dl.dl011.yqmc',
-          prop: 'yqmc',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.yqxh',
-          prop: 'yqxh',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.yqbh',
-          prop: 'yqbh',
-          bodyType: 'yq',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl011.xccsjzjdrq',
-          prop: 'xccsjzjdrq',
-          bodyType: 'input',
-          bodyDisabled: true,
-          bodyFillType: 'actFill',
-          disabled: true
-        }
-      ]
-    },
     pyxxConfig() {
       return [
         {
@@ -340,6 +243,8 @@ export default {
               subType: 'select',
               subKey: 'fshxbsjtjUnit',
               fillType: 'actFill',
+              copyFrom: 'fshxbyjtj',
+              compareTo: 'fshxbyjtj',
               subOptions: this.getDictOptions('business_nddw'),
               maxlength: 10,
               copyFrom: 'fshxbyjtj' //复制哪个字段
@@ -382,33 +287,14 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const sysjStepResource = this.$refs.sysjTableRef.getStepResource()
-      const yqsyStepResource = this.$refs.yqsyTableRef.getStepResource()
       const stepResource = this.$refs.stepRef.getStepResource()
       // 使用的试剂、仪器
-      this.resourceTmp = [
-        ...(sysjStepResource.sjResource || []),
-        ...(yqsyStepResource.sjResource || []),
-        ...(stepResource.sjResource || [])
-      ]
-      this.yqResourceTmp = [
-        ...(yqsyStepResource.yqResource || []),
-        ...(stepResource.yqResource || [])
-      ]
+      this.resourceTmp = stepResource.sjResource || []
+      this.yqResourceTmp = stepResource.yqResource || []
       return this.resourceTmp
     },
     onRegentSubmit(e) {
-      const { selectInfo, key, rowIndex } = e
-      const { row } = selectInfo
-
-      if (key === 'yqbh') {
-        const params = {
-          yqmc: row.mc,
-          yqxh: row.xh,
-          xccsjzjdrq: row.jzrq
-        }
-        this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
-      }
+      // 预留方法，如果需要处理试剂提交事件可以在这里添加
     },
     // 保存
     async onSave() {

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

@@ -16,44 +16,16 @@
             :formData="formData"
           />
 
-          <LineLabel label="template.dl.dl012.sysj" />
-          <CustomTable
+          <TableList
+            label="template.common.reagentInfo"
             :columns="sysjColumns"
-            :ref="refConf.sysj"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`sysjTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'sysjTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
-
-          <LineLabel label="template.dl.dl007.yqsyxx" />
-          <CustomTable
-            :columns="yqsyColumns"
-            :ref="refConf.yqsy"
-            @onRegentSubmit="(e) => onRegentSubmit(e)"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`yqsyTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'yqsyTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
+            :dataSource="resource"
+          />
+          <TableList
+            label="template.common.instrumentInfo"
+            :columns="yqColumns"
+            :dataSource="yqResource"
+          />
 
           <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl012.xbxx" />
@@ -108,8 +80,6 @@ import moment from 'moment'
 
 const refConf = {
   base: 'baseInfoRef',
-  sysj: 'sysjTableRef',
-  yqsy: 'yqsyTableRef',
   xbxx: 'xbxxRef',
   step: 'stepRef',
   pyxx: 'pyxxRef',
@@ -173,10 +143,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
+          label: 'template.dl.dl012.sydd',
           config: {
             sydd: {
-              span: 1,
               label: 'template.dl.dl012.sydd',
               type: 'select',
               options: this.getDictOptions('business_sydd'),
@@ -203,78 +173,6 @@ export default {
         }
       ]
     },
-    // 试验试剂信息
-    sysjColumns() {
-      return [
-        {
-          label: 'template.dl.dl012.sjmc',
-          prop: 'sjmc',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.bh',
-          prop: 'bh',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.ph',
-          prop: 'ph',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.ndhlcd',
-          prop: 'ndhlcd',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.ly',
-          prop: 'ly',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.sxr',
-          prop: 'sxr',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        }
-      ]
-    },
-    // 仪器使用信息
-    yqsyColumns() {
-      return [
-        {
-          label: 'template.dl.dl012.yqmc',
-          prop: 'yqmc',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.yqxh',
-          prop: 'yqxh',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.yqbh',
-          prop: 'yqbh',
-          bodyType: 'yq',
-          bodyFillType: 'actFill'
-        },
-        {
-          label: 'template.dl.dl012.xccsjzjdrq',
-          prop: 'xccsjzjdrq',
-          bodyType: 'input',
-          bodyDisabled: true,
-          bodyFillType: 'actFill',
-          disabled: true
-        }
-      ]
-    },
     // 培养信息配置
     pyxxConfig() {
       return [
@@ -364,7 +262,8 @@ export default {
               fillType: 'actFill',
               subOptions: this.getDictOptions('business_nddw'),
               maxlength: 10,
-              copyFrom: 'zbhxbyjtj' //复制哪个字段
+              compareTo: 'zbhxbyjtj',
+              copyFrom: 'zbhxbyjtj'
             }
           }
         }
@@ -408,7 +307,7 @@ export default {
     }
   },
   methods: {
-    handleClickButton(e,signData) {
+    handleClickButton(e, signData) {
       console.log(e)
       const { subKey } = e || {}
       if (subKey === 'pykssjButton') {
@@ -436,33 +335,14 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const sysjStepResource = this.$refs.sysjTableRef.getStepResource()
-      const yqsyStepResource = this.$refs.yqsyTableRef.getStepResource()
       const stepResource = this.$refs.stepRef.getStepResource()
       // 使用的试剂、仪器
-      this.resourceTmp = [
-        ...(sysjStepResource.sjResource || []),
-        ...(yqsyStepResource.sjResource || []),
-        ...(stepResource.sjResource || [])
-      ]
-      this.yqResourceTmp = [
-        ...(yqsyStepResource.yqResource || []),
-        ...(stepResource.yqResource || [])
-      ]
+      this.resourceTmp = stepResource.sjResource || []
+      this.yqResourceTmp = stepResource.yqResource || []
       return this.resourceTmp
     },
     onRegentSubmit(e) {
-      const { selectInfo, key, rowIndex } = e
-      const { row } = selectInfo
-
-      if (key === 'yqbh') {
-        const params = {
-          yqmc: row.mc,
-          yqxh: row.xh,
-          xccsjzjdrq: row.jzrq
-        }
-        this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
-      }
+      // 预留方法，如果需要处理试剂提交事件可以在这里添加
     },
     // 保存
     async onSave() {

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

@@ -179,11 +179,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
           label: 'template.dl.dl013.sydd',
           config: {
             sydd: {
-              span: 1,
               label: 'template.dl.dl013.sydd',
               type: 'select',
               options: this.getDictOptions('business_sydd'),

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

@@ -16,8 +16,16 @@
             :formData="formData"
           />
 
-          <TableList label="template.common.gyzjInfo" :columns="gyzjColumns" :dataSource="resourceGyzj" />
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+          <TableList
+            label="template.common.gyzjInfo"
+            :columns="gyzjColumns"
+            :dataSource="resourceGyzj"
+          />
+          <TableList
+            label="template.common.reagentInfo"
+            :columns="sysjColumns"
+            :dataSource="resource"
+          />
 
           <LineLabel label="template.dl.dl007.yqsyxx" />
           <CustomTable
@@ -78,6 +86,15 @@
               }}</el-button>
             </div>
 
+            <!-- 培养液 -->
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.pyy"
+              :formConfig="pyyFormConfig"
+              :formData="formData"
+            />
+
             <!-- 剂量组列表 -->
             <CustomTable
               :columns="jlzTableColumns"
@@ -129,6 +146,7 @@ const refConf = {
   xbInfo: 'xbInfoRef',
   jlzInfo: 'jlzInfoRef',
   jlzmcTable: 'jlzmcTableRef',
+  pyy: 'pyyRef',
   jlzTable: 'jlzTableRef',
   remark: 'remarkRef'
 }
@@ -204,11 +222,10 @@ export default {
           }
         },
         {
-          type: 'conditionItem',
+          type: 'cellItem',
           label: 'template.dl.dl014.sydd',
           config: {
             sydd: {
-              span: 1,
               label: 'template.dl.dl014.sydd',
               type: 'select',
               options: this.getDictOptions('business_sydd'),
@@ -328,14 +345,14 @@ export default {
         type: 'inputNumber',
         fillType: 'preFill'
       }
-      
+
       // 只在 preFill 模式下显示确认按钮
       if (this.fillType === 'preFill') {
         jlzzsConfig.subType = 'button'
         jlzzsConfig.subKey = 'jlzzsButton'
         jlzzsConfig.buttonName = 'template.dl.dl014.qrButton'
       }
-      
+
       firstStepConfig.jlzzs = jlzzsConfig
 
       return [
@@ -356,6 +373,25 @@ export default {
         }
       ]
     },
+    // 培养液表单配置
+    pyyFormConfig() {
+      return [
+        {
+          type: 'step',
+          config: {
+            pyymc: {
+              label: 'template.dl.dl014.pyy',
+              type: 'input',
+              fillType: 'preFill',
+              maxlength: 20,
+              subType: 'sj',
+              subKey: 'pyysj',
+              subFillType: 'actFill'
+            }
+          }
+        }
+      ]
+    },
     // 剂量组表格列配置
     jlzTableColumns() {
       const columns = [
@@ -438,11 +474,12 @@ export default {
       columns.push(
         {
           label: 'template.dl.dl014.gspbh',
-          prop: 'gspbh',
+          prop: 'gspbhmc',
           bodyType: 'input',
-          bodyFillType: 'actFill',
+          bodyFillType: 'preFill',
+          bodyMaxlength: 20,
           bodySubType: 'gsp',
-          bodySubKey: 'gspbh1',
+          bodySubKey: 'gspbh',
           bodySubFillType: 'actFill'
         },
         {
@@ -499,12 +536,12 @@ export default {
       this.isSftjs9Yes =
         this.formData.sftjs9 === '是' || this.formData.sftjs9 === 'Yes'
     }
-    
+
     // 初始化剂量组总数的旧值
     if (this.formData.jlzzs) {
       this.oldJlzzs = this.formData.jlzzs
     }
-    
+
     // 初始化平行瓶数的旧值
     if (this.formData.pxpb) {
       this.oldPxpb = this.formData.pxpb
@@ -523,6 +560,7 @@ export default {
       const jlzInfoData = this.$refs[refConf.jlzInfo]?.getFilledFormData() || {}
       const jlzmcTableData =
         this.$refs[refConf.jlzmcTable]?.getFilledFormData() || {}
+      const pyyData = this.$refs[refConf.pyy]?.getFilledFormData() || {}
       const jlzTableData =
         this.$refs[refConf.jlzTable]?.getFilledFormData() || {}
       const remarkData = this.$refs[refConf.remark]?.getFilledFormData() || {}
@@ -532,6 +570,7 @@ export default {
         ...yqsyData,
         ...xbInfoData,
         ...jlzInfoData,
+        ...pyyData,
         ...remarkData,
         // 保存两个表格的数据到 formData
         jlzmcTableData: jlzmcTableData.stepTableFormData || [],
@@ -547,6 +586,7 @@ export default {
         refConf.xbInfo,
         refConf.jlzInfo,
         refConf.jlzmcTable,
+        refConf.pyy,
         refConf.jlzTable,
         refConf.remark
       ]
@@ -559,7 +599,7 @@ export default {
       // 额外校验：检查剂量组名称表格和剂量组列表是否为空
       const jlzmcTableData = this.$refs[refConf.jlzmcTable]?.getFilledFormData()
       const jlzmcList = jlzmcTableData?.stepTableFormData || []
-      
+
       if (jlzmcList.length === 0) {
         this.$message.warning('请先生成剂量组名称')
         return false
@@ -567,7 +607,7 @@ export default {
 
       const jlzTableData = this.$refs[refConf.jlzTable]?.getFilledFormData()
       const jlzList = jlzTableData?.stepTableFormData || []
-      
+
       if (jlzList.length === 0) {
         this.$message.warning('请先生成剂量组列表数据')
         return false
@@ -583,6 +623,7 @@ export default {
         refConf.xbInfo,
         refConf.jlzInfo,
         refConf.jlzmcTable,
+        refConf.pyy,
         refConf.jlzTable,
         refConf.remark
       ]
@@ -595,7 +636,7 @@ export default {
       // 额外校验：检查剂量组名称表格和剂量组列表是否为空
       const jlzmcTableData = this.$refs[refConf.jlzmcTable]?.getFilledFormData()
       const jlzmcList = jlzmcTableData?.stepTableFormData || []
-      
+
       if (jlzmcList.length === 0) {
         this.$message.warning('请先生成剂量组名称')
         return false
@@ -603,7 +644,7 @@ export default {
 
       const jlzTableData = this.$refs[refConf.jlzTable]?.getFilledFormData()
       const jlzList = jlzTableData?.stepTableFormData || []
-      
+
       if (jlzList.length === 0) {
         this.$message.warning('请先生成剂量组列表数据')
         return false
@@ -615,22 +656,22 @@ export default {
       // 从仪器使用信息表格中提取仪器资源
       const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
       const yqsyList = yqsyData?.stepTableFormData || []
-      
+
       // 提取仪器资源
       this.yqResourceTmp = yqsyList
-        .filter(item => item.yqbh)
-        .map(item => ({
+        .filter((item) => item.yqbh)
+        .map((item) => ({
           bh: item.yqbh,
           mc: item.yqmc,
           xh: item.yqxh
         }))
-      
+
       // 从剂量组表格中提取试剂资源（如果有 S9混合液编号或细胞编号）
       const jlzData = this.$refs.jlzTableRef?.getFilledFormData()
       const jlzList = jlzData?.stepTableFormData || []
-      
+
       const sjResourceFromJlz = []
-      jlzList.forEach(item => {
+      jlzList.forEach((item) => {
         // 如果有细胞编号，添加到试剂资源
         if (item.xybh) {
           sjResourceFromJlz.push({
@@ -639,9 +680,9 @@ export default {
           })
         }
       })
-      
+
       this.resourceTmp = sjResourceFromJlz
-      
+
       return this.resourceTmp
     },
     onRegentSubmit(e) {
@@ -668,7 +709,7 @@ export default {
     // 处理剂量组配制信息的 blur 事件
     onJlzInfoBlur(e) {
       const { key, value } = e
-      
+
       // 当剂量组总数改变时，清空剂量组名称表格数据和剂量组列表数据
       if (key === 'jlzzs') {
         // 检查值是否真的改变了
@@ -677,24 +718,26 @@ export default {
           this.$set(this.formData, 'jlzmcTableData', [])
           // 同时清空剂量组列表数据
           this.$set(this.formData, 'jlzTableData', [])
-          
-          this.$message.info('剂量组总数已改变，已清空剂量组名称和剂量组列表数据')
+
+          this.$message.info(
+            '剂量组总数已改变，已清空剂量组名称和剂量组列表数据'
+          )
         }
-        
+
         // 更新旧值
         this.oldJlzzs = value
       }
-      
+
       // 当平行瓶数改变时，清空剂量组列表数据
       if (key === 'pxpb') {
         // 检查值是否真的改变了
         if (this.oldPxpb !== null && this.oldPxpb !== value) {
           // 清空剂量组列表数据
           this.$set(this.formData, 'jlzTableData', [])
-          
+
           this.$message.info('平行瓶数已改变，已清空剂量组列表数据')
         }
-        
+
         // 更新旧值
         this.oldPxpb = value
       }
@@ -702,7 +745,7 @@ export default {
     // 处理剂量组名称表格的 blur 事件
     onJlzmcTableBlur(e) {
       const { colKey } = e
-      
+
       // 当剂量组名称字段改变时，清空剂量组列表数据
       if (colKey === 'jlzzmc') {
         // 检查剂量组列表是否有数据