diff --git a/src/lang/en/template/pcr.js b/src/lang/en/template/pcr.js index 8295317..72e860b 100644 --- a/src/lang/en/template/pcr.js +++ b/src/lang/en/template/pcr.js @@ -73,7 +73,9 @@ export default { yjyjry: '已加匀浆溶液', dztpbh: '电子天平编号', ypmc: '样品名称', - zzz: '组织重', + cjgz: '采集管重', + lzzcz: '连组织称重', + zzzl: '组织重量', ysyjrybjrl: '预设匀浆溶液补加入量', sjyjrybjrl: '实际匀浆溶液补加入量', }, diff --git a/src/lang/zh/template/pcr.js b/src/lang/zh/template/pcr.js index 5000560..4e51090 100644 --- a/src/lang/zh/template/pcr.js +++ b/src/lang/zh/template/pcr.js @@ -66,13 +66,15 @@ export default { }, pcr008: { czb: '称重表', - clsj: '处理时间', + clsj: 'Work Time', yjry: '匀浆溶液', bs: '倍数', yjyjry: '已加匀浆溶液', dztpbh: '电子天平编号', ypmc: '样品名称', - zzz: '组织重', + cjgz: '采集管重', + lzzcz: '连组织称重', + zzzl: '组织重量', ysyjrybjrl: '预设匀浆溶液补加入量', sjyjrybjrl: '实际匀浆溶液补加入量', }, diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index c9644e1..6e613a0 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -59,6 +59,7 @@ import PCR007 from "./comps/pcr/PCR007.vue"; import PCR008 from "./comps/pcr/PCR008.vue"; import PCR009 from "./comps/pcr/PCR009.vue"; import PCR010 from "./comps/pcr/PCR010.vue"; +import PCR011 from "./comps/pcr/PCR011.vue"; //LBA // LBA001-使用SP001 @@ -128,7 +129,7 @@ export default { //色谱 SP001, SP003, SP00456,SP007, SP008, SP009,SP0019,SP0020,SP0021, // PCR - PCR002, PCR003, PCR004, PCR005,PCR007, PCR008, PCR009,PCR010, + PCR002, PCR003, PCR004, PCR005,PCR007, PCR008, PCR009,PCR010, PCR011, //LBA LBA002, LBA003, @@ -259,6 +260,7 @@ export default { 'PCR008': 'PCR008', 'PCR009': 'PCR009', 'PCR010': 'PCR010', + 'PCR011': 'PCR011', //LBA 'LBA001': 'SP001', 'LBA002': 'LBA002', diff --git a/src/views/business/comps/template/comps/pcr/PCR008.vue b/src/views/business/comps/template/comps/pcr/PCR008.vue index 662b6bd..495ca17 100644 --- a/src/views/business/comps/template/comps/pcr/PCR008.vue +++ b/src/views/business/comps/template/comps/pcr/PCR008.vue @@ -55,12 +55,12 @@ 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 { getPCR008Config } 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' export default { - name: "PCR005", + name: "PCR008", components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog }, mixins: [templateMixin], props: { @@ -71,7 +71,7 @@ export default { }, computed: { tableStepColumns() { - return getPCR010Config(this); + return getPCR008Config(this); }, // 配置条件 storageFormConfig() { @@ -177,6 +177,7 @@ export default { type: 'qxbd', fillType: 'preFill', qxbdType: 'PCR007', + checkType: 'checkBox', filledCodes: ['bdmc', 'bdbh'], }, yjry: { diff --git a/src/views/business/comps/template/comps/pcr/PCR011.vue b/src/views/business/comps/template/comps/pcr/PCR011.vue new file mode 100644 index 0000000..b82209a --- /dev/null +++ b/src/views/business/comps/template/comps/pcr/PCR011.vue @@ -0,0 +1,346 @@ + + + + + {{ formData.bdmc }} + + + + + + + + + + + + {{ + $t('template.common.downloadTemplate') }} + {{ + $t('template.common.importTemplate') + }} + + + + + deleteRow(rowIndex)"> + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/business/comps/template/formConfig/PCRTableConfig.js b/src/views/business/comps/template/formConfig/PCRTableConfig.js index 8dacff8..51e3074 100644 --- a/src/views/business/comps/template/formConfig/PCRTableConfig.js +++ b/src/views/business/comps/template/formConfig/PCRTableConfig.js @@ -758,6 +758,107 @@ export const getPCR007Config = ($this) => { ] } + +// PCR008 +export const getPCR008Config = ($this) => { + return [ + { + label: 'template.pcr.pcr008.ypmc', + prop: 'ypmc', + width: 280, + bodyType: 'input', + fillType: 'preFill', + otherCode: 'bhOther', + bodyFillType: 'preFill', + }, + { + label: 'template.pcr.pcr008.cjgz', + prop: 'cjgz', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'cjgzUnit', + headerOptions: $this.getDictOptions('business_tjdw'), + bodyType: 'inputNumber', + bodyFillType: 'preFill', + bodyMaxlength: 10, + }, + { + label: 'template.pcr.pcr008.lzzcz', + prop: 'lzzcz', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'lzzczUnit', + headerOptions: $this.getDictOptions('business_tjdw'), + bodyType: 'inputNumber', + bodyFillType: 'actFill', + bodyMaxlength: 10, + bodySubType: 'inputNumber', + bodyFillType: 'actFill', + bodySubType: 'button', + bodySubButtonName: 'form.hqz', + }, + { + label: 'template.pcr.pcr008.zzzl', + prop: 'zzzl', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'zzzlUnit', + 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.pcr008.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: 'targetDiluentVolumePrecision', + bodySubFillType: 'preFill', + showBodySub: $this.fillType === 'preFill', + bodyPrecisionKey: 'targetDiluentVolumePrecision', + bodyMaxlength: 10, + bodyDisabled: $this.fillType === 'preFill', + bodySubPlaceholder: 'template.common.xswsPlaceholder', + headerSelectTo:"actStartSolutionVolumeUnit", + }, + { + label: 'template.pcr.pcr008.sjyjrybjrl', + prop: 'sjyjrybjrl', + width: 280, + showWidth: 180, + fillType: 'preFill', + headerSelectKey: 'sjyjrybjrlUnit', + headerOptions: $this.getDictOptions('business_tjdw'), + bodyType: 'inputNumber', + bodyFillType: 'actFill', + copyFrom: 'ysyjrybjrl', //复制哪个字段 + bodyMaxlength: 10, + } + ] +} + + + // PCR009 export const getPCR009Config = ($this) => { return [