From 642055e8574f11987ec19515bd3d431b94f2c36f Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Wed, 14 Jan 2026 17:33:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?= =?UTF-8?q?=E7=AE=A1=E7=90=86][=E7=BB=99=E8=8D=AF=E5=88=B6=E5=89=82?= =?UTF-8?q?=E7=AD=BE=E5=90=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en.js | 1 + src/lang/en/business/resource/gyzj.js | 221 ++++++++++---------- src/lang/en/business/resource/mjy.js | 223 +++++++++++---------- src/lang/en/business/resource/resource.js | 1 + src/lang/en/business/resource/zcg.js | 45 +++-- src/lang/zh/business/resource/gyzj.js | 27 ++- src/lang/zh/business/resource/mjy.js | 15 +- src/lang/zh/business/resource/zcg.js | 2 + src/views/business/resource/gyzj/comps/ffjl/Gd.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Jd.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Jq.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Js.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Jy.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Sd.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Bj.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Czrq.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Czyj.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Ff.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Gd.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Gh.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Jd.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Js.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Jy.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Rk.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Sd.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Shbj.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Shxgkc.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Sqgh.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Sqrk.vue | 6 +- .../business/resource/gyzj/comps/gyzj/Xgkc.vue | 2 +- .../business/resource/gyzj/comps/gyzj/Ysff.vue | 2 +- src/views/business/resource/mjy/comps/ffjl/Gd.vue | 6 +- src/views/business/resource/mjy/comps/ffjl/Jd.vue | 2 +- src/views/business/resource/mjy/comps/ffjl/Jq.vue | 2 +- src/views/business/resource/mjy/comps/ffjl/Js.vue | 2 +- src/views/business/resource/mjy/comps/ffjl/Jy.vue | 2 +- src/views/business/resource/mjy/comps/ffjl/Sd.vue | 2 +- src/views/business/resource/mjy/comps/ffjl/Xq.vue | 1 - src/views/business/resource/mjy/comps/mjy/Bj.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Czrq.vue | 4 +- src/views/business/resource/mjy/comps/mjy/Czyj.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Ff.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Gd.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Gh.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Jd.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Js.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Jy.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Rk.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Sd.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Shbj.vue | 2 +- .../business/resource/mjy/comps/mjy/Shxgkc.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Xgkc.vue | 2 +- src/views/business/resource/mjy/comps/mjy/Ysff.vue | 2 +- src/views/business/resource/zcg/comps/Ysff.vue | 2 +- src/views/business/resource/zcg/comps/Ysgh.vue | 2 +- src/views/business/study/comp/wzlb/gyzjList.vue | 14 +- src/views/business/study/comp/wzlb/mjyList.vue | 1 + 57 files changed, 367 insertions(+), 286 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 6653d3d..964be34 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -74,6 +74,7 @@ export default { export: 'Export', saveConfirm: 'Confirm', confirm: 'Confirm', + reject: 'Reject', cancel: 'Cancel', close: 'Close', operate: 'Action', diff --git a/src/lang/en/business/resource/gyzj.js b/src/lang/en/business/resource/gyzj.js index a06a9e6..565f3d1 100644 --- a/src/lang/en/business/resource/gyzj.js +++ b/src/lang/en/business/resource/gyzj.js @@ -1,107 +1,122 @@ export default { - mc:'Name', - bh:'ID', - jyzt:'Check-out', - zjzt:'Form', - jlzt:'Status', - sxrq:'Expiration', - nd:'Concentration/Purity', - nddw:'浓度单位', - kcl:'Inventory', + mc: '名称', + bh: '编号', + jyzt: '借阅状态', + zjzt: '制剂状态', + jlzt: '记录状态', + sxrq: '失效日期', + nd: '浓度', + nddw: '浓度单位', + kcl: '库存量', + kc: '库存', + kcdw: '库存单位', + zcg: '暂存柜', + cctj: '存储条件', + ccwz: '存储位置', + cksj: '出库时间', + rksj: '入库时间', + ckjz: '出库量', + rkjz: '入库量', + syl: '使用量', + lqr1: '领取人', + lqr2: '领取人2', + yslqr1: '钥匙1领取人', + yslqr2: '钥匙2领取人', + kgy1: '库管员', + kgy2: '库管员2', + rkmz: '入库毛重', + plff: '批量发放', + plczyj: '批量处置药剂', + plczrq: '批量处置容器', + ysff: '钥匙发放', + plsd: '批量锁定', + plgd: '批量归档', + lock: '锁定', + unlock: '解锁', + detail: '详情', + guidang: '归档', + jiedang: '解档', + jieyue: '借阅', + guihuan: '确认归还', + fafang: '发放', + czrq: '处置容器', + czyj: '处置药剂', + yuanyin: '原因', + xgkc: '修改库存', + shxgkc: '审核修改库存', + shbj: '审核编辑', + clr: '处理人', + czfs: '处置方式', + fhr: '复核人', + xgbz: '修改备注', + jdr: '监督人', + xgr: '修改人', + czl: '处置量', + ffr: '发放人', + ffr1: '发放人', + ffr2: '发放人2', + zytj: '转移条件', + md: '目的', + ckl: '出库量', + ckldw: '出库单位', + ffzytj: '发放转移条件', + ghzytj: '归还转移条件', + ys1lrq: '钥匙1领取人', + ys2lrq: '钥匙2领取人', + sssy: '所属试验', + ssbd: '所属表单', + bdssr: '表单所属人', + syr: '使用人', + lqghr: '领取/归还人', + ffjsr: '发放/接收人', + czlx: '操作类型', + czl: '操作量', + bzyy: '备注/原因', + ccsj: '操作时间', + cksj: '出库时间', + rksj: '入库时间', + jiaqian: '加签', + gyzjgl: '给药制剂管理', + ffhsjl: '发放回收记录', - kc:'Inventory', - kcdw:'库存单位', - zcg:'Locker', - cctj:'Storage Condition', - ccwz:'Storage Location', - cksj:'Out of Storage Date', - rksj:'Into Storage Date', - ckjz:'出库量', - rkjz:'入库量', - syl:'Usage Amount', - lqr1:'Recipient', - lqr2:'Recipient 2', - kgy1:'Warehouse Keeper', - kgy2:'Warehouse Keeper 2', + bdxx: '表单信息', + jbxx: '基本信息', + rkwz: '入库位置', + rktj: '入库条件', + zytj: '转移条件', + rkl: '入库净重', + ghr1Id: '归还人', + ghr2Id: '归还人2', + jsr1Id: '接收人', + jsr2Id: '接收人2', + tz: '给药制剂台账', + gdsqrId: '归档申请人', + lqsj: '领取时间', + jcgj: '稽查轨迹', + ffbz: '发放备注', + ghbz: '归还备注', + cjsj: '创建时间', + jysj: '借阅时间', + ffjlxq: '发放回收记录详情', + gyzjxq: '给药制剂详情', + sqguihuan: '归还', + qrrk: '确认入库', + qmr1Id: '签名人1', + qmr2Id: '签名人2', - plff:'Batch Distribution', - plczyj:'Batch Dispose Substance', - plczrq:'Batch Dispose Containers', - plsd:'Batch Lock', - plgd:'Batch Archive', - lock:'Lock', - unlock:'Unlock', - detail:'Detail', - guidang:'Archive', - jiedang:'De-archive', - jieyue:'Check-out', - guihuan:'Return', - fafang:'Distribution', - ysff:'Issue Key', - czrq:'Dispose Container', - czyj:'Dispose Substance', - yuanyin:'Reason', - xgkc:'Change Inventory', - shxgkc:'Approve Inventory Change', - shbj:'Approve Edit', - clr:'Operator', - czfs:'Dispose Method', - fhr:'Reviewer', - xgbz:'修改备注', - jdr:'Supervisor', - xgr:'Editor', - czl:'Amount', - ffr:'Issuer', - ffr1:'Issuer', - ffr2:'Issuer 2', - zytj:'Transfer Condition', - md:'Purpose', - ckl:'Amount out', - ckldw:'出库单位', - ffzytj:'发放转移条件', - ghzytj:'归还转移条件', - ckmz:'出库毛重', - ckmzdw:'出库毛重单位', - ys1lrq:'Key 1 User', - ys2lrq:'Key 2 User', - sssy:'In Study', - ssbd:'In Record', - bdssr:'By User', - syr:'使用人', - lqghr:'Recipient/Returner', - ffjsr:'Issuer/接收人', - czlx:'Action', - czl:'Amount', - bzyy:'Comment/Reason', - ccsj:'Datetime', - cksj:'Out of Storage Date', - rksj:'Into Storage Date', - jiaqian:'Sign', - gyzjgl:'Dose Formulation', - ffhsjl:'In-and-Out Record', + lqff: '领取发放', + sqgd: '申请归档', + sqjd: '申请解档', + jsgyzj: '解锁给药制剂', + sqjy: '申请借阅', + tyjjrk: '同意/拒绝入库', + sdgyzj: '锁定给药制剂', + tyjjbj: '同意/拒绝编辑', + tyjjxgkc: '同意/拒绝修改库存', + gyzjrk: '给药制剂入库', - bdxx:'Record Information', - jbxx:'Information', - rkwz:'入库位置', - rktj:'入库条件', - zytj:'转移条件', - rkmz:'入库净量', - jsl:'减少量', - syl:'Usage Amount', - ghr1Id:'Returner', - ghr2Id:'Returner 2', - jsr1Id:'Warehouse Keeper', - jsr2Id:'Warehouse Keeper 2', - tz:'台账', - gdsqrId:'归档申请人', - lqsj:'领取时间', - jcgj:'Track Record', - ffbz:'发放备注', - ghbz:'归还备注', - cjsj:'Creation Date', - rkl:'入库量', - jysj:'Checkout Period', - ffjlxq:'In-and-Out Record Detail', - gyzjxq:'Dose Formulation Detail', - sqguihuan:'Return' -} \ No newline at end of file + xgkc: '修改库存', + bcsm: '补充说明', + jsffjl: '解锁发放记录', + sdffjl: '锁定发放记录' +} diff --git a/src/lang/en/business/resource/mjy.js b/src/lang/en/business/resource/mjy.js index 385ab76..06aaf16 100644 --- a/src/lang/en/business/resource/mjy.js +++ b/src/lang/en/business/resource/mjy.js @@ -1,104 +1,125 @@ export default { - mc:'Name', - bh:'ID', - jyzt:'Check-out', - zjzt:'Form', - jlzt:'Status', - sxrq:'Expiration', - nd:'Concentration/Purity', - nddw:'浓度单位', - kcl:'Inventory', - kc:'Inventory', - kcdw:'库存单位', - zcg:'Locker', - cctj:'Storage Condition', - ccwz:'Storage Location', - cksj:'Out of Storage Date', - rksj:'Into Storage Date', - ckjz:'出库净重', - rkjz:'入库净重', - syl:'Usage Amount', - lqr1:'Recipient', - lqr2:'Recipient 2', - kgy1:'Warehouse Keeper', - kgy2:'Warehouse Keeper 2', + mc: '名称', + bh: '编号', + jyzt: '借阅状态', + zjzt: '制剂状态', + jlzt: '记录状态', + sxrq: '失效日期', + nd: '浓度', + nddw: '浓度单位', + kcl: '库存量', + kc: '库存', + kcdw: '库存单位', + zcg: '暂存柜', + cctj: '存储条件', + ccwz: '存储位置', + cksj: '出库时间', + rksj: '入库时间', + ckjz: '出库净重', + rkjz: '入库净重', + syl: '使用量', + lqr1: '领取人', + lqr2: '领取人2', + yslqr1: '钥匙1领取人', + yslqr2: '钥匙2领取人', + kgy1: '库管员', + kgy2: '库管员2', - plff:'Batch Distribution', - plczyj:'Batch Dispose Substance', - plczrq:'Batch Dispose Containers', - plsd:'Batch Lock', - plgd:'Batch Archive', - lock:'Lock', - unlock:'Unlock', - detail:'Detail', - guidang:'Archive', - jiedang:'De-archive', - jieyue:'Check-out', - guihuan:'Return', - fafang:'Distribution', - ysff:'Issue Key', - czrq:'Dispose Container', - czyj:'Dispose Substance', - yuanyin:'Reason', - xgkc:'Change Inventory', - shxgkc:'Approve Inventory Change', - shbj:'Approve Edit', - clr:'Operator', - czfs:'Dispose Method', - fhr:'Reviewer', - xgbz:'修改备注', - jdr:'Supervisor', - xgr:'Editor', - czl:'Amount', - ffr:'Issuer', - ffr1:'Issuer', - ffr2:'Issuer 2', - zytj:'Transfer Condition', - md:'Purpose', - ckmz:'出库毛重', - ckl:'Amount out', - ckldw:'出库单位', - ffzytj:'发放转移条件', - ghzytj:'归还转移条件', - ckmzdw:'出库毛重单位', - ys1lrq:'Key 1 User', - ys2lrq:'Key 2 User', - sssy:'In Study', - ssbd:'In Record', - bdssr:'By User', - syr:'使用人', - lqghr:'Recipient/Returner', - ffjsr:'Issuer/接收人', - czlx:'Action', - czl:'Amount', - bzyy:'Comment/Reason', - ccsj:'Datetime', - cksj:'Out of Storage Date', - rksj:'Into Storage Date', - jiaqian:'Sign', - mjygl:'Controlled Drug', - ffhsjl:'In-and-Out Record', + plff: '批量发放', + plczyj: '批量处置药剂', + plczrq: '批量处置容器', + ysff: '钥匙发放', + plsd: '批量锁定', + plgd: '批量归档', + lock: '锁定', + unlock: '解锁', + detail: '详情', + guidang: '归档', + jiedang: '解档', + jieyue: '借阅', + guihuan: '归还', + fafang: '发放', + czrq: '处置容器', + czyj: '处置药剂', + yuanyin: '原因', + xgkc: '修改库存', + shxgkc: '审核修改库存', + shbj: '审核编辑', + clr: '处理人', + czfs: '处置方式', + fhr: '复核人', + xgbz: '修改备注', + jdr: '监督人', + xgr: '修改人', + czl: '处置量', + ffr: '发放人', + ffr1: '发放人1', + ffr2: '发放人2', + zytj: '转移条件', + md: '目的', + ckmz: '出库毛重', + ckl: '出库量', + ckldw: '出库单位', + ffzytj: '发放转移条件', + ghzytj: '归还转移条件', + ckmz: '出库毛重', + ckmzdw: '出库毛重单位', + ys1lrq: '钥匙1领取人', + ys2lrq: '钥匙2领取人', + sssy: '所属试验', + ssbd: '所属表单', + bdssr: '表单所属人', + syr: '使用人', + lqghr: '领取/归还人', + ffjsr: '发放/接收人', + czlx: '操作类型', + czl: '操作量', + bzyy: '备注/原因', + ccsj: '操作时间', + cksj: '出库时间', + rksj: '入库时间', + jiaqian: '加签', + mjygl: '麻精药管理', + ffhsjl: '发放回收记录', + ruku: '入库', + bdxx: '表单信息', + jbxx: '基本信息', + rkwz: '入库位置', + rktj: '入库条件', + zytj: '转移条件', + rkmz: '入库毛重', + jsl: '减少量', + syl: '使用量', + ghr1Id: '归还人', + ghr2Id: '归还人2', + jsr1Id: '库管员', + jsr2Id: '库管员2', + tz: '麻精药台账', + lqsj: '领取时间', + jcgj: '稽查轨迹', + ffbz: '发放备注', + ghbz: '归还备注', + cjsj: '创建时间', + rkl: '入库毛重', + jysj: '借阅时间', + mjyxq: '麻精药详情', + ffjlxq: '发放回收记录详情', + sswjj:'所属文件夹', + ssbd:'所属表单', + qmr1Id:'签名人1', + qmr2Id:'签名人2', - bdxx:'Record Information', - jbxx:'Information', - rkwz:'入库位置', - rktj:'入库条件', - zytj:'转移条件', - rkmz:'入库毛重', - jsl:'减少量', - syl:'Usage Amount', - ghr1Id:'Returner', - ghr2Id:'Returner 2', - jsr1Id:'Warehouse Keeper', - jsr2Id:'Warehouse Keeper 2', - tz:'Drug Table', - lqsj:'领取时间', - jcgj:'Track Record', - ffbz:'发放备注', - ghbz:'归还备注', - cjsj:'Creation Date', - jysj:'Checkout Period', - mjyxq:'Controlled Drug Detail', - ffjlxq:'In-and-Out Record Detail', - -} \ No newline at end of file + lqff:'领取发放', + sqgd:'申请归档', + sqjd:'申请解档', + jsmjy:'解锁麻精药', + sqjy:'申请借阅', + mjyrk:'麻精药入库', + sdmjy:'锁定麻精药', + tyjjbj:'同意/拒绝编辑', + tyjjxgkc:'同意/拒绝修改库存', + xgkc:'修改库存', + bcsm:'补充说明', + jsffjl:'解锁发放记录', + sdffjl:'锁定发放记录' +} diff --git a/src/lang/en/business/resource/resource.js b/src/lang/en/business/resource/resource.js index c42a691..9c3fef8 100644 --- a/src/lang/en/business/resource/resource.js +++ b/src/lang/en/business/resource/resource.js @@ -1,6 +1,7 @@ export default { zjzt: { rk: 'In Storage', + wrk: '未入库', yff: 'In Use', ysd: 'Locked', dgd: 'Pending Archiving', diff --git a/src/lang/en/business/resource/zcg.js b/src/lang/en/business/resource/zcg.js index 4067f53..3b1579e 100644 --- a/src/lang/en/business/resource/zcg.js +++ b/src/lang/en/business/resource/zcg.js @@ -1,18 +1,18 @@ export default { - ysbh: 'ID', + ysbh: '钥匙编号', jyr: '借用人', - zt: 'Status', - jyz: 'In Use', - wjy: 'Not in Use', - plgh: 'Batch Return', - zcg: 'Locker', - ysbh: 'ID', - ys1jyr: 'Key 1 User', - ys2jyr: 'Key 2 User', - glyj: 'Contained Substance', - ysff: 'Issue Key', - gh: 'Return Key', - ysgh: 'Return Key', + zt: '状态', + jyz: '借用中', + wjy: '未借用', + plgh: '批量归还', + zcg: '暂存柜', + ysbh: '钥匙编号', + ys1jyr: '钥匙1借用人', + ys2jyr: '钥匙2借用人', + glyj: '关联药剂', + ysff: '发放钥匙', + gh: '归还', + ysgh: '钥匙归还', ysghts:'请确认是否归还以下钥匙', ghr1Id:'钥匙1归还人', ghr1mm:'钥匙1归还人密码', @@ -20,13 +20,14 @@ export default { ghr2mm:'钥匙2归还人密码', jsr:'接收人', jsrmm:'接收人密码', - qmyy:'Purpose', - remark:'Remark', - lqr1Id:'Key 1 User', - lqr1mm:'Key 1 User Password', - lqr2Id:'Key 2 User', - lqr2mm:'Key 2 User Password', - ffr:'Distribute User', - ffrmm:'Distribute User Password', - + qmyy:'签名意义', + remark:'备注', + lqr1Id:'钥匙1领取人', + lqr1mm:'钥匙1领取人密码', + lqr2Id:'钥匙2领取人', + lqr2mm:'钥匙2领取人密码', + ffr:'发放人', + ffrmm:'发放人密码', + qysff:'钥匙发放', + qysgh:'钥匙归还' } \ No newline at end of file diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js index d5c27d9..b58622a 100644 --- a/src/lang/zh/business/resource/gyzj.js +++ b/src/lang/zh/business/resource/gyzj.js @@ -20,11 +20,11 @@ export default { syl: '使用量', lqr1: '领取人', lqr2: '领取人2', - yslqr1:'钥匙1领取人', - yslqr2:'钥匙2领取人', + yslqr1: '钥匙1领取人', + yslqr2: '钥匙2领取人', kgy1: '库管员', kgy2: '库管员2', -rkmz:'入库毛重', + rkmz: '入库毛重', plff: '批量发放', plczyj: '批量处置药剂', plczrq: '批量处置容器', @@ -39,7 +39,6 @@ rkmz:'入库毛重', jieyue: '借阅', guihuan: '确认归还', fafang: '发放', - ysff: '钥匙发放', czrq: '处置容器', czyj: '处置药剂', yuanyin: '原因', @@ -102,6 +101,22 @@ rkmz:'入库毛重', gyzjxq: '给药制剂详情', sqguihuan: '归还', qrrk: '确认入库', - qmr1Id:'签名人1', - qmr2Id:'签名人2', + qmr1Id: '签名人1', + qmr2Id: '签名人2', + + lqff: '领取发放', + sqgd: '申请归档', + sqjd: '申请解档', + jsgyzj: '解锁给药制剂', + sqjy: '申请借阅', + tyjjrk: '同意/拒绝入库', + sdgyzj: '锁定给药制剂', + tyjjbj: '同意/拒绝编辑', + tyjjxgkc: '同意/拒绝修改库存', + gyzjrk: '给药制剂入库', + ruku:'入库', + xgkc: '修改库存', + bcsm: '补充说明', + jsffjl: '解锁发放记录', + sdffjl: '锁定发放记录' } diff --git a/src/lang/zh/business/resource/mjy.js b/src/lang/zh/business/resource/mjy.js index 68adcc9..06aaf16 100644 --- a/src/lang/zh/business/resource/mjy.js +++ b/src/lang/zh/business/resource/mjy.js @@ -39,7 +39,6 @@ export default { jieyue: '借阅', guihuan: '归还', fafang: '发放', - ysff: '钥匙发放', czrq: '处置容器', czyj: '处置药剂', yuanyin: '原因', @@ -109,4 +108,18 @@ export default { ssbd:'所属表单', qmr1Id:'签名人1', qmr2Id:'签名人2', + + lqff:'领取发放', + sqgd:'申请归档', + sqjd:'申请解档', + jsmjy:'解锁麻精药', + sqjy:'申请借阅', + mjyrk:'麻精药入库', + sdmjy:'锁定麻精药', + tyjjbj:'同意/拒绝编辑', + tyjjxgkc:'同意/拒绝修改库存', + xgkc:'修改库存', + bcsm:'补充说明', + jsffjl:'解锁发放记录', + sdffjl:'锁定发放记录' } diff --git a/src/lang/zh/business/resource/zcg.js b/src/lang/zh/business/resource/zcg.js index 120ae8c..3b1579e 100644 --- a/src/lang/zh/business/resource/zcg.js +++ b/src/lang/zh/business/resource/zcg.js @@ -28,4 +28,6 @@ export default { lqr2mm:'钥匙2领取人密码', ffr:'发放人', ffrmm:'发放人密码', + qysff:'钥匙发放', + qysgh:'钥匙归还' } \ No newline at end of file diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue index 6a3102e..a467329 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue @@ -102,7 +102,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请归档', + qmyy: this.$t('page.business.resource.gyzj.sqgd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue index 4d29424..155c3cd 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue @@ -93,7 +93,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请解档', + qmyy: this.$t('page.business.resource.gyzj.sqjd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue index 8f7ec60..56336d7 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue @@ -83,7 +83,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '补充说明', + qmyy: this.$t('page.business.resource.gyzj.bcsm'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/ffjl/Js.vue b/src/views/business/resource/gyzj/comps/ffjl/Js.vue index 51e94e4..93508d1 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Js.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Js.vue @@ -83,7 +83,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '解锁发放记录', + qmyy: this.$t('page.business.resource.gyzj.jsffjl'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue index 19a43b4..66d21cb 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue @@ -114,7 +114,7 @@ export default { startDate: null, endDate: null, bh: null, - qmyy: '申请借阅', + qmyy: this.$t('page.business.resource.gyzj.sqjy'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue index 0190e68..e05b339 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue @@ -102,7 +102,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '锁定发放记录', + qmyy: this.$t('page.business.resource.gyzj.sdffjl'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue index ea9ea5e..9ad5fb5 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue @@ -167,7 +167,7 @@ export default { cctj: null, ccwz: null, qmrmm: null, - qmyy: '编辑', + qmyy: this.$t('page.form.edit'), bjbz: '' } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue index b241041..fb20025 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue @@ -232,7 +232,7 @@ export default { clrId: null, fhrId: null, jdrId: null, - qmyy: '处置容器', + qmyy: this.$t('page.business.resource.gyzj.czrq'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue index 47039f3..0ed91bc 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue @@ -255,7 +255,7 @@ export default { fhrId: null, jdrId: null, czl: null, - qmyy: '处置药剂', + qmyy: this.$t('page.business.resource.gyzj.czyj'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue index f047e7e..5f3cbaf 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue @@ -358,7 +358,7 @@ export default { ffr2Id: null, ffr2Mc: null, ffr2mm: null, - qmyy: '领取发放', + qmyy: this.$t('page.business.resource.gyzj.lqff'), qmrmm: null, remark: null } diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue index 28d3eef..b2b4042 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue @@ -102,7 +102,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请归档', + qmyy: this.$t('page.business.resource.gyzj.sqgd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue index 5848569..172fd1d 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue @@ -243,7 +243,7 @@ export default { }, reset() { this.form = { - qmyy: '确认归还', + qmyy: this.$t('page.business.resource.gyzj.guihuan'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue index 0b956c7..011bdcf 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue @@ -104,7 +104,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '申请解档', + qmyy: this.$t('page.business.resource.gyzj.sqjd'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Js.vue b/src/views/business/resource/gyzj/comps/gyzj/Js.vue index 2472922..328ce1e 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Js.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Js.vue @@ -83,7 +83,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '解锁给药制剂', + qmyy: this.$t('page.business.resource.gyzj.jsgyzj'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue index 7fe1753..ea5d581 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue @@ -136,7 +136,7 @@ export default { bh: null, startDate: null, endDate: null, - qmyy: '申请借阅', + qmyy: this.$t('page.business.resource.gyzj.sqjy'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Rk.vue b/src/views/business/resource/gyzj/comps/gyzj/Rk.vue index 4654d8f..c3e496c 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Rk.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Rk.vue @@ -244,7 +244,7 @@ export default { reset() { this.form = { qmyy: null, - qmyyMc: '同意/拒绝入库', + qmyyMc: this.$t('page.business.resource.gyzj.tyjjrk'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue index e8d9f4b..cde5508 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue @@ -102,7 +102,7 @@ export default { ids: null, mc: null, bh: null, - qmyy: '锁定给药制剂', + qmyy: this.$t('page.business.resource.gyzj.sdgyzj'), qmrmm: null } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue index 14a6bcb..7c9f009 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue @@ -185,7 +185,7 @@ export default { bjrMc: null, bjbz: null, qmyy: null, - qmyyMc: '同意/拒绝编辑', + qmyyMc: this.$t('page.business.resource.gyzj.tyjjbj'), remark: '' } this.resetForm("form") diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue index 7471929..114b17b 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue @@ -139,7 +139,7 @@ export default { kcbjbz: null, remark: '', qmyy: null, - qmyyMc: '同意/拒绝修改库存', + qmyyMc: this.$t('page.business.resource.gyzj.tyjjxgkc'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue index bba78c1..212deef 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue @@ -203,7 +203,7 @@ export default { }, reset() { this.form = { - qmyy: '归还', + qmyy: this.$t('page.business.resource.gyzj.sqguihuan'), } this.resetForm("form") }, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue index d3ac918..7efce9f 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue @@ -1,7 +1,7 @@ @@ -105,6 +110,8 @@ + + @@ -119,12 +126,13 @@ import Xq from "@/views/business/resource/gyzj/comps/gyzj/Xq"; import Bj from "@/views/business/resource/gyzj/comps/gyzj/Bj"; import Xgkc from "@/views/business/resource/gyzj/comps/gyzj/Xgkc"; import Sqgh from "@/views/business/resource/gyzj/comps/gyzj/Sqgh"; +import Sqrk from "@/views/business/resource/gyzj/comps/gyzj/Sqrk"; import Czyj from "@/views/business/resource/gyzj/comps/gyzj/Czyj"; import moment from "moment"; export default { name: "GyzjList", - components: { Xq, Bj, Xgkc, Sqgh, Czyj }, + components: { Xq, Bj, Xgkc, Sqgh, Czyj,Sqrk }, data() { return { daterange: [], @@ -187,6 +195,10 @@ export default { handleGh(row) { this.$refs.Sqgh.show(row) }, + //入库 + handleRk(row) { + this.$refs.Sqrk.show(row) + }, closeXq() { this.showDetail = false this.handleQuery() diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue index 4f1c7c6..f76085b 100644 --- a/src/views/business/study/comp/wzlb/mjyList.vue +++ b/src/views/business/study/comp/wzlb/mjyList.vue @@ -19,6 +19,7 @@ +