fix:[模板管理][PCR]

src/lang/en/template/pcr.js

@@ -37,6 +37,7 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: 'Analysis Batch Number',
+    clsj: '处理时间',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
     sxbs: '稀释倍数',
@@ -75,6 +76,7 @@ export default {
     ypmc: '样品名称',
     cjgz: '采集管重',
     lzzcz: '连组织称重',
+    lzzgz: '连组织管重',
     zzzl: '组织重量',
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
@@ -97,8 +99,15 @@ export default {
     yjyjry: '已加匀浆溶液',
     ypmc: '样品名称',
     cqzl: '称取重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    ysyjryjrl: '预设匀浆溶液加入量',
+    sjyjryjrl: '实际匀浆溶液加入量',
+  },
+  pcr011: {
+    sj: '试剂',
+    ysjyztj: '预设加样总体积',
+    sjypjytj: '实际样品加样体积',
+    yssjjrtj: '预设试剂加入体积',
+    sjsjjrtj: '实际试剂加入体积',
   },
   pcr012: {
     sjwj: '数据文件',

src/lang/zh/template/pcr.js

@@ -36,6 +36,7 @@ export default {
   // PCR分析样品处理表
   pcr005: {
     clpbh: '处理批编号',
+    clsj: '处理时间',
     ypmc: '样品名称',
     ypcsnd: '样品初始浓度',
     sxbs: '稀释倍数',
@@ -74,9 +75,10 @@ export default {
     ypmc: '样品名称',
     cjgz: '采集管重',
     lzzcz: '连组织称重',
+    lzzgz: '连组织管重',
     zzzl: '组织重量',
-    ysyjrybjrl: '预设匀浆溶液补加入量',
-    sjyjrybjrl: '实际匀浆溶液补加入量',
+    ysyjryjrl: '预设匀浆溶液加入量',
+    sjyjryjrl: '实际匀浆溶液加入量',
   },
    pcr009: {
     clsj: '处理时间',
@@ -99,6 +101,13 @@ export default {
     ysyjrybjrl: '预设匀浆溶液补加入量',
     sjyjrybjrl: '实际匀浆溶液补加入量',
   },
+  pcr011: {
+    sj: '试剂',
+    ysjyztj: '预设加样总体积',
+    sjypjytj: '实际样品加样体积',
+    yssjjrtj: '预设试剂加入体积',
+    sjsjjrtj: '实际试剂加入体积',
+  },
   pcr012: {
     sjwj: '数据文件',
     hsndcdwjm: '核酸浓度测定文件名',

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

@@ -148,6 +148,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -187,7 +200,7 @@ export default {
 				},
 				{
 					type: "cellItem",
-					label: 'template.common.configurationTime',
+					label: 'template.pcr.pcr005.clsj',
 					config: {
 						startDate: {
 							label: 'template.common.startTime',

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

@@ -127,6 +127,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -320,12 +333,12 @@ export default {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
 						console.log(item)
-						let lzzcz = item.lzzcz
+						let lzzgz = item.lzzgz
 						let cjgz = item.cjgz
 						let tabZzzl;
 						// 组织重量 =  连组织称重 减去 采集管重
-						if(lzzcz && cjgz) {
-							let temp = subTj([lzzcz, cjgz], [content.headerSelectFields.lzzczUnit, content.headerSelectFields.cjgzUnit])
+						if(lzzgz && cjgz) {
+							let temp = subTj([lzzgz, cjgz], [content.headerSelectFields.lzzgzUnit, content.headerSelectFields.cjgzUnit])
 							let zzzl = temp.total
 							let zzzlUnit = temp.unit
 							tabZzzl = volumeConverter.convert(zzzl + zzzlUnit, content.headerSelectFields.zzzlUnit)

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

@@ -129,6 +129,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -258,8 +271,8 @@ export default {
 						let cqzl = item.cqzl * bs
 						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
 
-						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
-						tableList[i].ysyjrybjrl = ysyjrybjrl
+						let ysyjryjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjryjrlUnit)
+						tableList[i].ysyjryjrl = ysyjryjrl
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);

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

@@ -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 { getPCR010Config } from "../../formConfig/PCRTableConfig.js";
+import { getPCR011Config } 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,7 +74,7 @@ export default {
 	},
 	computed: {
 		tableStepColumns() {
-			return getPCR010Config(this);
+			return getPCR011Config(this);
 		},
 		// 配制条件
 		storageFormConfig() {
@@ -129,6 +129,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{
@@ -177,7 +190,7 @@ export default {
 					type: 'step',
 					config: {
 						yjry: {
-							label: 'template.pcr.pcr010.yjry',
+							label: 'template.pcr.pcr011.sj',
 							type: 'input',
 							fillType: 'preFill',
 							subType: 'sj',
@@ -185,17 +198,7 @@ export default {
 							subFillType: 'actFill',
 							maxlength: 20
 						},
-						bs: {
-							label: 'template.pcr.pcr010.bs',
-							type: 'inputNumber',
-							fillType: 'actFill',
-							maxlength: 20
-						},
-						dztpbh: {
-							label: 'template.pcr.pcr010.dztpbh',
-							type: 'yq',
-							fillType: 'actFill',
-						},
+
 					}
 				}
 			]
@@ -216,7 +219,7 @@ export default {
 	},
 	methods: {
 		downloadExcelTemplate() {
-			this.exportExcel(['样品名称'], 'PCR分析组织匀浆表-常规导入模板')
+			this.exportExcel(['样品名称'], 'PCR分析核酸提取样品处理表导入模板')
 		},
 		showImportExcelDialog() {
 			this.$refs.ImportExcelDialog.show()
@@ -249,18 +252,19 @@ export default {
 		updateTable() {
 			let content = this.getFilledFormData();
 
-			let bs = content.bs
 			content
 			if (this.fillType === "actFill") {
 				let tableList = content.stepTableFormData
 				if (tableList && tableList.length > 0) {
 					for (let i = 0; i < tableList.length; i++) {
 						let item = tableList[i]
-						let cqzl = item.cqzl * bs
-						// 组织重量 乘以 倍数 ）减去 已加匀浆溶液
+						let temp = subTj([item.ysjyztj, item.sjypjytj], [content.headerSelectFields.ysjyztjUnit, content.headerSelectFields.sjypjytjUnit])
+
+						let yssjjrtj = temp.total
+						let yssjjrtjUnit = temp.unit
+						yssjjrtj = volumeConverter.convert(yssjjrtj + yssjjrtjUnit, content.headerSelectFields.yssjjrtjUnit)
+						tableList[i].yssjjrtj = yssjjrtj
 
-						let ysyjrybjrl = volumeConverter.convert(cqzl + content.headerSelectFields.cqzlUnit, content.headerSelectFields.ysyjrybjrlUnit)
-						tableList[i].ysyjrybjrl = ysyjrybjrl
 					}
 				}
 				this.$refs.stepTableRef.updateDataSource(tableList);

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

@@ -130,6 +130,19 @@ export default {
 							type: "input",
 							disabled: true,
 						},
+						methodCode: {
+							label: 'template.common.methodCode',
+							type: "input",
+							fillType: "preFill",
+							maxlength: 50
+						},
+						versionNum: {
+							label: 'template.common.versionNumber',
+							type: "inputNumber",
+							fillType: "preFill",
+							prepend: "V",
+							maxlength: 50
+						},
 					}
 				},
 				{

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

@@ -785,12 +785,12 @@ export const getPCR008Config = ($this) => {
       bodyMaxlength: 10
     },
     {
-      label: 'template.pcr.pcr008.lzzcz',
-      prop: 'lzzcz',
+      label: 'template.pcr.pcr008.lzzgz',
+      prop: 'lzzgz',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'lzzczUnit',
+      headerSelectKey: 'lzzgzUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
@@ -954,12 +954,12 @@ export const getPCR010Config = ($this) => {
       bodySubPlaceholder: 'template.common.xswsPlaceholder'
     },
     {
-      label: 'template.pcr.pcr009.ysyjrybjrl',
-      prop: 'ysyjrybjrl',
+      label: 'template.pcr.pcr009.ysyjryjrl',
+      prop: 'ysyjryjrl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'ysyjrybjrlUnit',
+      headerSelectKey: 'ysyjryjrlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
@@ -975,17 +975,82 @@ export const getPCR010Config = ($this) => {
       headerSelectTo: 'actStartSolutionVolumeUnit'
     },
     {
-      label: 'template.pcr.pcr009.sjyjrybjrl',
-      prop: 'sjyjrybjrl',
+      label: 'template.pcr.pcr009.sjyjryjrl',
+      prop: 'sjyjryjrl',
       width: 280,
       showWidth: 180,
       fillType: 'preFill',
-      headerSelectKey: 'sjyjrybjrlUnit',
+      headerSelectKey: 'sjyjryjrlUnit',
       headerOptions: $this.getDictOptions('business_tjdw'),
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
-      copyFrom: 'ysyjrybjrl', //复制哪个字段
+      copyFrom: 'ysyjryjrl', //复制哪个字段
       bodyMaxlength: 10
     }
   ]
 }
+
+// PCR010
+export const getPCR011Config = ($this) => {
+  return [
+    {
+      label: 'template.pcr.pcr010.ypmc',
+      prop: 'ypmc',
+      width: 280,
+      bodyType: 'input',
+      fillType: 'preFill',
+      otherCode: 'bhOther',
+      bodyFillType: 'preFill'
+    },
+    {
+      label: 'template.pcr.pcr011.ysjyztj',
+      prop: 'ysjyztj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'ysjyztjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'preFill',
+      bodyMaxlength: 10,
+      bodyDisabled: true,
+    },
+    {
+      label: 'template.pcr.pcr011.sjypjytj',
+      prop: 'sjypjytj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjypjytjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+     {
+      label: 'template.pcr.pcr011.yssjjrtj',
+      prop: 'yssjjrtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'yssjjrtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+    {
+      label: 'template.pcr.pcr011.sjsjjrtj',
+      prop: 'sjsjjrtj',
+      width: 280,
+      showWidth: 180,
+      fillType: 'preFill',
+      headerSelectKey: 'sjsjjrtjUnit',
+      headerOptions: $this.getDictOptions('business_tjdw'),
+      bodyType: 'inputNumber',
+      bodyFillType: 'actFill',
+      bodyMaxlength: 10,
+    },
+  ]
+}
+