From 73ec67473eee16b2b95b356c485aa900bd4d1347 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 25 Dec 2025 13:54: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][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E5=8F=91?= =?UTF-8?q?=E6=94=BE=E8=AE=B0=E5=BD=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 31 +- src/api/business/mjy/mjy.js | 56 ++- src/lang/en/business/resource/mjy/mjy.js | 53 ++- src/lang/zh/business/resource/mjy/mjy.js | 43 +- src/views/business/resource/mjy/comps/Bj.vue | 196 ---------- src/views/business/resource/mjy/comps/Czrq.vue | 272 ------------- src/views/business/resource/mjy/comps/Czyj.vue | 295 -------------- src/views/business/resource/mjy/comps/Ff.vue | 363 ----------------- src/views/business/resource/mjy/comps/Gd.vue | 158 -------- src/views/business/resource/mjy/comps/Gh.vue | 158 -------- src/views/business/resource/mjy/comps/Jd.vue | 157 -------- src/views/business/resource/mjy/comps/Js.vue | 123 ------ src/views/business/resource/mjy/comps/Jy.vue | 157 -------- src/views/business/resource/mjy/comps/Sd.vue | 156 -------- .../business/resource/mjy/comps/SelectList.vue | 38 -- src/views/business/resource/mjy/comps/Shbj.vue | 223 ----------- src/views/business/resource/mjy/comps/Shxgkc.vue | 167 -------- src/views/business/resource/mjy/comps/Xgkc.vue | 145 ------- src/views/business/resource/mjy/comps/Xq.vue | 66 ---- src/views/business/resource/mjy/comps/Ysff.vue | 217 ---------- src/views/business/resource/mjy/list.vue | 435 --------------------- 21 files changed, 135 insertions(+), 3374 deletions(-) delete mode 100644 src/views/business/resource/mjy/comps/Bj.vue delete mode 100644 src/views/business/resource/mjy/comps/Czrq.vue delete mode 100644 src/views/business/resource/mjy/comps/Czyj.vue delete mode 100644 src/views/business/resource/mjy/comps/Ff.vue delete mode 100644 src/views/business/resource/mjy/comps/Gd.vue delete mode 100644 src/views/business/resource/mjy/comps/Gh.vue delete mode 100644 src/views/business/resource/mjy/comps/Jd.vue delete mode 100644 src/views/business/resource/mjy/comps/Js.vue delete mode 100644 src/views/business/resource/mjy/comps/Jy.vue delete mode 100644 src/views/business/resource/mjy/comps/Sd.vue delete mode 100644 src/views/business/resource/mjy/comps/SelectList.vue delete mode 100644 src/views/business/resource/mjy/comps/Shbj.vue delete mode 100644 src/views/business/resource/mjy/comps/Shxgkc.vue delete mode 100644 src/views/business/resource/mjy/comps/Xgkc.vue delete mode 100644 src/views/business/resource/mjy/comps/Xq.vue delete mode 100644 src/views/business/resource/mjy/comps/Ysff.vue delete mode 100644 src/views/business/resource/mjy/list.vue diff --git a/src/App.vue b/src/App.vue index 6baa892..da86767 100644 --- a/src/App.vue +++ b/src/App.vue @@ -131,7 +131,9 @@ export default { .el-dialog__footer { box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1) !important; } - +.el-dialog__body{ + padding: 10px 10px; +} /*搜索区域样式 */ .search-area { input { @@ -139,6 +141,10 @@ export default { } } +.el-tabs--border-card>.el-tabs__content { + padding: 0px 0px; +} + /*详情 */ .detail-container { background: #ffffff !important; @@ -170,8 +176,20 @@ export default { } .content { - margin-top: 10px; - padding: 10px 10px; + + display: flex; + justify-content: space-between; + + .content-right { + width: 33%; + margin-left: 2%; + padding: 0px 10px; + border-left: 1px solid #d0d0d0; + } + + .content-left { + width: 65%; + } .content-title { width: 100%; @@ -206,14 +224,13 @@ export default { display: flex; justify-content: space-between; - + margin: 10px 0px; .left { box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1); - margin: 20px 20px 20px 0px; + margin: 5px 5px 5px 0px; width: 50%; padding: 10px 10px; border-radius: 5px 5px; - .left-title { height: 40px; line-height: 40px; @@ -222,7 +239,7 @@ export default { .right { box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1); - margin: 20px 0px 20px 0px; + margin: 5px 0px 5px 5px; width: 50%; padding: 10px 10px; border-radius: 5px 5px; diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js index 024e8a4..01f1038 100644 --- a/src/api/business/mjy/mjy.js +++ b/src/api/business/mjy/mjy.js @@ -1,7 +1,7 @@ import request from '@/utils/request' // 查询麻精药列表 -export function mjy_list(query) { +export function list(query) { return request({ url: '/system/business/mjy/list', method: 'get', @@ -10,7 +10,7 @@ export function mjy_list(query) { } // 查询麻精药详情 -export function mjy_info(query) { +export function info(query) { return request({ url: '/system/business/mjy/info', method: 'get', @@ -19,7 +19,7 @@ export function mjy_info(query) { } // 编辑 -export function mjy_bj(data) { +export function bj(data) { return request({ url: '/system/business/mjy/bj', method: 'post', @@ -29,7 +29,7 @@ export function mjy_bj(data) { // 审核编辑 -export function mjy_shbj(data) { +export function shbj(data) { return request({ url: '/system/business/mjy/shbj', method: 'post', @@ -38,7 +38,7 @@ export function mjy_shbj(data) { } // 修改库存 -export function mjy_xgkc(data) { +export function xgkc(data) { return request({ url: '/system/business/mjy/xgkc', method: 'post', @@ -48,7 +48,7 @@ export function mjy_xgkc(data) { // 审核修改库存 -export function mjy_shxgkc(data) { +export function shxgkc(data) { return request({ url: '/system/business/mjy/shxgkc', method: 'post', @@ -57,7 +57,7 @@ export function mjy_shxgkc(data) { } // 解锁 -export function mjy_js(data) { +export function js(data) { return request({ url: '/system/business/mjy/js', method: 'post', @@ -67,7 +67,7 @@ export function mjy_js(data) { // 锁定 -export function mjy_sd(data) { +export function sd(data) { return request({ url: '/system/business/mjy/sd', method: 'post', @@ -77,7 +77,7 @@ export function mjy_sd(data) { //批量锁定 -export function mjy_plsd(data) { +export function plsd(data) { return request({ url: '/system/business/mjy/plsd', method: 'post', @@ -86,7 +86,7 @@ export function mjy_plsd(data) { } //处置容器 -export function mjy_czrq(data) { +export function czrq(data) { return request({ url: '/system/business/mjy/czrq', method: 'post', @@ -95,7 +95,7 @@ export function mjy_czrq(data) { } //批量处置容器 -export function mjy_plczrq(data) { +export function plczrq(data) { return request({ url: '/system/business/mjy/plczrq', method: 'post', @@ -105,7 +105,7 @@ export function mjy_plczrq(data) { //处置药剂 -export function mjy_czyj(data) { +export function czyj(data) { return request({ url: '/system/business/mjy/czyj', method: 'post', @@ -114,7 +114,7 @@ export function mjy_czyj(data) { } //批量处置药剂 -export function mjy_plczyj(data) { +export function plczyj(data) { return request({ url: '/system/business/mjy/plczyj', method: 'post', @@ -123,7 +123,7 @@ export function mjy_plczyj(data) { } //归档 -export function mjy_gd(data) { +export function gd(data) { return request({ url: '/system/business/mjy/gd', method: 'post', @@ -132,7 +132,7 @@ export function mjy_gd(data) { } //批量归档 -export function mjy_plgd(data) { +export function plgd(data) { return request({ url: '/system/business/mjy/plgd', method: 'post', @@ -140,7 +140,7 @@ export function mjy_plgd(data) { }) } //发放 -export function mjy_ff(data) { +export function ff(data) { return request({ url: '/system/business/mjy/ff', method: 'post', @@ -148,7 +148,7 @@ export function mjy_ff(data) { }) } //批量发放 -export function mjy_plff(data) { +export function plff(data) { return request({ url: '/system/business/mjy/plff', method: 'post', @@ -157,7 +157,7 @@ export function mjy_plff(data) { } //钥匙发放 -export function mjy_ysff(data) { +export function ysff(data) { return request({ url: '/system/business/mjy/ysff', method: 'post', @@ -166,10 +166,28 @@ export function mjy_ysff(data) { } //归还 -export function mjy_gh(data) { +export function gh(data) { return request({ url: '/system/business/mjy/gh', method: 'post', data: data }) } + +//台账列表 +export function tzList(query) { + return request({ + url: '/system/business/mjy/tzList', + method: 'get', + params: query + }) +} + +//解档 +export function jd(data) { + return request({ + url: '/system/business/mjy/jd', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/lang/en/business/resource/mjy/mjy.js b/src/lang/en/business/resource/mjy/mjy.js index 9ef50d4..e9edb61 100644 --- a/src/lang/en/business/resource/mjy/mjy.js +++ b/src/lang/en/business/resource/mjy/mjy.js @@ -1,16 +1,27 @@ export default { - sdts:'请确认是否锁定以下麻精药', - gdts:'请确认是否归档以下麻精药', - mc:'名称', + mc:'名称', bh:'编号', jyzt:'借阅状态', zjzt:'制剂状态', + jlzt:'记录状态', sxrq:'失效日期', nd:'浓度', + nddw:'浓度单位', kcl:'库存量', - zcgMc:'暂存柜', + kc:'库存', + kcdw:'库存单位', + zcg:'暂存柜', cctj:'存储条件', ccwz:'存储位置', + cksj:'出库时间', + rksj:'入库时间', + ckjz:'出库净重', + rkjz:'入库净重', + syl:'使用量', + lqr1:'领取人1', + lqr2:'领取人2', + kgy1:'库管员1', + kgy2:'库管员2', plff:'批量发放', plczyj:'批量处置药剂', @@ -18,7 +29,6 @@ export default { ysff:'钥匙发放', plsd:'批量锁定', plgd:'批量归档', - lock:'锁定', unlock:'解锁', detail:'详情', @@ -30,8 +40,41 @@ export default { ysff:'钥匙发放', czrq:'处置容器', czyj:'处置药剂', + yuanyin:'原因', xgkc:'修改库存', shxgkc:'审核修改库存', shbj:'审核编辑', + clr:'处理人', + czfs:'处置方式', + fhr:'复核人', + xgbz:'修改备注', + jdr:'监督人', + xgr:'修改人', + czl:'处置量', + ffr:'发放人', + ffr1:'发放人1', + ffr2:'发放人2', + zytj:'转移条件', + md:'目的', + ckmz:'出库毛重', + ckl:'出库量', + ckldw:'出库单位', + ffzytj:'转移条件', + ckmz:'出库毛重', + ckmzdw:'出库毛重单位', + ys1lrq:'钥匙1领取人', + ys2lrq:'钥匙2领取人', + sssy:'所属试验', + ssbd:'所属表单', + bdssr:'表单所属人', + syr:'使用人', + lqghr:'领取/归还人', + ffjsr:'发放/接收人', + czlx:'操作类型', + czl:'操作量', + bzyy:'备注/原因', + ccsj:'操作时间', + cksj:'出库时间', + rksj:'入库时间', } \ No newline at end of file diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy/mjy.js index beced89..8b29daa 100644 --- a/src/lang/zh/business/resource/mjy/mjy.js +++ b/src/lang/zh/business/resource/mjy/mjy.js @@ -1,19 +1,27 @@ export default { - sdts:'请确认是否锁定以下麻精药', - gdts:'请确认是否归档以下麻精药', mc:'名称', bh:'编号', jyzt:'借阅状态', zjzt:'制剂状态', + jlzt:'记录状态', sxrq:'失效日期', nd:'浓度', nddw:'浓度单位', kcl:'库存量', kc:'库存', kcdw:'库存单位', - zcgMc:'暂存柜', + zcg:'暂存柜', cctj:'存储条件', ccwz:'存储位置', + cksj:'出库时间', + rksj:'入库时间', + ckjz:'出库净重', + rkjz:'入库净重', + syl:'使用量', + lqr1:'领取人1', + lqr2:'领取人2', + kgy1:'库管员1', + kgy2:'库管员2', plff:'批量发放', plczyj:'批量处置药剂', @@ -21,7 +29,6 @@ export default { ysff:'钥匙发放', plsd:'批量锁定', plgd:'批量归档', - lock:'锁定', unlock:'解锁', detail:'详情', @@ -44,30 +51,32 @@ export default { jdr:'监督人', xgr:'修改人', czl:'处置量', - - lqr1:'领取人1', - lqr2:'领取人2', + ffr:'发放人', ffr1:'发放人1', ffr2:'发放人2', zytj:'转移条件', md:'目的', ckmz:'出库毛重', - ckl:'出库量', ckldw:'出库单位', ffzytj:'转移条件', ckmz:'出库毛重', ckmzdw:'出库毛重单位', - lqr1Mc:'领取人1', - lqr2Mc:'领取人2', - ffr1Mc:'发放人1', - ffr2Mc:'发放人2', - ffr2Mc:'发放人2', - ffxm:'目的', + ys1lrq:'钥匙1领取人', + ys2lrq:'钥匙2领取人', + sssy:'所属试验', + ssbd:'所属表单', + bdssr:'表单所属人', + syr:'使用人', + lqghr:'领取/归还人', + ffjsr:'发放/接收人', + czlx:'操作类型', + czl:'操作量', + bzyy:'备注/原因', + ccsj:'操作时间', + cksj:'出库时间', + rksj:'入库时间', - lqr1Id:'钥匙1领取人', - lqr2Id:'钥匙2领取人', - ffr:'发放人' } \ No newline at end of file diff --git a/src/views/business/resource/mjy/comps/Bj.vue b/src/views/business/resource/mjy/comps/Bj.vue deleted file mode 100644 index 4168397..0000000 --- a/src/views/business/resource/mjy/comps/Bj.vue +++ /dev/null @@ -1,196 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Czrq.vue b/src/views/business/resource/mjy/comps/Czrq.vue deleted file mode 100644 index 00167c5..0000000 --- a/src/views/business/resource/mjy/comps/Czrq.vue +++ /dev/null @@ -1,272 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Czyj.vue b/src/views/business/resource/mjy/comps/Czyj.vue deleted file mode 100644 index d97271c..0000000 --- a/src/views/business/resource/mjy/comps/Czyj.vue +++ /dev/null @@ -1,295 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Ff.vue b/src/views/business/resource/mjy/comps/Ff.vue deleted file mode 100644 index 31fc579..0000000 --- a/src/views/business/resource/mjy/comps/Ff.vue +++ /dev/null @@ -1,363 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Gd.vue b/src/views/business/resource/mjy/comps/Gd.vue deleted file mode 100644 index 0e3e3e0..0000000 --- a/src/views/business/resource/mjy/comps/Gd.vue +++ /dev/null @@ -1,158 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Gh.vue b/src/views/business/resource/mjy/comps/Gh.vue deleted file mode 100644 index 9a71fc2..0000000 --- a/src/views/business/resource/mjy/comps/Gh.vue +++ /dev/null @@ -1,158 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Jd.vue b/src/views/business/resource/mjy/comps/Jd.vue deleted file mode 100644 index ee03edc..0000000 --- a/src/views/business/resource/mjy/comps/Jd.vue +++ /dev/null @@ -1,157 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Js.vue b/src/views/business/resource/mjy/comps/Js.vue deleted file mode 100644 index 65c2b0d..0000000 --- a/src/views/business/resource/mjy/comps/Js.vue +++ /dev/null @@ -1,123 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Jy.vue b/src/views/business/resource/mjy/comps/Jy.vue deleted file mode 100644 index 81153ae..0000000 --- a/src/views/business/resource/mjy/comps/Jy.vue +++ /dev/null @@ -1,157 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Sd.vue b/src/views/business/resource/mjy/comps/Sd.vue deleted file mode 100644 index 85cfeaf..0000000 --- a/src/views/business/resource/mjy/comps/Sd.vue +++ /dev/null @@ -1,156 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/SelectList.vue b/src/views/business/resource/mjy/comps/SelectList.vue deleted file mode 100644 index a4cba7f..0000000 --- a/src/views/business/resource/mjy/comps/SelectList.vue +++ /dev/null @@ -1,38 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Shbj.vue b/src/views/business/resource/mjy/comps/Shbj.vue deleted file mode 100644 index b18ae1b..0000000 --- a/src/views/business/resource/mjy/comps/Shbj.vue +++ /dev/null @@ -1,223 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Shxgkc.vue b/src/views/business/resource/mjy/comps/Shxgkc.vue deleted file mode 100644 index b1f78b3..0000000 --- a/src/views/business/resource/mjy/comps/Shxgkc.vue +++ /dev/null @@ -1,167 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Xgkc.vue b/src/views/business/resource/mjy/comps/Xgkc.vue deleted file mode 100644 index 87291ee..0000000 --- a/src/views/business/resource/mjy/comps/Xgkc.vue +++ /dev/null @@ -1,145 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Xq.vue b/src/views/business/resource/mjy/comps/Xq.vue deleted file mode 100644 index 68304d3..0000000 --- a/src/views/business/resource/mjy/comps/Xq.vue +++ /dev/null @@ -1,66 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/comps/Ysff.vue b/src/views/business/resource/mjy/comps/Ysff.vue deleted file mode 100644 index c2a42df..0000000 --- a/src/views/business/resource/mjy/comps/Ysff.vue +++ /dev/null @@ -1,217 +0,0 @@ -G - - diff --git a/src/views/business/resource/mjy/list.vue b/src/views/business/resource/mjy/list.vue deleted file mode 100644 index 3846657..0000000 --- a/src/views/business/resource/mjy/list.vue +++ /dev/null @@ -1,435 +0,0 @@ - - - - - \ No newline at end of file