Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/lang/en/template/dl.js

@@ -138,12 +138,33 @@ export default {
   dl011: {
     ...common,
     fxbz: 'Resuscitation Steps',
-    pyxx: 'Culture Information'
+    pyxx: 'Culture Information',
+    xbxx: 'Cell Information',
+    xbmc: 'Cell Name',
+    xbdcbh: 'Cell Cryopreservation Number',
+    fshxbbh: 'Cell Number After Resuscitation',
+    fshxbyjtj: 'Expected Cell Volume After Resuscitation',
+    fshxbsjtj: 'Actual Cell Volume After Resuscitation',
+    pyxbh: 'Incubator Number',
+    pytjText: 'Culture Conditions',
+    pykssj: 'Culture Start Time',
+    pykssjButton: 'Start'
   },
   dl012: {
     ...common,
     zbbz: 'Preparation Steps',
-    pyxx: 'Culture Information'
+    pyxx: 'Culture Information',
+    xbxx: 'Cell Information',
+    xbmc: 'Cell Name',
+    xbzbqbh: 'Cell Number Before Preparation',
+    zbxbs: 'Number of Cells Prepared',
+    zbhxbbh: 'Cell Number After Preparation',
+    zbhxbyjtj: 'Expected Cell Volume After Preparation',
+    zbhxbsjtj: 'Actual Cell Volume After Preparation',
+    pyxbh: 'Incubator Number',
+    pytjText: 'Culture Conditions',
+    pykssj: 'Culture Start Time',
+    pykssjButton: 'Start'
   },
   dl013: {
     ...common,
@@ -211,6 +232,8 @@ export default {
     xybh:'悬液编号',
     rsks:'染色开始',
     rsjs:'染色结束',
+    ksButton:'开始',
+    jsButton:'结束',
     zs:'左上（个）',
     ys:'右上（个）',
     zy:'左下（个）',
@@ -291,4 +314,16 @@ export default {
     ksButton:'开始',
     jsButton:'结束',
   },
+  dl024: {
+    sydd:'实验地点',
+    czsj:'操作时间',
+    dlbz: '备注',
+    xbpyxx: '细胞培养信息',
+
+    qxbd:'前序表单',
+    pykssj:'培养开始时间',
+    pyjssj:'培养结束时间',
+    jsButton:'培养结束时间',
+    xbbh:'细胞编号',
+  },
 }

src/lang/zh/template/dl.js

@@ -139,12 +139,33 @@ export default {
   dl011: {
     ...common,
     fxbz: '复苏步骤',
-    pyxx: '培养信息'
+    pyxx: '培养信息',
+    xbxx: '细胞信息',
+    xbmc: '细胞名称',
+    xbdcbh: '细胞冻存编号',
+    fshxbbh: '复苏后细胞编号',
+    fshxbyjtj: '复苏后细胞预计体积',
+    fshxbsjtj: '复苏后细胞实际体积',
+    pyxbh: '培养箱编号',
+    pytjText: '培养条件',
+    pykssj: '培养开始时间',
+    pykssjButton: '开始'
   },
   dl012: {
     ...common,
     zbbz: '制备步骤',
-    pyxx: '培养信息'
+    pyxx: '培养信息',
+    xbxx: '细胞信息',
+    xbmc: '细胞名称',
+    xbzbqbh: '细胞制备前编号',
+    zbxbs: '制备细胞数',
+    zbhxbbh: '制备后细胞编号',
+    zbhxbyjtj: '制备后细胞预计体积',
+    zbhxbsjtj: '制备后细胞实际体积',
+    pyxbh: '培养箱编号',
+    pytjText: '培养条件',
+    pykssj: '培养开始时间',
+    pykssjButton: '开始'
   },
   dl013: {
     ...common,
@@ -212,6 +233,8 @@ export default {
     xybh:'悬液编号',
     rsks:'染色开始',
     rsjs:'染色结束',
+    ksButton:'开始',
+    jsButton:'结束',
     zs:'左上（个）',
     ys:'右上（个）',
     zy:'左下（个）',
@@ -291,4 +314,16 @@ export default {
     ksButton:'开始',
     jsButton:'结束',
   },
+  dl024: {
+    sydd:'实验地点',
+    czsj:'操作时间',
+    dlbz: '备注',
+    xbpyxx: '细胞培养信息',
+
+    qxbd:'前序表单',
+    pykssj:'培养开始时间',
+    pyjssj:'培养结束时间',
+    jsButton:'培养结束时间',
+    xbbh:'细胞编号',
+  },
 }

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

@@ -55,14 +55,32 @@
             </template>
           </CustomTable>
 
-          <!-- 预留区域 - 细胞信息 -->
+          <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl011.xbxx" />
+          <div class="template-form-item">
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.xbxx"
+              :formConfig="xbxxConfig"
+              :formData="formData"
+            />
+          </div>
 
           <LineLabel label="template.dl.dl011.fxbz" />
           <Step :ref="refConf.step" :formData="formData.stepData" />
 
           <!-- 预留区域 - 培养信息 -->
           <LineLabel label="template.dl.dl011.pyxx" />
+          <div class="template-form-item">
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.pyxx"
+              :formConfig="pyxxConfig"
+              :formData="formData"
+            />
+          </div>
 
           <BaseInfoFormPackage
             fieldItemLabel="template.dl.dl007.bz"
@@ -92,7 +110,9 @@ const refConf = {
   sysj: 'sysjTableRef',
   yqsy: 'yqsyTableRef',
   step: 'stepRef',
-  remark: 'remarkRef'
+  remark: 'remarkRef',
+  xbxx: 'xbxxRef',
+  pyxx: 'pyxxRef'
 }
 const refNames = Object.values(refConf)
 
@@ -165,7 +185,7 @@ export default {
         },
         {
           type: 'cellItem',
-          label:'操作时间',
+          label: '操作时间',
           config: {
             kssj: {
               label: 'template.dl.dl011.kssj',
@@ -175,8 +195,7 @@ export default {
             jssj: {
               label: 'template.dl.dl011.jssj',
               type: 'input',
-              fillType: 'actFill',
-              maxlength: 200
+              disabled: true
             }
           }
         }
@@ -253,8 +272,92 @@ export default {
           disabled: true
         }
       ]
+    },
+    pyxxConfig() {
+      return [
+        {
+          type: 'step',
+          config: {
+            pyxbh: {
+              label: 'template.dl.dl011.pyxbh',
+              type: 'yq',
+              fillType: 'actFill'
+            },
+            pytjText: {
+              type: 'span',
+              label: ''
+            },
+            pykssj: {
+              label: 'template.dl.dl011.pykssj',
+              type: 'input',
+              fillType: 'actFill',
+              subType: 'button',
+              subKey: 'pykssjButton',
+              buttonName: 'template.dl.dl011.pykssjButton'
+            }
+          }
+        }
+      ]
+    },
+    xbxxConfig() {
+      return [
+        {
+          type: 'step',
+          config: {
+            xbmc: {
+              label: 'template.dl.dl011.xbmc',
+              type: 'select',
+              options: [],
+              fillType: 'preFill',
+              otherCode: 'xbmcOther'
+            },
+            xbdcbh: {
+              label: 'template.dl.dl011.xbdcbh',
+              type: 'xb',
+              fillType: 'actFill'
+            },
+            fshxbbh: {
+              label: 'template.dl.dl011.fshxbbh',
+              type: 'input',
+              subType: 'span',
+              maxlength: 20,
+              subKey: 'fshxbbhCodeSn',
+              fillType: 'preFill'
+            },
+            fshxbyjtj: {
+              label: 'template.dl.dl011.fshxbyjtj',
+              type: 'inputNumber',
+              subType: 'select',
+              subKey: 'fshxbyjtjUnit',
+              fillType: 'preFill',
+              subOptions: this.getDictOptions('business_nddw'),
+              maxlength: 10,
+              selectTo: 'fshxbsjtjUnit' //下拉选择后，赋值到对应字段
+            },
+            fshxbsjtj: {
+              label: 'template.dl.dl011.fshxbsjtj',
+              type: 'inputNumber',
+              subType: 'select',
+              subKey: 'fshxbsjtjUnit',
+              fillType: 'actFill',
+              subOptions: this.getDictOptions('business_nddw'),
+              maxlength: 10,
+              copyFrom: 'fshxbyjtj' //复制哪个字段
+            }
+          }
+        }
+      ]
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs[refConf.pyxx]?.updateFormData(
+        'pytjText',
+        '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+        { isUpdateRecord: false, signData: null }
+      )
+    })
+  },
   data() {
     return {
       formData: {},

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

@@ -55,14 +55,32 @@
             </template>
           </CustomTable>
 
-          <!-- 预留区域 - 细胞信息 -->
+          <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl012.xbxx" />
+          <div class="template-form-item">
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.xbxx"
+              :formConfig="xbxxConfig"
+              :formData="formData"
+            />
+          </div>
 
           <LineLabel label="template.dl.dl012.zbbz" />
           <Step :ref="refConf.step" :formData="formData.stepData" />
 
-          <!-- 预留区域 - 培养信息 -->
+          <!-- 培养信息 -->
           <LineLabel label="template.dl.dl012.pyxx" />
+          <div class="template-form-item">
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.pyxx"
+              :formConfig="pyxxConfig"
+              :formData="formData"
+            />
+          </div>
 
           <BaseInfoFormPackage
             fieldItemLabel="template.dl.dl007.bz"
@@ -91,7 +109,9 @@ const refConf = {
   base: 'baseInfoRef',
   sysj: 'sysjTableRef',
   yqsy: 'yqsyTableRef',
+  xbxx: 'xbxxRef',
   step: 'stepRef',
+  pyxx: 'pyxxRef',
   remark: 'remarkRef'
 }
 const refNames = Object.values(refConf)
@@ -176,8 +196,7 @@ export default {
             jssj: {
               label: 'template.dl.dl012.jssj',
               type: 'input',
-              fillType: 'actFill',
-              maxlength: 200
+              disabled: true
             }
           }
         }
@@ -254,8 +273,99 @@ export default {
           disabled: true
         }
       ]
+    },
+    // 培养信息配置
+    pyxxConfig() {
+      return [
+        {
+          type: 'step',
+          config: {
+            pyxbh: {
+              label: 'template.dl.dl012.pyxbh',
+              type: 'yq',
+              fillType: 'actFill'
+            },
+            pytjText: {
+              type: 'span',
+              label: ''
+            },
+            pykssj: {
+              label: 'template.dl.dl012.pykssj',
+              type: 'input',
+              fillType: 'actFill',
+              subType: 'button',
+              subKey: 'pykssjButton',
+              buttonName: 'template.dl.dl012.pykssjButton'
+            }
+          }
+        }
+      ]
+    },
+    // 细胞信息配置
+    xbxxConfig() {
+      return [
+        {
+          type: 'step',
+          config: {
+            xbmc: {
+              label: 'template.dl.dl012.xbmc',
+              type: 'select',
+              options: [],
+              fillType: 'preFill',
+              otherCode: 'xbmcOther'
+            },
+            xbzbqbh: {
+              label: 'template.dl.dl012.xbzbqbh',
+              type: 'xb',
+              fillType: 'actFill'
+            },
+            zbxbs: {
+              label: 'template.dl.dl012.zbxbs',
+              type: 'inputNumber',
+              fillType: 'preFill'
+            },
+            zbhxbbh: {
+              label: 'template.dl.dl012.zbhxbbh',
+              type: 'input',
+              subType: 'span',
+              maxlength: 20,
+              subKey: 'zbhxbbhCodeSn',
+              fillType: 'preFill'
+            },
+            zbhxbyjtj: {
+              label: 'template.dl.dl012.zbhxbyjtj',
+              type: 'inputNumber',
+              subType: 'select',
+              subKey: 'fshxbyjtjUnit',
+              fillType: 'preFill',
+              subOptions: this.getDictOptions('business_nddw'),
+              maxlength: 10,
+              selectTo: 'zbhxbsjtjUnit' //下拉选择后，赋值到对应字段
+            },
+            zbhxbsjtj: {
+              label: 'template.dl.dl012.zbhxbsjtj',
+              type: 'inputNumber',
+              subType: 'select',
+              subKey: 'zbhxbsjtjUnit',
+              fillType: 'actFill',
+              subOptions: this.getDictOptions('business_nddw'),
+              maxlength: 10,
+              copyFrom: 'zbhxbyjtj' //复制哪个字段
+            }
+          }
+        }
+      ]
     }
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.$refs[refConf.pyxx]?.updateFormData(
+        'pytjText',
+        '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%',
+        { isUpdateRecord: false, signData: null }
+      )
+    })
+  },
   data() {
     return {
       formData: {},

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

@@ -21,7 +21,7 @@
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
 							@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
 							:showAddRow="false" :showOperation="false"
-							ref="stepTableRef" :columns="stepColumns" :formData="formData">
+							ref="qcxjjyqkTableRef" :columns="stepColumns" :formData="formData">
 						</CustomTable>
 
 					<LineLabel label="template.dl.dl016.czbz" />
@@ -160,6 +160,7 @@ export default {
 					bodyType: "input",
 					bodyFillType: "actFill",
 					width: 180,
+          disabled:true
 				},
 				{
 					label: "template.dl.dl016.xybh",
@@ -168,7 +169,7 @@ export default {
 					bodyType: "input",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
-					// bodyDisabled: true,
+					disabled:true
 				},
 				{
 					label: "template.dl.dl016.qsxjjrl",
@@ -193,14 +194,14 @@ export default {
     onRegentSubmit(e) {
       const { selectInfo, key, rowIndex } = e
       const { row } = selectInfo
-
-      if (key === 'yqbh') {
+      console.log('selectInfo==============',selectInfo)
+      if (key === 'qxbd') {
         const params = {
-          yqmc: row.mc,
-          yqxh: row.xh,
-          xccsjzjdrq: row.jzrq
+          jlzb: row.mc,
+          xybh: row.xh,
+          xccsjzjdrq: ''
         }
-        // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+        this.$refs.qcxjjyqkTableRef.updateDataSourceByRowIndex(rowIndex, params)
       }
     },
     //选择table header下拉框也要更新体积
@@ -269,11 +270,11 @@ export default {
 		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"])
+			return this.getFilledFormDataByRefs(["baseInfoRef",  "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"])
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef", "stepTableRef", "stepRef","remarkRef"]);
+			let content = await this.validFormFields(["baseInfoRef",  "swypyjInfoRef", "qcxjjyqkTableRef", "stepRef","remarkRef"]);
 			return content;
 		},
 		getResource() {

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

@@ -57,7 +57,7 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
 export default {
 	name: "DL017",
   dicts: [
-        'business_dl_qsxjbltj','business_tjdw','business_dl_sjqszqk','business_dl_sjqcdqk','business_dl_sjqqtqk'
+        'business_dl_qsxjbltj','business_tjdw','business_dl_sjqszqk','business_dl_sjqcdqk','business_dl_sjqqtqk','business_dl_xbmc'
     ],
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete },
 	mixins: [templateMixin],
@@ -111,8 +111,11 @@ export default {
 					config: {
 						sydd: {
 							label: 'template.dl.dl017.sydd',
-							type: "input",
-							fillType: "actFill",
+							type: 'select',
+							fillType: 'actFill',
+							options: this.getDictOptions('business_dl_xbmc'),
+							otherCode: 'xbmcOther',
+              showOtherLabel:false
 						},
 					}
 				},
@@ -158,7 +161,7 @@ export default {
 				}
 			]
 		},
-		// 秋水仙碱加液情况
+		// 细胞操作情况
 		stepColumns() {
 			return [
 				{
@@ -278,14 +281,13 @@ export default {
     onRegentSubmit(e) {
       const { selectInfo, key, rowIndex } = e
       const { row } = selectInfo
-
+      console.log('selectInfo==============',selectInfo)
       if (key === 'yqbh') {
         const params = {
-          yqmc: row.mc,
-          yqxh: row.xh,
-          xccsjzjdrq: row.jzrq
+          jlzb: row.mc,
+          xybh: row.xh,
         }
-        // this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
+        this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
       }
     },
     //选择table header下拉框也要更新体积

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

@@ -19,7 +19,7 @@
 					<CustomTable
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
+							@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
 							:showAddRow="false" :showOperation="false"
 							ref="stepTableRef" :columns="stepColumns" :formData="formData">
 							<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -167,7 +167,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
+          disabled: true,
 					bodyDisabled: true,
 				},
 				{
@@ -176,7 +176,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
+          disabled: true,
 					bodyDisabled: true,
 				},
 				{
@@ -185,8 +185,11 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
+          disabled: true,
+          subType: 'button',
+          subKey: 'rsks',
+          buttonName: 'template.dl.dl018.ksButton',
 				},
 				{
 					label: "template.dl.dl018.rsjs",
@@ -194,52 +197,50 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
+          disabled: true,
+          subType: 'button',
+          subKey: 'rsjs',
+          buttonName: 'template.dl.dl018.jsButton',
 				},
 				{
 					label: "template.dl.dl018.zs",
 					prop: "zs",
 					width: 180,
-					bodyType: "input",
+					bodyType: "inputNumber",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl018.ys",
 					prop: "ys",
 					width: 180,
-					bodyType: "input",
+					bodyType: "inputNumber",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl018.zy",
 					prop: "zy",
 					width: 180,
-					bodyType: "input",
+					bodyType: "inputNumber",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl018.yx",
 					prop: "yx",
 					width: 180,
-					bodyType: "input",
+					bodyType: "inputNumber",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
 				},
 				{
 					label: "template.dl.dl018.tj",
 					prop: "tj",
 					width: 180,
-					bodyType: "input",
+					bodyType: "inputNumber",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
 					bodyDisabled: true,
 				}
 			]
@@ -253,6 +254,18 @@ export default {
 	mounted() {
 	},
 	methods: {
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+      console.log('selectInfo==============',selectInfo)
+      if (key === 'yqbh') {
+        const params = {
+          jlzb: row.mc,
+          xybh: row.xh,
+        }
+        this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      }
+    },
     //选择table header下拉框也要更新体积
 		onHeaderSelectChange(data){
 			const {key, headerSelectFields,dataSource=[]} = data;

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

@@ -19,7 +19,7 @@
 					<CustomTable
 							@headerSelectChange="onHeaderSelectChange"
 							fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
-							@beforeSaveRecord = "beforeSaveRecord"
+							@beforeSaveRecord = "beforeSaveRecord" @onRegentSubmit="(e) => onRegentSubmit"
 							:showAddRow="false" :showOperation="false"
 							ref="stepTableRef" :columns="stepColumns" :formData="formData">
 							<!-- <template slot="operation" slot-scope="{ row, rowIndex, columns }">
@@ -167,7 +167,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
+          disabled: true,
 					bodyDisabled: true,
 				},
 				{
@@ -176,7 +176,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
+          disabled: true,
 					bodyDisabled: true,
 				},
 				{
@@ -185,7 +185,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
+          bodyMaxlength: 50,
 					bodyDisabled: true,
 				},
 				{
@@ -194,7 +194,7 @@ export default {
 					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
-					bodyMaxlength: 10,
+					bodyMaxlength: 50,
 					bodyDisabled: true,
 				}
 			]
@@ -208,6 +208,18 @@ export default {
 	mounted() {
 	},
 	methods: {
+    onRegentSubmit(e) {
+      const { selectInfo, key, rowIndex } = e
+      const { row } = selectInfo
+      console.log('selectInfo==============',selectInfo)
+      if (key === 'yqbh') {
+        const params = {
+          jlzb: row.mc,
+          xybh: row.xh,
+        }
+        this.$refs.stepTableRef.updateDataSourceByRowIndex(rowIndex, params)
+      }
+    },
     //选择table header下拉框也要更新体积
 		onHeaderSelectChange(data){
 			const {key, headerSelectFields,dataSource=[]} = data;

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

@@ -8,33 +8,30 @@
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
-					<TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
+            <!-- 仪器使用信息 -->
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
 
-          <LineLabel label="template.dl.dl021.gcqk" />
-          <!-- 观察情况 -->
+          <LineLabel label="template.dl.dl024.xbpyxx" />
+          <!-- 操作记录 -->
           <div class="template-form-item">
-						<BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
-							@onRegentSubmit="onRegentSubmit"
-							:formConfig="stepFormConfig" @blur="onHandleBlur"
-							:formData="formData" />
-						<CustomTable
+          <BaseInfoFormPackage ref="swypyjInfoRef" fieldItemLabel="template.common.operationSteps"
+            :formConfig="stepFormConfig" @blur="onHandleBlur"
+            :formData="formData" />
+            <CustomTable
               :ref="`tableRef`"
               :columns="tableColumns"
               :formData="formData"
               operationWidth = "80px"
               :prefixKey = "`table`"
-              fieldItemLabel = "template.dl.dl021.gcqk"
-              :showAddRow="fillType === 'actFill'"
-              :showOperation="fillType === 'actFill'"
+              fieldItemLabel = "template.dl.dl024.gcqk"
+              :showAddRow="false"
+              :showOperation="false"
             >
               <template slot="operation" slot-scope="{ row, rowIndex, columns }">
                 <TableOpertaionDelete  :row="row" :rowIndex="rowIndex" :columns="columns"  @deleteRow="deleteRow" ></TableOpertaionDelete>
               </template>
             </CustomTable>
-					</div>
-
-
-
+            </div>
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
 						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
@@ -57,7 +54,7 @@ import { debounce } from 'lodash-es'
 import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue"
 
 export default {
-	name: "DL024",
+	name: "dl024",
   dicts: [
         'business_dl_xbmc'
     ],
@@ -106,10 +103,23 @@ export default {
 							disabled: true,
 						},
 					}
+				},{
+					type: "cellItem",
+					label: 'template.dl.dl024.sydd',
+					config: {
+						sydd: {
+							label: 'template.dl.dl024.sydd',
+							type: 'select',
+							fillType: 'actFill',
+							options: this.getDictOptions('business_dl_xbmc'),
+							otherCode: 'xbmcOther',
+              showOtherLabel:false
+						},
+					}
 				},
-				{
+        {
 					type: "cellItem",
-					label: 'template.dl.dl021.czsj',
+					label: 'template.dl.dl024.czsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -124,55 +134,50 @@ export default {
 			]
 		},
 
-    // 观察情况
-		tableColumns() {
-			return [{
-				label: 'template.dl.dl021.bpbh',
-				prop: 'bpbh',
-				bodyType: 'input',
-				bodyFillType: 'actFill',
-				width: 100,
-				bodyMaxlength: 50,
-			},{
-				label: 'template.dl.dl021.gcxps',
-				prop: 'gcxps',
-				bodyType: 'input',
-				bodyFillType: 'actFill',
-				width: 100,
-        bodyMaxlength: 50,
-			},{
-				label: 'template.dl.dl021.zqxxbs',
-				prop: 'zqxxbs',
-				bodyType: 'input',
-				bodyFillType: 'actFill',
-				width: 80,
-        bodyMaxlength: 50,
-			}]
-		},
-    // 观察情况
-		stepFormConfig() {
-			return [
+    // 细胞培养信息
+    stepFormConfig(){
+      return [
 				{
-					type: "step",
+					type: "cellItem",
 					config: {
-            xbmc: {
-							label: 'template.dl.dl021.xbmc',
-							type: 'select',
-							fillType: 'actFill',
-							options: this.getDictOptions('business_dl_xbmc'),
-							otherCode: 'xbmcOther',
-              showOtherLabel:false
-						},
-            xwj: {
+            qxbd: {
 							// span:1,
-							label: 'template.dl.dl021.xwj',
+							label: 'template.dl.dl024.qxbd',
 							type: 'qxbd',
 							fillType: 'actFill',
 							filledCodes:['bdmc','bdbh'],
 						},
+            pykssj:{
+              label: 'template.dl.dl024.pykssj',
+              type: 'input',
+              fillType: 'actFill',
+              subType: 'button',
+              subKey: 'pyjssj',
+              buttonName: 'template.dl.dl024.jsButton',
+            },
+            pyjssj: {
+              label: 'template.dl.dl024.pyjssj',
+              type: 'input',
+              fillType: 'actFill',
+              subType: 'button',
+              subKey: 'pyjssj',
+              buttonName: 'template.dl.dl024.jsButton',
+            },
 					}
 				}
 			]
+    },
+		tableColumns() {
+			return [
+				{
+          label: 'template.dl.dl024.xbbh',
+          prop: 'xbbh',
+          bodyType: 'input',
+          bodyFillType: 'actFill',
+          width: 100,
+          bodyMaxlength: 50,
+        }
+			]
 		},
 	},
 	data() {
@@ -183,11 +188,11 @@ export default {
 	mounted() {
 	},
 	methods: {
-    // 选择显微镜预留
+    // 选择仪器编号预留
     onRegentSubmit(e) {
       const { selectInfo, key, rowIndex } = e
       const { row } = selectInfo
-      console.log('选择显微镜预留===',row)
+      console.log('选择仪器编号预留===',row)
       // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
       //   const params = {
       //     yqmc: row.mc,