Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev

Signed-off-by: 凌太虚 <343015202@qq.com>
This commit is contained in:
凌太虚
2023-03-22 14:26:18 +00:00
committed by Gitee
45 changed files with 2561 additions and 1654 deletions

View File

@ -90,10 +90,10 @@
<script setup lang="ts" name="Dept">
import { handleTree } from '@/utils/tree'
import * as DeptApi from '@/api/system/dept'
import { getListSimpleUsersApi, UserVO } from '@/api/system/user'
import { DICT_TYPE, getDictOptions } from '@/utils/dict'
import DeptForm from './form.vue'
import { dateFormatter } from '@/utils/formatTime'
import { getSimpleUserList, UserVO } from '@/api/system/user'
const message = useMessage() // 消息弹窗
const { t } = useI18n() // 国际化
// 搜索变量
@ -115,7 +115,7 @@ const loading = ref(true) // 列表的加载中
//获取用户列表
const getUserList = async () => {
const res = await getListSimpleUsersApi()
const res = await getSimpleUserList()
userOption.value = res
}