调整全部人员的接口

fhKeeper/formulahousekeeper/timesheet/src/views/awayOffice/awayOffice.vue

@@ -1565,16 +1565,18 @@ export default {
 
 
         getUsers() {
-            this.http.post(this.port.manage.list, {
-                departmentId: -1,
-                pageIndex: 1,
-                // pageSize: 99999
-                pageSize: -1
-            },
+            // this.http.post(this.port.manage.list, {
+            //     departmentId: -1,
+            //     pageIndex: 1,
+            //     // pageSize: 99999
+            //     pageSize: -1
+            // },
+            this.http.post('/user/getSimpleActiveUserList', {},
             res => {
                 if (res.code == "ok") {
                     // console.log("users",res.data);
-                    this.users = res.data.records;
+                    // this.users = res.data.records;
+                    this.users = res.data;
                     for (let i = 0; i < this.users.length; i++) {
                         this.susers.push({value:this.users[i].id,label:this.users[i].name})
                     }

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -919,15 +919,17 @@ export default {
 
     //  获取人员信息
     getUsers() {
-        this.http.post(this.port.manage.list, {
-            departmentId: -1,
-            pageIndex: 1,
-            // pageSize: 99999
-            pageSize: -1
-        },
+        // this.http.post(this.port.manage.list, {
+        //     departmentId: -1,
+        //     pageIndex: 1,
+        //     // pageSize: 99999
+        //     pageSize: -1
+        // },
+        this.http.post('/user/getSimpleActiveUserList', {},
         res => {
             if (res.code == "ok") {
-                this.users = res.data.records;
+                // this.users = res.data.records;
+                this.users = res.data;
                 if (!this.permissions.costAudit) {
                     this.addForm.ownerId = this.user.id;
                     this.addForm.status = 1;

fhKeeper/formulahousekeeper/timesheet/src/views/leave/list.vue

@@ -1297,15 +1297,17 @@ export default {
         });
     },
     getUsers() {
-      this.http.post(this.port.manage.list, {
-            departmentId: -1,
-            pageIndex: 1,
-            // pageSize: 99999
-            pageSize: -1
-        },
+      // this.http.post(this.port.manage.list, {
+      //       departmentId: -1,
+      //       pageIndex: 1,
+      //       // pageSize: 99999
+      //       pageSize: -1
+      //   },
+      this.http.post('/user/getSimpleActiveUserList', {},
         res => {
             if (res.code == "ok") {
-                this.users = res.data.records;
+                // this.users = res.data.records;
+                this.users = res.data;
                 for (let i = 0; i < this.users.length; i++) {
                   this.susers.push({value:this.users[i].id,label:this.users[i].name})
                 }

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -194,16 +194,17 @@
                 });
             },
             getUsers() {
-                console.log(this.port.manage.list)
-                this.http.post(this.port.manage.list, {
-                        departmentId: -1,
-                        pageIndex: 1,
-                        // pageSize: 99999
-                        pageSize: -1
-                    },
+                // console.log(this.port.manage.list)
+                // this.http.post(this.port.manage.list, {
+                //         departmentId: -1,
+                //         pageIndex: 1,
+                //         // pageSize: 99999
+                //         pageSize: -1
+                //     },
+                this.http.post('/user/getSimpleActiveUserList', {},
                     res => {
                         if (res.code == "ok") {
-                            this.users = res.data.records;
+                            this.users = res.data;
                         } else {
                             this.$message({
                             message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/project/custom_data.vue

@@ -137,15 +137,16 @@
             },
             getUsers() {
                 // console.log(this.port.manage.list,'getusers')
-                this.http.post(this.port.manage.list, {
-                        departmentId: -1,
-                        pageIndex: 1,
-                        // pageSize: 99999
-                        pageSize: -1
-                    },
+                // this.http.post(this.port.manage.list, {
+                //         departmentId: -1,
+                //         pageIndex: 1,
+                //         // pageSize: 99999
+                //         pageSize: -1
+                //     },
+                    this.http.post('/user/getSimpleActiveUserList', {},
                     res => {
                         if (res.code == "ok") {
-                            this.users = res.data.records;
+                            this.users = res.data;
                         } else {
                             this.$message({
                             message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/project/fileCenter.vue

@@ -357,15 +357,16 @@
                 });
             },
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    // pageSize: 99999
-                    pageSize: -1
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     // pageSize: 99999
+                //     pageSize: -1
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/project/info.vue

@@ -1301,15 +1301,16 @@
                 
             },
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    pageSize: -1
-                    // pageSize: 99999
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     pageSize: -1
+                //     // pageSize: 99999
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,
@@ -1610,15 +1611,16 @@
                 });
             },
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    // pageSize: 99999
-                    pageSize: -1
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     // pageSize: 99999
+                //     pageSize: -1
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -2741,15 +2741,16 @@ a {
                 })
             },
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    // pageSize: 99999
-                    pageSize: -1
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     // pageSize: 99999
+                //     pageSize: -1
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -2722,14 +2722,15 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
             },
            
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    pageSize: -1
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     pageSize: -1
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -909,15 +909,16 @@ import { error } from 'dingtalk-jsapi';
                 
             },
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    // pageSize: 99999
-                    pageSize: -1
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     // pageSize: 99999
+                //     pageSize: -1
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,
@@ -1269,14 +1270,15 @@ import { error } from 'dingtalk-jsapi';
             },
             getUsers() {
                 // console.log(this.port.manage.list)
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    pageSize: 99999
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     pageSize: 99999
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.users = res.data.records;
+                        this.users = res.data;
                     } else {
                         this.$message({
                         message: res.msg,

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -735,15 +735,16 @@
             },
             // 获取所有人员
             getUsers() {
-                this.http.post(this.port.manage.list, {
-                    departmentId: -1,
-                    pageIndex: 1,
-                    // pageSize: 99999
-                    pageSize: -1
-                },
+                // this.http.post(this.port.manage.list, {
+                //     departmentId: -1,
+                //     pageIndex: 1,
+                //     // pageSize: 99999
+                //     pageSize: -1
+                // },
+                this.http.post('/user/getSimpleActiveUserList', {},
                 res => {
                     if (res.code == "ok") {
-                        this.usersList = res.data.records;
+                        this.usersList = res.data;
                         this.searchUsersList = this.usersList
                     } else {
                         this.$message({