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

src/components/Template/BaseInfoFormPackage.vue

@@ -92,7 +92,7 @@
                                 <div v-show="isShowOther(formFields[key])" class="flex flex1 ml-10">
                                     <div class="other-title" v-if="isShowOtherLabel(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                         $t("template.common.other") }}</div>
-                                    <div class="flex">
+                                    <div class="flex flex1">
                                         <HandleFormItem :field-item-label="fieldItemLabel"
                                             :field-key="prefixKey + '_' + sItem.otherCode" @blur="onBlur(key, $event)"
                                             :item="getOtherItem(sItem)" v-model="formFields[sItem.otherCode]"
@@ -194,7 +194,7 @@
                             <div v-show="isShowOther(formFields[key])" class="flex flex1 ml-10">
                                 <div class="other-title" v-if="isShowOtherLabel(sItem)">{{ sItem.otherLabel ? $t(sItem.otherLabel) :
                                     $t("template.common.other") }}</div>
-                                <div class="flex">
+                                <div class="flex flex1">
                                     <HandleFormItem :field-item-label="fieldItemLabel"
                                         :field-key="prefixKey + '_' + sItem.otherCode" @blur="onBlur(key, $event)"
                                         :item="getOtherItem(sItem)" v-model="formFields[sItem.otherCode]"

src/lang/en/template/dl.js

@@ -47,7 +47,16 @@ export default {
     clxx: 'Processing Information',
     clbh: 'Processing Number',
     cltj: 'Processing Conditions',
-    jgxx: 'Result Information'
+    jgxx: 'Result Information',
+    qxbd: 'Previous Form',
+    jlzb: 'Dose Group',
+    jzbh: 'Strain Number',
+    czqk: 'Precipitation Status',
+    bjjt: 'Background Lawn',
+    jls: 'Colony Count',
+    czqkDesc: 'Precipitation codes: "P-" = "None"; "P+" = "Slight"; "P++" = "Moderate"; "P+++" = "Severe".',
+    bjjtDesc: 'Background lawn codes: "N" = "Normal"; "R1" = "Weak, lawn covers 70%-90% of plate area"; "R2" = "Medium, lawn covers 40%-70% of plate area"; "R3" = "Strong, lawn covers 10%-40% of plate area"; "A" = "Absent, no lawn on plate"; "O" = "Precipitation present, affecting lawn assessment";',
+    jlsDesc: 'Colony count special case: "*" indicates pinpoint colonies visible on plate;'
   },
   dl010: {
     ...common,

src/lang/zh/template/dl.js

@@ -47,7 +47,16 @@ export default {
     clxx: '处理信息',
     clbh: '处理编号',
     cltj: '处理条件',
-    jgxx: '结果信息'
+    jgxx: '结果信息',
+    qxbd: '前序表单',
+    jlzb: '剂量组别',
+    jzbh: '菌种编号',
+    czqk: '沉淀情况',
+    bjjt: '背景菌苔',
+    jls: '菌落数（个）',
+    czqkDesc: '沉淀量以代码填入："P-" 代表 "无沉淀"；"P+" 代表 "少量"；"P++" 代表 "中等"；"P+++" 代表 "严重"。',
+    bjjtDesc: '背景菌苔以代码填入："N" 代表 "正常"；"R1" 代表 "弱，菌苔约占平皿面积 70%-90%"；"R2" 代表 "中，菌苔约占平皿面积 40%-70%"；"R3" 代表 "强，菌苔约占平皿面积 10%-40%"；"A" 代表 "消失，平皿上无菌苔"；"O" 代表 "产生沉淀，影响背景菌苔判断"；',
+    jlsDesc: '菌落数特殊情况："*" 该平皿可见针尖样菌落；'
   },
   dl010: {
     ...common,

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

@@ -38,13 +38,16 @@
 
           <!-- 成像情况 -->
           <LineLabel label="template.dl.dl008.cxqk" />
+          <div class="template-form-item">
           <BaseInfoFormPackage
             :ref="refConf.cxqkqxbb"
             :formConfig="cxqkqxbbInfoFormConfig"
             :formData="formData"
             @clickButton="handleClickButton"
             @onRegentSubmit="onRegentSubmit"
-          />
+          >
+          
+          </BaseInfoFormPackage>
           <CustomTable
             :columns="cxqkColumns"
             :ref="refConf.cxqk"
@@ -59,6 +62,7 @@
             :formConfig="cxqkwrqkConfig"
             :formData="formData"
           />
+          </div>
 
           <BaseInfoFormPackage
             fieldItemLabel="template.dl.dl007.bz"
@@ -133,16 +137,17 @@ export default {
     cxqkwrqkConfig() {
       return [
         {
-          type: 'conditionItem',
+          type: 'step',
           config: {
             cxqkwrqk: {
               // 注意：这里选项为污染时需要填写信息，与别的选择中 '其他' 选项不一样
-              span: 1,
               label: 'template.dl.dl008.wrqk',
               type: 'select',
+              span:1,
               options: this.getDictOptions('business_dl_ameswrqk'),
               fillType: 'actFill',
-              otherCode: 'cxqkwrqkOther'
+              otherCode: 'cxqkwrqkOther',
+              showOtherLabel:false
             }
           }
         }
@@ -242,7 +247,7 @@ export default {
     cxqkqxbbInfoFormConfig() {
       return [
         {
-          type: 'cellItem',
+          type: 'step',
           config: {
             cxqkqxbd: {
               label: 'template.dl.dl007.qxbd',

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

@@ -48,8 +48,18 @@
             </template>
           </CustomTable>
 
-          <!-- 结果信息 - 预留模块 -->
+          <!-- 结果信息 -->
           <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>
           <CustomTable
             :columns="jgxxColumns"
             :ref="refConf.jgxx"
@@ -88,6 +98,7 @@ const refConf = {
   cltj: 'cltjRef',
   czsj: 'czsjRef',
   yqsy: 'yqsyTableRef',
+  jgxxQxbd: 'jgxxQxbdRef',
   jgxx: 'jgxxTableRef',
   remark: 'remarkRef'
 }
@@ -237,9 +248,58 @@ export default {
         }
       ]
     },
-    // 结果信息列表 - 预留模块，暂不实现
+    // 结果信息前序表单配置
+    jgxxQxbdFormConfig() {
+      return [
+        {
+          type: 'cellItem',
+          config: {
+            jgxxQxbd: {
+              label: 'template.dl.dl009.qxbd',
+              type: 'qxbd',
+              fillType: 'actFill',
+              filledCodes: ['bdmc', 'bdbh']
+            }
+          }
+        }
+      ]
+    },
+    // 结果信息列表
     jgxxColumns() {
-      return []
+      return [
+        {
+          label: 'template.dl.dl009.jlzb',
+          prop: 'jlzb',
+          bodyType: 'input',
+          bodyFillType: 'actFill'
+        },
+        {
+          label: 'template.dl.dl009.jzbh',
+          prop: 'jzbh',
+          bodyType: 'input',
+          bodyFillType: 'actFill'
+        },
+        {
+          label: 'template.dl.dl009.czqk',
+          prop: 'czqk',
+          bodyType: 'select',
+          bodyFillType: 'actFill',
+          bodyOptions: this.getDictOptions('business_czqk')
+        },
+        {
+          label: 'template.dl.dl009.bjjt',
+          prop: 'bjjt',
+          bodyType: 'select',
+          bodyFillType: 'actFill',
+          bodyOptions: this.getDictOptions('business_bjjt')
+        },
+        {
+          label: 'template.dl.dl009.jls',
+          prop: 'jls',
+          bodyType: 'input',
+          bodyFillType: 'actFill'
+        }
+      ]
     }
   },
   data() {
@@ -266,10 +326,17 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const stepResource = this.$refs.yqsyTableRef.getStepResource()
+      const yqsyStepResource = this.$refs.yqsyTableRef.getStepResource()
+      const jgxxStepResource = this.$refs.jgxxTableRef.getStepResource()
       // 使用的试剂、仪器
-      this.resourceTmp = stepResource.sjResource || []
-      this.yqResourceTmp = stepResource.yqResource || []
+      this.resourceTmp = [
+        ...(yqsyStepResource.sjResource || []),
+        ...(jgxxStepResource.sjResource || [])
+      ]
+      this.yqResourceTmp = [
+        ...(yqsyStepResource.yqResource || []),
+        ...(jgxxStepResource.yqResource || [])
+      ]
       return this.resourceTmp
     },
     onRegentSubmit(e) {
@@ -294,6 +361,20 @@ 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;
+
+  p {
+    margin: 5px 0;
+  }
+}
+
 .mt-20 {
   margin-top: 20px;
 }

src/views/business/comps/template/comps/sp/SP0020.vue

@@ -7,10 +7,10 @@
 			<div class="detail-content">
 				<div class="content">
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
-						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
+						:ref="refConfig.baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
 					<LineLabel label="试验内容" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
-						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+						:ref="refConfig.remarkRef" :formConfig="remarkConig" :formData="formData" />
 				</div>
 			</div>
 		</div>
@@ -30,6 +30,12 @@ import TableOpertaionDelete from "@/components/Template/operation/TableOpertaion
 import { getBaseInfoFormConfig} from "../../formConfig/sp/SP0019";
 import { getSynrFormConfig} from "../../formConfig/sp/SP0020";
 
+const refConfig = {
+	baseInfoRef: "baseInfoRef",
+	remarkRef: "remarkRef",
+}
+
+const compRefs = Object.values(refConfig);
 
 export default {
 	name: "SP0020",
@@ -74,7 +80,7 @@ export default {
 	data() {
 		return {
 			formData: {},
-			compRefs:["baseInfoRef", "storageConditionRef", "spzxhRef","yqInfoTableRef","ryTableRef", "remarkRef"]
+			refConfig
 		};
 	},
 	mounted() {
@@ -93,16 +99,13 @@ export default {
 				this.$refs.ryTableRef.updateDataSourceByRowIndex(rowIndex, params);
 			}
 		},
-		onYqSubmit(data, col, rowIndex, colIndex, row){
-			console.log(data, col, rowIndex, colIndex, row,"onRegentSubmit")
-		},
 		//获取已填写的表单数据
 		getFilledFormData() {
-			return this.getFilledFormDataByRefs(this.compRefs)
+			return this.getFilledFormDataByRefs(compRefs)
 		},
 		//获取填写完成的表单数据
 		async getFormData() {
-			let content = await this.validFormFields(this.compRefs);
+			let content = await this.validFormFields(compRefs);
 			console.log(content)
 			return content;
 		},