From b13af16c0b06259f284d89978fb0bf053c802e86 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 25 Jun 2021 17:56:21 +0800
Subject: [PATCH] commit

---
 src/assets/styles/newStyle.less               |    4 +
 src/components/navMenu/index.vue              |   25 +-
 .../config/pages/mechanismManage/index.vue    | 1142 ++---------------
 src/pages/config/pages/postManage/index.vue   |  210 +++
 src/router/index.js                           |   11 +
 5 files changed, 358 insertions(+), 1034 deletions(-)
 create mode 100644 src/pages/config/pages/postManage/index.vue

diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less
index d4cbb9ac8..ef8706955 100644
--- a/src/assets/styles/newStyle.less
+++ b/src/assets/styles/newStyle.less
@@ -902,3 +902,7 @@ tr.el-table__row{
     width: 100% !important;
   }
 }
+.filter-tree-input {
+  margin: 10px;
+  width: calc(~'100% - 20px');
+}
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index e05997f7f..bc43095be 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -269,16 +269,21 @@ export default {
         //       path: '/dynamicInformationManage',
         //       menuId: '6V2QZ9STRZ'
         //     },
-        //     {
-        //       title: '机构管理',
-        //       path: '/MechanismManage',
-        //       menuId: '7MWCQK6NNH'
-        //     },
-        //     {
-        //       title: '角色管理',
-        //       path: '/roleManage',
-        //       menuId: 'NVU76EMB7N'
-        //     },
+            {
+              title: '机构管理',
+              path: '/MechanismManage',
+              menuId: '7MWCQK6NNH'
+            },
+            {
+              title: '角色管理',
+              path: '/roleManage',
+              menuId: 'NVU76EMB7N'
+            },
+            {
+              title: '岗位管理',
+              path: '/postManage',
+              menuid: ''
+            },
         //     {
         //       title: '用户管理',
         //       path: '/userManage',
diff --git a/src/pages/config/pages/mechanismManage/index.vue b/src/pages/config/pages/mechanismManage/index.vue
index c433a7cad..a1964a6c8 100644
--- a/src/pages/config/pages/mechanismManage/index.vue
+++ b/src/pages/config/pages/mechanismManage/index.vue
@@ -3,23 +3,20 @@
   <div id="mechanism-manage" :class="{ 'tree-close': sideClose }" class="v-class">
     <div class="tree-content" :class="{ 'tree-closed': sideClose }">
       <div class="tree">
-        <laws-tree
-          ref="mechanismManage"
-          treeDivId="mechanismManage"
-          v-if="zNodes.length"
-          :zNodes="zNodes"
-          showRMenu
-          deptSelect
-          autoSelect
-          add-id="SSSSE8FGMP"
-          edit-id="7EKKPBU65W"
-          remove-id="XL4CJXWB8M"
-          @treeClick="(treeId, treeNode) => handleClick(treeId, treeNode)"
-          @treeAdd="(treeId, treeNode) => handleAdd(treeId, treeNode)"
-          @treeEdit="(treeId, treeNode) => handleEdit(treeId, treeNode)"
-          @treeRightClick="(treeId, treeNode) => treeRightClick(treeId, treeNode)"
-          @treeRemove="(treeId, treeNode) => handleBeforeRemove(treeId, treeNode)"
-        ></laws-tree>
+        <el-input
+                class="filter-tree-input"
+                placeholder="输入关键字进行过滤"
+                v-model="filterText">
+        </el-input>
+        <el-tree
+                class="filter-tree"
+                :data="treeData"
+                :props="defaultProps"
+                default-expand-all
+                :filter-node-method="filterNode"
+                ref="tree"
+                @node-click="handleNodeClick">
+        </el-tree>
       </div>
       <div class="tree-collapse" @click="treeCollapse" :class="{ 'tree-close': sideClose }">
         <!--切换折叠样式-->
@@ -28,1079 +25,176 @@
       </div>
     </div>
     <div class="tree-right">
-      <div class="search-area">
-        <div class="left">
-          <!-- 查询条件 -->
-          <el-form
-            ref="mechanismSearch"
-            :model="mechanismSearch"
-            inline
-            class="label-input-form"
-            @keyup.enter.native="findByOrgBtn">
-            <el-form-item prop="userName" :label="$t('m.personnelName')" class="search-item">
-              <el-input v-model="mechanismSearch.uname" :placeholder="$t('m.byPersonName')" clearable />
-            </el-form-item>
-              <custom-role-tree
-                ref="roleName"
-                :config="{
-                  attrName: '角色',
-                  attrField: 'roleId',
-                }"
-                v-model="mechanismSearch.roleId"
-                :data-model="mechanismSearch"
-              ></custom-role-tree>
-            <el-form-item :label="$t('m.state')" prop="state" class="search-item">
-              <el-select
-                v-model="mechanismSearch.disableFlag"
-                :placeholder="$t('m.byState')"
-                filterable
-              >
-                <el-option
-                  v-for="item in mechanismSearch.disableFlagOptions"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item class="search-item btn-box">
-              <el-button
-                icon="el-icon-search"
-                type="primary"
-                class="common-button-primary"
-                round
-                @click="findByOrgBtn"
-                :loading="mechanismSearch.searching"
-              ></el-button>
-            </el-form-item>
-            <el-form-item class="search-item btn-box">
-              <el-button
-                class="common-button-default"
-                icon="el-icon-refresh-left"
-                round
-                @click="resetSearch"></el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-      <div class="action-bar">
-        <!--<el-button
-          @click="setRole"
-          class="common-button-default"
-          round
-        >设置角色</el-button>-->
-        <el-button
-          @click="delUserList"
-          v-btn-permission="'XL4CJXWB8M'"
-          class="common-button-default delete-button"
-          round
-        ><i class="iconfont">&#xe61b;</i>批量删除</el-button>
-      </div>
       <div class="content">
         <el-table
-          border
-          ref="selection"
-          height="100%"
-          :data="deptEmpData"
-          tooltip-effect="dark"
-          style="width: 100%;"
-          @selection-change="handleSelect"
-          :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
-         fontWeight: 'bold', height: '48px'}"
-        >
+                ref="multipleTable"
+                :data="data"
+                tooltip-effect="dark"
+                border
+                style="width: 100%; flex: auto;"
+                class="drag-table"
+                height="100%"
+                :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}">
           <el-table-column
-            type="selection"
-            width="55"
-            fixed
-            align="center">
+                  prop="uname"
+                  label="姓名"
+                  width="170px">
           </el-table-column>
           <el-table-column
-            prop="orgName"
-            label="组织机构类型"
-            width="150">
+                  prop="sex"
+                  label="性别"
+                  width="170px">
             <template slot-scope="scope">
-              <div v-if="scope.row.orgType === 'ROOM'">{{$t('m.roomLevel')}}</div>
-              <div v-if="scope.row.orgType === 'DEPART'">{{$t('m.ministry')}}</div>
-              <div v-if="scope.row.orgType === 'FAMILY'">{{$t('m.level')}}</div>
+              <div v-if="scope.row.sex === '1'">男</div>
+              <div v-if="scope.row.sex === '2'">女</div>
             </template>
           </el-table-column>
           <el-table-column
-            prop="uname"
-            :label="$t('m.personnelName')"
-            width="150">
+                  prop="phone"
+                  label="电话"
+                  width="170px">
           </el-table-column>
           <el-table-column
-            prop="account"
-            :label="$t('m.systemAccount')"
-            width="150">
+                  prop="email"
+                  label="邮箱"
+                  width="170px">
           </el-table-column>
           <el-table-column
-            prop="workNum"
-            label="人员编号"
-            width="150">
+                  prop="institutionName"
+                  label="所属部门">
           </el-table-column>
           <el-table-column
-            prop="roleNameList"
-            :label="$t('m.role')"
-            width="150">
-            <template slot-scope="scope">
-              {{ scope.row.roleNameList.join(',') }}
-            </template>
+                  prop="positionName"
+                  label="所属岗位">
           </el-table-column>
           <el-table-column
-            prop="orgName"
-            :label="$t('m.departments')"
-            width="150">
+                  prop="state"
+                  label="状态"
+                  width="170px">
           </el-table-column>
           <el-table-column
-            prop="email"
-            :label="$t('m.email')"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="officePhone"
-            label="办公电话"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="mobilePhone"
-            :label="$t('m.phoneNumber')"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="faxAddress"
-            label="传真"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="address"
-            :label="$t('m.postalAddress')"
-            width="150">
-          </el-table-column>
-          <el-table-column
-            prop="disableFlag"
-            :label="$t('m.state')"
-            width="150">
-            <template slot-scope="scope">
-              <div v-if="scope.row.disableFlag === 0">{{$t('m.normal')}}</div>
-              <div v-else>{{$t('m.disabled')}}</div>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="modifyTime"
-            :label="$t('m.modificationTime')"
-            sortable
-            width="150">
-            <template slot-scope="scope">
-              <div>{{ scope.row.modifyTime !== null ? scope.row.modifyTime.split(' ')[0] : '' }}</div>
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="50" fixed="right">
+                  label="操作"
+                  width="50px">
             <template slot-scope="scope">
               <div @click.stop style="display: inline-block">
                 <el-dropdown trigger="click" @command="handleCommand">
-<i class="iconfont">&#xe61e;</i>
+                  <i class="iconfont">&#xe61e;</i>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="[scope.row, '查看']">查看</el-dropdown-item>
-                    <el-dropdown-item v-btn-permission="'XL4CJXWB8M'" :command="[scope.row, '删除']">删除</el-dropdown-item>
+                    <el-dropdown-item v-if="scope.row.disableFlag === '1'" :command="[scope.row, '启用']">启用</el-dropdown-item>
+                    <el-dropdown-item v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">禁用</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
             </template>
           </el-table-column>
         </el-table>
-        <loading :loading="loading">{{$t('m.gettingList')}}</loading>
       </div>
+      <loading :loading="Loading">加载中...</loading>
       <pagination :page="page" :total="total" @pageChange="pageChange" @pageSizeChange="pageSizeChange"></pagination>
     </div>
-    <el-dialog
-      :visible.sync="visibleSetRole"
-      title="设置角色"
-      @close="closeModal"
-      :loading="roleSaveLoading"
-      width="400px"
-    >
-      <div>
-        <el-form
-          ref="roleForm"
-          :model="roleForm"
-          :rules="roleRules"
-          class="label-input-form"
-          label-width="100px"
-          inline
-        >
-<!--          <el-form-item :label="$t('m.role')" prop="roleIdList" class="add-form-item width-all">-->
-<!--            <el-select v-model="roleForm.roleIdList" multiple>-->
-<!--              <el-option v-for="item in roleList" :value="item.value" :label="item.label" :key="item.value"></el-option>-->
-<!--            </el-select>-->
-<!--          </el-form-item>-->
-            <custom-role-tree
-                    :config="{
-                  attrName: '角色',
-                  attrField: 'roleIdList',
-              }"
-                    v-model="roleForm.roleIdList"
-                    :data-model="roleForm"
-            ></custom-role-tree>
-        </el-form>
-      </div>
-      <div slot="footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="closeModal">{{$t('m.cancel')}}</el-button>
-        <el-button class="common-button-primary" icon="el-icon-check" type="primary" @click="saveModal">{{$t('m.confirm')}}</el-button>
-      </div>
-    </el-dialog>
-    <!-- 查看 -->
-    <el-drawer
-      title="用户信息"
-      :wrapperClosable="false"
-      :visible.sync="view.showUserDrawer"
-      :destroy-on-close="true"
-      size="800px"
-    >
-      <div class="see-drawer-content">
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.bodyType')}}</label>
-          <span class="see-drawer-val">{{ userInfo.txets || '--' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.personnelName')}}</label>
-          <span class="see-drawer-val">{{ userInfo.uname }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.systemAccount')}}</label>
-          <span class="see-drawer-val">{{ userInfo.account }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.personnelNumber')}}</label>
-          <span class="see-drawer-val">{{ userInfo.workNum || '--'}}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.role')}}</label>
-          <span class="see-drawer-val">{{ userInfo.roleNameList || '暂无' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.departments')}}</label>
-          <span class="see-drawer-val">{{ userInfo.orgName || '暂无' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.email')}}</label>
-          <span class="see-drawer-val">{{ userInfo.email || '--' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.officePhone')}}</label>
-          <span class="see-drawer-val">{{ userInfo.officePhone || '--' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.phoneNumber')}}</label>
-          <span class="see-drawer-val">{{ userInfo.mobilePhone || '--' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">传真</label>
-          <span class="see-drawer-val">{{ userInfo.faxAddress || '--' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">通讯地址</label>
-          <span class="see-drawer-val">{{ userInfo.address || '--' }}</span>
-        </div>
-        <div class="see-drawer-div">
-          <label class="see-drawer-name">{{$t('m.state')}}</label>
-          <span class="see-drawer-val">{{ userInfo.disableFlag === 0 ? '正常' : '禁用' }}</span>
-        </div>
-      </div>
-    </el-drawer>
-    <!-- 节点新增、节点维护 -->
-    <el-dialog
-      :visible.sync="view.treeView"
-      @close="treChange"
-      :close-on-click-modal="false"
-      width="360px"
-      :title="treeTitle"
-      destroy-on-close
-    >
-      <div class="form-content">
-        <el-form
-          ref="treeForm"
-          :model="treeForm"
-          :rules="treeFormRules"
-          class="label-input-form"
-          label-width="100px"
-          inline
-        >
-          <el-form-item :label="$t('m.subordinateSuperior')" prop="pNodeName" class="add-form-item form-item-disabled">
-            <el-input v-model="treeForm.pNodeName" disabled/>
-          </el-form-item>
-          <el-form-item :label="$t('m.departmentName')" prop="orgName" class="add-form-item">
-            <el-input v-model="treeForm.orgName" :placeholder="$t('m.enterDepartmentName')" clearable />
-          </el-form-item>
-          <el-form-item :label="$t('m.DepartmentAbbreviation')" prop="shotName" class="add-form-item">
-            <el-input v-model="treeForm.shotName" :placeholder="$t('m.enterDepartmentAbbreviation')" clearable class="top1px" />
-          </el-form-item>
-          <el-form-item :label="$t('m.departmentType')" prop="orgType" class="add-form-item">
-            <search-select v-model="treeForm.orgType" :options="[{
-                label: this.$t('m.room'),
-                value: 'ROOM'
-              }, {
-                label: this.$t('m.section'),
-                value: 'FAMILY'
-              }, {
-                label: this.$t('m.department'),
-                value: 'DEPART'
-              }
-              // {
-              //   label: this.$t('m.subsidiary'),
-              //   value: 'SUBUS'
-              // }
-              ]" :placeholder="$t('m.selectDepartmentType')" />
-          </el-form-item>
-          <el-form-item :label="$t('m.departmentProfile')" prop="remarks" class="add-form-item">
-            <el-input
-              v-model="treeForm.remarks"
-              :maxlength="500"
-              type="textarea"
-              :autosize="{minRows: 1,maxRows: 5}"
-              :placeholder="$t('m.enterDepartmentDescription')"
-              class="top1px"
-              clearable />
-          </el-form-item>
-        </el-form>
-      </div>
-      <div slot="footer">
-        <el-button class="common-button-default" icon="el-icon-close" @click="treeCancel">{{$t('m.cancel')}}</el-button>
-        <el-button class="common-button-primary" type="primary" icon="el-icon-check" @click="treeOk">{{$t('m.confirm')}}</el-button>
-      </div>
-    </el-dialog>
+    <loading style="z-index: 2099;" :loading="treeLoading">导入中...</loading>
   </div>
 </template>
 
 <script>
-import 'zTree/js/jquery.ztree.core.js'
-import 'zTree/js/jquery.ztree.excheck.js'
-import 'zTree/js/jquery.ztree.exedit.js'
-import CustomRoleTree from '@/components/CustomFormComponents/mechanismRoleTree'
 export default {
   name: 'MechanismManage',
-  components: {
-    CustomRoleTree
-  },
   data () {
     return {
-      orgFlag: '',
-      orgObject: {},
-      orgNew: '',
-      // 搜索组
-      mechanismSearch: {
-        userType: '',
-        uname: '',
-        roleId: '',
-        disableFlag: '',
-        typeOptions: [
-          {
-            label: '类型1',
-            value: 1
-          }, {
-            label: '类型2',
-            value: 2
-          }
-        ],
-        roleOptions: [
-          {
-            label: '管理员',
-            value: 1
-          },
-          {
-            label: '普通用户',
-            value: 2
-          }
-        ],
-        disableFlagOptions: [{
-          label: '正常',
-          value: '0'
-        }, {
-          label: '禁用',
-          value: '1'
-        }],
-        searching: false,
-        ZRBM: ''
+      filterText: '', // 树结构检索条件
+      defaultProps: {
+        children: 'children',
+        label: 'name'
       },
-      // 显示条件
-      view: {
-        treeView: false,
-        treeFlag: 1, // 1新增 2编辑
-        treeLoadingFlag: 1, // 获取为1 操作为2
-        showUserDrawer: false // 显示用户信息抽屉
-      },
-      zTree: '',
-      zNodes: [],
-      setting: '',
-      // 组织机构表单
-      treeForm: {
-        id: '',
-        orgName: '',
-        pNodeName: '',
-        pId: '',
-        remarks: '',
-        shotName: '',
-        parentIds: '',
-        orgType: ''
-      },
-      // 组织机构表单规则
-      treeFormRules: {
-        pNodeName: [
-          { required: true, message: '上级部门不能为空', trigger: 'blur' },
-          {type: 'string', max: 20, message: '最多输入20字符', trigger: 'blur'},
-          {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ],
-        orgName: [
-          { required: true, message: '部门名称不能为空', trigger: 'blur' },
-          {type: 'string', max: 20, message: '最多输入20字符', trigger: 'blur'},
-          {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ],
-        shotName: [
-          { required: true, message: '部门简称不能为空', trigger: 'blur' },
-          {type: 'string', max: 20, message: '最多输入20字符', trigger: 'blur'},
-          {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ],
-        remarks: [
-          {type: 'string', max: 500, message: '最多输入500字符', trigger: 'blur'},
-          {type: 'string', validator: this.verify.checkSpecialCharacter, trigger: 'blur'}
-        ],
-        orgType: [
-          {type: 'string', required: true, message: '部门类型不能为空', trigger: 'change'}
-        ]
-      },
-      deptEmpData: [], // 组织下的员工列表
-      loading: false,
-      syncInfo: '无',
-      treeModalLoading: false, // 新增、删除弹窗loading
-      treeLoading: false,
-      orgId: '', // 组织机构id
+      treeData: [], // 树结构数据
       page: 1,
-      pageSize: this.$store.getters.userInfo.configContent,
       total: 0,
-      selectionList: [],
-      treeReady: false,
-      roleList: [], // 角色列表
-      userInfo: '', // 用户信息
-      openNodes: [], // 展开的节点
-      currentNode: '', // 当前节点
-      visibleSetRole: false, // 角色配置对话框
-      roleForm: {
-        roleId: '',
-        roleIdList: [],
-        ZRBM: ''
-      },
-      roleRules: {
-        // roleIdList: [
-        //   { required: true, type: 'array', message: '角色不能为空', trigger: 'change' }
-        // ]
-      },
-      roleSaveLoading: false, // 角色保存loading
-      unassigned: false, // 未分配人员查询标志
-      sideClose: false // 边栏收展状态
+      pageSize: this.$store.getters.userInfo.configContent,
+      sideClose: false,
+      data: [], // table数据
+      treeLoading: false,
+      Loading: false,
+      id: ''
     }
   },
   methods: {
-    // 更多
     handleCommand (command) {
       switch (command[1]) {
-        case '查看':
-          this.showUsersInfo(command[0])
+        case '启用':
+          this.disableFlagEdit(command[0], 0)
           break
-        case '删除':
-          this.delUser(command[0])
+        case '禁用':
+          this.disableFlagEdit(command[0], 1)
           break
       }
     },
-    /**
-       * @author liruohao
-       * @date 2019/6/3
-       * @Description: 右击事件
-       */
-    treeRightClick (treeId, treeNode) {
-      this.orgObject = treeNode
-      this.orgNew = treeNode.id
-      this.orgId = treeNode.id
-    },
-    treChange (type) {
-      // this.$refs['treeForm'].resetFields()
-      if (!type) {
-        for (let i in this.treeForm) {
-          this.treeForm[i] = ''
-        }
-        this.orgNew = ''
-      }
-    },
-    // 点击table表格查看按钮事件
-    showUsersInfo (row) {
-      this.view.showUserDrawer = true
-      this.userInfo = JSON.parse(JSON.stringify(row))
-      switch (this.userInfo.orgType) {
-        case 'ROOM' :
-          this.userInfo.txets = '室级'
-          break
-        case 'DEPART' :
-          this.userInfo.txets = '部级'
-          break
-        case 'FAMILY' :
-          this.userInfo.txets = '科级'
-          break
-        default :
-          break
-      }
-      let obj = ''
-      obj = this.userInfo.roleNameList.join(',')
-      this.userInfo.roleNameList = obj
-    },
-    /**
-       * @description: 获取组织结构树结构
-       * @author: chenxiaoxi
-       * @date: 2018-09-21 09:27:27
-       */
-    getTree () {
-      return new Promise((resolve, reject) => {
-        this.$http.get('sys/org/getTree', {}, {
-          _this: this,
-          loading: 'treeLoading'
-        }, res => {
-          if (res.ok) {
-            this.orgId = ''
-            let zNodes = []
-            for (let i = 0; i < res.data.length; i++) {
-              let zObj = {}
-              zObj.id = res.data[i].id
-              zObj.pId = res.data[i].pId
-              zObj.name = res.data[i].orgName
-              zObj.shotName = res.data[i].shotName
-              zObj.orgType = res.data[i].orgType
-              zObj.remarks = res.data[i].remarks
-              zObj.parentIds = res.data[i].parentIds
-              if (res.data[i].pId === null && this.orgId === '') {
-                // this.orgId = res.data[i].id
-                this.orgId = ''
-                zObj.open = false
-                zNodes[i] = zObj
-              } else {
-                zNodes[i] = zObj
-              }
-              if (res.data[i].parentIds !== null) {}
-            }
-            zNodes.push({
-              id: 'noDepartment',
-              pId: null,
-              name: '未分配人员',
-              shotName: '',
-              remarks: '',
-              orgType: '',
-              isParent: true
-            })
-            if (this.openNodes.length > 0) {
-              this.openNodes.map((openNode) => {
-                zNodes.map((node) => {
-                  if (openNode.id === node.id) {
-                    node.open = true
-                  }
-                })
-              })
-            }
-            this.zNodes = zNodes
+    disableFlagEdit (row, type) {
+      let json = {}
+      json.userId = row.userId
+      json.disableFlag = type
+      this.$http.postData('sarUser/user/disable', json, {},
+      res => {
+        if (res.ok){
+          if (type === 0) {
+            this.$message.success('已启用')
+          } else {
+            this.$message.success('已禁用')
           }
-          resolve()
-        }, e => {
-          reject(e)
-        })
-      })
-    },
-    /**
-       * @description: 组织结构树弹窗确认
-       * @author: chenxiaoxi
-       * @date: 2018-09-21 09:17:04
-       */
-    treeOk () {
-      this.$refs['treeForm'].validate((valid) => {
-        if (valid) {
-          this.$http[this.view.treeFlag === 1 ? 'postData' : 'putData']('sys/org', this.treeForm, {
-            _this: this,
-            loading: 'treeModalLoading'
-          }, res => {
-            if (res.ok) {
-              console.log('dataaaaaa', res.data)
-              let backData = res.data
-              // 新增一个接口
-              this.$http.postData('lawss/sarSubMenu/insertSarSubMenuall', backData, {
-                _this: this
-              }, res => {
-                if (res.ok) {
-                }
-              }, e => {
-              })
-              this.getTree().then(() => {
-                setTimeout(() => {
-                  this.findByOrg(res.data === '' ? this.orgNew : res.data.id)
-                  this.unassigned = false
-                  this.orgNew = this.treeForm.id
-                  this.$refs.mechanismManage.selectOneNode(res.data === '' ? this.orgNew : res.data.id)
-                  this.treeFormReset()
-                  this.view.treeFlag = 1
-                  this.view.treeView = false
-                })
-              })
-            }
-          }, e => {})
-        } else {
+          this.getData()
         }
       })
     },
-    /**
-       * @description: 组织结构树取消
-       * @author: chenxiaoxi
-       * @date: 2018-09-21 09:17:27
-       */
-    treeCancel () {
-      this.treeFormReset()
-      this.view.treeView = false
-    },
-    /**
-       * @description: 组织结构表单重置
-       * @author: chenxiaoxi
-       * @date: 2018-09-21 09:17:36
-       */
-    treeFormReset () {
-      this.$refs['treeForm'].resetFields()
-    },
-    /**
-       * @description: 根据组织机构id查看员工列表
-       * @author: chenxiaoxi
-       * @date: 2018-09-25 15:59:40
-       */
-    // 搜索
-    findByOrgBtn () {
-      this.page = 1
-      // if (this.mechanismSearch.disableFlag === '0') {
-      //   this.mechanismSearch.disableFlag = 0
-      // }
-      if (!this.unassigned) {
-        this.findByOrg()
-      } else {
-        this.findUnassigned()
-      }
-      // this.$refs.selection.selectAll(false)
-    },
-    findByOrg (id) {
-      this.selectionList = []
-      this.deptEmpData = []
-      this.$http.get('sys/user/findByOrg', {
-        orgId: id || this.orgId,
-        page: this.page,
-        pageSize: this.pageSize,
-        uname: this.mechanismSearch.uname,
-        roleId: this.mechanismSearch.roleId,
-        disableFlag: this.mechanismSearch.disableFlag
-      }, {
-        _this: this,
-        loading: 'loading'
-      }, res => {
-        this.deptEmpData = res.data.list
-        this.total = res.data.count
-      }, e => {})
-    },
-    /**
-       * @description:搜索框重置
-       * @author: zhaochunfeng
-       * @date: 2018/10/31 10:44:10
-       */
-    resetSearch () {
-      this.$refs.roleName.checkedName = ''
-      this.mechanismSearch.uname = ''
-      this.mechanismSearch.roleId = ''
-      this.mechanismSearch.disableFlag = ''
-      this.mechanismSearch.page = 1
-      if (!this.unassigned) {
-        this.findByOrg()
-      } else {
-        this.findUnassigned()
-      }
-    },
-    /**
-       * @description: 页码改变
-       * @author: chenxiaoxi
-       * @date: 2018-09-29 14:24:51
-       */
-    pageChange (page) {
-      this.page = page
-      if (!this.unassigned) {
-        this.findByOrg()
-      } else {
-        this.findUnassigned()
-      }
-      this.$refs.selection.selectAll(false)
-    },
-    /**
-       * @description: 每页条数改变
-       * @author: chenxiaoxi
-       * @date: 2018-09-29 14:25:57
-       */
-    pageSizeChange (rows) {
-      this.pageSize = rows
-      if (!this.unassigned) {
-        this.findByOrg()
-      } else {
-        this.findUnassigned()
-      }
-    },
-    /**
-       * @description: 删除用户与组织机构的关联
-       * @author: chenxiaoxi
-       * @date: 2018-09-29 14:39:42
-       */
-    delUser (row) {
-      if (this.orgId === '') {
-        this.$message.warning('用户未关联组织机构')
-      } else if (this.orgId === 'noDepartment') {
-        this.$message.warning('未分配人员不可删除用户与组织机构的关系')
-      } else {
-        const h = this.$createElement
-        this.$msgbox({
-          title: '消息',
-          message: h('p', null, [
-            h('span', null, '您确认要删除 '),
-            h('i', { style: 'color: #E4393C' }, row.uname),
-            h('span', null, '的组织关系吗？')
-          ]),
-          showCancelButton: true,
-          confirmButtonText: '确定',
-          confirmButtonClass: 'common-button-primary',
-          cancelButtonText: '取消',
-          roundButton: true,
-          type: 'warning'
-        }).then(() => {
-          this.$http.delete('sys/org/deleteList/' + row.usid, {}, {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              if (!this.unassigned) {
-                this.findByOrg()
-              } else {
-                this.findUnassigned()
-              }
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-      }
-    },
-    /**
-       * @description: 批量删除用户关联
-       * @author: chenxiaoxi
-       * @date: 2018-09-29 17:14:23
-       */
-    delUserList () {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请选择您要删除组织的用户')
-      } else {
-        this.$confirm('您确认要删除选中用户的组织关系吗?', '提示', {
-          confirmButtonText: '确定',
-          confirmButtonClass: 'common-button-primary',
-          cancelButtonText: '取消',
-          roundButton: true,
-          type: 'warning'
-        }).then(() => {
-          let ids = this.selectionList.join(',')
-          this.$http.delete('sys/org/deleteList/' + ids, {}, {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              if (!this.unassigned) {
-                this.findByOrg()
-              } else {
-                this.findUnassigned()
-              }
-            }
-          })
-        }).catch(() => {
-          this.$refs.selection.clearSelection()
-          this.selectionList = []
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-      }
-    },
-    // 选项发生改变回调
-    handleSelect (selection) {
-      let selectionList = []
-      for (let i = 0; i < selection.length; i++) {
-        selectionList.push(selection[i].usid)
-      }
-      this.selectionList = selectionList
-    },
-
-    /**
-       * @description: 获取角色列表
-       * @author: chenxiaoxi
-       * @date: 2018/10/16 15:43:04
-       */
-    queryRoleList () {
-      this.$http.get('sys/role', {
-        pageNo: 1,
-        pageSize: 999
-      }, {
-        _this: this
-      }, res => {
-        let roleList = res.data.map(function (item, key, ary) {
-          let role = {}
-          role.label = item.name
-          role.value = item.id
-          return role
-        })
-        this.roleList = roleList
-      }, e => {})
-    },
-
-    /**
-       * @description: 保存展开的节点
-       * @author: chenxiaoxi
-       * @date: 2018/11/09 16:29:18
-       */
-    setOpenNodes () {
-      let treeObj = $.fn.zTree.getZTreeObj('treeDemo')
-      let node = treeObj.getNodes()
-      let nodes = treeObj.transformToArray(node)
-      let openNodes = nodes.filter((item, index) => {
-        return item.open === true
-      })
-      this.openNodes = openNodes
-    },
-    /**
-       * @description: 角色配置
-       * @author: chenxiaoxi
-       * @date: 2018/11/11 11:27:23
-       */
-    setRole () {
-      if (this.selectionList.length === 0) {
-        this.$message.warning('请至少选择一个用户进行配置')
-      } else {
-        this.visibleSetRole = true
-      }
-    },
-    // 同步SSO组织机构数据
-    syncOrg () {
-      this.$http.get('sys/org/syncOrgInfo', {}, {
-        _this: this, loading: 'loading'
-      }, res => {
-        this.$message.success(res.message)
-      })
-    },
-    getLastSyncTime () {
-      this.$http.get('sys/otSyncInfo/getLastSync', {syncType: 'ORG'}, {
-        _this: this, loading: 'loading'
-      }, res => {
-        if (res.data !== null || res.data !== undefined) {
-          let sync = res.data
-          this.syncInfo = sync.syncTime
-        }
-      }, e => {})
-    },
-    /**
-       * @description: 查找未分配人员
-       * @author: chenxiaoxi
-       * @date: 2018/11/11 13:50:20
-       */
-    findUnassigned () {
-      this.selectionList = []
-      this.deptEmpData = []
-      this.total = 0
-      this.$http.get('sys/user/findBySetOrg', {
-        page: this.page,
-        pageSize: this.pageSize,
-        uname: this.mechanismSearch.uname,
-        roleId: this.mechanismSearch.roleId,
-        disableFlag: this.mechanismSearch.disableFlag
-      }, {
-        _this: this,
-        loading: 'loading'
-      }, res => {
-        this.deptEmpData = res.data.list
-        this.total = res.data.count
-      }, e => {})
-    },
-    // 关闭模态
-    closeModal () {
-      this.visibleSetRole = false
-      this.$refs['roleForm'].resetFields()
-      this.$refs.selection.clearSelection()
-      this.selectionList = []
-    },
-    // 保存模态
-    saveModal () {
-      let configUser = {
-        usid: this.selectionList.join(','),
-        // roleId: this.roleForm.roleId,
-        orgId: this.orgId,
-        roleIdList: this.roleForm.roleIdList
-      }
-      this.$http.postData('sys/user/saveUserRole', configUser, {
-        _this: this,
-        loading: 'roleSaveLoading'
-      }, res => {
-        if (res.ok) {
-          this.visibleSetRole = false
-          this.findByOrg()
-        }
-      }, e => {})
-    },
-
-    /**
-       * @description: 树节点点击
-       * @author: chenxiaoxi
-       * @date: 2018-09-25 16:13:25
-       */
-    handleClick (treeId, treeNode) {
-      this.orgId = treeNode.id
-      this.mechanismSearch.ZRBM = treeNode.id
-      if (this.orgId !== 'noDepartment') {
-        this.findByOrg()
-        this.unassigned = false
-        this.orgFlag = ''
-      } else {
-        this.findUnassigned()
-        this.unassigned = true
-        this.orgFlag = 1
-      }
-    },
-
-    /**
-       * @description: 树节点添加
-       * @author: chenxiaoxi
-       * @date: 2018/12/26 15:39:22
-       */
-    handleAdd (treeId, treeNode) {
-      this.view.treeView = true
-      this.view.treeFlag = 1
-      this.treeForm.pId = treeNode.id
-      this.treeForm.pNodeName = treeNode.oldname || treeNode.name
-      this.treeForm.orgName = treeNode.orgName
-      this.treeForm.parentIds = treeNode.parentIds
-    },
-
-    /**
-       * @description: 树节点删除
-       * @author: chenxiaoxi
-       * @date: 2018-09-25 14:05:25
-       */
-    handleBeforeRemove (treeId, treeNode) {
-      const h = this.$createElement
-      this.$msgbox({
-        title: '提示',
-        message: h('p', null, [
-          h('span', null, '您确认要删除机构 '),
-          h('i', { style: 'color: #E4393C' }, treeNode.name),
-          h('span', null, '吗？')
-        ]),
-        showCancelButton: true,
-        confirmButtonText: '确定',
-        confirmButtonClass: 'common-button-primary',
-        cancelButtonText: '取消',
-        roundButton: true,
-        type: 'warning'
-      }).then(() => {
-        this.$http.delete('sys/org', {
-          id: treeNode.id
-        }, {
-          _this: this,
-          loading: 'treeLoading'
-        }, res => {
-          // 新增一个接口
-          let id = treeNode.id
-          this.$http.delete('lawss/sarSubMenu/deleteSubAll', {id: id}, {
-            _this: this
-          }, res => {
-            if (res.ok) {
-              // this.getDomesticStandardTable(this.tableFlag)
-              // this.resetForm()
-            }
-          }, e => {
-          })
-          this.getTree().then(() => {
-            setTimeout(() => {
-              this.findByOrg(this.orgObject.pId)
-              this.$refs.mechanismManage.selectOneNode(this.orgObject.pId)
-            })
-          })
-        })
-      }).catch(() => {
-      })
-    },
-
-    /**
-       * @description: 节点编辑
-       * @author: chenxiaoxi
-       * @date: 2018/12/26 15:29:46
-       */
-    handleEdit (treeId, treeNode) {
-      this.view.treeView = true
-      this.view.treeFlag = 2
-      let pNode = this.$refs.mechanismManage.getParentNode(treeNode)
-      this.treeForm.pNodeName = pNode.oldname || pNode.name
-      this.treeForm.pId = treeNode.pId
-      this.treeForm.orgName = treeNode.oldname || treeNode.name
-      this.treeForm.shotName = treeNode.shotName
-      this.treeForm.orgType = treeNode.orgType
-      this.treeForm.remarks = treeNode.remarks
-      this.treeForm.id = treeNode.id
-    },
     treeCollapse () {
       this.sideClose = !this.sideClose
-    }
-  },
-  // props: {
-  //   sideClose: {
-  //     type: Boolean
-  //   }
-  // },
-  computed: {
-    treeTitle () {
-      return this.view.treeFlag === 1 ? '组织机构节点新增' : '组织机构节点维护'
     },
-    treeLoadingTips () {
-      return this.view.treeLoadingFlag === 1 ? '组织机构获取中...' : '节点保存中...'
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.name.indexOf(value) !== -1;
+    },
+    handleNodeClick (data) {
+      this.id = data.id
+      this.getData()
+    },
+    getTree () {
+      this.$http.get('SarInstitution/institution', {}, {
+        _this: this,
+        loading: 'treeLoading'
+      }, res => {
+        this.treeData = res.data
+        this.id = res.data[0].id
+        this.getData()
+      })
+    },
+    getData () {
+      this.$http.get('SarInstitution/institution/user', {
+        institutionId: this.id
+      }, {
+        _this: this,
+        loading: 'Loading'
+      }, res => {
+        this.data = res.data
+      })
+    },
+    pageChange (page) {
+      this.page = page
+      this.getData()
+    },
+    pageSizeChange (pageSize) {
+      this.$store.getters.userInfo.configContent = pageSize
+      this.getData()
     },
-    // 没有数据的提示
-    hasNoDataTips () {
-      return this.deptEmpData.length === 0 && this.treeReady ? '该组织下暂无人员' : '未获取到组织机构'
-    }
   },
+  computed: {},
   watch: {
-    orgFlag: {
-      deep: true,
-      handler (newVal, oldVal) {
-        if (newVal === 1) {
-          let roleCopyList = []
-          for (let i = 0; i < this.roleList.length; i++) {
-            if (this.roleList[i].value !== 'GQSBB2N3KURYYC6AUFER' && this.roleList[i].value !== 'YK5P33FZ29TPN2VPDP6E') {
-              roleCopyList.push(this.roleList[i])
-            }
-          }
-          this.roleList = roleCopyList
-        } else {
-          this.queryRoleList()
-        }
-      }
+    filterText(val) {
+      console.log(val);
+      this.$refs.tree.filter(val);
     }
   },
   mounted () {
-    let _this = this
-    // this.findByOrgBtn()
-    this.queryRoleList()
     // 获取组织结构树
     this.getTree()
-    this.getLastSyncTime()
-    // 不选择结构时，显示所有人
-    this.findByOrg()
   }
 }
 </script>
@@ -1148,7 +242,7 @@ export default {
       display: flex;
       flex-direction: column;
       .content{
-        padding: 0 10px;
+        padding: 0px;
         display: flex;
         flex-direction: column;
         position: relative;
diff --git a/src/pages/config/pages/postManage/index.vue b/src/pages/config/pages/postManage/index.vue
new file mode 100644
index 000000000..2fe21f20a
--- /dev/null
+++ b/src/pages/config/pages/postManage/index.vue
@@ -0,0 +1,210 @@
+<!-- 配置管理 - 岗位管理 -->
+<template>
+    <div id="post-manage">
+        <div class="action-bar">
+            <el-button type="primary"
+                       class="common-button-primary add-button"
+                       @click="addModal"
+                       size="mini">新增</el-button>
+            <el-button type="primary"
+                       class="common-button-primary add-button"
+                       @click="addRole"
+                       size="mini">配置角色</el-button>
+        </div>
+        <div class="content">
+            <el-table
+                    ref="multipleTable"
+                    :data="data"
+                    tooltip-effect="dark"
+                    border
+                    style="width: 100%; flex: auto;"
+                    class="drag-table"
+                    height="100%"
+                    :header-cell-style="{background: '#E8E8E8', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+                    @selection-change="handleSelectionChange">
+                <el-table-column
+                        type="selection"
+                        width="55"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="name"
+                        label="岗位名称"
+                        width="170px">
+                </el-table-column>
+                <el-table-column
+                        prop=""
+                        label="绑定角色">
+                </el-table-column>
+                <el-table-column
+                        prop="operator"
+                        label="操作人"
+                        width="170px">
+                </el-table-column>
+                <el-table-column
+                        prop="createTime"
+                        label="操作时间"
+                        width="170px">
+                </el-table-column>
+            </el-table>
+        </div>
+        <loading :loading="Loading">加载中...</loading>
+        <el-dialog
+                title="新增岗位"
+                :visible.sync="modalshowflag"
+                :wrapperClosable="false"
+                size="800px"
+                @close="resetForm"
+        >
+            <el-form
+                    ref="sarStandardsInfoForm"
+                    :model="sarStandardsInfoEO"
+                    :rules="sarStandardsInfoRules"
+                    class="label-input-form"
+            >
+                <el-form-item label="岗位名称" prop="name" label-width="150px" class="add-form-item">
+                    <el-input v-model="sarStandardsInfoEO.name"
+                              placeholder="请输入岗位名称"
+                              clearable></el-input>
+                </el-form-item>
+            </el-form>
+            <span slot="footer" class="demo-drawer-footer">
+                <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button>
+                <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button>
+            </span>
+        </el-dialog>
+        <el-drawer
+                title="配置角色"
+                :visible.sync="modalRole"
+                :wrapperClosable="false"
+                size="800px"
+                @close="resetFormRole"
+        >
+            <el-tree
+                    ref="tree"
+                    node-key="id"
+                    class="filter-tree"
+                    v-if="modalRole"
+                    :props="props"
+                    :data="roleList"
+                    show-checkbox
+                    @check="handleCheckChange">
+            </el-tree>
+            <el-button @click="add"></el-button>
+        </el-drawer>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: 'PostManage',
+        data () {
+            return {
+                selectList: [],
+                data: [],
+                Loading: false,
+                modalshowflag: false,
+                sarStandardsInfoEO: {
+                    name: ''
+                },
+                sarStandardsInfoRules: {
+                    name: [
+                        { required: true, message: '请输入岗位名称', trigger: 'blur' }
+                    ]
+                },
+                modalRole: false,
+                roleList: [],
+                props: {
+                    label: 'name',
+                    children: 'children'
+                }
+            }
+        },
+        methods: {
+            add () {
+                console.log(this.$refs.tree.getCheckedNodes());
+                console.log(this.$refs.tree.getCheckedKeys());
+            },
+            handleCheckChange (checkedNodes, checkedKeys) {
+                var list = []
+                for (var a = 0; a < checkedKeys.checkedNodes.length; a++) {
+                    list.push(checkedKeys.checkedNodes[a].id)
+                }
+                console.log(list);
+            },
+            getRole () {
+                this.$http.get('sarRole/role', {}, {}, res=> {
+                    this.roleList = res.data
+                })
+            },
+            handleSelectionChange (val) { // 选中角色
+                this.selectList = val
+            },
+            addRole () { // 点击配置角色按钮
+                if (this.selectList.length > 0) {
+                    this.modalRole = true
+                } else {
+                    this.$message.warning('请选择要配置角色的岗位')
+                }
+            },
+            getData () { // 获取岗位数据
+                this.$http.get('sarPosition/position', {}, {
+                    _this: this,
+                    loading: 'Loading'
+                }, res=> {
+                    this.data = res.data
+                })
+            },
+            addModal () { // 点击新增按钮
+                this.modalshowflag = true
+            },
+            resetForm () { // 新增岗位关闭事件
+                this.$refs['sarStandardsInfoForm'].resetFields();
+                this.modalshowflag = false
+            },
+            resetFormRole () { // 配置角色关闭事件
+            },
+            submit () { // 新增角色确认
+                this.$refs['sarStandardsInfoForm'].validate((valid) => {
+                    if (valid) {
+                        this.$http.post('sarPosition/position', {
+                            createById: this.$store.getters.userInfo.userId,
+                            operator: this.$store.getters.userInfo.account,
+                            name: this.sarStandardsInfoEO.name
+                        }, {
+                            _this: this,
+                            loading: 'Loading'
+                        }, res=> {
+                            if (res.ok) {
+                                this.$message.success('新增成功')
+                                this.modalshowflag = false
+                                this.getData()
+                            } else {
+                                this.$message.warning('新增失败')
+                            }
+                        })
+                    } else {
+                        return false;
+                    }
+                });
+            },
+        },
+        computed: {},
+        watch: {},
+        mounted () {
+            this.getData()
+            this.getRole()
+        }
+    }
+</script>
+
+<style lang="less">
+    @import '~@/assets/styles/mixins';
+    #post-manage {
+        height: 100%;
+        .content {
+            height: calc(~'100% - 53px')
+        }
+    }
+</style>
diff --git a/src/router/index.js b/src/router/index.js
index a26431095..71676e073 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -950,6 +950,17 @@ const routes = [
           menuId: '7MWCQK6NNH'
         }
       },
+      {
+        path: '/postManage',
+        name: 'postManage',
+        component: () =>
+            import('@/pages/config/pages/postManage/index'),
+        meta: {
+          requireAuth: true,
+          title: '岗位管理',
+          menuId: '7MWCQK6NNH'
+        }
+      },
       {
         path: '/roleManage',
         name: 'RoleManage',