userProfile.value.dept.id改成 userProfile.value.dept.orgid
This commit is contained in:
parent
2d6b89dfec
commit
81f5da6acc
@ -6,7 +6,9 @@ export interface ProfileVO {
|
|||||||
nickname: string
|
nickname: string
|
||||||
dept: {
|
dept: {
|
||||||
id: number
|
id: number
|
||||||
name: string
|
name: string,
|
||||||
|
orgid: number,
|
||||||
|
orgname: string
|
||||||
}
|
}
|
||||||
roles: {
|
roles: {
|
||||||
id: number
|
id: number
|
||||||
|
@ -389,7 +389,7 @@ const initAllData = async () => {
|
|||||||
try {
|
try {
|
||||||
// 获取用户信息,从中获取orgid(部门ID)
|
// 获取用户信息,从中获取orgid(部门ID)
|
||||||
const userProfile = await getUserProfile()
|
const userProfile = await getUserProfile()
|
||||||
const orgid = userProfile.dept.id
|
const orgid = userProfile.dept.orgid
|
||||||
|
|
||||||
// 并行获取所有数据
|
// 并行获取所有数据
|
||||||
await Promise.all([
|
await Promise.all([
|
||||||
|
@ -144,7 +144,7 @@ const submitForm = async () => {
|
|||||||
...formData.value,
|
...formData.value,
|
||||||
devicecode: formData.value.devicecode,
|
devicecode: formData.value.devicecode,
|
||||||
location: fullAddress,
|
location: fullAddress,
|
||||||
orgid: userProfile.value.dept.id,
|
orgid: userProfile.value.dept.orgid,
|
||||||
orgname: userProfile.value.dept.name
|
orgname: userProfile.value.dept.name
|
||||||
} as DeviceVO
|
} as DeviceVO
|
||||||
|
|
||||||
|
@ -325,7 +325,7 @@ export default {
|
|||||||
deviceid: this.currentDeviceId,
|
deviceid: this.currentDeviceId,
|
||||||
userid: this.selectedPerson.userid,
|
userid: this.selectedPerson.userid,
|
||||||
username: this.selectedPerson.username,
|
username: this.selectedPerson.username,
|
||||||
orgid: this.userProfile.dept.id,
|
orgid: this.userProfile.dept.orgid,
|
||||||
doctorid: this.userProfile.id,
|
doctorid: this.userProfile.id,
|
||||||
datatime: new Date().getTime(),
|
datatime: new Date().getTime(),
|
||||||
noticetype: 2, // 建议提醒
|
noticetype: 2, // 建议提醒
|
||||||
|
@ -139,7 +139,7 @@ const ecgDataRef = ref()
|
|||||||
const handleQuery = async () => {
|
const handleQuery = async () => {
|
||||||
try {
|
try {
|
||||||
//指定查询当前登录用户的机构ID
|
//指定查询当前登录用户的机构ID
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
const res = await DeviceApi.getDevicePage(queryParams)
|
const res = await DeviceApi.getDevicePage(queryParams)
|
||||||
deviceList.value = res.list
|
deviceList.value = res.list
|
||||||
total.value = res.total
|
total.value = res.total
|
||||||
|
@ -237,7 +237,7 @@ const getMessageList = async () => {
|
|||||||
|
|
||||||
// 添加orgid参数
|
// 添加orgid参数
|
||||||
if (userProfile.value?.dept?.id) {
|
if (userProfile.value?.dept?.id) {
|
||||||
params.orgid = userProfile.value.dept.id
|
params.orgid = userProfile.value.dept.orgid
|
||||||
}
|
}
|
||||||
|
|
||||||
const res = await FeedbackApi.getFeedbackPage(params)
|
const res = await FeedbackApi.getFeedbackPage(params)
|
||||||
@ -295,7 +295,7 @@ const handleExport = async () => {
|
|||||||
|
|
||||||
// 添加orgid参数
|
// 添加orgid参数
|
||||||
if (userProfile.value?.dept?.id) {
|
if (userProfile.value?.dept?.id) {
|
||||||
exportParams.orgid = userProfile.value.dept.id
|
exportParams.orgid = userProfile.value.dept.orgid
|
||||||
}
|
}
|
||||||
|
|
||||||
await FeedbackApi.exportFeedback(exportParams)
|
await FeedbackApi.exportFeedback(exportParams)
|
||||||
@ -362,7 +362,7 @@ onMounted(async () => {
|
|||||||
try {
|
try {
|
||||||
// 首先获取用户信息
|
// 首先获取用户信息
|
||||||
userProfile.value = await getUserProfile()
|
userProfile.value = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
// 然后获取留言列表
|
// 然后获取留言列表
|
||||||
await getMessageList()
|
await getMessageList()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
@ -130,7 +130,7 @@ const statusFormatter = (row: any, column: any, cellValue: any) => {
|
|||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
//首先获取用户信息
|
//首先获取用户信息
|
||||||
userProfile.value = await getUserProfile()
|
userProfile.value = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await AlertMessageApi.getAlertMessagePage(queryParams)
|
const data = await AlertMessageApi.getAlertMessagePage(queryParams)
|
||||||
|
@ -7,20 +7,20 @@
|
|||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
>
|
>
|
||||||
<div class="mb-15px">
|
<div class="mb-15px">
|
||||||
<el-button
|
<!-- <el-button
|
||||||
type="primary"
|
type="primary"
|
||||||
plain
|
plain
|
||||||
@click="handleAddMemberClick"
|
@click="handleAddMemberClick"
|
||||||
>
|
>
|
||||||
<Icon icon="ep:plus" /> 添加成员
|
<Icon icon="ep:plus" /> 添加成员
|
||||||
</el-button>
|
</el-button> -->
|
||||||
<el-button
|
<!-- <el-button
|
||||||
type="success"
|
type="success"
|
||||||
plain
|
plain
|
||||||
@click="handleCreateFamily"
|
@click="handleCreateFamily"
|
||||||
>
|
>
|
||||||
<Icon icon="ep:house" /> 创建家庭
|
<Icon icon="ep:house" /> 创建家庭
|
||||||
</el-button>
|
</el-button> -->
|
||||||
<span class="member-count">当前成员:{{ memberList.length }} 人</span>
|
<span class="member-count">当前成员:{{ memberList.length }} 人</span>
|
||||||
</div>
|
</div>
|
||||||
<el-table v-loading="loading" :data="memberList">
|
<el-table v-loading="loading" :data="memberList">
|
||||||
@ -34,7 +34,7 @@
|
|||||||
</el-tag>
|
</el-tag>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" width="160">
|
<!-- <el-table-column label="操作" align="center" width="160">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-button
|
<el-button
|
||||||
type="danger"
|
type="danger"
|
||||||
@ -44,7 +44,7 @@
|
|||||||
移除
|
移除
|
||||||
</el-button>
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column> -->
|
||||||
</el-table>
|
</el-table>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
@ -255,7 +255,7 @@ const getList = async () => {
|
|||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
userProfile.value = await getUserProfile()
|
userProfile.value = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
const data = await DeviceApi.getDevicePage(queryParams)
|
const data = await DeviceApi.getDevicePage(queryParams)
|
||||||
// 获取每个设备的家庭组号信息
|
// 获取每个设备的家庭组号信息
|
||||||
const devicePromises = data.list.map(async (device) => {
|
const devicePromises = data.list.map(async (device) => {
|
||||||
|
@ -130,12 +130,12 @@
|
|||||||
<el-dropdown-item @click="openForm('bind', scope.row.id, scope.row.name)">
|
<el-dropdown-item @click="openForm('bind', scope.row.id, scope.row.name)">
|
||||||
<Icon icon="ep:link" />绑定设备
|
<Icon icon="ep:link" />绑定设备
|
||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
<el-dropdown-item @click="openForm('update', scope.row.id)">
|
<!-- <el-dropdown-item @click="openForm('update', scope.row.id)">
|
||||||
<Icon icon="ep:edit" />修改
|
<Icon icon="ep:edit" />修改
|
||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
<el-dropdown-item @click="handleDelete(scope.row.id)">
|
<el-dropdown-item @click="handleDelete(scope.row.id)">
|
||||||
<Icon icon="ep:delete" />删除
|
<Icon icon="ep:delete" />删除
|
||||||
</el-dropdown-item>
|
</el-dropdown-item> -->
|
||||||
</el-dropdown-menu>
|
</el-dropdown-menu>
|
||||||
</template>
|
</template>
|
||||||
</el-dropdown>
|
</el-dropdown>
|
||||||
@ -202,7 +202,8 @@ const getList = async () => {
|
|||||||
try {
|
try {
|
||||||
//首先获取用户信息
|
//首先获取用户信息
|
||||||
userProfile.value = await getUserProfile()
|
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)
|
const data = await PersonApi.getPersonPage(queryParams)
|
||||||
list.value = data.list
|
list.value = data.list
|
||||||
total.value = data.total
|
total.value = data.total
|
||||||
|
@ -113,7 +113,7 @@ const getList = async () => {
|
|||||||
try {
|
try {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
const userProfile = await getUserProfile()
|
const userProfile = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.dept.id
|
queryParams.orgid = userProfile.dept.orgid
|
||||||
const res = await PersonApi.getPersonNoFamilyid(queryParams)
|
const res = await PersonApi.getPersonNoFamilyid(queryParams)
|
||||||
if (res.list) {
|
if (res.list) {
|
||||||
list.value = res.list.map((item: PersonVO) => ({
|
list.value = res.list.map((item: PersonVO) => ({
|
||||||
|
@ -343,7 +343,7 @@ const open = async (type: string, id?: number, userProfile?: any, currentPerson?
|
|||||||
const newFormData = {
|
const newFormData = {
|
||||||
id: undefined,
|
id: undefined,
|
||||||
userid: currentPerson.id,
|
userid: currentPerson.id,
|
||||||
orgid: userProfile.dept.id,
|
orgid: userProfile.dept.orgid,
|
||||||
orgname: userProfile.dept.name,
|
orgname: userProfile.dept.name,
|
||||||
name: currentPerson.name,
|
name: currentPerson.name,
|
||||||
gender: currentPerson.gender,
|
gender: currentPerson.gender,
|
||||||
|
@ -141,7 +141,7 @@ const getList = async () => {
|
|||||||
try {
|
try {
|
||||||
//首先获取用户信息
|
//首先获取用户信息
|
||||||
userProfile.value = await getUserProfile()
|
userProfile.value = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
const data = await PersonApi.getPersonPage(queryParams)
|
const data = await PersonApi.getPersonPage(queryParams)
|
||||||
console.log(data.list)
|
console.log(data.list)
|
||||||
list.value = data.list
|
list.value = data.list
|
||||||
|
@ -317,7 +317,7 @@ const params = ref({
|
|||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
try {
|
try {
|
||||||
const userProfile = await getUserProfile()
|
const userProfile = await getUserProfile()
|
||||||
params.value.orgid = userProfile.dept.id
|
params.value.orgid = userProfile.dept.orgid
|
||||||
|
|
||||||
// 调用回访统计的API
|
// 调用回访统计的API
|
||||||
const res = await RecordApi.getStatistics(
|
const res = await RecordApi.getStatistics(
|
||||||
|
@ -339,7 +339,7 @@ const params = ref({
|
|||||||
const fetchData = async () => {
|
const fetchData = async () => {
|
||||||
try {
|
try {
|
||||||
const userProfile = await getUserProfile()
|
const userProfile = await getUserProfile()
|
||||||
params.value.orgid = userProfile.dept.id
|
params.value.orgid = userProfile.dept.orgid
|
||||||
|
|
||||||
const res = await AlertMessageApi.getAlertMessageStatistics(params.value)
|
const res = await AlertMessageApi.getAlertMessageStatistics(params.value)
|
||||||
console.log(res)
|
console.log(res)
|
||||||
|
@ -135,7 +135,7 @@ const getList = async () => {
|
|||||||
try {
|
try {
|
||||||
//首先获取用户信息
|
//首先获取用户信息
|
||||||
userProfile.value = await getUserProfile()
|
userProfile.value = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
const data = await DoctornoticeApi.getDoctornoticePage(queryParams)
|
const data = await DoctornoticeApi.getDoctornoticePage(queryParams)
|
||||||
list.value = data.list
|
list.value = data.list
|
||||||
total.value = data.total
|
total.value = data.total
|
||||||
|
@ -197,7 +197,7 @@ const getList = async () => {
|
|||||||
const res = await PersonApi.getPersonPage({
|
const res = await PersonApi.getPersonPage({
|
||||||
pageNo: queryParams.pageNo,
|
pageNo: queryParams.pageNo,
|
||||||
pageSize: queryParams.pageSize,
|
pageSize: queryParams.pageSize,
|
||||||
orgid: userProfile.value.dept.id
|
orgid: userProfile.value.dept.orgid
|
||||||
})
|
})
|
||||||
// 检查返回的数据结构
|
// 检查返回的数据结构
|
||||||
if (res) {
|
if (res) {
|
||||||
|
@ -206,7 +206,7 @@ const handleSubmit = async () => {
|
|||||||
content: formData.content,
|
content: formData.content,
|
||||||
result: formData.result,
|
result: formData.result,
|
||||||
nextvisittime: formData.nextVisitTime ? new Date(formData.nextVisitTime).getTime() : null,
|
nextvisittime: formData.nextVisitTime ? new Date(formData.nextVisitTime).getTime() : null,
|
||||||
orgid: userProfile.dept.id,
|
orgid: userProfile.dept.orgid,
|
||||||
orgname: userProfile.dept.name,
|
orgname: userProfile.dept.name,
|
||||||
createby: userProfile.username,
|
createby: userProfile.username,
|
||||||
userid: formData.userid
|
userid: formData.userid
|
||||||
|
@ -148,7 +148,7 @@ const getList = async () => {
|
|||||||
try {
|
try {
|
||||||
//首先获取用户信息
|
//首先获取用户信息
|
||||||
userProfile.value = await getUserProfile()
|
userProfile.value = await getUserProfile()
|
||||||
queryParams.orgid = userProfile.value.dept.id
|
queryParams.orgid = userProfile.value.dept.orgid
|
||||||
queryParams.isvip = 1
|
queryParams.isvip = 1
|
||||||
const data = await PersonApi.getPersonPage(queryParams)
|
const data = await PersonApi.getPersonPage(queryParams)
|
||||||
list.value = data.list
|
list.value = data.list
|
||||||
|
Loading…
Reference in New Issue
Block a user