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

src/lang/en/template/dl.js

@@ -247,7 +247,7 @@ export default {
     hyqqtqk: 'Other Conditions Before Medium Change',
     qqpyy: 'Discard Culture Medium',
     pbsxd: 'PBS Wash',
-    pyybrl: 'Culture Medium Volume Added (ul)'
+    pyybrl: 'Culture Medium Volume Added'
   },
   dl016: {
     xbxx: '细胞信息',

src/lang/zh/template/dl.js

@@ -241,7 +241,7 @@ export default {
     hyqqtqk: '换液前其他情况',
     qqpyy: '倾去培养液',
     pbsxd: 'PBS洗涤',
-    pyybrl: '培养液补入量(ul)'
+    pyybrl: '培养液补入量'
   },
   dl016: {
     xbxx: '细胞信息',

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

@@ -371,7 +371,7 @@ export default {
             bodyFillType: 'actFill',
             bodyDisabled: true,
             disabled: true,
-            width: 100
+            width: 200
           }
         ]
 
@@ -654,7 +654,7 @@ export default {
           bodyFillType: 'actFill',
           bodyDisabled: true,
           disabled: true,
-          width: 100
+          width: 200
         }
       ]
 

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

@@ -29,7 +29,7 @@
 
           <LineLabel label="template.dl.dl010.sjxx" />
           <div class="template-form-item">
-            <div class="sj-operation-btns">
+            <div class="sj-operation-btns" v-ifan class="s">="fillType === 'preFill'">
               <el-button
                 size="small"
                 type="primary"
@@ -287,7 +287,7 @@ export default {
             },
             { type: 'span', label: 'template.dl.dl010.gusui' }
           ],
-          width: 260
+          width: 320
         },
         {
           label: 'template.dl.dl010.lx',

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

@@ -8,11 +8,24 @@
       </div>
       <div class="detail-content">
         <div class="content">
-          <BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
-            :ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
+          <BaseInfoFormPackage
+            fieldItemLabel="template.common.baseInfo"
+            label="template.common.baseInfo"
+            :ref="refConf.base"
+            :formConfig="baseInfoFormConfig"
+            :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.dl011.xbxx" />
@@ -22,8 +35,14 @@
                 $t('template.dl.dl011.bqdy')
               }}</el-button>
             </div>
-            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.xbxx" :formConfig="xbxxConfig"
-              @onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.xbxx"
+              :formConfig="xbxxConfig"
+              @onRegentSubmit="(data) => onTableRegentSubmit(data)"
+              :formData="formData"
+            />
           </div>
 
           <LineLabel label="template.dl.dl011.fxbz" />
@@ -32,13 +51,24 @@
           <!-- 预留区域 - 培养信息 -->
           <LineLabel label="template.dl.dl011.pyxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyxx" :formConfig="pyxxConfig"
-              :formData="formData" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
-              @clickButton="handlePyxxClickButton" />
+            <BaseInfoFormPackage
+              fieldItemLabel=""
+              label=""
+              :ref="refConf.pyxx"
+              :formConfig="pyxxConfig"
+              :formData="formData"
+              @onRegentSubmit="(data) => onTableRegentSubmit(data)"
+              @clickButton="handlePyxxClickButton"
+            />
           </div>
 
-          <BaseInfoFormPackage fieldItemLabel="template.dl.dl007.bz" label="template.dl.dl007.bz" :ref="refConf.remark"
-            :formConfig="remarkConfig" :formData="formData" />
+          <BaseInfoFormPackage
+            fieldItemLabel="template.dl.dl007.bz"
+            label="template.dl.dl007.bz"
+            :ref="refConf.remark"
+            :formConfig="remarkConfig"
+            :formData="formData"
+          />
         </div>
       </div>
     </div>
@@ -54,8 +84,8 @@ import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import moment from 'moment'
-import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools";
-import { EventBus } from "@/utils/eventBus";
+import { uniqeYqOne, uniqeResource } from '@/utils/calUnitTools'
+import { EventBus } from '@/utils/eventBus'
 
 const refConf = {
   base: 'baseInfoRef',
@@ -166,16 +196,23 @@ export default {
               type: 'span',
               label: ''
             },
-            pykssj: {
-              label: 'template.dl.dl011.pykssj',
-              type: 'input',
-              fillType: 'actFill',
-              subType: 'button',
-              subKey: 'pykssjButton',
-              subDisabled: this.fillType !== 'actFill',
-              disabled: true,
-              buttonName: 'template.dl.dl011.pykssjButton'
-            }
+            pykssj:
+              this.fillType === 'actFill'
+                ? {
+                    label: 'template.dl.dl011.pykssj',
+                    type: 'input',
+                    fillType: 'actFill',
+                    subType: 'button',
+                    subKey: 'pykssjButton',
+                    disabled: true,
+                    buttonName: 'template.dl.dl011.pykssjButton'
+                  }
+                : {
+                    label: 'template.dl.dl011.pykssj',
+                    type: 'input',
+                    fillType: 'actFill',
+                    disabled: true
+                  }
           }
         }
       ]
@@ -212,9 +249,9 @@ export default {
               subType: 'select',
               subKey: 'fshxbyjtjUnit',
               fillType: 'preFill',
-              subOptions: this.getDictOptions('business_nddw'),
+              subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10,
-              selectTo: 'fshxbsjtjUnit' //下拉选择后，赋值到对应字段
+              // selectTo: 'fshxbsjtjUnit'
             },
             fshxbsjtj: {
               label: 'template.dl.dl011.fshxbsjtj',
@@ -279,15 +316,18 @@ export default {
       if (data.key === 'pyxbh') {
         this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc)
         this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh)
-        this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq)
+        this.$refs.pyxxRef.updateFormData(
+          'pyxbh_jzrq',
+          data.selectInfo.row.jzrq
+        )
       }
-       //通知后端保存数据
+      //通知后端保存数据
       const params = {
-        type: "fieldChanged",
+        type: 'fieldChanged',
         newRecord: null,
-        resourceList: null,
+        resourceList: null
       }
-      EventBus.$emit('onModifyRecord', params);
+      EventBus.$emit('onModifyRecord', params)
     },
     // 处理培养信息中按钮点击事件
     handlePyxxClickButton(_item, signData) {
@@ -331,10 +371,10 @@ export default {
         kcdw: content.fshxbsjtjUnit,
         syl: null,
         type: null, //生成的时候传null
-        elnType: this.product,  //生成的时候传 his.product
+        elnType: this.product, //生成的时候传 his.product
         syldw: content.fshxbsjtjUnit,
         yxzq: null,
-        yxzqdw: null,
+        yxzqdw: null
       })
       //使用细胞
       tmpResource.push({
@@ -353,20 +393,23 @@ export default {
         elnType: null, //传null
         syldw: content.xbdcbh_dw,
         yxzq: null,
-        yxzqdw: null,
+        yxzqdw: null
       })
       //使用仪器
       tmpYq.push({
         mc: content.pyxbh_mc,
         xh: content.pyxbh_xh,
         bh: content.pyxbh,
-        jzrq: content.pyxbh_jzrq,
+        jzrq: content.pyxbh_jzrq
       })
       //使用的试剂、仪器
       const stepResource = this.$refs.stepRef.getStepResource()
-      this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+      this.resourceTmp = uniqeResource(
+        tmpResource,
+        stepResource.sjResource || []
+      )
       this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
-      return this.resourceTmp;
+      return this.resourceTmp
     },
     onRegentSubmit(e) {
       // 预留方法，如果需要处理试剂提交事件可以在这里添加

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

@@ -231,7 +231,7 @@ export default {
               fillType: 'preFill',
               subOptions: this.getDictOptions('business_nddw'),
               maxlength: 10,
-              selectTo: 'zbhxbsjtjUnit'
+              // selectTo: 'zbhxbsjtjUnit'
             },
             zbhxbsjtj: {
               label: 'template.dl.dl012.zbhxbsjtj',

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

@@ -261,10 +261,7 @@ export default {
           bodyType: 'select',
           width: 180,
           bodyFillType: 'actFill',
-          bodyOptions: [
-            { label: '大量贴壁细胞变圆', value: '大量贴壁细胞变圆' },
-            { label: '无', value: '无' }
-          ]
+          bodyOptions: this.getDictOptions('business_dl_sjqqtqk')
         },
         {
           label: 'template.dl.dl015.qqpyy',
@@ -288,7 +285,10 @@ export default {
           prop: 'pyybrl',
           bodyType: 'inputNumber',
           bodyFillType: 'actFill',
-          bodyMaxlength: 10
+          bodyMaxlength: 10,
+          headerSelectKey: 'pyybrlUnit',
+          headerOptions: this.getDictOptions('business_tjdw'),
+          fillType: 'preFill'
         }
       ]
     }