From f3815a84fb6e4b2974d93524605e4a004c2a171e Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Sat, 10 Jan 2026 19:38:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86]=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/sj/sj.js | 8 +-- src/api/business/yq/yq.js | 9 +++ src/lang/en/business/resource/sj.js | 99 ++++++++++++++--------------- src/lang/en/business/resource/yq.js | 19 +++--- src/lang/zh/business/resource/sj.js | 4 +- src/lang/zh/business/resource/yq.js | 3 +- src/views/business/resource/sj/comps/Bj.vue | 4 +- src/views/business/resource/sj/list.vue | 44 ++++++------- src/views/business/resource/yq/list.vue | 83 ++++++++++++++---------- vue.config.js | 4 +- 10 files changed, 149 insertions(+), 128 deletions(-) diff --git a/src/api/business/sj/sj.js b/src/api/business/sj/sj.js index a9ca11d..63e5837 100644 --- a/src/api/business/sj/sj.js +++ b/src/api/business/sj/sj.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询试剂库存列表 +// 查询试剂列表 export function sj_list(query) { return request({ url: '/system/business/sj/list', @@ -27,10 +27,10 @@ export function sj_info(query) { }) } -// 保存试剂 -export function sj_save(data) { +// 试剂编辑 +export function sj_bj(data) { return request({ - url: '/system/business/sj/save', + url: '/system/business/sj/bj', method: 'post', data: data }) diff --git a/src/api/business/yq/yq.js b/src/api/business/yq/yq.js index d4718b2..703fa67 100644 --- a/src/api/business/yq/yq.js +++ b/src/api/business/yq/yq.js @@ -27,6 +27,15 @@ export function yq_save(data) { }) } +// 编辑仪器管理 +export function yq_update(data) { + return request({ + url: '/system/business/yq/update', + method: 'post', + data: data + }) +} + export function yqJcgj_list(query) { return request({ url: '/system/business/yq/jcgj/list', diff --git a/src/lang/en/business/resource/sj.js b/src/lang/en/business/resource/sj.js index 917769b..32166d0 100644 --- a/src/lang/en/business/resource/sj.js +++ b/src/lang/en/business/resource/sj.js @@ -1,60 +1,57 @@ export default { sdts: '请确认是否锁定以下麻精药', gdts: '请确认是否归档以下麻精药', - mc: '名称', - bh: '编号', - ssbm: '所属部门', - gxsjk: '更新试剂库', - jyzt: '借阅状态', - zjzt: '制剂状态', - sxrq: '失效日期', - nd: '浓度/含量/纯度', - kcl: '库存量', - gg: '规格', - ly: '来源', - sssy: '所属试验', - ph: '批号', - yxzq: '有效周期', + mc: 'Name', + bh: 'ID', + ssbm: 'Department', + gxsjk: 'Refresh', + jyzt: 'Check-out', + zjzt: 'Form', + sxrq: 'Expiration', + nd: 'Concentration/Purity', + kcl: 'Inventory', + gg: 'Specification', + ly: 'Source', + sssy: 'Study', + ph: 'Batch Num', + yxzq: 'Validity Period', zcgMc: '暂存柜', - cctj: '存储条件', - ccwz: '存储位置', - sxr: '失效日', - pzrq: '配置日期', - plcz: '批量处置', - plsd: '批量锁定', - plgd: '批量归档', + cctj: 'Storage Condition', + ccwz: 'Storage Location', + sxr: 'Expiration', + pzrq: 'Formulation Date', + plcz: 'Batch Dispose', + plsd: 'Batch Dispose', + plgd: 'Batch Dispose', - cz: '处置', - sjczfs: '试剂处置方式', - czl: '处置量', - yuanyin: '原因', - lock: '锁定', - unlock: '解锁', - detail: '详情', - guidang: '归档', - jiedang: '解档', - jieyue: '借阅', - guihuan: '归还', - fafang: '发放', - ysff: '钥匙发放', - czrq: '处置容器', - czyj: '处置药剂', - xgkc: '修改库存', - shxgkc: '审核修改库存', - shbj: '审核编辑', + cz: 'Dispose', + sjczfs: 'Dispose Method', + czl: 'Amount', + yuanyin: 'Reason', + lock: 'Lock', + unlock: 'Unlock', + detail: 'Enter', + guidang: 'Archived', + jiedang: 'De-archive', + jieyue: 'Check out', + guihuan: 'Return', + fafang: 'Distribute', + ysff: 'Key', + xgkc: 'Change Inventory', + shxgkc: 'Approve Inventory Change', + shbj: 'Approve Edit', - ssbd: '所属表单', - bdsssy: '表单所属试验', - bdssr: '表单所属人', - bdssbm: '表单所属部门', + ssbd: 'In Record', + bdsssy: 'In Study', + bdssr: 'By User', + bdssbm: 'Department', - tz: '试剂台账', - tz: '试剂台账', - qmr: '签名人', - czlx: '操作类型', - czl: '操作量', - bz: '备注/原因', - czsj: '操作时间', + tz: 'Reagent Table', + qmr: 'Signed By', + czlx: 'Action', + czl: 'Amount', + bz: 'Comment/Reason', + czsj: 'Datetime', - jcgj: '稽查轨迹', + jcgj: 'Track Record', } diff --git a/src/lang/en/business/resource/yq.js b/src/lang/en/business/resource/yq.js index 1bfb11d..f8a502c 100644 --- a/src/lang/en/business/resource/yq.js +++ b/src/lang/en/business/resource/yq.js @@ -1,10 +1,11 @@ export default { - - yqbh: '仪器编号', - yqmc: '仪器名称', - xcjzrq: '下次校准日期', - ssbm: '所属部门', - yqxh: '仪器型号', - yqly: '仪器来源' - -} \ No newline at end of file + refresh: 'Refresh', + add: 'Add', + yqbh: 'ID', + yqmc: 'Name', + xcjzrq: 'Next Calibration', + ssbm: 'Department', + yqxh: 'Type', + yqly: 'Source', + wc: 'Compartment' +} diff --git a/src/lang/zh/business/resource/sj.js b/src/lang/zh/business/resource/sj.js index bc72a17..0c7075a 100644 --- a/src/lang/zh/business/resource/sj.js +++ b/src/lang/zh/business/resource/sj.js @@ -19,7 +19,7 @@ export default { cctj: '存储条件', ccwz: '存储位置', sxr: '失效日', - pzrq: '配置日期', + pzrq: '配制日期', plcz: '批量处置', plsd: '批量锁定', plgd: '批量归档', @@ -38,8 +38,6 @@ export default { guihuan: '归还', fafang: '发放', ysff: '钥匙发放', - czrq: '处置容器', - czyj: '处置药剂', xgkc: '修改库存', shxgkc: '审核修改库存', shbj: '审核编辑', diff --git a/src/lang/zh/business/resource/yq.js b/src/lang/zh/business/resource/yq.js index cef6e8d..2d27736 100644 --- a/src/lang/zh/business/resource/yq.js +++ b/src/lang/zh/business/resource/yq.js @@ -1,5 +1,6 @@ export default { - + refresh: '更新仪器库', + add: '新增', yqbh: '仪器编号', yqmc: '仪器名称', xcjzrq: '下次校准日期', diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue index 44ea0b1..32e5ea2 100644 --- a/src/views/business/resource/sj/comps/Bj.vue +++ b/src/views/business/resource/sj/comps/Bj.vue @@ -94,7 +94,7 @@