luojie 1 week ago
parent
commit
ad02cfb647
9 changed files with 149 additions and 43 deletions
  1. +10
    -10
      src/lang/zh/template/pcr.js
  2. +1
    -1
      src/views/business/comps/template/comps/dl/DL011.vue
  3. +1
    -1
      src/views/business/comps/template/comps/dl/DL012.vue
  4. +29
    -3
      src/views/business/comps/template/comps/lba/LBA008.vue
  5. +28
    -3
      src/views/business/comps/template/comps/pcr/PCR007.vue
  6. +31
    -3
      src/views/business/comps/template/comps/pcr/PCR008.vue
  7. +29
    -3
      src/views/business/comps/template/comps/pcr/PCR010.vue
  8. +14
    -14
      src/views/business/comps/template/formConfig/PCRTableConfig.js
  9. +6
    -5
      src/views/business/comps/template/formConfig/lba/lba008.js

+ 10
- 10
src/lang/zh/template/pcr.js View File

@ -45,7 +45,7 @@ export default {
ysxsyxytj: '预设稀释液吸样体积',
sjxsyxytj: '实际稀释液吸样体积',
ypznd: '样品终浓度',
fj: '附件',
fj: '附件'
},
pcr007: {
dztpbh: '电子天平编号',
@ -63,7 +63,7 @@ export default {
ysxsyxytj: '预设稀释液吸样体积',
sjxsyxytj: '实际稀释液吸样体积',
ypznd: '样品终浓度',
fj: 'Attachment',
fj: 'Attachment'
},
pcr008: {
czb: '称重表',
@ -77,10 +77,10 @@ export default {
lzzcz: '连组织称重',
lzzgz: '连组织管重',
zzzl: '组织重量',
ysyjryjrl: '预设匀浆溶液加入量',
sjyjryjrl: '实际匀浆溶液加入量',
ysyjrybjrl: '预设匀浆溶液加入量',
sjyjrybjrl: '实际匀浆溶液加入量'
},
pcr009: {
pcr009: {
clsj: '处理时间',
yjry: '匀浆溶液',
bs: '倍数',
@ -88,7 +88,7 @@ export default {
ypmc: '样品名称',
zzz: '组织重',
ysyjrybjrl: '预设匀浆溶液补加入量',
sjyjrybjrl: '实际匀浆溶液补加入量',
sjyjrybjrl: '实际匀浆溶液补加入量'
},
pcr010: {
clsj: '处理时间',
@ -98,20 +98,20 @@ export default {
yjyjry: '已加匀浆溶液',
ypmc: '样品名称',
cqzl: '称取重量',
ysyjrybjrl: '预设匀浆溶液加入量',
sjyjrybjrl: '实际匀浆溶液加入量',
ysyjryjrl: '预设匀浆溶液加入量',
sjyjryjrl: '实际匀浆溶液加入量'
},
pcr011: {
sj: '试剂',
ysjyztj: '预设加样总体积',
sjypjytj: '实际样品加样体积',
yssjjrtj: '预设试剂加入体积',
sjsjjrtj: '实际试剂加入体积',
sjsjjrtj: '实际试剂加入体积'
},
pcr012: {
sjwj: '数据文件',
hsndcdwjm: '核酸浓度测定文件名',
hsndcdwjlj: '核酸浓度测定文件路径',
hsndcdwjlj: '核酸浓度测定文件路径'
},
// 生物样品分析方法学样品制备表-Recovery
sp009: {

+ 1
- 1
src/views/business/comps/template/comps/dl/DL011.vue View File

@ -422,7 +422,7 @@ export default {
tmpResource,
stepResource.sjResource || []
)
this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
return this.resourceTmp
},
//

+ 1
- 1
src/views/business/comps/template/comps/dl/DL012.vue View File

@ -454,7 +454,7 @@ export default {
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
return this.resourceTmp;
},
//

+ 29
- 3
src/views/business/comps/template/comps/lba/LBA008.vue View File

@ -26,7 +26,8 @@
<CustomTable @blur="onHandleTableBlur" @headerSelectChange="onHandleTableBlur"
:ref="`stepTableRef`" :columns="tableStepColumns" :formData="formData" :prefixKey="`table`"
:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps">
:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps"
@clickButton="handleClickButton">
<template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
@ -60,8 +61,9 @@ import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import { getLBA008Config } from "../../formConfig/lba/lba008.js";
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals,uniqeYqOne } from "@/utils/calUnitTools";
import ImportExcelDialog from '../../dialog/ImportExcelDialog'
import { getBalance } from '@/utils/tpph.js';
export default {
name: "LBA008",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog },
@ -307,9 +309,12 @@ export default {
},
getResource() {
let content = this.getFilledFormData();
let formData = this.formData;
//resource
let tmpResource = []
let tmpYq = []
if (this.fillType === "actFill") {
let tableList = content.stepTableFormData
if (tableList && tableList.length > 0) {
@ -344,10 +349,14 @@ export default {
if (tmpResource.length > 0) {
tmpResource = uniqeResourceOne(tmpResource)
}
//使
tmpYq.push(content.selectInfo_dztpbh || formData.selectInfo_dztpbh)
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = stepResource.yqResource || []
this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
return this.resourceTmp;
},
//
@ -363,6 +372,23 @@ export default {
stepTableRef.deleteRow(rowIndex);
}
},
//
async handleClickButton(e, rowIndex,colIndex,ee,data) {
if(e==='cqzlBtn'){
const content = this.getFilledFormData()
let formData = this.formData;
let qy = content.yqInfo_dztpbh || formData.yqInfo_dztpbh
let dw = content.headerSelectFields.cqzlUnit
let x = await getBalance({yq:qy,dw:dw})
if(x && x.success){
this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, { cqzl: x.value },{signData:data,updateFields:['cqzl']});
}else{
this.$message.error(x.message || '称量失败')
}
}
},
}
};

+ 28
- 3
src/views/business/comps/template/comps/pcr/PCR007.vue View File

@ -27,7 +27,7 @@
<CustomTable @blur="onHandleTableBlur" @headerSelectChange="onHandleTableBlur"
:ref="`stepTableRef`" :columns="tableStepColumns" :formData="formData" :prefixKey="`table`"
:showOperation="fillType === 'preFill'"
fieldItemLabel="template.common.operationSteps">
fieldItemLabel="template.common.operationSteps" @clickButton="handleClickButton">
<template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
@ -61,8 +61,9 @@ import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import { getPCR007Config } from "../../formConfig/PCRTableConfig.js";
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import { addTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
import { addTj, uniqeResource, uniqeResourceOne, addDecimals,uniqeYqOne } from "@/utils/calUnitTools";
import ImportExcelDialog from '../../dialog/ImportExcelDialog'
import { getBalance } from '@/utils/tpph.js';
export default {
name: "PCR005",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog },
@ -236,9 +237,12 @@ export default {
},
getResource() {
let content = this.getFilledFormData();
let formData = this.formData;
//resource
let tmpResource = []
let tmpYq = []
if (this.fillType === "actFill") {
let tableList = content.stepTableFormData
if (tableList && tableList.length > 0) {
@ -249,10 +253,14 @@ export default {
if (tmpResource.length > 0) {
tmpResource = uniqeResourceOne(tmpResource)
}
//使
tmpYq.push(content.selectInfo_solution || formData.selectInfo_solution)
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = stepResource.yqResource || []
this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
return this.resourceTmp;
},
//
@ -267,6 +275,23 @@ export default {
stepTableRef.deleteRow(rowIndex);
}
},
//
async handleClickButton(e, rowIndex,colIndex,ee,data) {
if(e==='targetDiluentVolumePrecision'){
const content = this.getFilledFormData()
let formData = this.formData;
let qy = content.yqInfo_solution || formData.yqInfo_solution
let dw = content.headerSelectFields.cjgzlUnit
let x = await getBalance({yq:qy,dw:dw})
if(x && x.success){
this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, { cjgzl: x.value },{signData:data,updateFields:['cjgzl']});
}else{
this.$message.error(x.message || '称量失败')
}
}
},
}
};

+ 31
- 3
src/views/business/comps/template/comps/pcr/PCR008.vue View File

@ -25,7 +25,8 @@
<CustomTable @blur="onHandleTableBlur" @headerSelectChange="onHandleTableBlur"
:ref="`stepTableRef`" :columns="tableStepColumns" :formData="formData" :prefixKey="`table`"
:showCheckAll="true" @selectionChange="handleSelectionChange"
:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps">
:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps"
@clickButton="handleClickButton">
<template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
@ -58,8 +59,9 @@ import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import { getPCR008Config } from "../../formConfig/PCRTableConfig.js";
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals,uniqeYqOne } from "@/utils/calUnitTools";
import ImportExcelDialog from '../../dialog/ImportExcelDialog'
import { getBalance } from '@/utils/tpph.js';
export default {
name: "PCR008",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog },
@ -368,9 +370,13 @@ export default {
},
getResource() {
let content = this.getFilledFormData();
let formData = this.formData;
//resource
let tmpResource = []
let tmpYq = []
if (this.fillType === "actFill") {
//使
tmpResource.push({
@ -395,10 +401,14 @@ export default {
if (tmpResource.length > 0) {
tmpResource = uniqeResourceOne(tmpResource)
}
//使
tmpYq.push(content.selectInfo_dztpbh || formData.selectInfo_dztpbh)
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = stepResource.yqResource || []
this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
return this.resourceTmp;
},
//
@ -414,6 +424,24 @@ export default {
stepTableRef.deleteRow(rowIndex);
}
},
//
async handleClickButton(e, rowIndex,colIndex,ee,data) {
debugger
if(e==='lzzgzBtn'){
const content = this.getFilledFormData()
let formData = this.formData;
let qy = content.yqInfo_dztpbh || formData.yqInfo_dztpbh
let dw = content.headerSelectFields.lzzgzUnit
let x = await getBalance({yq:qy,dw:dw})
if(x && x.success){
this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, { lzzgz: x.value },{signData:data,updateFields:['lzzgz']});
}else{
this.$message.error(x.message || '称量失败')
}
}
},
}
};

+ 29
- 3
src/views/business/comps/template/comps/pcr/PCR010.vue View File

@ -26,7 +26,8 @@
<CustomTable @blur="onHandleTableBlur" @headerSelectChange="onHandleTableBlur"
:ref="`stepTableRef`" :columns="tableStepColumns" :formData="formData" :prefixKey="`table`"
:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps">
:showOperation="fillType === 'preFill'" fieldItemLabel="template.common.operationSteps"
@clickButton="handleClickButton">
<template slot="operation" slot-scope="{ row, rowIndex, columns }">
<TableOpertaion :fillType="fillType" :row="row" :rowIndex="rowIndex" :columns="columns"
@deleteRow="(rowIndex) => deleteRow(rowIndex)"></TableOpertaion>
@ -60,8 +61,9 @@ import { convertConcentration } from "@/utils/conConverter";//浓度单位转换
import SelectReagentDialog from '../../dialog/SelectReagentDialog.vue';
import { getPCR010Config } from "../../formConfig/PCRTableConfig.js";
import TableOpertaion from "@/components/Template/operation/TableOpertaion.vue"
import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals } from "@/utils/calUnitTools";
import { addTj, subTj, uniqeResource, uniqeResourceOne, addDecimals,uniqeYqOne } from "@/utils/calUnitTools";
import ImportExcelDialog from '../../dialog/ImportExcelDialog'
import { getBalance } from '@/utils/tpph.js';
export default {
name: "PCR005",
components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaion, SelectReagentDialog, ImportExcelDialog },
@ -288,9 +290,12 @@ export default {
},
getResource() {
let content = this.getFilledFormData();
let formData = this.formData;
//resource
let tmpResource = []
let tmpYq = []
if (this.fillType === "actFill") {
let tableList = content.stepTableFormData
if (tableList && tableList.length > 0) {
@ -326,10 +331,14 @@ export default {
if (tmpResource.length > 0) {
tmpResource = uniqeResourceOne(tmpResource)
}
//使
tmpYq.push(content.selectInfo_dztpbh || formData.selectInfo_dztpbh)
//使
const stepResource = this.$refs.stepRef.getStepResource()
this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
this.yqResourceTmp = stepResource.yqResource || []
this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
return this.resourceTmp;
},
//
@ -345,6 +354,23 @@ export default {
stepTableRef.deleteRow(rowIndex);
}
},
//
async handleClickButton(e, rowIndex,colIndex,ee,data) {
if(e==='targetDiluentVolumePrecision'){
const content = this.getFilledFormData()
let formData = this.formData;
let qy = content.yqInfo_dztpbh || formData.yqInfo_dztpbh
let dw = content.headerSelectFields.cqzlUnit
let x = await getBalance({yq:qy,dw:dw})
if(x && x.success){
this.$refs.stepTableRef?.updateDataSourceByRowIndex(rowIndex, { cqzl: x.value },{signData:data,updateFields:['cqzl']});
}else{
this.$message.error(x.message || '称量失败')
}
}
},
}
};

+ 14
- 14
src/views/business/comps/template/formConfig/PCRTableConfig.js View File

@ -743,7 +743,7 @@ export const getPCR007Config = ($this) => {
showWidth: 180,
fillType: 'preFill',
headerSelectKey: 'cjgzlUnit',
headerOptions: $this.getDictOptions('business_tjdw'),
headerOptions: $this.getDictOptions('business_zldw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodySubType: 'button',
@ -779,7 +779,7 @@ export const getPCR008Config = ($this) => {
showWidth: 180,
fillType: 'preFill',
headerSelectKey: 'cjgzUnit',
headerOptions: $this.getDictOptions('business_tjdw'),
headerOptions: $this.getDictOptions('business_zldw'),
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10
@ -791,10 +791,11 @@ export const getPCR008Config = ($this) => {
showWidth: 180,
fillType: 'preFill',
headerSelectKey: 'lzzgzUnit',
headerOptions: $this.getDictOptions('business_tjdw'),
headerOptions: $this.getDictOptions('business_zldw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
bodySubKey: 'lzzgzBtn',
bodyFillType: 'actFill',
bodySubType: 'button',
bodySubButtonName: 'form.hqz',
@ -808,7 +809,7 @@ export const getPCR008Config = ($this) => {
showWidth: 180,
fillType: 'preFill',
headerSelectKey: 'zzzlUnit',
headerOptions: $this.getDictOptions('business_tjdw'),
headerOptions: $this.getDictOptions('business_zldw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
@ -939,7 +940,7 @@ export const getPCR010Config = ($this) => {
showWidth: 180,
fillType: 'preFill',
headerSelectKey: 'cqzlUnit',
headerOptions: $this.getDictOptions('business_tjdw'),
headerOptions: $this.getDictOptions('business_zldw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodySubType: 'button',
@ -954,7 +955,7 @@ export const getPCR010Config = ($this) => {
bodySubPlaceholder: 'template.common.xswsPlaceholder'
},
{
label: 'template.pcr.pcr009.ysyjryjrl',
label: 'template.pcr.pcr010.ysyjryjrl',
prop: 'ysyjryjrl',
width: 280,
showWidth: 180,
@ -975,7 +976,7 @@ export const getPCR010Config = ($this) => {
headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.pcr.pcr009.sjyjryjrl',
label: 'template.pcr.pcr010.sjyjryjrl',
prop: 'sjyjryjrl',
width: 280,
showWidth: 180,
@ -1013,7 +1014,7 @@ export const getPCR011Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodyMaxlength: 10,
bodyDisabled: true,
bodyDisabled: true
},
{
label: 'template.pcr.pcr011.sjypjytj',
@ -1025,9 +1026,9 @@ export const getPCR011Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
bodyMaxlength: 10
},
{
{
label: 'template.pcr.pcr011.yssjjrtj',
prop: 'yssjjrtj',
width: 280,
@ -1037,7 +1038,7 @@ export const getPCR011Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
bodyMaxlength: 10
},
{
label: 'template.pcr.pcr011.sjsjjrtj',
@ -1049,8 +1050,7 @@ export const getPCR011Config = ($this) => {
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
},
bodyMaxlength: 10
}
]
}

+ 6
- 5
src/views/business/comps/template/formConfig/lba/lba008.js View File

@ -8,7 +8,7 @@ export const getLBA008Config = ($this) => {
bodyType: 'input',
fillType: 'preFill',
otherCode: 'bhOther',
bodyFillType: 'preFill',
bodyFillType: 'preFill'
},
{
label: 'template.lba.lba008.zzlx',
@ -18,7 +18,7 @@ export const getLBA008Config = ($this) => {
fillType: 'preFill',
bodyType: 'input',
bodyFillType: 'preFill',
bodyMaxlength: 10,
bodyMaxlength: 10
},
{
label: 'template.lba.lba008.cqzl',
@ -31,13 +31,14 @@ export const getLBA008Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodySubType: 'button',
bodySubKey: 'cqzlBtn',
bodySubButtonName: 'form.hqz',
bodyMaxlength: 10,
bodySubFillType: 'actFill',
subPrecision: 0,
showBodySub: $this.fillType === 'actFill',
bodyMaxlength: 10,
bodySubPlaceholder: 'template.common.xswsPlaceholder',
bodySubPlaceholder: 'template.common.xswsPlaceholder'
},
{
label: 'template.lba.lba008.ysyjrybjrl',
@ -58,7 +59,7 @@ export const getLBA008Config = ($this) => {
bodyMaxlength: 10,
bodyDisabled: $this.fillType === 'preFill',
bodySubPlaceholder: 'template.common.xswsPlaceholder',
headerSelectTo:"actStartSolutionVolumeUnit",
headerSelectTo: 'actStartSolutionVolumeUnit'
},
{
label: 'template.lba.lba008.sjyjrybjrl',
@ -71,7 +72,7 @@ export const getLBA008Config = ($this) => {
bodyType: 'inputNumber',
bodyFillType: 'actFill',
copyFrom: 'ysyjrybjrl', //复制哪个字段
bodyMaxlength: 10,
bodyMaxlength: 10
}
]
}

Loading…
Cancel
Save