From daf14fbe2119e9a80b21c2d4f83c8ad83dae0fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZHANGTENG=5C=E5=BC=A0=E8=85=BE?= <894697943@qq.com> Date: Tue, 21 Apr 2026 17:50:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/bl.js | 24 +++++----- src/lang/en/template/dj.js | 35 +++++++------- src/lang/en/template/dl.js | 56 +++++++++++----------- src/lang/en/template/xb.js | 12 ++--- src/lang/zh.js | 2 +- src/lang/zh/template/dj.js | 3 +- .../business/comps/template/comps/bl/BL001.vue | 2 +- .../business/comps/template/comps/dj/DJ001.vue | 1 + .../business/comps/template/comps/dj/DJ002.vue | 20 +++++--- .../business/comps/template/comps/dj/DJ003.vue | 20 +++++--- .../business/comps/template/comps/xb/XB001.vue | 7 +-- .../business/comps/template/formConfig/xb/xb001.js | 4 +- 12 files changed, 100 insertions(+), 86 deletions(-) diff --git a/src/lang/en/template/bl.js b/src/lang/en/template/bl.js index 8b1ac02..1f9a2c0 100644 --- a/src/lang/en/template/bl.js +++ b/src/lang/en/template/bl.js @@ -1,16 +1,18 @@ + //病理 export default { bl002: { - fhsj: '复核时间', - ybsm: '样本说明', - smybh: '扫描仪编号', - dwypbh: '动物/样本编号', - qprsbh: '切片/染色编号', - smryqrxx: '扫描人员确认信息', - ztblxjqrxx: '专题病理学家确认信息', - smybz: '扫描员备注', - ztblxjbz: '专题病理学家备注', - txmmzq: '图像命名准确', - txwzqx: '图像完整清晰' + fhsj: 'Review Time', + ybsm: 'Sample Description', + smybh: 'Scanner ID', + dwypbh: 'Animal/Sample ID', + qprsbh: 'Section/Stain ID', + smryqrxx: 'Scan Personnel Confirmation Information ', + ztblxjqrxx: ' Histopathology Confirmation Information', + smybz: 'Scan Personnel Comment', + ztblxjbz: 'Histopathologist Comment', + txmmzq: 'Accurate Image Name', + txwzqx: 'Complete Clear Image' }, } + diff --git a/src/lang/en/template/dj.js b/src/lang/en/template/dj.js index bab65c4..ca212fb 100644 --- a/src/lang/en/template/dj.js +++ b/src/lang/en/template/dj.js @@ -1,26 +1,25 @@ //动技 export default { dj001: { - syts: '试验天数', - fhfw: '复核范围', - fhlr: '复核内容' + syts: 'Test Days', + fhfw: 'Review Scope', + fhlr: 'Review Content' }, //dj002复用dj003 dj003: { - yplx: '样品类型', - knj: '抗凝剂', - cyhcftj: '采样后存放条件', - cyd: '采样点', - ypmc: '样品名称', - dwbh: '动物编号', - cysj: '采样开始时间', - sjbd: '时间比对', - sjbd: '时间比对', - yps: '样品数', - ypyjxx: '样品移交信息', - yjczxx: '移交处置信息', - yjsj: '移交时间', - hqsj: '获取时间', - dsfs: '递送方式' + yplx: 'Sample Category', + knj: 'Anticoagulant', + cyhcftj: 'Storage Condition after Sampling', + cyd: 'Sampling Point', + ypmc: 'Sample Name', + dwbh: 'Animal ID', + cysj: 'Sampling Time', + sjbd: 'Time Comparison', + yps: 'Sample Size', + ypyjxx: 'Sample Transfer Information', + yjczxx: 'Sample Disposal Information', + yjsj: 'Transfer Time', + hqsj: 'Acquire Time', + dsfs: 'Transfer Method' } } diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js index 6262c50..06278d8 100644 --- a/src/lang/en/template/dl.js +++ b/src/lang/en/template/dl.js @@ -33,44 +33,44 @@ export default { czsj: 'Operation Time', dl003: { ...common, - pytj: '培养条件', - jzkssj: '接种开始时间', - jzjssj: '接种结束时间', - fssygbh: '复苏水浴锅编号', - pyx: '培养箱', - fstj: '复苏条件', - jzjzhbh: '菌种接种后编号', - jzlybh: '菌种来源编号', - rtbh: '肉汤编号', - jzjrtj: '菌种加入体积', + pytj: 'Incubation Condition', + jzkssj: 'Inoculation Start Time', + jzjssj: 'Inoculation End Time', + fssygbh: 'Revival Water Bath ID', + pyx: 'Incubator', + fstj: 'Revival Condition', + jzjzhbh: 'Strain ID after Inoculation', + jzlybh: 'Strain Source ID', + rtbh: 'Broth ID', + jzjrtj: 'Inoculum Volume', ksButton: 'Start', jsButton: 'End' }, dl004: { ...common, - zjjgqr: '增菌结果确认', + zjjgqr: 'Enrichment Result Confirmation', ccwz: 'Storage Location' }, dl006: { ...common, - jlzpzxx: '剂量组配制信息', - jzs: '菌种数', - pxms: '平行皿数', - qsbh: '起始编号', - sftjs9: '是否添加s9', - s9hhybh: 'S9混合液编号', - s9hhyyjjrl: 'S9混合液预计加入量', - pbsbh: 'PBS编号', - pbsryyjjrl: 'PBS溶液预计加入量', - jlzsl: '剂量组数量', + jlzpzxx: 'Dose Group Formulation Information', + jzs: 'Strain Number', + pxms: 'Plate Number', + qsbh: 'Original ID', + sftjs9: 'Whether to add S9', + s9hhybh: 'S9 Mixture ID', + s9hhyyjjrl: 'Expected Volume of S9 Mixture Added', + pbsbh: 'PBS ID', + pbsryyjjrl: 'Expected Volume of PBS Added', + jlzsl: 'Dose Group Number', wcButton: 'Finsh', - jlzmc: '剂量组名称 ', - jymc: '加液名称', - jybh: '加液编号', - ysjytj: '预设加液体积', - jlzb: '剂量组别', - jzbh: '菌种编号', - gspcdqk: '供试品沉淀情况' + jlzmc: 'Dose Group Name', + jymc: 'Added Liquid Name', + jybh: 'Added Liquid ID', + ysjytj: 'Expected Volume of Added Liquid', + jlzb: 'Dose Group', + jzbh: 'Strain ID', + gspcdqk: 'Test Item Precipitation Status ' }, dl007: { ...common, diff --git a/src/lang/en/template/xb.js b/src/lang/en/template/xb.js index d14c73a..c8be6f2 100644 --- a/src/lang/en/template/xb.js +++ b/src/lang/en/template/xb.js @@ -1,15 +1,15 @@ //细胞 export default { xb001: { - jcsj: '操作时间', + jcsj: 'Operation Time', czbz: 'Operation Workflow', - qtbz: '其他步骤', + qtbz: 'Other Workflow', fj: 'Attachment', - fpc: '分批次', - zb: '组别', - lx: '类型', + fpc: 'Batch', + zb: 'Group', + lx: 'Category', ks: 'Start', js: 'End', - fysc: '孵育时长（hr: min）' + fysc: 'Incubation Duration（hr: min）' } } diff --git a/src/lang/zh.js b/src/lang/zh.js index b6a1758..aaedd69 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -34,7 +34,7 @@ import xb from './zh/template/xb' //动技模板 import dj from './zh/template/dj' //病理模板 -import bl from './en/template/bl' +import bl from './zh/template/bl' // 试验管理 import study from './zh/business/study/study' diff --git a/src/lang/zh/template/dj.js b/src/lang/zh/template/dj.js index bab65c4..99647e4 100644 --- a/src/lang/zh/template/dj.js +++ b/src/lang/zh/template/dj.js @@ -13,8 +13,7 @@ export default { cyd: '采样点', ypmc: '样品名称', dwbh: '动物编号', - cysj: '采样开始时间', - sjbd: '时间比对', + cysj: '采样时间', sjbd: '时间比对', yps: '样品数', ypyjxx: '样品移交信息', diff --git a/src/views/business/comps/template/comps/bl/BL001.vue b/src/views/business/comps/template/comps/bl/BL001.vue index 6155206..5162241 100644 --- a/src/views/business/comps/template/comps/bl/BL001.vue +++ b/src/views/business/comps/template/comps/bl/BL001.vue @@ -193,7 +193,7 @@ export default { config: { cyhcftjyt: { span: 1, - label: 'template.common.actualFill', + label: 'template.common.preFill', multiple: true, type: 'select', options: this.getDictOptions('business_cftj'), diff --git a/src/views/business/comps/template/comps/dj/DJ001.vue b/src/views/business/comps/template/comps/dj/DJ001.vue index cfa9f4a..0fdbddd 100644 --- a/src/views/business/comps/template/comps/dj/DJ001.vue +++ b/src/views/business/comps/template/comps/dj/DJ001.vue @@ -20,6 +20,7 @@ {{ $t('template.dj.dj003.ypmc') }} @@ -219,7 +220,7 @@ export default { prop: 'fpc', bodyType: 'input', bodyFillType: 'preFill', - width: 280, + width: 250, bodyMaxlength: 50, },{ label: 'template.xb.xb001.zb', @@ -227,7 +228,7 @@ export default { bodyType: 'select', bodyOptions: this.getDictOptions('business_xbzb'), bodyFillType: 'preFill', - width: 280, + width: 350, bodyMaxlength: 10, otherCode: "preOther1", },{ @@ -236,7 +237,7 @@ export default { bodyType: 'select', bodyOptions: this.getDictOptions('business_xblx'), bodyFillType: 'preFill', - width: 280, + width: 350, bodyMaxlength: 10, otherCode: "preOther2", }] diff --git a/src/views/business/comps/template/formConfig/xb/xb001.js b/src/views/business/comps/template/formConfig/xb/xb001.js index 6228f50..1d252bc 100644 --- a/src/views/business/comps/template/formConfig/xb/xb001.js +++ b/src/views/business/comps/template/formConfig/xb/xb001.js @@ -292,7 +292,7 @@ export const getStepFivth = ($this) => { type: 'text' }, yjwd: { - type: 'input', + type: 'inputNumber', fillType: 'preFill' }, text4: { @@ -300,7 +300,7 @@ export const getStepFivth = ($this) => { type: 'text' }, sjwd: { - type: 'input', + type: 'inputNumber', fillType: 'actFill', compareTo: 'yjwd', copyFrom: 'yjwd'