From 8f181256a01896c32a27eb6f5a3e5e205d26f158 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sat, 10 Jan 2026 15:06:02 +0800 Subject: [PATCH 1/4] =?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]bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/resource/gyzj/comps/gyzj/Czrq.vue | 10 +++++----- .../business/resource/gyzj/comps/gyzj/Czyj.vue | 8 ++++---- src/views/business/resource/gyzj/comps/gyzj/Ff.vue | 16 ++++++++-------- src/views/business/resource/gyzj/comps/gyzj/Gh.vue | 9 +++++---- .../business/resource/gyzj/comps/gyzj/Sqgh.vue | 10 +++++----- src/views/business/resource/mjy/comps/mjy/Czrq.vue | 8 ++++---- src/views/business/resource/mjy/comps/mjy/Czyj.vue | 8 ++++---- src/views/business/resource/mjy/comps/mjy/Ff.vue | 8 ++++---- src/views/business/resource/mjy/comps/mjy/Gh.vue | 22 ++++++++++++---------- 9 files changed, 51 insertions(+), 48 deletions(-) diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue index c5995f7..9d5350a 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue @@ -14,8 +14,7 @@ :show-overflow-tooltip="true" width="120px" /> @@ -50,7 +49,7 @@ - + @@ -126,10 +125,11 @@ import { czrq, plczrq } from "@/api/business/gyzj/gyzj" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Bj", - components: { SelectDeptUser }, + components: { SelectDeptUser,BusinessSelect }, data() { return { isBatch: false, @@ -183,7 +183,7 @@ export default { }, computed: { ...mapGetters([ - 'nickName','name' + 'nickName', 'name' ]), }, created() { diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue index 7a328fd..063b358 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue @@ -14,8 +14,7 @@ :show-overflow-tooltip="true" width="120px" /> @@ -58,7 +57,7 @@ - + @@ -140,10 +139,11 @@ import { czyj, plczyj } from "@/api/business/gyzj/gyzj" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Czyj", - components: { SelectDeptUser }, + components: { SelectDeptUser,BusinessSelect }, data() { return { isBatch: false, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue index a82f3fe..2f1512c 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue @@ -30,8 +30,7 @@ @@ -78,7 +77,7 @@ + }} @@ -99,13 +98,13 @@ + }} - + @@ -156,7 +155,7 @@ - @@ -203,10 +202,11 @@ import { mapGetters } from 'vuex' import SelectList from "./SelectList"; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import SelectStudy from '@/views/business/comps/select/SelectStudy'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Ff", - components: { SelectList, SelectDeptUser, SelectStudy }, + components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect }, data() { return { isBatch: false, @@ -275,7 +275,7 @@ export default { }, computed: { ...mapGetters([ - 'nickName','name' + 'nickName', 'name' ]), }, created() { diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue index df6ddef..132dd68 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue @@ -67,19 +67,19 @@ - + - + - + @@ -161,10 +161,11 @@ import { gh, info } from "@/api/business/gyzj/gyzj" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Gh", - components: { SelectDeptUser }, + components: { SelectDeptUser,BusinessSelect }, data() { return { isBatch: false, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue index f72e28c..9d94182 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue @@ -65,22 +65,21 @@ - - + - + - + @@ -139,10 +138,11 @@ import { sqgh, info } from "@/api/business/gyzj/gyzj" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Gh", - components: { SelectDeptUser }, + components: { SelectDeptUser,BusinessSelect }, data() { return { isBatch: false, diff --git a/src/views/business/resource/mjy/comps/mjy/Czrq.vue b/src/views/business/resource/mjy/comps/mjy/Czrq.vue index 2939e34..5dd0469 100644 --- a/src/views/business/resource/mjy/comps/mjy/Czrq.vue +++ b/src/views/business/resource/mjy/comps/mjy/Czrq.vue @@ -14,8 +14,7 @@ :show-overflow-tooltip="true" width="120px" /> @@ -50,7 +49,7 @@ - + @@ -125,10 +124,11 @@ import { czrq, plczrq } from "@/api/business/mjy/mjy" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Bj", - components: { SelectDeptUser }, + components: { SelectDeptUser ,BusinessSelect}, data() { return { isBatch: false, diff --git a/src/views/business/resource/mjy/comps/mjy/Czyj.vue b/src/views/business/resource/mjy/comps/mjy/Czyj.vue index c16be9e..c0f3200 100644 --- a/src/views/business/resource/mjy/comps/mjy/Czyj.vue +++ b/src/views/business/resource/mjy/comps/mjy/Czyj.vue @@ -14,8 +14,7 @@ :show-overflow-tooltip="true" width="120px" /> @@ -58,7 +57,7 @@ - + @@ -142,10 +141,11 @@ import { czyj, plczyj } from "@/api/business/mjy/mjy" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Czyj", - components: { SelectDeptUser }, + components: { SelectDeptUser,BusinessSelect }, data() { return { isBatch: false, diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue index ea96c23..a706407 100644 --- a/src/views/business/resource/mjy/comps/mjy/Ff.vue +++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue @@ -30,8 +30,7 @@ @@ -114,7 +113,7 @@ - + @@ -219,10 +218,11 @@ import { mapGetters } from 'vuex' import SelectList from "./SelectList"; import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; import SelectStudy from '@/views/business/comps/select/SelectStudy'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Ff", - components: { SelectList, SelectDeptUser, SelectStudy }, + components: { SelectList, SelectDeptUser, SelectStudy,BusinessSelect }, data() { return { isBatch: false, diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue index 109bfee..0ff16af 100644 --- a/src/views/business/resource/mjy/comps/mjy/Gh.vue +++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue @@ -26,7 +26,7 @@ + }} @@ -47,7 +47,7 @@ + }} @@ -62,7 +62,7 @@ + }} @@ -77,19 +77,19 @@ - + - + - + @@ -157,8 +157,9 @@ - - + + @@ -203,10 +204,11 @@ import { gh, info } from "@/api/business/mjy/mjy" import { mapGetters } from 'vuex' import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser'; +import BusinessSelect from '@/views/business/comps/select/BusinessSelect'; export default { name: "Gh", - components: { SelectDeptUser }, + components: { SelectDeptUser, BusinessSelect }, data() { return { isBatch: false, @@ -290,7 +292,7 @@ export default { }, computed: { ...mapGetters([ - 'nickName','name' + 'nickName', 'name' ]), }, created() { From 4ee29eeea62ba93d9119ac940030458878de258a Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Sat, 10 Jan 2026 17:49:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/ytbd/Bj.vue | 1 - src/views/business/study/comp/ytbd/Sh.vue | 2 +- src/views/business/study/comp/ytbd/Xq.vue | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 1950d12..a0d90ad 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -228,7 +228,6 @@ export default { }, edit(row) { this.reset() - debugger if (row && row.id) { this.showIndex = 2 this.$modal.loading() diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue index 7a63c69..540498e 100644 --- a/src/views/business/study/comp/ytbd/Sh.vue +++ b/src/views/business/study/comp/ytbd/Sh.vue @@ -16,7 +16,7 @@
- +
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue index f9ad749..22cfe7e 100644 --- a/src/views/business/study/comp/ytbd/Xq.vue +++ b/src/views/business/study/comp/ytbd/Xq.vue @@ -16,7 +16,7 @@
- +
{{ $t('page.business.study.studyFormPre.qmxx') }}
From 21371e0066e95109b5ec573573b11cae7b00269c Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Sat, 10 Jan 2026 17:58:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?= =?UTF-8?q?[=E7=89=A9=E8=B5=84=E5=88=97=E8=A1=A8]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/gsp/gsp.js | 10 ++ src/api/business/sj/sj.js | 9 + src/views/business/study/comp/wzlb.vue | 6 +- src/views/business/study/comp/wzlb/gspList.vue | 231 +++++++++++++++++++++++++ src/views/business/study/comp/wzlb/sjList.vue | 225 ++++++++++++++++++++++++ 5 files changed, 480 insertions(+), 1 deletion(-) create mode 100644 src/views/business/study/comp/wzlb/gspList.vue create mode 100644 src/views/business/study/comp/wzlb/sjList.vue diff --git a/src/api/business/gsp/gsp.js b/src/api/business/gsp/gsp.js index 4f5ac2d..228ac6f 100644 --- a/src/api/business/gsp/gsp.js +++ b/src/api/business/gsp/gsp.js @@ -9,6 +9,16 @@ export function list(query) { }) } +// 试验物资列表 +export function studyList(query) { + return request({ + url: '/system/business/gsp/studyList', + method: 'get', + params: query + }) +} + + // 稽查轨迹列表 export function jcgjList(query) { return request({ diff --git a/src/api/business/sj/sj.js b/src/api/business/sj/sj.js index dfe0e32..a9ca11d 100644 --- a/src/api/business/sj/sj.js +++ b/src/api/business/sj/sj.js @@ -9,6 +9,15 @@ export function sj_list(query) { }) } +// 试验物资列表 +export function studyList(query) { + return request({ + url: '/system/business/sj/studyList', + method: 'get', + params: query + }) +} + // 查询试剂库存详情 export function sj_info(query) { return request({ diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue index 457d41e..5790412 100644 --- a/src/views/business/study/comp/wzlb.vue +++ b/src/views/business/study/comp/wzlb.vue @@ -38,6 +38,8 @@
+ +
@@ -50,6 +52,8 @@ import { checkPermi, checkRole } from "@/utils/permission"; import { study_info } from "@/api/business/study/study" import gyzjList from './wzlb/gyzjList.vue' +import sjList from './wzlb/sjList.vue' +import gspList from './wzlb/gspList.vue' export default { name: 'StudyWzlb', props: { @@ -69,7 +73,7 @@ export default { } }, }, - components: {gyzjList}, + components: {gyzjList, sjList, gspList}, data() { return { showDetail: false, diff --git a/src/views/business/study/comp/wzlb/gspList.vue b/src/views/business/study/comp/wzlb/gspList.vue new file mode 100644 index 0000000..52a57b4 --- /dev/null +++ b/src/views/business/study/comp/wzlb/gspList.vue @@ -0,0 +1,231 @@ + + + + + \ No newline at end of file diff --git a/src/views/business/study/comp/wzlb/sjList.vue b/src/views/business/study/comp/wzlb/sjList.vue new file mode 100644 index 0000000..fc4f621 --- /dev/null +++ b/src/views/business/study/comp/wzlb/sjList.vue @@ -0,0 +1,225 @@ + + + + + \ No newline at end of file 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 4/4] =?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 @@