Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/api/system/post.js

@@ -67,3 +67,13 @@ export function queryDeptPostList(data) {
     data
   });
 }
+/**
+ * 获取部门岗位列表
+ */
+export function getDeptPostTree(data) {
+  return request({
+    url: '/User/GetDeptPostTree',
+    method: 'post',
+    data
+  });
+}

src/pages/administration/ApprovalProcess.vue

@@ -169,6 +169,7 @@
                  ref="treeRole"
                  show-checkbox
                  :filter-node-method="filterNode1"
+                 node-key="PostId"
                  :props="defaultProps1"
                  @check-change="checkedRole"
         >
@@ -231,6 +232,9 @@
   import {
     getEmployeeAddrBook
   } from '../../api/users/user'
+  import {
+    getDeptPostTree,
+  } from '../../api/system/post'
   export default {
 
     data() {
@@ -470,9 +474,21 @@
       getRole() {
         this.outerVisible1 = true;
         this.dialogTitle = '选择岗位';
-        this.apipost('WorkFlow_get_GetDepartMentPost', {}, res => {
-          this.roleList = res.data.data
-        }, err => {})
+        let msg={
+          pageIndex: 1,
+          pageSize: 99999,
+          PostName: "", //岗位名称
+          PostId: 0, //岗位编号
+          Status: "-1",
+        }
+        getDeptPostTree(msg).then(res => {
+          this.roleList = res.Data
+        }).catch(() => {
+
+        })
+        // this.apipost('WorkFlow_get_GetDepartMentPost', {}, res => {
+        //   this.roleList = res.data.data
+        // }, err => {})
       },
       handleNodeChange1(data, checked) {
         data.IsCheck = checked;
@@ -568,8 +584,10 @@
 
       },
       checkedRole(data,checked){
+        console.log(data,checked)
         data.IsCheck = checked;
-        if(data.Disabled==false&&data.IsCheck){
+        // if(data.Disabled==false&&data.IsCheck){
+        if(data.IsCheck){
           this.showRole=[];
           this.showRole.push({DeptName:data.DeptName,Id:data.DeptId})
         }