diff --git a/src/lang/en.js b/src/lang/en.js index 9ae4f95..a7a2e1d 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -83,7 +83,7 @@ import systemLog from './en/system/systemLog' import storageLocation from './en/system/storageLocation' export default { system: { - name: 'WestChina-Frontier PharmaTech ELN', + name: 'WCFP Electronic Laboratory Notebook', title: 'HXHQ', tip: 'Prompt', logOut: 'Are You Sure To Log Out And Exit The System?', diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js index d6108c6..87f08d8 100644 --- a/src/lang/en/template/dl.js +++ b/src/lang/en/template/dl.js @@ -61,7 +61,7 @@ export default { s9hhybh: 'S9混合液编号', s9hhyyjjrl: 'S9混合液预计加入量', pbsbh: 'PBS编号', - pbsryyjjrl: '0.2mol PBS溶液预计加入量', + pbsryyjjrl: 'PBS溶液预计加入量', jlzsl: '剂量组数量', wcButton: 'Finsh', jlzmc: '剂量组名称 ', diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js index 770dd52..af464cf 100644 --- a/src/lang/en/template/lba.js +++ b/src/lang/en/template/lba.js @@ -47,7 +47,7 @@ export default { dwbh: '动物编号', zzlx: '组织类型', cqzl: '称取重量', - ysyjrybjrl: '预设匀浆溶液补加入量', - sjyjrybjrl: '实际匀浆溶液补加入量' + ysyjrybjrl: '预设匀浆溶液加入量', + sjyjrybjrl: '实际匀浆溶液加入量' } } diff --git a/src/lang/en/template/sp.js b/src/lang/en/template/sp.js index 31a22ae..4892205 100644 --- a/src/lang/en/template/sp.js +++ b/src/lang/en/template/sp.js @@ -58,7 +58,10 @@ export default { sp007: { title: '生物样品分析样本处理表', ybsm: 'Sample Description', - bt: 'Title' + bt: 'Title', + clhxx: '处理后信息', + hjsj: '处理后样品放入进样环境时间', + cfwz: '存放位置' }, // 生物样品分析方法学样品制备表-准确度与精密度 sp008: { diff --git a/src/lang/zh.js b/src/lang/zh.js index 284ee34..b6a1758 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -83,7 +83,7 @@ import storageLocation from './zh/system/storageLocation' export default { system: { - name: '华西海圻ELN系统', + name: '华西海圻实验室电子记录系统', title: '华西海圻管理系统', tip: '提示', logOut: '确认注销并退出系统吗？', diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js index 1e523c2..665ec07 100644 --- a/src/lang/zh/template/dl.js +++ b/src/lang/zh/template/dl.js @@ -62,7 +62,7 @@ export default { s9hhybh: 'S9混合液编号', s9hhyyjjrl: 'S9混合液预计加入量', pbsbh: 'PBS编号', - pbsryyjjrl: '0.2mol PBS溶液预计加入量', + pbsryyjjrl: 'PBS溶液预计加入量', jlzsl: '剂量组数量', wcButton: '完成', jlzmc: '剂量组名称 ', diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js index 0df0810..272c1fa 100644 --- a/src/lang/zh/template/lba.js +++ b/src/lang/zh/template/lba.js @@ -47,7 +47,7 @@ export default { dwbh: '动物编号', zzlx: '组织类型', cqzl: '称取重量', - ysyjrybjrl: '预设匀浆溶液补加入量', - sjyjrybjrl: '实际匀浆溶液补加入量' + ysyjrybjrl: '预设匀浆溶液加入量', + sjyjrybjrl: '实际匀浆溶液加入量' } } diff --git a/src/lang/zh/template/sp.js b/src/lang/zh/template/sp.js index 0812b65..cc372ea 100644 --- a/src/lang/zh/template/sp.js +++ b/src/lang/zh/template/sp.js @@ -58,7 +58,10 @@ export default { sp007: { title: '生物样品分析样本处理表', ybsm: '样本说明', - bt: '标题' + bt: '标题', + clhxx: '处理后信息', + hjsj: '处理后样品放入进样环境时间', + cfwz: '存放位置' }, // 生物样品分析方法学样品制备表-准确度与精密度 sp008: { diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue index 83876b6..e1f51c2 100644 --- a/src/views/business/comps/template/comps/dl/DL010.vue +++ b/src/views/business/comps/template/comps/dl/DL010.vue @@ -216,22 +216,6 @@ export default { } } }, - { - type: 'cellItem', - label: 'template.dl.dl010.jprq', - config: { - startDate: { - label: 'template.dl.dl010.jprqKssj', - type: 'input', - disabled: true - }, - endDate: { - label: 'template.dl.dl010.jprqJssj', - type: 'input', - disabled: true - } - } - } ] }, // 采集信息列表 diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue index ac30ab5..3804c2e 100644 --- a/src/views/business/comps/template/comps/dl/DL011.vue +++ b/src/views/business/comps/template/comps/dl/DL011.vue @@ -289,7 +289,7 @@ export default { this.$nextTick(() => { this.$refs[refConf.pyxx]?.updateFormData( 'pytjText', - '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%', + '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±1%', { isUpdateRecord: false, signData: null } ) }) diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue index 15df57c..3c7c440 100644 --- a/src/views/business/comps/template/comps/dl/DL012.vue +++ b/src/views/business/comps/template/comps/dl/DL012.vue @@ -273,7 +273,7 @@ export default { this.$nextTick(() => { this.$refs[refConf.pyxx]?.updateFormData( 'pytjText', - '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±0.5%', + '培养条件：温度为温度为37℃±2℃，CO2浓度为5%±1%', { isUpdateRecord: false, signData: null } ) }) diff --git a/src/views/business/comps/template/comps/lba/LBA008.vue b/src/views/business/comps/template/comps/lba/LBA008.vue index f0693e9..50e72dc 100644 --- a/src/views/business/comps/template/comps/lba/LBA008.vue +++ b/src/views/business/comps/template/comps/lba/LBA008.vue @@ -144,6 +144,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 + }, } }, { diff --git a/src/views/business/comps/template/comps/sp/SP007.vue b/src/views/business/comps/template/comps/sp/SP007.vue index 05ac0b4..44e4bd1 100644 --- a/src/views/business/comps/template/comps/sp/SP007.vue +++ b/src/views/business/comps/template/comps/sp/SP007.vue @@ -18,10 +18,15 @@ ref="ybRef" :formConfig="ybFormConfig" :formData="formData" /> - + + + + + @@ -41,7 +46,8 @@ import { getLatestSn } from '@/api/template'; import { EventBus } from "@/utils/eventBus"; import { uniqeResource } from "@/utils/calUnitTools"; import { debounce } from 'lodash-es'; -import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig} from "../../formConfig/sp/SP007"; +import {getBaseInfoFormConfig, getRemarkFormConfig,getStorageFormConfig,getYbFormConfig,getfjFormConfig,getClhxxFormConfig} from "../../formConfig/sp/SP007"; +import moment from "moment"; export default { name: "SP007", @@ -74,6 +80,10 @@ export default { getFjFormConfig() { return getfjFormConfig(this); }, + //处理后信息 + clhxxConfig() { + return getClhxxFormConfig(this); + }, }, data() { @@ -84,6 +94,10 @@ export default { mounted() { }, methods: { + // 点击按钮 + handleClickButton(item,signData){ + this.$refs.clhxxRef.updateFormData("hjsj", moment().format("YYYY/MM/DD HH:mm"),{isUpdateRecord:true,signData}); + }, //打印标签 printTag() { const printConfig = this.getBasePrintConfig(); @@ -96,11 +110,11 @@ export default { //获取已填写的表单数据 getFilledFormData() { - return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"]) + return this.getFilledFormDataByRefs(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef","clhxxRef"]) }, //获取填写完成的表单数据 async getFormData() { - let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef"]); + let content = await this.validFormFields(["baseInfoRef", "storageConditionRef", "ybRef","stepRef", "remarkRef","fjRef","clhxxRef"]); return content; }, getResource() { diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js index 9cf7c8c..569db3d 100644 --- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js +++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js @@ -568,18 +568,44 @@ export const getBaseInfoFormConfig = ($this) => { maxlength: 50 } } - : { - studyMc: { - label: 'template.common.testName', - type: 'input', - disabled: true - }, - studySn: { - label: 'template.common.testNumber', - type: 'input', - disabled: true + : isLba + ? { + studyMc: { + label: 'template.common.testName', + type: 'input', + disabled: true + }, + studySn: { + label: 'template.common.testNumber', + 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 + } + } + : { + studyMc: { + label: 'template.common.testName', + type: 'input', + disabled: true + }, + studySn: { + label: 'template.common.testNumber', + type: 'input', + disabled: true + } } - } }, { type: 'conditionItem', diff --git a/src/views/business/comps/template/formConfig/sp/SP007.js b/src/views/business/comps/template/formConfig/sp/SP007.js index 080c684..ae3497d 100644 --- a/src/views/business/comps/template/formConfig/sp/SP007.js +++ b/src/views/business/comps/template/formConfig/sp/SP007.js @@ -158,3 +158,30 @@ export const getfjFormConfig = () => { } ] } +//备注 +export const getClhxxFormConfig = ($this) => { + return [ + { + type: 'cellItem', + config: { + hjsj: { + label: 'template.sp.sp007.hjsj', + type: 'input', + fillType: 'actFill', + maxlength: 200, + subType: 'button', + subKey: 'hjsjButton', + buttonName: 'template.yp.yp002.hqsj', + disabled: true, + subDisabled: $this.fillType !== 'actFill' + }, + cfwz: { + label: 'template.sp.sp007.cfwz', + type: 'input', + fillType: 'actFill', + maxlength: 100 + } + } + } + ] +}