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,

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,

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: {},