按钮级别的新版本,多级别的组织架构
loulijun2021
2023-08-22 746e355df3ce7b588f40e96e4f20ba35266e7190
1.人员管理开发完成
已添加1个文件
已修改7个文件
844 ■■■■ 文件已修改
src/api/GeneralBasicData.js 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/basicSettings.js 78 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/permission.js 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/store/modules/user.js 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicSettings/organizationList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicSettings/personList.vue 649 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicSettings/roleList.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/encodingRules.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/GeneralBasicData.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,47 @@
import request from '@/utils/request'
// ç»„织架构查找
export function PrentOrganization(data) {
  return request({
    url: 'GeneralBasicData/PrentOrganization',
    method: 'get',
    params: data
  })
}
// æŒ‰é’®åŸºç¡€èµ„æ–™
export function ButtonData() {
  return request({
    url: 'GeneralBasicData/ButtonData',
    method: 'get'
  })
}
// æ•°æ®æƒé™åŸºç¡€èµ„æ–™
export function DataPermissions() {
  return request({
    url: 'GeneralBasicData/DataPermissions',
    method: 'get'
  })
}
// å²—位
export function PostPermissions() {
  return request({
    url: 'GeneralBasicData/PostPermissions',
    method: 'get'
  })
}
// è§’色
export function RolePermissions() {
  return request({
    url: 'GeneralBasicData/RolePermissions',
    method: 'get'
  })
}
// ç­ç»„
export function GroupsPermissions() {
  return request({
    url: 'GeneralBasicData/GroupsPermissions',
    method: 'get'
  })
}
src/api/basicSettings.js
@@ -9,15 +9,6 @@
  })
}
// ç»„织架构查找
export function PrentOrganization(data) {
  return request({
    url: 'BasicSetting/PrentOrganization',
    method: 'get',
    params: data
  })
}
// ç»„织架构新增
export function AddUpdateOrganization(data) {
  return request({
@@ -31,6 +22,33 @@
export function DeleteOrganization(data) {
  return request({
    url: 'BasicSetting/DeleteOrganization',
    method: 'post',
    params: data
  })
}
// ç”¨æˆ·åˆ—表查询
export function UserData(data) {
  return request({
    url: 'BasicSetting/UserData',
    method: 'get',
    params: data
  })
}
// ç”¨æˆ·ä¿¡æ¯æ–°å¢žç¼–辑
export function AddUpdateUserSave(data) {
  return request({
    url: 'BasicSetting/AddUpdateUserSave',
    method: 'post',
    data
  })
}
// ç”¨æˆ·ä¿¡æ¯åˆ é™¤
export function DeleteUserSave(data) {
  return request({
    url: 'BasicSetting/DeleteUserSave',
    method: 'post',
    params: data
  })
@@ -120,28 +138,28 @@
    data
  })
}
// æŒ‰é’®åŸºç¡€èµ„æ–™
export function ButtonData() {
// ç­ç»„信息列表查询
export function GroupData(data) {
  return request({
    url: 'BasicSetting/ButtonData',
    method: 'get'
    url: 'BasicSetting/GroupData',
    method: 'get',
    params: data
  })
}
// ç­ç»„新增编辑
export function AddUpdateGroup(data) {
  return request({
    url: 'BasicSetting/AddUpdateGroup',
    method: 'post',
    data
  })
}
// ç­ç»„删除
export function DeleteGroup(data) {
  return request({
    url: 'BasicSetting/DeleteGroup',
    method: 'post',
    params: data
  })
}
// æ•°æ®æƒé™åŸºç¡€èµ„æ–™
export function DataPermissions() {
  return request({
    url: 'BasicSetting/DataPermissions',
    method: 'get'
  })
}
// ç»„织架构新增编辑
// export function AddUpdateOrganization(data) {
//   return request({
//     url: 'BasicSetting/AddUpdateOrganization',
//     method: 'post',
//     data
//   })
// }
src/permission.js
@@ -39,35 +39,21 @@
          // jwt解密获取用户编码
          const jwt = decode(localStorage.getItem('token'))
          localStorage.setItem('usercode', jwt.usercode)
          localStorage.setItem('username', jwt.username)
          localStorage.setItem('torg_name', jwt.storg_name)
          localStorage.setItem('torg_code', jwt.storg_code)
          // const code = await store.dispatch('user/getUserTorgData')
          // if (code === '200') {
          // æ‹‰å–菜单信息表
          const menu = await store.dispatch('user/getMenu')
          // ç”Ÿæˆå¯è®¿é—®çš„路由表
          await store.dispatch('permission/generateRoutes', menu)
          // åŠ¨æ€æ·»åŠ å¯è®¿é—®è·¯ç”±è¡¨
          router.addRoutes(store.getters.addRouters)
          // hack方法 ç¡®ä¿addRoutes已完成
          next({ ...to, replace: true })
          // }
          // // æ‹‰å–菜单信息表
          // const menu = await store.dispatch('user/getMenu')
          // // ç”Ÿæˆå¯è®¿é—®çš„路由表
          // await store.dispatch('permission/generateRoutes', menu)
          //
          // // eslint-disable-next-line require-atomic-updates
          // // store.state.settings.orgType = getCookie('description')  //注释掉
          //
          // // åŠ¨æ€æ·»åŠ å¯è®¿é—®è·¯ç”±è¡¨
          // router.addRoutes(store.getters.addRouters)
          //
          // // hack方法 ç¡®ä¿addRoutes已完成
          // next({ ...to, replace: true })
          //
          // // next()
          // next()
        } catch (error) {
          // remove token and go to login page to re-login
          await store.dispatch('user/resetToken')
src/store/modules/user.js
@@ -1,8 +1,7 @@
import { login, logout, getInfo, LoginMenu, LoginMenuCloud, UserTorgData } from '@/api/user'
import { getToken, setToken, removeToken, setCookie, removeCookie, getCookie } from '@/utils/auth'
import { login, logout, getInfo, LoginMenu } from '@/api/user'
import { getToken, removeToken, setCookie } from '@/utils/auth'
import { resetRouter } from '@/router'
import { ButtonData } from '@/api/basicSettings'
import Vue from 'vue'
import { ButtonData } from '@/api/GeneralBasicData'
const getDefaultState = () => {
  return {
@@ -68,37 +67,6 @@
        resolve(data)
      }).catch(error => {
        reject(error)
      })
    })
  },
  getUserTorgData() {
    return new Promise((resolve, reject) => {
      UserTorgData({ usercode: localStorage.getItem('usercode') }).then(res1 => {
        localStorage.setItem('username', res1.data.user)
        localStorage.setItem('torg', JSON.stringify(res1.data.torg))
        Vue.prototype.$stu_torg = JSON.parse(localStorage.getItem('torg'))
        if (Vue.prototype.$stu_torg.length > 0) {
          const name = Vue.prototype.$stu_torg[0].torg_name
          const code = Vue.prototype.$stu_torg[0].torg_code
          localStorage.setItem('torg_name', name)
          localStorage.setItem('torg_code', code)
        } else {
          localStorage.setItem('torg_name', '')
          localStorage.setItem('torg_code', '')
        }
        if (res1.code === '200') {
          ButtonData().then(res2 => {
            localStorage.setItem('ButtonData', JSON.stringify(res2.data))
          })
        }
        resolve(res1.code)
      }).catch(e => {
        reject(e)
      })
    })
  },
src/views/basicSettings/organizationList.vue
@@ -176,13 +176,13 @@
import {
  AddUpdateOrganization,
  DeleteOrganization,
  PrentOrganization,
  STorgData
} from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import arrayToTree from 'array-to-tree'
import { PrentOrganization } from '@/api/GeneralBasicData'
export default {
  name: 'Zzjg',
src/views/basicSettings/personList.vue
@@ -1,11 +1,648 @@
<template />
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div style="display: flex">
        <!--        background:rgba(248,248,250,1);-->
        <div style="width: 300px;margin: 10px 10px 0  0;background: #fff">
          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
            <div style="display: flex;">
              <div
                style="width: 5px;height: 100%;border-radius: 5px;"
                :style="{background:$store.state.settings.theme}"
              />
              <div style="margin-left: 8px;">组织架构</div>
            </div>
            <!--            <div style="margin-right:10px">-->
            <!--              <i class="el-icon-plus" style="cursor: pointer;color: #999" />-->
            <!--            </div>-->
          </div>
          <el-tree
            ref="treeLeftRef"
            style="padding: 10px;overflow: auto;"
            :style="{height:(tableHeight+140)+'px'}"
            :data="treeLeft"
            node-key="torg_code"
            highlight-current
            :props="defaultPropsLeft"
            :default-expand-all="true"
            :expand-on-click-node="false"
            @node-click="nodeClick"
          />
        </div>
        <div style="width: calc(100% - 300px)">
          <div class="bodyTopButtonGroup">
            <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>
          </div>
          <div class="bodyTopFormGroup">
            <el-form
              ref="form"
              :model="form"
              label-width="100px"
              inline
              style="display: flex;"
            >
              <div class="elForm">
                <el-form-item label="用户编码" style=" display: flex;">
                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item label="用户名称" style=" display: flex;">
                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />
                </el-form-item>
              </div>
              <div
                class="bodySearchReset"
                :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
              >
                <el-button v-waves type="primary" icon="el-icon-search" @click="getUserData">查询</el-button>
                <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
              </div>
            </el-form>
          </div>
          <div class="elTableDiv">
            <el-table
              ref="tableDataRef"
              class="tableFixed"
              :data="tableData"
              :height="tableHeight+'px'"
              border
              row-class-name="custom-row"
              :style="{width: 100+'%',height:tableHeight+'px',}"
              highlight-current-row
              :header-cell-style="this.$headerCellStyle"
              :cell-style="this.$cellStyle"
              @sort-change="sortChange"
            >
              <el-table-column
                prop="rowNum"
                width="50"
                fixed
                label="序号"
              />
              <el-table-column
                prop="usercode"
                label="用户编码"
                sortable="custom"
              />
              <el-table-column
                prop="username"
                label="用户名称"
                sortable="custom"
              />
              <el-table-column
                prop="storg_name"
                label="所属组织"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <div v-if="row.storg_name">{{ row.storg_name }}</div>
                  <div v-else>/</div>
                </template>
              </el-table-column>
              <el-table-column
                prop="status"
                label="状态"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  <el-tag v-if="row.status==='Y'" size="small" type="success">正常</el-tag>
                  <el-tag v-if="row.status==='N'" size="small" type="danger">停用</el-tag>
                </template>
              </el-table-column>
              <el-table-column
                prop="email"
                label="邮箱"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  {{ row.email ? row.email : '/' }}
                </template>
              </el-table-column>
              <el-table-column
                prop="mobile"
                label="号码"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  {{ row.mobile ? row.mobile : '/' }}
                </template>
              </el-table-column>
              <el-table-column
                prop="postname"
                label="岗位"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  {{ row.postname ? row.postname : '/' }}
                </template>
              </el-table-column>
              <el-table-column
                prop="rolename"
                label="角色"
                sortable="custom"
              >
                <template slot-scope="{row}">
                  {{ row.rolename ? row.rolename : '/' }}
                </template>
              </el-table-column>
              <el-table-column
                prop="lm_user"
                label="创建人员"
                sortable="custom"
              />
              <el-table-column
                prop="lm_date"
                label="创建时间"
                width="160"
                sortable="custom"
              />
              <el-table-column
                label="操作"
                width="120"
                fixed="right"
              >
                <template slot-scope="{row}">
                  <div class="operationClass">
                    <el-tooltip class="item" effect="dark" content="编辑" placement="top">
                      <i
                        v-if="row.usercode!=='9999'"
                        class="el-icon-edit-outline"
                        :style="{color:$store.state.settings.theme}"
                        @click="edit('edit',row)"
                      />
                    </el-tooltip>
                    <el-tooltip v-del-tab-index class="item" effect="dark" content="删除" placement="top">
                      <i
                        v-if="row.usercode!=='9999'"
                        class="el-icon-delete"
                        :style="{color:$store.state.settings.theme}"
                        @click="del(row)"
                      />
                    </el-tooltip>
                  </div>
                </template>
              </el-table-column>
            </el-table>
          </div>
          <!--分页-->
          <pagination
            :total="total"
            :page.sync="form.page"
            :limit.sync="form.rows"
            align="right"
            layout="total,prev, pager, next,sizes,jumper"
            popper-class="select_bottom"
            @pagination="getUserData"
          />
        </div>
      </div>
    </div>
    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'编辑'"
      :visible.sync="dialogVisible"
      width="800px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
      @close="handleClose"
    >
      <el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
        <el-form-item label="用户编码" prop="usercode">
          <el-input v-model="dialogForm.usercode" :disabled="operation!=='add'" style="width: 200px" />
        </el-form-item>
        <el-form-item label="用户名称" prop="username">
          <el-input v-model="dialogForm.username" style="width: 200px" />
        </el-form-item>
        <el-form-item label="用户密码" prop="password">
          <el-input v-model="dialogForm.password" style="width: 200px" />
        </el-form-item>
        <el-form-item label="所属组织" prop="storg_code">
          <el-cascader
            ref="cascader"
            v-model="dialogForm.storg_code"
            :options="cascaderOptions"
            filterable
            :props="defaultProps"
            :show-all-levels="false"
          />
        </el-form-item>
        <el-form-item label="手机号" prop="mobile">
          <el-input v-model="dialogForm.mobile" style="width: 200px" />
        </el-form-item>
        <el-form-item label="邮箱" prop="email">
          <el-input v-model="dialogForm.email" style="width: 200px" />
        </el-form-item>
        <el-form-item required label="用户状态">
          <el-radio-group v-model="dialogForm.status" style="width: 200px;">
            <el-radio label="Y">正常</el-radio>
            <el-radio label="N">停用</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item prop="post_code" label="岗位">
          <el-select
            v-model="dialogForm.post_code"
            style="width:490px"
            placeholder="请选择"
            multiple
            filterable
            clearable
            collapse-tags
            :popper-append-to-body="false"
          >
            <el-option
              v-for="item in postArr"
              :key="item.postcode"
              :label="item.postname"
              :value="item.postcode"
            />
          </el-select>
        </el-form-item>
        <el-form-item prop="role_code" label="角色">
          <el-select
            v-model="dialogForm.role_code"
            style="width:490px"
            multiple
            filterable
            clearable
            collapse-tags
            placeholder="请选择"
            :popper-append-to-body="false"
          >
            <el-option
              v-for="item in roleArr"
              :key="item.rolecode"
              :label="item.rolename"
              :value="item.rolecode"
            />
          </el-select>
        </el-form-item>
        <el-form-item prop="group_code" label="班组">
          <el-select
            v-model="dialogForm.group_code"
            style="width: 490px"
            placeholder="请选择"
            :popper-append-to-body="false"
            multiple
            filterable
            collapse-tags
            clearable
          >
            <el-option
              v-for="item in groupArr"
              :key="item.usergroupcode"
              :label="item.usergroupname"
              :value="item.usergroupcode"
            />
          </el-select>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button v-waves @click="dialogVisibleCancel">取 æ¶ˆ</el-button>
          <el-button v-waves type="primary" @click="dialogVisibleConfirm">ç¡® å®š</el-button>
        </div>
      </span>
    </el-dialog>
  </div>
</template>
<script>
import Pagination from '@/components/Pagination'
import {
  AddUpdateUserSave,
  DeleteUserSave, UserData
} from '@/api/basicSettings'
import { validateCode } from '@/utils/global'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import arrayToTree from 'array-to-tree'
import { GroupsPermissions, PostPermissions, PrentOrganization, RolePermissions } from '@/api/GeneralBasicData'
export default {
  name: 'PersonList'
  name: 'Zzjg',
  components: {
    Pagination
  },
  directives: { elDragDialog, waves },
  data() {
    const validateMobile = (rule, value, callback) => {
      if (!value) {
        callback()
        // return callback(new Error('请输入电话号码'))
      } else {
        const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // é•¿å·
        const mobile2 = /^[0-9]{6}$/ // çŸ­å·
        if (mobile.test(value) || mobile2.test(value)) {
          callback()
          // return callback(new Error('电话号码不符合规则'))
        } else {
          return callback(new Error('电话号码不符合规则'))
          // callback()
        }
      }
    }
    const validateEmail = (rule, value, callback) => {
      if (!value) {
        callback()
        // return callback(new Error('请输入电子邮箱'))
      } else {
        const email = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$/
        if (email.test(value)) {
          callback()
        } else {
          return callback(new Error('电子邮箱不符合规则'))
        }
      }
    }
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        usercode: '',
        username: '',
        storgcode: '', // ç»„织编码
        prop: 'lm_date', // æŽ’序字段
        order: 'desc', // æŽ’序字段
        page: 1, // ç¬¬å‡ é¡µ
        rows: 20 // æ¯é¡µå¤šå°‘条
      },
      total: 10,
      tableData: [],
      dialogVisible: false,
      dialogForm: {
        usercode: '', // ç”¨æˆ·ç¼–码
        username: '', // ç”¨æˆ·åç§°
        post_code: [], // å²—位
        role_code: [], // è§’色
        group_code: [], // ç­ç»„
        password: '123456', // å¯†ç 
        storg_code: '', // æ‰€å±žç»„织
        mobile: '', // å·ç 
        email: '', // é‚®ç®±
        status: 'Y'// çŠ¶æ€
      },
      operation: '',
      dialogFormRules: {
        usercode: [
          { required: true, validator: validateCode, trigger: ['blur', 'change'] }
        ],
        username: [
          { required: true, message: '请输入组织名称', trigger: ['blur', 'change'] }
        ],
        password: [
          { required: true, message: '请输入用户密码', trigger: ['blur', 'change'] }
        ],
        mobile: [
          { required: false, validator: validateMobile, trigger: ['blur', 'change'] }
        ],
        email: [
          { required: false, validator: validateEmail, trigger: ['blur', 'change'] }
        ],
        storg_code: [
          { required: true, message: '请选择所属组织', trigger: ['blur', 'change'] }
        ]
      },
      defaultProps: {
        checkStrictly: true,
        expandTrigger: 'hover',
        value: 'torg_code',
        label: 'torg_name'
      },
      Options: [],
      cascaderOptions: [],
      postArr: [],
      roleArr: [],
      groupArr: [],
      defaultPropsLeft: {
        children: 'children',
        label: 'torg_name'
      },
      treeLeft: []
    }
  },
  created() {
    this.getUserData()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
    this.getPrentOrganization()
    this.getAllSelectData()
  },
  methods: {
    // ç»„织架构大列表查询
    async getUserData() {
      const res = await UserData(this.form)
      this.tableData = res.data
      this.total = res.count
    },
    // ç»„织架构级联选择器
    async getPrentOrganization() {
      const { data: res } = await PrentOrganization()
      this.Options = res
      this.cascaderOptions = arrayToTree(res, {
        parentProperty: 'parent_id',
        customID: 'torg_code',
        childrenProperty: 'children'
      })
      this.treeLeft = this.cascaderOptions
    },
    // å²—位 è§’色 ç­ç»„
    async getAllSelectData() {
      const { data: res1 } = await PostPermissions()
      this.postArr = res1
      const { data: res2 } = await RolePermissions()
      this.roleArr = res2
      const { data: res3 } = await GroupsPermissions()
      this.groupArr = res3
    },
    // æŽ’序改变时
    sortChange({ column, prop, order }) {
      if (order === 'descending') {
        order = 'desc'
      } else if (order === 'ascending') {
        order = 'asc'
      } else {
        order = 'desc'
      }
      this.form.order = order
      this.form.prop = prop
      this.getUserData()
    },
    nodeClick(obj, Node, VueComponent) {
      this.form.storgcode = obj.torg_code
      this.getUserData()
    },
    // é‡ç½®
    reset() {
      this.form.usercode = ''
      this.form.username = ''
      this.form.storgcode = ''
      this.$refs.treeLeftRef.setCurrentKey(null)
      this.getUserData()
    },
    // æ–°å¢žæŒ‰é’®
    add(operation) {
      this.operation = operation
      this.dialogVisible = true
      this.dialogForm.OperType = 'Add'
    },
    // ä¿®æ”¹æŒ‰é’®
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true
      this.dialogForm.OperType = 'Update'
      // this.cascaderOptions = this.filterChildren(this.cascaderOptions, row.storg_code)
      this.$nextTick(() => {
        this.dialogForm.usercode = row.usercode
        this.dialogForm.username = row.username
        this.dialogForm.password = row.password
        this.dialogForm.mobile = row.mobile
        this.dialogForm.email = row.email
        this.dialogForm.status = row.status
        this.dialogForm.storg_code = this.findParent([], row.storg_code, this.cascaderOptions).reverse()
        this.dialogForm.post_code = row.post_code ? row.post_code.split(',') : []
        this.dialogForm.role_code = row.role_code ? row.role_code.split(',') : []
        this.dialogForm.group_code = row.group_code ? row.group_code.split(',') : []
      })
    },
    filterChildren(treeData, code) {
      treeData.forEach(item => {
        if (code.split(',').includes(item.torg_code)) {
          item.disabled = true
          if (item.children && item.children.length > 0) {
            this.filterChildren(item.children, item.children.map(it => it.torg_code).join(','))
          }
        } else {
          if (item.children && item.children.length > 0) {
            this.filterChildren(item.children, code)
          }
        }
      })
      return treeData
    },
    // parents:用于返回的数组,childNode:要查询的节点,treeData:json树形数据
    findParent(parents, childNode, treeData) {
      // console.log(parents, childNode, treeData, 2)
      for (let i = 0; i < treeData.length; i++) {
        // çˆ¶èŠ‚ç‚¹æŸ¥è¯¢æ¡ä»¶
        if (treeData[i].torg_code === childNode) {
          // å¦‚果找到结果,保存当前节点
          parents.push(treeData[i].torg_code)
          // ç”¨å½“前节点再去原数据查找当前节点的父节点
          this.findParent(parents, treeData[i].parent_id, this.cascaderOptions)
          break
        } else {
          if (treeData[i].children instanceof Array) {
            //    æ²¡æ‰¾åˆ°ï¼ŒéåŽ†è¯¥èŠ‚ç‚¹çš„å­èŠ‚ç‚¹
            this.findParent(parents, childNode, treeData[i].children)
          }
        }
      }
      return parents
    },
    // åˆ é™¤æŒ‰é’®
    async del(row) {
      this.$confirm('是否确认删除?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        DeleteUserSave({ usercode: row.usercode }).then(res => {
          if (res.code === '200') {
            this.$notify.success('删除成功!')
            if (this.form.page > 1 && this.tableData.length === 1) {
              this.form.page--
            }
            this.getUserData()
          }
        })
      }).catch(() => {
        this.$notify.info('已取消删除')
      })
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.dialogForm.usercode = ''
      this.dialogForm.username = ''
      this.dialogForm.storg_code = ''
      this.dialogForm.status = 'Y'
      this.dialogForm.post_code = []
      this.dialogForm.role_code = []
      this.dialogForm.group_code = []
      this.dialogForm.password = '123456'
      this.dialogForm.mobile = ''
      this.dialogForm.email = ''
      this.$refs.cascader.checkedValue = ''
      this.$refs.dialogForm.clearValidate()
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {
      this.dialogVisible = false
    },
    // å¯¹è¯æ¡†ç¡®è®¤
    dialogVisibleConfirm() {
      this.$refs.dialogForm.validate(valid => {
        if (valid) {
          this.dialogForm.group_code = this.dialogForm.group_code.join(',')
          this.dialogForm.post_code = this.dialogForm.post_code.join(',')
          this.dialogForm.role_code = this.dialogForm.role_code.join(',')
          this.dialogForm.storg_code = this.dialogForm.storg_code[this.dialogForm.storg_code.length - 1]
          console.log(JSON.parse(JSON.stringify(this.dialogForm)))
          AddUpdateUserSave(this.dialogForm).then(res => {
            if (res.code === '200') {
              this.$notify.success(this.operation === 'add' ? '添加成功!' : '修改成功!')
              this.dialogVisible = false
              this.getUserData()
            } else {
              this.$notify.error(this.operation === 'add' ? '添加失败!' : '修改失败!')
            }
          })
        }
      })
    },
    // èŽ·å–é¡µé¢é«˜åº¦
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 200
        this.$refs.tableDataRef.doLayout()
      })
    }
  }
}
</script>
<style scoped>
</style>
src/views/basicSettings/roleList.vue
@@ -222,7 +222,7 @@
<script>
import waves from '@/directive/waves'
import {
  DataPermissions, RoleAddUpdateSava, RoleDeleteSava,
  RoleAddUpdateSava, RoleDeleteSava,
  RolePermissionSava,
  RolePermissionSearchRole,
  RolePermissionSearchRoleMenu,
@@ -230,6 +230,7 @@
} from '@/api/basicSettings'
import arrayToTree from 'array-to-tree'
import { throttle } from '@/utils/debounceAndThrottle'
import { DataPermissions } from '@/api/GeneralBasicData'
export default {
  name: 'RoleList',
src/views/systemSetting/encodingRules.vue
@@ -36,9 +36,6 @@
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
          class="bodyTopFormExpand"
        />
      </div>
      <div class="elTableDiv">
@@ -433,7 +430,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 245
        this.tableHeight = this.mainHeight - 240
        this.$refs.tableDataRef.doLayout()
      })
    }