人员tree修改

client/src/views/OaSystem/financialManagement/bzjglDeptPage/index.vue

@@ -11,17 +11,14 @@
       </div>
       <div class="form">
         <span class="formSpan">申请人：</span>
-        <el-tree-select
-          v-model="queryParams.userId"
-          :data="userList"
-          :props="defaultProps"
-          check-strictly
-          clearable
-          filterable
-          default-expand-all
-          node-key="id"
-          placeholder="请选择人员"
-        />
+        <el-select v-model="queryParams.userId" filterable clearable placeholder="请选择申请人">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
       </div>
       <div class="form">
         <span class="formSpan">核销状态：</span>
@@ -155,6 +152,7 @@ import { useRouter } from 'vue-router'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 import { arrFlatten } from '../../attendanceCenter/attendAuth'
+import * as UserApi from '@/api/system/user'
 import moment from 'moment'
 defineOptions({ name: 'BzjglDeptPage' })
 const { wsCache } = useCache()
@@ -192,7 +190,6 @@ const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数
 const deptList = ref<Tree[]>([]) // 树形结构
-const userList = ref<Tree[]>([]) // 树形结构
 const deptSort: any = ref([])
 const initTreeDeps = async () => {
   DeptApi.getSimpleDeptList().then((res) => {
@@ -200,11 +197,12 @@ const initTreeDeps = async () => {
     deptSort.value = arrFlatten(res, 'children')
   })
 }
+
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 /** 用户列表 */
-const initTreeUsers = async () => {
-  DeptApi.getSimpleDeptUserAllList().then((res) => {
-    userList.value = handleTree(res)
-  })
+const initDeptUsers = async () => {
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleDeptUserAllList(userDeptId)
 }
 const changeApplyDate = (value, data) => {
   if (!value) {
@@ -274,8 +272,8 @@ const handleCurrentChange = (pageNo: number) => {
 /** 初始化 */
 onMounted(() => {
   initTreeDeps()
-  initTreeUsers()
   getList()
+  initDeptUsers()
   getOverview()
 })
 const router = useRouter()

client/src/views/OaSystem/financialManagement/bzjglPage/index.vue

@@ -10,21 +10,11 @@
         />
       </div>
       <div class="form">
-        <span class="formSpan">报销人：</span>
-        <el-tree-select
-          v-model="queryParams.userId"
-          :data="userList"
-          :props="defaultProps"
-          check-strictly
-          clearable
-          filterable
-          default-expand-all
-          node-key="id"
-          placeholder="请选择人员"
-        />
+        <span class="formSpan">申请人：</span>
+        <UserOrgTree v-model="queryParams['userId']" placeholder="请选择申请人" />
       </div>
       <div class="form">
-        <span class="formSpan">报销人部门：</span>
+        <span class="formSpan">申请部门：</span>
         <DeptTree v-model="queryParams['deptId']" placeholder="请选择部门" check-strictly />
       </div>
       <div class="form">
@@ -164,6 +154,7 @@ import { arrFlatten } from '../../attendanceCenter/attendAuth'
 import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
 import moment from 'moment'
 import download from '@/utils/download'
+import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
 defineOptions({ name: 'BzjglPage' })
 const queryParams = reactive({
   pageNo: 1,

client/src/views/OaSystem/financialManagement/yksqPage/index.vue

@@ -11,17 +11,7 @@
       </div>
       <div class="form">
         <span class="formSpan">报销人：</span>
-        <el-tree-select
-          v-model="queryParams.userId"
-          :data="userList"
-          :props="defaultProps"
-          check-strictly
-          clearable
-          filterable
-          default-expand-all
-          node-key="id"
-          placeholder="请选择人员"
-        />
+        <UserOrgTree v-model="queryParams['userId']" placeholder="请选择报销人" />
       </div>
       <div class="form">
         <span class="formSpan">报销人部门：</span>
@@ -156,6 +146,7 @@ import { arrFlatten } from '../../attendanceCenter/attendAuth'
 import moment from 'moment'
 import download from '@/utils/download'
 import DeptTree from '@/views/OaSystem/components/DeptTree/index.vue'
+import UserOrgTree from '@/views/OaSystem/components/UserOrgTree/index.vue'
 
 defineOptions({ name: 'UseMoney' })
 const queryParams = reactive({

client/src/views/OaSystem/oaLayout/menus.vue

@@ -143,12 +143,13 @@ const handleMouseEnter = (item: any, index: any) => {
     mouseenterIndex.value = -1
   }
 }
+const baseUrl = import.meta.env.VITE_BASE_URL
 const toMainOfficeCenter = () => {
   push({
     path: '/mainOfficeCenter',
     query: {
       iframe: '1',
-      url: 'http://10.10.10.7:18080/workflow/HandlerCaseCenter/index',
+      url: `${baseUrl}/workflow/HandlerCaseCenter/index`,
       iFrameId: 'mainOfficeCenter_001'
     }
   })