diff --git a/src/lang/zh/template/pcr.js b/src/lang/zh/template/pcr.js index ef3b959..388ff87 100644 --- a/src/lang/zh/template/pcr.js +++ b/src/lang/zh/template/pcr.js @@ -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: { diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue index 3804c2e..1e6418e 100644 --- a/src/views/business/comps/template/comps/dl/DL011.vue +++ b/src/views/business/comps/template/comps/dl/DL011.vue @@ -422,7 +422,7 @@ export default { tmpResource, stepResource.sjResource || [] ) - this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || []) + this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq]) return this.resourceTmp }, // 保存 diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue index 3c7c440..6a7931c 100644 --- a/src/views/business/comps/template/comps/dl/DL012.vue +++ b/src/views/business/comps/template/comps/dl/DL012.vue @@ -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; }, // 保存 diff --git a/src/views/business/comps/template/comps/pcr/PCR007.vue b/src/views/business/comps/template/comps/pcr/PCR007.vue index 3587b6e..40c32a4 100644 --- a/src/views/business/comps/template/comps/pcr/PCR007.vue +++ b/src/views/business/comps/template/comps/pcr/PCR007.vue @@ -27,7 +27,7 @@ + fieldItemLabel="template.common.operationSteps" @clickButton="handleClickButton">