更新

package.json

@@ -37,7 +37,6 @@
     "@antv/g6": "3.1.10",
     "@antv/g6-editor": "^1.2.0",
     "@antv/util": "1.3.1",
-    "@johnhom/el-load-select": "^1.0.0",
     "@riophae/vue-treeselect": "0.4.0",
     "ace-builds": "^1.4.12",
     "axios": "^0.21.1",

src/api/process/work-order.js

@@ -116,6 +116,14 @@ export function queryAllOrgan() {
   })
 }
 
+export function queryUserInfo(data) {
+  return request({
+    url: '/api-web/employee/queryUserInfo',
+    method: 'get',
+    params: data
+  })
+}
+
 // 获取合作单位
 export function getOrganCooperation(params) {
   return request({

src/components/wfd/components/DetailPanel/NodeDetail.vue

@@ -68,6 +68,9 @@
         v-model="selected"
         :data="data"
         :page="page"
+        dictLabel="username"
+        dictValue="userId"
+        style="width: 90%"
         :hasMore="more"
         :request="getData"
       ></load-select> -->
@@ -135,18 +138,15 @@ export default {
       getData({ page = 1, more = false, keyword = "" } = {}) {
         return new Promise(async (resolve) => {
           // 访问后端接口API
-          await listUser({ page, keyword, pageSize: 10 }).then(res => {
-              console.log(res)
+          await listUser({ pageIndex: page, username: keyword, pageSize: 10 }).then(res => {
               if (more) {
                   this.data = [...this.data, ...(res.data.list || [])];
               } else {
                   this.data = res.data.list || [];
               }
-              console.log(this.data)
-              this.page = res.data.page;
-              let { count, page, pageSize } = res.data;
-              this.more = page * pageSize < count;
-              this.page = page;
+              let { count, pageIndex, pageSize } = res.data;
+              this.more = pageIndex * pageSize < count;
+              this.page = pageIndex;
               resolve();
           });
         });

src/components/wfd/components/DetailPanel/UserTaskDetail.vue

@@ -185,13 +185,16 @@
 import DefaultDetail from './DefaultDetail'
 import NodeDetail from './NodeDetail'
 import Treeselect from '@riophae/vue-treeselect'
+import loadSelect from '@/components/loadSelect'
+import { listUser } from '@/api/system/sysuser'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 export default {
   inject: ['i18n'],
   components: {
     DefaultDetail,
     NodeDetail,
-    Treeselect
+    Treeselect,
+    loadSelect
   },
   props: {
     model: {

src/views/process/list/create.vue

@@ -86,7 +86,7 @@ import { GenerateForm } from "@/components/VueFormMaking";
 import "form-making/dist/FormMaking.css";
 Vue.component(GenerateForm.name, GenerateForm);
 
-import { processStructure, createWorkOrder, checkCourseReturnFee, queryAllOrgan } from "@/api/process/work-order";
+import { processStructure, createWorkOrder, checkCourseReturnFee, queryAllOrgan, queryUserInfo } from "@/api/process/work-order";
 import { listUser } from "@/api/system/sysuser";
 export default {
   name: "Create",
@@ -98,6 +98,8 @@ export default {
       organList: [],
       processStructureValue: {},
       socialId: null, // 是否是社保分部
+      userId: null,
+      tenantId: 1,
       ruleForm: {
         priority: 1,
         deptId: null, // 社保部分
@@ -136,13 +138,25 @@ export default {
       }
     };
   },
-  created() {
+  async created() {
+    await this.getUserInfo()
     this.getAllOrgan()
     this.getProcessNodeList()
   },
   methods: {
+    async getUserInfo() {
+      await queryUserInfo().then(res => {
+        console.log(res)
+        if(res.code == 200) {
+          this.userId = res.data.id
+          this.tenantId = res.data.tenantId
+        } else {
+          this.$message.error(res.data)
+        }
+      })
+    },
     getAllOrgan() { // 获取分部
-      queryAllOrgan().then(res => {
+      queryAllOrgan({ tenantId: this.tenantId }).then(res => {
         if (res.code == 200) {
           const result = res.data;
           const filterOrganId = [36, 39, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 52, 54, 55, 56]
@@ -159,7 +173,8 @@ export default {
     },
     getProcessNodeList() {
       processStructure({
-        processId: this.$route.query.processId
+        processId: this.$route.query.processId,
+        userId: this.userId
       }).then(response => {
         this.processStructureValue = response.data
         this.currentNode = this.processStructureValue.nodes[0]

src/views/process/list/handle.vue

@@ -193,6 +193,7 @@ import {
   handleWorkOrder,
   activeOrder,
   asyncPlayLog,
+  queryUserInfo,
   queryAllOrgan
 } from '@/api/process/work-order'
 
@@ -233,6 +234,8 @@ export default {
         tpls: [],
         tasks: []
       },
+      userId: null,
+      tenantId: 1,
       btn_group: [],
       is_end: 0, // 是否结束
       remoteFunc: {
@@ -253,15 +256,28 @@ export default {
       'userId'
     ])
   },
-  created() {
+  async created() {
+    await this.getUserInfo()
     this.getAllOrgan()
     this.getProcessNodeList()
   },
   methods: {
+    async getUserInfo() {
+      await queryUserInfo().then(res => {
+        console.log(res)
+        if(res.code == 200) {
+          this.userId = res.data.id
+          this.tenantId = res.data.tenantId
+        } else {
+          this.$message.error(res.data)
+        }
+      })
+    },
     getProcessNodeList() {
       processStructure({
         processId: this.$route.query.processId,
-        workOrderId: this.$route.query.workOrderId
+        workOrderId: this.$route.query.workOrderId,
+        userId: this.userId
       }).then(response => {
         this.isActiveProcessing = false
         this.processStructureValue = response.data
@@ -392,7 +408,7 @@ export default {
       })
     },
     getAllOrgan() {
-      queryAllOrgan().then(res => {
+      queryAllOrgan({ tenantId: this.tenantId }).then(res => {
         if (res.code == 200) {
           const result = res.data;
           const filterOrganId = [36, 39, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 52, 54, 55, 56]