diff --git a/src/api/system/user/profile.ts b/src/api/system/user/profile.ts index 2e2790129..ca66ca114 100644 --- a/src/api/system/user/profile.ts +++ b/src/api/system/user/profile.ts @@ -6,7 +6,9 @@ export interface ProfileVO { nickname: string dept: { id: number - name: string + name: string, + orgid: number, + orgname: string } roles: { id: number diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 7951e5b6e..6a082349c 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -389,7 +389,7 @@ const initAllData = async () => { try { // 获取用户信息,从中获取orgid(部门ID) const userProfile = await getUserProfile() - const orgid = userProfile.dept.id + const orgid = userProfile.dept.orgid // 并行获取所有数据 await Promise.all([ diff --git a/src/views/devices/DevFrom.vue b/src/views/devices/DevFrom.vue index 689669fe9..834fae044 100644 --- a/src/views/devices/DevFrom.vue +++ b/src/views/devices/DevFrom.vue @@ -144,7 +144,7 @@ const submitForm = async () => { ...formData.value, devicecode: formData.value.devicecode, location: fullAddress, - orgid: userProfile.value.dept.id, + orgid: userProfile.value.dept.orgid, orgname: userProfile.value.dept.name } as DeviceVO diff --git a/src/views/devices/Device_Data_Components/ECG_datas.vue b/src/views/devices/Device_Data_Components/ECG_datas.vue index 61c4221d9..b8dc70011 100644 --- a/src/views/devices/Device_Data_Components/ECG_datas.vue +++ b/src/views/devices/Device_Data_Components/ECG_datas.vue @@ -325,7 +325,7 @@ export default { deviceid: this.currentDeviceId, userid: this.selectedPerson.userid, username: this.selectedPerson.username, - orgid: this.userProfile.dept.id, + orgid: this.userProfile.dept.orgid, doctorid: this.userProfile.id, datatime: new Date().getTime(), noticetype: 2, // 建议提醒 diff --git a/src/views/devices/index.vue b/src/views/devices/index.vue index f30d913dc..26333280f 100644 --- a/src/views/devices/index.vue +++ b/src/views/devices/index.vue @@ -139,7 +139,7 @@ const ecgDataRef = ref() const handleQuery = async () => { try { //指定查询当前登录用户的机构ID - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid const res = await DeviceApi.getDevicePage(queryParams) deviceList.value = res.list total.value = res.total diff --git a/src/views/notice/msgboard.vue b/src/views/notice/msgboard.vue index f4929d645..85f0e9dbc 100644 --- a/src/views/notice/msgboard.vue +++ b/src/views/notice/msgboard.vue @@ -237,7 +237,7 @@ const getMessageList = async () => { // 添加orgid参数 if (userProfile.value?.dept?.id) { - params.orgid = userProfile.value.dept.id + params.orgid = userProfile.value.dept.orgid } const res = await FeedbackApi.getFeedbackPage(params) @@ -295,7 +295,7 @@ const handleExport = async () => { // 添加orgid参数 if (userProfile.value?.dept?.id) { - exportParams.orgid = userProfile.value.dept.id + exportParams.orgid = userProfile.value.dept.orgid } await FeedbackApi.exportFeedback(exportParams) @@ -362,7 +362,7 @@ onMounted(async () => { try { // 首先获取用户信息 userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid // 然后获取留言列表 await getMessageList() } catch (error) { diff --git a/src/views/notice/sos.vue b/src/views/notice/sos.vue index 8b77998e3..6f9fe1aae 100644 --- a/src/views/notice/sos.vue +++ b/src/views/notice/sos.vue @@ -130,7 +130,7 @@ const statusFormatter = (row: any, column: any, cellValue: any) => { const getList = async () => { //首先获取用户信息 userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid loading.value = true try { const data = await AlertMessageApi.getAlertMessagePage(queryParams) diff --git a/src/views/person/Personmember.vue b/src/views/person/Personmember.vue index 2197618e1..e5e0b480a 100644 --- a/src/views/person/Personmember.vue +++ b/src/views/person/Personmember.vue @@ -7,20 +7,20 @@ @close="handleClose" >
- 添加成员 - - --> + 当前成员:{{ memberList.length }} 人
@@ -34,7 +34,7 @@ - + diff --git a/src/views/person/devicebind.vue b/src/views/person/devicebind.vue index 5e9d1a1d8..a0f5847b4 100644 --- a/src/views/person/devicebind.vue +++ b/src/views/person/devicebind.vue @@ -255,7 +255,7 @@ const getList = async () => { loading.value = true try { userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid const data = await DeviceApi.getDevicePage(queryParams) // 获取每个设备的家庭组号信息 const devicePromises = data.list.map(async (device) => { diff --git a/src/views/person/index.vue b/src/views/person/index.vue index 744d157da..83b9a29e4 100644 --- a/src/views/person/index.vue +++ b/src/views/person/index.vue @@ -130,12 +130,12 @@ 绑定设备 - + @@ -202,7 +202,8 @@ const getList = async () => { try { //首先获取用户信息 userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + console.log(userProfile.value) + queryParams.orgid = userProfile.value.dept.orgid const data = await PersonApi.getPersonPage(queryParams) list.value = data.list total.value = data.total diff --git a/src/views/person/memberdrawer.vue b/src/views/person/memberdrawer.vue index d6a3870fb..c3500ad4e 100644 --- a/src/views/person/memberdrawer.vue +++ b/src/views/person/memberdrawer.vue @@ -113,7 +113,7 @@ const getList = async () => { try { loading.value = true const userProfile = await getUserProfile() - queryParams.orgid = userProfile.dept.id + queryParams.orgid = userProfile.dept.orgid const res = await PersonApi.getPersonNoFamilyid(queryParams) if (res.list) { list.value = res.list.map((item: PersonVO) => ({ diff --git a/src/views/personarchive/PersonArchiveForm.vue b/src/views/personarchive/PersonArchiveForm.vue index 86512509d..f54153a7a 100644 --- a/src/views/personarchive/PersonArchiveForm.vue +++ b/src/views/personarchive/PersonArchiveForm.vue @@ -343,7 +343,7 @@ const open = async (type: string, id?: number, userProfile?: any, currentPerson? const newFormData = { id: undefined, userid: currentPerson.id, - orgid: userProfile.dept.id, + orgid: userProfile.dept.orgid, orgname: userProfile.dept.name, name: currentPerson.name, gender: currentPerson.gender, diff --git a/src/views/personarchive/index.vue b/src/views/personarchive/index.vue index 7eeb171e3..8e8aaffda 100644 --- a/src/views/personarchive/index.vue +++ b/src/views/personarchive/index.vue @@ -141,7 +141,7 @@ const getList = async () => { try { //首先获取用户信息 userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid const data = await PersonApi.getPersonPage(queryParams) console.log(data.list) list.value = data.list diff --git a/src/views/stat/Returnvisit.vue b/src/views/stat/Returnvisit.vue index 6e2b29303..983a98eef 100644 --- a/src/views/stat/Returnvisit.vue +++ b/src/views/stat/Returnvisit.vue @@ -317,7 +317,7 @@ const params = ref({ const fetchData = async () => { try { const userProfile = await getUserProfile() - params.value.orgid = userProfile.dept.id + params.value.orgid = userProfile.dept.orgid // 调用回访统计的API const res = await RecordApi.getStatistics( diff --git a/src/views/stat/Warnings.vue b/src/views/stat/Warnings.vue index a5d4b1037..81a987547 100644 --- a/src/views/stat/Warnings.vue +++ b/src/views/stat/Warnings.vue @@ -339,7 +339,7 @@ const params = ref({ const fetchData = async () => { try { const userProfile = await getUserProfile() - params.value.orgid = userProfile.dept.id + params.value.orgid = userProfile.dept.orgid const res = await AlertMessageApi.getAlertMessageStatistics(params.value) console.log(res) diff --git a/src/views/vip/doctornotice/index.vue b/src/views/vip/doctornotice/index.vue index 83bde959a..8a4fe90a5 100644 --- a/src/views/vip/doctornotice/index.vue +++ b/src/views/vip/doctornotice/index.vue @@ -135,7 +135,7 @@ const getList = async () => { try { //首先获取用户信息 userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid const data = await DoctornoticeApi.getDoctornoticePage(queryParams) list.value = data.list total.value = data.total diff --git a/src/views/vip/index.vue b/src/views/vip/index.vue index 716f55797..e81bef61b 100644 --- a/src/views/vip/index.vue +++ b/src/views/vip/index.vue @@ -197,7 +197,7 @@ const getList = async () => { const res = await PersonApi.getPersonPage({ pageNo: queryParams.pageNo, pageSize: queryParams.pageSize, - orgid: userProfile.value.dept.id + orgid: userProfile.value.dept.orgid }) // 检查返回的数据结构 if (res) { diff --git a/src/views/vip/iphone/components/VisitDialog.vue b/src/views/vip/iphone/components/VisitDialog.vue index 96641656d..1386241fb 100644 --- a/src/views/vip/iphone/components/VisitDialog.vue +++ b/src/views/vip/iphone/components/VisitDialog.vue @@ -206,7 +206,7 @@ const handleSubmit = async () => { content: formData.content, result: formData.result, nextvisittime: formData.nextVisitTime ? new Date(formData.nextVisitTime).getTime() : null, - orgid: userProfile.dept.id, + orgid: userProfile.dept.orgid, orgname: userProfile.dept.name, createby: userProfile.username, userid: formData.userid diff --git a/src/views/vip/iphone/index.vue b/src/views/vip/iphone/index.vue index c0bfcd556..460f8e3a0 100644 --- a/src/views/vip/iphone/index.vue +++ b/src/views/vip/iphone/index.vue @@ -148,7 +148,7 @@ const getList = async () => { try { //首先获取用户信息 userProfile.value = await getUserProfile() - queryParams.orgid = userProfile.value.dept.id + queryParams.orgid = userProfile.value.dept.orgid queryParams.isvip = 1 const data = await PersonApi.getPersonPage(queryParams) list.value = data.list