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

src/lang/en/template/lba.js

@@ -27,7 +27,7 @@ export default {
     sjjzjrz: 'Actual Blank Matrix Volume'
   },
   lba005: {
-    bzqxpz: 'Standard Curve Preparation',
+    bzqxpz: 'Calibration Standards',
     zkpz: 'Quality Control Preparation'
   },
   lba006: {
@@ -48,6 +48,6 @@ export default {
     zzlx: '组织类型',
     cqzl: '称取重量',
     ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    sjyjrybjrl: '实际匀浆溶液补加入量'
   }
 }

src/lang/zh/template/lba.js

@@ -27,7 +27,7 @@ export default {
     sjjzjrz: '实际基质加入值'
   },
   lba005: {
-    bzqxpz: '标准曲线配制',
+    bzqxpz: '校正标样',
     zkpz: '质控配制'
   },
   lba006: {
@@ -48,6 +48,6 @@ export default {
     zzlx: '组织类型',
     cqzl: '称取重量',
     ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    sjyjrybjrl: '实际匀浆溶液补加入量'
   }
 }

src/views/business/comps/template/comps/lba/LBA006.vue

@@ -111,40 +111,12 @@ export default {
 						versionNum: {
 							label: 'template.common.versionNumber',
 							type: "inputNumber",
-							fillType: "preFill",
+							fillType: "actFill",
 							prepend: "V",
 							maxlength: 50
 						},
 					}
 				},
-				{
-					type: "conditionItem",
-					label: 'template.lba.lba006.fxtj',
-					config: {
-						act: {
-							label: 'template.common.actualFill',
-							type: "select",
-							fillType: "actFill",
-							otherCode: "actOther",otherCodeCompareTo: "preOther",
-							multiple: true,
-							options: this.getDictOptions('business_pztj')
-						}
-					}
-				},
-				{
-					type: "cellItem",
-					label: 'template.lba.lba006.fxsj',
-					config: {
-						startDate: {
-							label: 'template.common.startTime',
-							type: "input",
-						},
-						endDate: {
-							label: 'template.common.endTime',
-							type: "input",
-						},
-					}
-				}
 			]
 		},
 		paralleStepFormConfig(){