feat:[模板管理][DL009~DL010调整]

src/lang/en/template/dl.js

@@ -87,7 +87,15 @@ export default {
     jprq: 'Dissection Date',
     jprqKssj: 'Start Time',
     jprqJssj: 'End Time',
+    sysj: 'Test Reagent',
+    sjmc: 'Reagent Name',
+    bh: 'Number',
+    ph: 'Batch Number',
+    ndhlcd: 'Concentration or Range',
+    ly: 'Source',
+    sxr: 'Expiration Date',
     yqsybh: 'Instrument Usage Number',
+    mc: 'Name',
     zcqk: 'Status/Condition/Performance',
     sjxx: 'Collection Information',
     xzmb: 'Download Template',

src/lang/zh/template/dl.js

@@ -88,7 +88,15 @@ export default {
     jprq: '解剖日期',
     jprqKssj: '开始时间',
     jprqJssj: '结束时间',
+    sysj: '试验试剂',
+    sjmc: '试剂名称',
+    bh: '编号',
+    ph: '批号',
+    ndhlcd: '浓度或量程度',
+    ly: '来源',
+    sxr: '失效日',
     yqsybh: '仪器使用编号',
+    mc: '名称',
     zcqk: '状态/情况/性能',
     sjxx: '受集信息',
     xzmb: '下载模板',

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

@@ -50,26 +50,27 @@
 
           <!-- 结果信息 -->
           <LineLabel label="template.dl.dl009.jgxx" />
-          <BaseInfoFormPackage
-            :ref="refConf.jgxxQxbd"
-            :formConfig="jgxxQxbdFormConfig"
-            :formData="formData"
-          />
-          <div class="jgxx-description">
-            <p>{{ $t('template.dl.dl009.czqkDesc') }}</p>
-            <p>{{ $t('template.dl.dl009.bjjtDesc') }}</p>
-            <p>{{ $t('template.dl.dl009.jlsDesc') }}</p>
+          <div class="template-form-item">
+            <BaseInfoFormPackage
+              :ref="refConf.jgxxQxbd"
+              :formConfig="jgxxQxbdFormConfig"
+              :formData="formData"
+            />
+            <div class="jgxx-description">
+              <p>{{ $t('template.dl.dl009.czqkDesc') }}</p>
+              <p>{{ $t('template.dl.dl009.bjjtDesc') }}</p>
+              <p>{{ $t('template.dl.dl009.jlsDesc') }}</p>
+            </div>
+            <CustomTable
+              :columns="jgxxColumns"
+              :ref="refConf.jgxx"
+              :showOperation="false"
+              :showAddRow="false"
+              :formData="formData"
+              :prefixKey="`jgxxTable`"
+            >
+            </CustomTable>
           </div>
-          <CustomTable
-            :columns="jgxxColumns"
-            :ref="refConf.jgxx"
-            :showOperation="false"
-            :showAddRow="false"
-            :formData="formData"
-            :prefixKey="`jgxxTable`"
-          >
-          </CustomTable>
-
           <BaseInfoFormPackage
             fieldItemLabel="template.dl.dl007.bz"
             label="template.dl.dl007.bz"
@@ -251,7 +252,7 @@ export default {
     jgxxQxbdFormConfig() {
       return [
         {
-          type: 'cellItem',
+          type: 'step',
           config: {
             jgxxQxbd: {
               label: 'template.dl.dl009.qxbd',
@@ -283,19 +284,19 @@ export default {
           prop: 'czqk',
           bodyType: 'select',
           bodyFillType: 'actFill',
-          bodyOptions: this.getDictOptions('business_czqk')
+          bodyOptions: this.getDictOptions('business_dl_amescdqk')
         },
         {
           label: 'template.dl.dl009.bjjt',
           prop: 'bjjt',
           bodyType: 'select',
           bodyFillType: 'actFill',
-          bodyOptions: this.getDictOptions('business_bjjt')
+          bodyOptions: this.getDictOptions('business_dl_amesbjjt')
         },
         {
           label: 'template.dl.dl009.jls',
           prop: 'jls',
-          bodyType: 'input',
+          bodyType: 'inputNumber',
           bodyFillType: 'actFill'
         }
       ]
@@ -361,10 +362,7 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss">
 .jgxx-description {
-  margin: 15px 0;
   padding: 12px 15px;
-  background-color: #f5f7fa;
-  border-left: 4px solid #409eff;
   font-size: 13px;
   line-height: 1.8;
   color: #606266;

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

@@ -56,31 +56,36 @@
           </CustomTable>
 
           <LineLabel label="template.dl.dl010.sjxx" />
-          <div class="sj-operation-btns">
-            <el-button size="small" type="primary">{{
-              $t('template.dl.dl010.xzmb')
-            }}</el-button>
-            <el-button size="small" type="success">{{
-              $t('template.dl.dl010.dr')
-            }}</el-button>
+          <div class="template-form-item">
+            <div class="sj-operation-btns">
+              <el-button size="small" type="primary">{{
+                $t('template.dl.dl010.xzmb')
+              }}</el-button>
+              <el-button size="small" type="success">{{
+                $t('template.dl.dl010.dr')
+              }}</el-button>
+            </div>
+            <CustomTable
+              :columns="sjxxColumns"
+              :ref="refConf.sjxx"
+              :showOperation="fillType === 'preFill'"
+              :showAddRow="fillType === 'preFill'"
+              :formData="formData"
+              :prefixKey="`sjxxTable`"
+            >
+              <template
+                slot="operation"
+                slot-scope="{ row, rowIndex, columns }"
+              >
+                <TableOpertaionDelete
+                  :row="row"
+                  :rowIndex="rowIndex"
+                  :columns="columns"
+                  @deleteRow="() => deleteTableRow(rowIndex, 'sjxxTableRef')"
+                ></TableOpertaionDelete>
+              </template>
+            </CustomTable>
           </div>
-          <CustomTable
-            :columns="sjxxColumns"
-            :ref="refConf.sjxx"
-            :showOperation="fillType === 'actFill'"
-            :showAddRow="fillType === 'actFill'"
-            :formData="formData"
-            :prefixKey="`sjxxTable`"
-          >
-            <template slot="operation" slot-scope="{ row, rowIndex, columns }">
-              <TableOpertaionDelete
-                :row="row"
-                :rowIndex="rowIndex"
-                :columns="columns"
-                @deleteRow="() => deleteTableRow(rowIndex, 'sjxxTableRef')"
-              ></TableOpertaionDelete>
-            </template>
-          </CustomTable>
 
           <BaseInfoFormPackage
             fieldItemLabel="template.dl.dl007.bz"
@@ -285,40 +290,34 @@ export default {
     yqsyColumns() {
       return [
         {
-          label: 'template.dl.dl010.yqsybh',
+          label: 'template.dl.dl010.yqbh',
           prop: 'yqbh',
           bodyType: 'yq',
           bodyFillType: 'actFill'
         },
         {
-          label: 'template.dl.dl010.mc',
-          prop: 'mc',
+          label: 'template.dl.dl010.yqmc',
+          prop: 'yqmc',
           bodyType: 'input',
           bodyDisabled: true,
           bodyFillType: 'actFill',
           disabled: true
         },
         {
-          label: 'template.dl.dl010.bh',
-          prop: 'bh',
+          label: 'template.dl.dl010.yqxh',
+          prop: 'yqxh',
           bodyType: 'input',
           bodyDisabled: true,
           bodyFillType: 'actFill',
           disabled: true
         },
         {
-          label: 'template.dl.dl010.zcqk',
-          prop: 'zcqk',
+          label: 'template.dl.dl010.xccsjzjdrq',
+          prop: 'jzrq',
           bodyType: 'input',
           bodyDisabled: true,
           bodyFillType: 'actFill',
           disabled: true
-        },
-        {
-          label: 'template.dl.dl010.bz',
-          prop: 'bz',
-          bodyType: 'input',
-          bodyFillType: 'actFill'
         }
       ]
     },
@@ -405,9 +404,9 @@ export default {
 
       if (key === 'yqbh') {
         const params = {
-          mc: row.mc,
-          bh: row.xh,
-          zcqk: row.jzrq
+          yqmc: row.mc,
+          yqxh: row.xh,
+          jzrq: row.jzrq
         }
         this.$refs.yqsyTableRef.updateDataSourceByRowIndex(rowIndex, params)
       }

src/views/business/comps/template/mixins/templateMixin.js

@@ -40,6 +40,8 @@ export default {
 		'business_sydd', // 毒理-Ames实验地点
 		'business_dl_ameswrqk', // 毒理-Ames污染情况
 		'business_dl_amescltj', // 毒理-Ames处理条件
+		'business_dl_amesbjjt', // 毒理-Ames背景菌苔
+		'business_dl_amescdqk', // 毒理-Ames沉淀情况
 		'business_rylx', // 溶液类型
 		'business_xbzb', // 细胞组别
 		'business_xblx', // 细胞类型