From bb14919cbc1db49066c7697da997e516d2eaa07a Mon Sep 17 00:00:00 2001 From: wuyy Date: Wed, 11 Mar 2026 18:08:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/liswork/dict/ComDict.ts | 6 +- src/api/liswork/order/index.ts | 53 +- src/api/login.ts | 5 +- src/api/regional/dict/diagnosis.js | 44 -- src/api/regional/dict/diagnosis.ts | 44 ++ src/api/regional/dict/hospital.js | 44 -- src/api/regional/dict/hospital.ts | 44 ++ src/api/regional/dict/itemclass.js | 44 -- src/api/regional/dict/itemclass.ts | 44 ++ src/api/regional/dict/regdict.js | 44 -- src/api/regional/dict/regdict.ts | 44 ++ src/components/vxeTable/index.vue | 14 +- src/layout/components/Navbar.vue | 11 +- src/main.ts | 5 + src/store/modules/user.ts | 23 +- src/types/api/system/user.ts | 2 + src/utils/dict.ts | 6 +- src/utils/polyfills.ts | 21 + .../liswork/Issueorder/components/info.vue | 12 +- .../Issueorder/components/setBilling.vue | 192 ------- src/views/liswork/Issueorder/index.vue | 129 +++-- src/views/liswork/dict/data.vue | 11 + src/views/liswork/dict/index.vue | 403 ++++++++++++++ src/views/monitor/job/index.vue | 511 ++++++++---------- src/views/monitor/online/index.vue | 100 ++-- src/views/regional/circulation/bbcx/index.vue | 4 +- src/views/regional/circulation/bbqs/index.vue | 4 +- src/views/regional/circulation/bbth/index.vue | 4 +- src/views/regional/circulation/sjdj/index.vue | 4 +- src/views/regional/circulation/zycy/index.vue | 2 +- src/views/regional/dict/diagnosis/index.vue | 5 +- src/views/regional/dict/hospital/index.vue | 5 +- src/views/regional/dict/itemclass/index.vue | 21 +- src/views/regional/dict/regdict/index.vue | 7 +- src/views/regional/regConfig/index.vue | 5 +- src/views/regional/statistics/bbtj/index.vue | 4 +- src/views/regional/statistics/fytj/index.vue | 4 +- src/views/system/config/index.vue | 271 ++++------ src/views/system/dept/index.vue | 249 ++++----- src/views/system/dict/index.vue | 285 ++++------ src/views/system/notice/index.vue | 269 ++++----- src/views/system/post/index.vue | 245 ++++----- src/views/system/role/index.vue | 408 ++++++-------- src/views/system/user/index.vue | 107 ++-- 44 files changed, 1835 insertions(+), 1924 deletions(-) delete mode 100644 src/api/regional/dict/diagnosis.js create mode 100644 src/api/regional/dict/diagnosis.ts delete mode 100644 src/api/regional/dict/hospital.js create mode 100644 src/api/regional/dict/hospital.ts delete mode 100644 src/api/regional/dict/itemclass.js create mode 100644 src/api/regional/dict/itemclass.ts delete mode 100644 src/api/regional/dict/regdict.js create mode 100644 src/api/regional/dict/regdict.ts create mode 100644 src/utils/polyfills.ts delete mode 100644 src/views/liswork/Issueorder/components/setBilling.vue create mode 100644 src/views/liswork/dict/data.vue create mode 100644 src/views/liswork/dict/index.vue diff --git a/src/api/liswork/dict/ComDict.ts b/src/api/liswork/dict/ComDict.ts index 5e2f957..ace0db9 100644 --- a/src/api/liswork/dict/ComDict.ts +++ b/src/api/liswork/dict/ComDict.ts @@ -38,10 +38,10 @@ export function delComDictService(data?: Object) { } // 根据字典类型查询字典数据信息 -export function getComDicts(zdlb?: Object) { +export function getComDicts(dict_type?: Object) { return request({ - url: '/comdict/getComDicts', + url: '/transitdict/regdict/getInfoOne', method: 'get', - params: zdlb + params: dict_type }) } \ No newline at end of file diff --git a/src/api/liswork/order/index.ts b/src/api/liswork/order/index.ts index f5b704b..00f9ab1 100644 --- a/src/api/liswork/order/index.ts +++ b/src/api/liswork/order/index.ts @@ -1,68 +1,37 @@ import request from '@/utils/request' -//获取项目信息 -export function queryXmInfoList(query: any) { +//查询申请单信息 +export function queryRegRequestInfo(query: Object) { return request({ - url: '/reqInput/queryXmInfoList', + url: '/regRequestInfo/queryRegRequestInfo', method: 'get', params: query }) } //保存病人信息 -export function saveReqInfo(query: any) { +export function saveReqInfo(query: Object) { return request({ url: '/reqInput/saveReqInfo', method: 'post', data: query }) } -//保存病人信息 -export function queryPatList(query: any) { + + +//开单项目信息 +export function getXmItemInfo(query: Object) { return request({ - url: '/reqInput/queryPatList', - method: 'post', - data: query - }) -} -//查询病人信息 -export function queryPatInfo(query: any) { - return request({ - url: '/reqInput/queryPatInfo', + url: '/regRequestInfo/getItemInfo', method: 'get', params: query }) } -//不可开单项目列表 -export function queryCreateReqList(query: any) { - return request({ - url: '/reqInput/queryCreateReqList', - method: 'get', - params: query - }) -} - -//可开单项目列表 -export function queryCanCreateReqList(query: any) { - return request({ - url: '/reqInput/queryCanCreateReqList', - method: 'get', - params: query - }) -} -//保存可开单项目 -export function saveCanCreaeReqList(query: any) { - return request({ - url: '/reqInput/saveCanCreaeReqList', - method: 'post', - data: query - }) -} //获取病人明细信息 -export function queryPatDetail(query: any) { +export function queryReqDetail(query: Object) { return request({ - url: '/reqInput/queryPatDetail', + url: '/regRequestInfo/queryReqDetail', method: 'get', params: query }) diff --git a/src/api/login.ts b/src/api/login.ts index 37eeaa3..517f72d 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -2,12 +2,13 @@ import request from '@/utils/request' import type { SysRegister, LoginInfoResult, UserInfoResult, CaptchaInfoResult, AjaxResult } from '@/types' // 登录方法 -export function login(username: string, password: string, code: string, uuid: string): Promise { +export function login(username: string, password: string, code: string, uuid: string, loginParam?: Object): Promise { const data = { username, password, code, - uuid + uuid, + loginParam } return request({ url: '/login', diff --git a/src/api/regional/dict/diagnosis.js b/src/api/regional/dict/diagnosis.js deleted file mode 100644 index 3c2f72d..0000000 --- a/src/api/regional/dict/diagnosis.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询诊断列表 -export function listdiagnosis(query) { - return request({ - url: '/transitdict/diagnosis/list', - method: 'get', - params: query - }) -} - -// 查询诊断详细 -export function getdiagnosis(diagnosisId) { - return request({ - url: '/transitdict/diagnosis/' + diagnosisId, - method: 'get' - }) -} - -// 新增诊断 -export function adddiagnosis(data) { - return request({ - url: '/transitdict/diagnosis', - method: 'post', - data: data - }) -} - -// 修改诊断 -export function updatediagnosis(data) { - return request({ - url: '/transitdict/diagnosis', - method: 'put', - data: data - }) -} - -// 删除诊断 -export function deldiagnosis(diagnosisId) { - return request({ - url: '/transitdict/diagnosis/' + diagnosisId, - method: 'delete' - }) -} diff --git a/src/api/regional/dict/diagnosis.ts b/src/api/regional/dict/diagnosis.ts new file mode 100644 index 0000000..34a886d --- /dev/null +++ b/src/api/regional/dict/diagnosis.ts @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询诊断列表 +export function listdiagnosis(query: Object) { + return request({ + url: '/transitdict/diagnosis/list', + method: 'get', + params: query + }) +} + +// 查询诊断详细 +export function getdiagnosis(diagnosisId: number) { + return request({ + url: '/transitdict/diagnosis/' + diagnosisId, + method: 'get' + }) +} + +// 新增诊断 +export function adddiagnosis(data: Object) { + return request({ + url: '/transitdict/diagnosis', + method: 'post', + data: data + }) +} + +// 修改诊断 +export function updatediagnosis(data: Object) { + return request({ + url: '/transitdict/diagnosis', + method: 'put', + data: data + }) +} + +// 删除诊断 +export function deldiagnosis(diagnosisId: number) { + return request({ + url: '/transitdict/diagnosis/' + diagnosisId, + method: 'delete' + }) +} diff --git a/src/api/regional/dict/hospital.js b/src/api/regional/dict/hospital.js deleted file mode 100644 index 797dfd6..0000000 --- a/src/api/regional/dict/hospital.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询医疗机构列表 -export function listhospital(query) { - return request({ - url: '/transitdict/hospital/list', - method: 'get', - params: query - }) -} - -// 查询医疗机构详细 -export function gethospital(hospitalId) { - return request({ - url: '/transitdict/hospital/' + hospitalId, - method: 'get' - }) -} - -// 新增医疗机构 -export function addhospital(data) { - return request({ - url: '/transitdict/hospital', - method: 'post', - data: data - }) -} - -// 修改医疗机构 -export function updatehospital(data) { - return request({ - url: '/transitdict/hospital', - method: 'put', - data: data - }) -} - -// 删除医疗机构 -export function delhospital(hospitalId) { - return request({ - url: '/transitdict/hospital/' + hospitalId, - method: 'delete' - }) -} diff --git a/src/api/regional/dict/hospital.ts b/src/api/regional/dict/hospital.ts new file mode 100644 index 0000000..041fad2 --- /dev/null +++ b/src/api/regional/dict/hospital.ts @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询医疗机构列表 +export function listhospital(query: Object) { + return request({ + url: '/transitdict/hospital/list', + method: 'get', + params: query + }) +} + +// 查询医疗机构详细 +export function gethospital(hospitalId: number) { + return request({ + url: '/transitdict/hospital/' + hospitalId, + method: 'get' + }) +} + +// 新增医疗机构 +export function addhospital(data: Object) { + return request({ + url: '/transitdict/hospital', + method: 'post', + data: data + }) +} + +// 修改医疗机构 +export function updatehospital(data: Object) { + return request({ + url: '/transitdict/hospital', + method: 'put', + data: data + }) +} + +// 删除医疗机构 +export function delhospital(hospitalId: number) { + return request({ + url: '/transitdict/hospital/' + hospitalId, + method: 'delete' + }) +} diff --git a/src/api/regional/dict/itemclass.js b/src/api/regional/dict/itemclass.js deleted file mode 100644 index 44b6fa3..0000000 --- a/src/api/regional/dict/itemclass.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询诊断列表 -export function listitemclass(query) { - return request({ - url: '/transitdict/itemclass/list', - method: 'get', - params: query - }) -} - -// 查询诊断详细 -export function getitemclass(itemclassId) { - return request({ - url: '/transitdict/itemclass/' + itemclassId, - method: 'get' - }) -} - -// 新增诊断 -export function additemclass(data) { - return request({ - url: '/transitdict/itemclass', - method: 'post', - data: data - }) -} - -// 修改诊断 -export function updateitemclass(data) { - return request({ - url: '/transitdict/itemclass', - method: 'put', - data: data - }) -} - -// 删除诊断 -export function delitemclass(itemclassId) { - return request({ - url: '/transitdict/itemclass/' + itemclassId, - method: 'delete' - }) -} diff --git a/src/api/regional/dict/itemclass.ts b/src/api/regional/dict/itemclass.ts new file mode 100644 index 0000000..8bf6c9c --- /dev/null +++ b/src/api/regional/dict/itemclass.ts @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询诊断列表 +export function listitemclass(query: Object) { + return request({ + url: '/transitdict/itemclass/list', + method: 'get', + params: query + }) +} + +// 查询诊断详细 +export function getitemclass(itemclassId: number) { + return request({ + url: '/transitdict/itemclass/' + itemclassId, + method: 'get' + }) +} + +// 新增诊断 +export function additemclass(data: Object) { + return request({ + url: '/transitdict/itemclass', + method: 'post', + data: data + }) +} + +// 修改诊断 +export function updateitemclass(data: Object) { + return request({ + url: '/transitdict/itemclass', + method: 'put', + data: data + }) +} + +// 删除诊断 +export function delitemclass(itemclassId: number) { + return request({ + url: '/transitdict/itemclass/' + itemclassId, + method: 'delete' + }) +} diff --git a/src/api/regional/dict/regdict.js b/src/api/regional/dict/regdict.js deleted file mode 100644 index 57c3ffb..0000000 --- a/src/api/regional/dict/regdict.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询字典列表 -export function listregdict(query) { - return request({ - url: '/transitdict/regdict/list', - method: 'get', - params: query - }) -} - -// 查询字典详细 -export function getregdict(regdictId) { - return request({ - url: '/transitdict/regdict/' + regdictId, - method: 'get' - }) -} - -// 新增字典 -export function addregdict(data) { - return request({ - url: '/transitdict/regdict', - method: 'post', - data: data - }) -} - -// 修改字典 -export function updateregdict(data) { - return request({ - url: '/transitdict/regdict', - method: 'put', - data: data - }) -} - -// 删除字典 -export function delregdict(regdictId) { - return request({ - url: '/transitdict/regdict/' + regdictId, - method: 'delete' - }) -} diff --git a/src/api/regional/dict/regdict.ts b/src/api/regional/dict/regdict.ts new file mode 100644 index 0000000..6b60183 --- /dev/null +++ b/src/api/regional/dict/regdict.ts @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询字典列表 +export function listregdict(query: Object) { + return request({ + url: '/transitdict/regdict/list', + method: 'get', + params: query + }) +} + +// 查询字典详细 +export function getregdict(regdictId: number) { + return request({ + url: '/transitdict/regdict/' + regdictId, + method: 'get' + }) +} + +// 新增字典 +export function addregdict(data: Object) { + return request({ + url: '/transitdict/regdict', + method: 'post', + data: data + }) +} + +// 修改字典 +export function updateregdict(data: Object) { + return request({ + url: '/transitdict/regdict', + method: 'put', + data: data + }) +} + +// 删除字典 +export function delregdict(regdictId: number) { + return request({ + url: '/transitdict/regdict/' + regdictId, + method: 'delete' + }) +} diff --git a/src/components/vxeTable/index.vue b/src/components/vxeTable/index.vue index 7a9d1c6..a1983de 100644 --- a/src/components/vxeTable/index.vue +++ b/src/components/vxeTable/index.vue @@ -33,6 +33,14 @@ + + + + + @@ -92,11 +100,7 @@ const props = defineProps({ type: Boolean, default: true }, - // 是否高亮当前行 已废弃 - highlightCurrentRow: { - type: Boolean, - default: true - }, + // 纵向滚动配置 scrollYConfig: { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index aa60ee7..bad58fe 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -4,8 +4,7 @@ @toggleClick="toggleSideBar" />
- - 医疗机构 + {{ yljgName }}
@@ -52,11 +51,13 @@ import RuoYiDoc from '@/components/RuoYi/Doc/index.vue' import useAppStore from '@/store/modules/app' import useUserStore from '@/store/modules/user' import useSettingsStore from '@/store/modules/settings' -import { formatDict, getDictData } from '@/hooks' +import { listhospital } from '@/api/regional/dict/hospital' const appStore = useAppStore() const userStore = useUserStore() const settingsStore = useSettingsStore() + +const yljgName = ref('区域检验平台') function toggleSideBar(): void { appStore.toggleSideBar() } @@ -132,7 +133,9 @@ async function toggleTheme(event?: MouseEvent): Promise { } onMounted(() => { - getDictData('HOS') + listhospital({ pageSize: 100, pageNum: 1 }).then((resp: any) => { + yljgName.value = resp.rows.find((item: any) => item.hospitalId == userStore.sysLoginParam.loginYLJG)?.hospitalName || '区域检验平台' + }) }) diff --git a/src/main.ts b/src/main.ts index e21f7ae..ec787e4 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,10 +11,15 @@ import 'vxe-pc-ui/lib/style.css' import VXETable from 'vxe-table' import 'vxe-table/lib/style.css' import '@/assets/styles/index.scss' // global css +import '@/utils/polyfills'; import { setupRem } from './utils/rem'; + + setupRem(); // 初始化rem适配 + + import App from './App.vue' import store from './store' import router from './router' diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index ee0e104..5561f69 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -5,14 +5,21 @@ import { getToken, setToken, removeToken } from '@/utils/auth' import { isHttp, isEmpty } from "@/utils/validate" import defAva from '@/assets/images/profile.jpg' +interface RoleInfo { + roleName: string + [key: string]: any +} + interface UserState { token: string | undefined id: string | number name: string nickName: string + roleName: string avatar: string roles: string[] permissions: string[] + sysLoginParam: Object } const useUserStore = defineStore( @@ -23,9 +30,11 @@ const useUserStore = defineStore( id: '', name: '', nickName: '', + roleName: '', avatar: '', roles: [], - permissions: [] + permissions: [], + sysLoginParam: {}, // 登录参数 }), actions: { // 单点登录 @@ -47,13 +56,14 @@ const useUserStore = defineStore( }) }, // 登录 - login(userInfo: { username: string; password: string; code: string; uuid: string }) { + login(userInfo: { username: string; password: string; code: string; uuid: string; loginParam: Object }) { const username = userInfo.username.trim() const password = userInfo.password const code = userInfo.code const uuid = userInfo.uuid + const loginParam = userInfo.loginParam return new Promise((resolve, reject) => { - login(username, password, code, uuid).then(res => { + login(username, password, code, uuid, loginParam).then(res => { setToken(res.token) this.token = res.token resolve() @@ -68,12 +78,15 @@ const useUserStore = defineStore( getInfo().then(res => { const user = res.user let avatar = user.avatar || '' + this.sysLoginParam = user.sysLoginParam if (!isHttp(avatar)) { avatar = (isEmpty(avatar)) ? defAva : import.meta.env.VITE_APP_BASE_API + avatar } - if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 - this.roles = res.roles + const roles = res.user.roles as any[] + if (roles && roles.length > 0) { + this.roles = roles this.permissions = res.permissions + this.roleName = (roles[0] as RoleInfo).roleName } else { this.roles = ['ROLE_DEFAULT'] } diff --git a/src/types/api/system/user.ts b/src/types/api/system/user.ts index de0675f..86750d8 100644 --- a/src/types/api/system/user.ts +++ b/src/types/api/system/user.ts @@ -56,6 +56,8 @@ export interface SysUser extends BaseEntity { roleIds?: number[]; /** 岗位组 */ postIds?: number[]; + // 登录参数 + sysLoginParam?: Object; } /** 注册信息 */ diff --git a/src/utils/dict.ts b/src/utils/dict.ts index c483a8b..e5595b2 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -76,11 +76,11 @@ export function comDict(...args: string[]): Promise { } else { // 缓存不存在，发起请求并记录 Promise const promise = getComDicts({ - zdlb: dictType + dict_type: dictType }).then((resp: any) => { const dictList = resp.data.map((p: any) => ({ - label: p.zdmc, - value: p.zddh, + label: p.dictName, + value: p.dictCode, elTagType: "", elTagClass: "" })); diff --git a/src/utils/polyfills.ts b/src/utils/polyfills.ts new file mode 100644 index 0000000..0e9a14a --- /dev/null +++ b/src/utils/polyfills.ts @@ -0,0 +1,21 @@ +// 检测浏览器是否支持，不支持则注入兼容版 +if (!Array.prototype.findLastIndex) { + Object.defineProperty(Array.prototype, 'findLastIndex', { + value: function ( + this: T[], + callback: (value: T, index: number, array: T[]) => boolean, + thisArg?: any + ): number { + const arr = this; + const len = arr.length >>> 0; + for (let i = len - 1; i >= 0; i--) { + if (i in arr && callback.call(thisArg, arr[i], i, arr)) { + return i; + } + } + return -1; + }, + writable: true, + configurable: true + }); +} \ No newline at end of file diff --git a/src/views/liswork/Issueorder/components/info.vue b/src/views/liswork/Issueorder/components/info.vue index ee364b1..1b4f46c 100644 --- a/src/views/liswork/Issueorder/components/info.vue +++ b/src/views/liswork/Issueorder/components/info.vue @@ -87,7 +87,7 @@ - - \ No newline at end of file diff --git a/src/views/liswork/Issueorder/index.vue b/src/views/liswork/Issueorder/index.vue index 6ebd461..1ee89dd 100644 --- a/src/views/liswork/Issueorder/index.vue +++ b/src/views/liswork/Issueorder/index.vue @@ -27,26 +27,28 @@ -
- + + + + +
+ + +
- + +
@@ -59,7 +61,6 @@ - @@ -75,7 +76,7 @@ -
@@ -84,8 +85,7 @@ + :cell-style="cellStyle" class="mytable-style" ref="tableRef"> @@ -104,27 +104,32 @@ \ No newline at end of file diff --git a/src/views/liswork/dict/index.vue b/src/views/liswork/dict/index.vue new file mode 100644 index 0000000..39549f0 --- /dev/null +++ b/src/views/liswork/dict/index.vue @@ -0,0 +1,403 @@ + + + + + \ No newline at end of file diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue index 1a6c441..f8fef8d 100644 --- a/src/views/monitor/job/index.vue +++ b/src/views/monitor/job/index.vue @@ -1,287 +1,234 @@ diff --git a/src/views/regional/dict/regdict/index.vue b/src/views/regional/dict/regdict/index.vue index 7bd03d1..4ccb933 100644 --- a/src/views/regional/dict/regdict/index.vue +++ b/src/views/regional/dict/regdict/index.vue @@ -36,7 +36,8 @@ - + @@ -80,7 +81,7 @@ {{ dict.label - }} + }} @@ -98,7 +99,7 @@