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

src/lang/en/template/pcr.js

@@ -75,6 +75,17 @@ export default {
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
   },
+  pcr010: {
+    clsj: 'Work Time',
+    dztpbh: '电子天平编号',
+    yjry: '匀浆溶液',
+    bs: '倍数',
+    yjyjry: '已加匀浆溶液',
+    ypmc: '样品名称',
+    cqzl: '称取重量',
+    ysyjrybjrl: '预设匀浆溶液补加入量',
+    sjyjrybjrl: '实际匀浆溶液补加入量',
+  },
   // 生物样品分析方法学样品制备表-准确度与精密度
   sp008: {
     title:

src/lang/zh/template/pcr.js

@@ -74,6 +74,17 @@ export default {
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
   },
+  pcr010: {
+    clsj: 'Work Time',
+    dztpbh: '电子天平编号',
+    yjry: '匀浆溶液',
+    bs: '倍数',
+    yjyjry: '已加匀浆溶液',
+    ypmc: '样品名称',
+    cqzl: '称取重量',
+    ysyjrybjrl: '预设匀浆溶液补加入量',
+    sjyjrybjrl: '实际匀浆溶液补加入量',
+  },
   // 生物样品分析方法学样品制备表-Recovery
   sp009: {
     title: '生物样品分析方法学样品制备表（Recovery）',

src/views/business/comps/template/TemplateTable.vue

@@ -57,6 +57,7 @@ import PCR004 from "./comps/pcr/PCR004.vue";
 import PCR005 from "./comps/pcr/PCR005.vue";
 import PCR007 from "./comps/pcr/PCR007.vue";
 import PCR009 from "./comps/pcr/PCR009.vue";
+import PCR010 from "./comps/pcr/PCR010.vue";
 
 //LBA
 // LBA001-使用SP001
@@ -123,7 +124,7 @@ export default {
     //色谱
     SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,SP0021,
     // PCR
-    PCR002, PCR003, PCR004, PCR005,PCR007,PCR009,
+    PCR002, PCR003, PCR004, PCR005,PCR007,PCR009,PCR010,
     //LBA
     LBA002,
     LBA003,
@@ -249,6 +250,7 @@ export default {
           'PCR005': 'PCR005',
           'PCR007': 'PCR007',
           'PCR009': 'PCR009',
+          'PCR010': 'PCR010',
           //LBA
           'LBA001': 'SP001',
           'LBA002': 'LBA002',

src/views/business/comps/template/comps/pcr/PCR010.vue

@@ -1,4 +1,4 @@
-<!-- PCR分析组织匀浆表-知组织重 -->
+<!-- PCR分析组织匀浆表-常规 -->
 <template>
 	<div>
 		<div class="detail-container">
@@ -58,7 +58,7 @@ import { EventBus } from "@/utils/eventBus";
 import { volumeConverter } from "@/utils/volConverter";//体积单位转换
 import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
 import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
-import { getPCR009Config } from "../../formConfig/PCRTableConfig.js";
+import { getPCR010Config } from "../../formConfig/PCRTableConfig.js";
 import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
 import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
 import ImportExcelDialog from '../../dialog/ImportExcelDialog'
@@ -74,22 +74,7 @@ export default {
 	},
 	computed: {
 		tableStepColumns() {
-			return getPCR009Config(this);
-		},
-		// 附件表单配置
-		getFjFormConfig() {
-			return [
-				{
-					type: "attachment",
-					config: {
-						attTitle: {
-							label: 'template.pcr.pcr005.fj',
-							type: "attachment",
-							fillType: "actFill",
-						},
-					}
-				}
-			]
+			return getPCR010Config(this);
 		},
 		// 配置条件
 		storageFormConfig() {
@@ -170,7 +155,7 @@ export default {
 				},
 				{
 					type: "cellItem",
-					label: 'template.pcr.pcr009.clsj',
+					label: 'template.pcr.pcr010.clsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',
@@ -191,7 +176,7 @@ export default {
 					type: 'step',
 					config: {
 						yjry: {
-							label: 'template.pcr.pcr009.yjry',
+							label: 'template.pcr.pcr010.yjry',
 							type: 'input',
 							fillType: 'preFill',
 							subType: 'sj',
@@ -200,20 +185,15 @@ export default {
 							maxlength: 20
 						},
 						bs: {
-							label: 'template.pcr.pcr009.bs',
+							label: 'template.pcr.pcr010.bs',
 							type: 'inputNumber',
 							fillType: 'actFill',
 							maxlength: 20
 						},
-						yjyjry: {
-							label: 'template.pcr.pcr009.yjyjry',
-							type: 'inputNumber',
-							fillType: 'preFill',
-							subType: 'select',
-							subKey: 'yjyjryUnit',
-							subOptions: this.getDictOptions('business_tjdw'),
-							subFillType: 'preFill',
-							maxlength: 20
+						dztpbh: {
+							label: 'template.pcr.pcr010.dztpbh',
+							type: 'yq',
+							fillType: 'actFill',
 						},
 					}
 				}
@@ -235,11 +215,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称', '组织重'], 'PCR分析组织匀浆表-知组织重导入模板')
-		},
-		//选择试剂提交事件
-		onSelectReagentSubmit(code, row) {
-
+			this.exportExcel(['样品名称'], 'PCR分析组织匀浆表-常规导入模板')
 		},
 		showImportExcelDialog() {
 			this.$refs.ImportExcelDialog.show()
@@ -250,7 +226,6 @@ export default {
 			excelData.forEach(item => {
 				list.push({
 					ypmc: item[0],
-					zzz: item[1],
 					targetStartSolutionVolumePrecision: 3
 				})
 			})
@@ -279,10 +254,10 @@ export default {
 				if (tableList && tableList.length > 0) {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
-						let zzz = item.zzz * bs
+						let cqzl = item.cqzl * bs
 						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
-						const { total, unit } = subTj([zzz, content.yjyjry], [content.headerSelectFields.zzzUnit, content.yjyjryUnit])
-						let ysyjrybjrl = volumeConverter.convert(total + unit, content.headerSelectFields.ysyjrybjrlUnit)
+
+						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
 						tableList[i].ysyjrybjrl = ysyjrybjrl
 					}
 				}

src/views/business/comps/template/formConfig/PCRTableConfig.js

@@ -817,4 +817,75 @@ export const getPCR009Config = ($this) => {
       bodyMaxlength: 10,
     }
   ]
+}
+
+
+// PCR010
+export const getPCR010Config = ($this) => {
+  return [
+    {
+      label: 'template.pcr.pcr010.ypmc',
+      prop: 'ypmc',
+      width: 280,
+      bodyType: 'input',
+      fillType: 'preFill',
+      otherCode: 'bhOther',
+      bodyFillType: 'preFill',
+    },
+    {
+      label: 'template.pcr.pcr010.cqzl',
+      prop: 'cqzl',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'cqzlUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodySubType: 'button',
+      bodySubButtonName: 'form.hqz',
+      bodyMaxlength: 10,
+      bodySubKey: 'targetDiluentVolumePrecision',
+      bodyPrecisionKey: 'targetDiluentVolumePrecision',
+      bodySubFillType: 'actFill',
+      subPrecision: 0,
+      showBodySub: $this.fillType === 'actFill',
+      bodyMaxlength: 10,
+      bodySubPlaceholder: 'template.common.xswsPlaceholder',
+    },
+    {
+      label: 'template.pcr.pcr009.ysyjrybjrl',
+      prop: 'ysyjrybjrl',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'ysyjrybjrlUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+      bodySubType: 'inputNumber',
+      bodySubKey: 'targetStartSolutionVolumePrecision',
+      bodySubFillType: 'preFill',
+      showBodySub: $this.fillType === 'preFill',
+      bodyPrecisionKey: 'targetStartSolutionVolumePrecision',
+      bodyMaxlength: 10,
+      bodyDisabled: $this.fillType === 'preFill',
+      bodySubPlaceholder: 'template.common.xswsPlaceholder',
+      headerSelectTo:"actStartSolutionVolumeUnit",
+    },
+    {
+      label: 'template.pcr.pcr009.sjyjrybjrl',
+      prop: 'sjyjrybjrl',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjyjrybjrlUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      copyFrom: 'ysyjrybjrl', //复制哪个字段
+      bodyMaxlength: 10,
+    }
+  ]
 }