按钮级别的新版本,多级别的组织架构
loulijun2021
2023-08-25 d11cd8d5c595660912723d49f7a02881332e6e27
1.角色分配优化
已修改2个文件
89 ■■■■■ 文件已修改
src/views/basicSettings/personList.vue 71 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicSettings/roleDivider.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/basicSettings/personList.vue
@@ -55,25 +55,24 @@
                <el-form-item label="用户名称" style=" display: flex;">
                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item label="用户编码" style=" display: flex;">
                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item v-show="isExpandForm" label="用户名称" style=" display: flex;">
                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item v-show="isExpandForm" label="用户编码" style=" display: flex;">
                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item v-show="isExpandForm" label="用户名称" style=" display: flex;">
                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item v-show="isExpandForm" label="用户编码" style=" display: flex;">
                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <el-form-item v-show="isExpandForm" label="用户名称" style=" display: flex;">
                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />
                </el-form-item>
                <!--                <el-form-item label="用户编码" style=" display: flex;">-->
                <!--                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />-->
                <!--                </el-form-item>-->
                <!--                <el-form-item v-show="isExpandForm" label="用户名称" style=" display: flex;">-->
                <!--                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />-->
                <!--                </el-form-item>-->
                <!--                <el-form-item v-show="isExpandForm" label="用户编码" style=" display: flex;">-->
                <!--                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />-->
                <!--                </el-form-item>-->
                <!--                <el-form-item v-show="isExpandForm" label="用户名称" style=" display: flex;">-->
                <!--                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />-->
                <!--                </el-form-item>-->
                <!--                <el-form-item v-show="isExpandForm" label="用户编码" style=" display: flex;">-->
                <!--                  <el-input v-model="form.usercode" placeholder="请输入" style="width: 200px" />-->
                <!--                </el-form-item>-->
                <!--                <el-form-item v-show="isExpandForm" label="用户名称" style=" display: flex;">-->
                <!--                  <el-input v-model="form.username" placeholder="请输入" style="width: 200px" />-->
                <!--                </el-form-item>-->
              </div>
              <div
                class="bodySearchReset"
@@ -85,20 +84,21 @@
            </el-form>
            <div
              class="bodyTopFormExpand"
              style="height: 5px;"
            >
              <svg-icon
                v-show="mouseHoverType==='mouseout'"
                style="cursor: pointer"
                :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
                @mouseenter="mouseHoverType=$event.type"
              />
              <svg-icon
                v-show="mouseHoverType==='mouseenter'"
                style="cursor: pointer"
                :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
                @click="isExpandForm=!isExpandForm"
                @mouseout="mouseHoverType=$event.type"
              />
              <!--              <svg-icon-->
              <!--                v-show="mouseHoverType==='mouseout'"-->
              <!--                style="cursor: pointer"-->
              <!--                :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
              <!--                @mouseenter="mouseHoverType=$event.type"-->
              <!--              />-->
              <!--              <svg-icon-->
              <!--                v-show="mouseHoverType==='mouseenter'"-->
              <!--                style="cursor: pointer"-->
              <!--                :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
              <!--                @click="isExpandForm=!isExpandForm"-->
              <!--                @mouseout="mouseHoverType=$event.type"-->
              <!--              />-->
            </div>
          </div>
@@ -156,6 +156,7 @@
                prop="email"
                label="邮箱"
                sortable="custom"
                show-overflow-tooltip
              >
                <template slot-scope="{row}">
                  {{ row.email ? row.email : '/' }}
@@ -165,6 +166,7 @@
                prop="mobile"
                label="号码"
                sortable="custom"
                show-overflow-tooltip
              >
                <template slot-scope="{row}">
                  {{ row.mobile ? row.mobile : '/' }}
@@ -174,6 +176,7 @@
                prop="postname"
                label="岗位"
                sortable="custom"
                show-overflow-tooltip
              >
                <template slot-scope="{row}">
                  {{ row.postname ? row.postname : '/' }}
@@ -183,6 +186,7 @@
                prop="rolename"
                label="角色"
                sortable="custom"
                show-overflow-tooltip
              >
                <template slot-scope="{row}">
                  {{ row.rolename ? row.rolename : '/' }}
@@ -192,6 +196,7 @@
                prop="group_name"
                label="班组"
                sortable="custom"
                show-overflow-tooltip
              >
                <template slot-scope="{row}">
                  {{ row.group_name ? row.group_name : '/' }}
@@ -693,7 +698,7 @@
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 295
        this.tableHeight = this.mainHeight - 280
        this.$refs.tableDataRef.doLayout()
      })
    }
src/views/basicSettings/roleDivider.vue
@@ -154,6 +154,7 @@
          <el-table-column
            prop="rolename"
            label="角色"
            show-overflow-tooltip
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -164,6 +165,7 @@
            prop="postname"
            label="岗位"
            sortable="custom"
            show-overflow-tooltip
          >
            <template slot-scope="{row}">
              {{ row.postname ? row.postname : '/' }}
@@ -172,6 +174,7 @@
          <el-table-column
            prop="group_name"
            label="班组"
            show-overflow-tooltip
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -214,7 +217,7 @@
      v-el-drag-dialog
      title="新增"
      :visible.sync="dialogVisible"
      width="800px"
      width="1200px"
      :close-on-click-modal="false"
      top="15vh"
      @closed="handleClose"
@@ -225,6 +228,8 @@
          ref="tableDataDialogRef"
          class="tableFixed"
          :data="tableDataDialog"
          row-class-name="custom-row"
          height="400"
          border
          :style="{width: 100+'%',height:'400px',}"
@@ -260,6 +265,7 @@
          />
          <el-table-column
            prop="rolename"
            show-overflow-tooltip
            label="角色"
          >
            <template slot-scope="{row}">
@@ -269,6 +275,7 @@
          <el-table-column
            prop="postname"
            label="岗位"
            show-overflow-tooltip
          >
            <template slot-scope="{row}">
              {{ row.postname?row.postname:'/' }}
@@ -276,6 +283,7 @@
          </el-table-column>
          <el-table-column
            prop="group_name"
            show-overflow-tooltip
            label="班组"
          >
            <template slot-scope="{row}">
@@ -393,6 +401,10 @@
  methods: {
    // 组织架构大列表查询
    async getRoleAssignedUserData() {
      if (window.location.hash.indexOf('?') !== -1) {
        this.form.role_code = window.location.hash.split('?')[1].split('=')[1]
      }
      if (!this.form.role_code) {
        this.form.role_code = this.roleArr[0].rolecode
      }
@@ -455,6 +467,10 @@
    },
    async cancel(code) {
      // if (!this.form.role_code) {
      //   return this.$message.error('')
      // }
      const res = await RoleAssignedUserBatchCancel([code], this.form.role_code)
      if (res.code === '200') {
        this.$notify.success('取消授权成功!')