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

src/lang/zh/template/dl.js

@@ -189,9 +189,8 @@ export default {
     dlbz: '备注',
     gcqk: '观察情况',
 
-    jlzb:'剂量组别',
-    xybh:'悬液编号',
-    bplsh1:'玻片流水号',
-    bplsh2:'玻片流水号',
+    bpbh:'玻片编号',
+    gcxps:'观察细胞数目',
+    zqxxbs:'中期相细胞数',
   },
 }

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

@@ -150,6 +150,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

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

@@ -151,6 +151,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

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

@@ -151,6 +151,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

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

@@ -151,6 +151,7 @@ export default {
 							fillType: 'preFill',
 							options: this.getDictOptions('business_dl_qsxjbltj'),
 							otherCode: 'bltjOther',
+              showOtherLabel:false
 						},
 					}
 				}

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

@@ -123,21 +123,16 @@ export default {
 				bodyMaxlength: 50,
 			},{
 				label: 'template.dl.dl021.gcxps',
-				prop: 'dwbh',
-				bodyType: 'checkboxTag',
+				prop: 'cyd',
+				bodyType: 'input',
 				bodyFillType: 'actFill',
-				bodySubType:"button",
-				bodySubFillType:"preFill",
-				bodySubButtonName:"template.common.importTemplate",
-				bodySubKey:"exportBtn",
-				showBodySub:this.fillType === "preFill",
-				width: 280,
+				width: 100,
         bodyMaxlength: 10,
 			},{
 				label: 'template.dl.dl021.zqxxbs',
-				prop: 'ypsl',
+				label: 'template.dl.dl021.gcxps',
+				prop: 'cyd',
 				bodyType: 'input',
-				bodyDisabled: true,
 				bodyFillType: 'actFill',
 				width: 80,
         bodyMaxlength: 10,