Merge remote-tracking branch 'origin/zdTest' into zdTest

src/api/system/role.js

 import request from '@/utils/request'
-
+import Qs from 'qs'
 // 查询角色列表
 export function listRole(query) {
   return request({
@@ -10,57 +10,63 @@ export function listRole(query) {
 }
 
 // 查询角色详细
-export function getRole(roleId) {
+export function getRole(businessId) {
   return request({
-    url: '/system/role/' + roleId,
+    url: '/system/role/detail/' + businessId,
     method: 'get'
   })
 }
 
 // 新增角色
 export function addRole(data) {
+  data = Qs.stringify(data)
   return request({
-    url: '/authority/system/role',
+    url: '/system/role/add',
     method: 'post',
-    data: data
+    data: data,
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded'
+    }
   })
 }
 
 // 修改角色
 export function updateRole(data) {
+  const businessId = data.businessId
+  data = Qs.stringify(data)
   return request({
-    url: '/authority/system/role',
+    url: '/system/role/update/' + businessId,
     method: 'put',
-    data: data
+    data
   })
 }
 
 // 角色数据权限
 export function dataScope(data) {
   return request({
-    url: '/authority/system/role/dataScope',
+    url: '/system/role/dataScope',
     method: 'put',
-    data: data
+    data
   })
 }
 
 // 角色状态修改
-export function changeRoleStatus(roleId, status) {
+export function changeRoleStatus(businessId, flag) {
   const data = {
-    roleId,
-    status
+    businessId,
+    flag
   }
   return request({
-    url: '/authority/system/role/changeStatus',
+    url: '/system/role/changeStatus',
     method: 'put',
-    data: data
+    params: data
   })
 }
 
 // 删除角色
 export function delRole(roleId) {
   return request({
-    url: '/authority/system/role/' + roleId,
+    url: '/system/role/deleteLogical/' + roleId,
     method: 'delete'
   })
 }
@@ -68,7 +74,7 @@ export function delRole(roleId) {
 // 导出角色
 export function exportRole(query) {
   return request({
-    url: '/authority/system/role/export',
+    url: '/system/role/export',
     method: 'get',
     params: query
   })

src/api/system/user.js

@@ -136,6 +136,7 @@ export function importTemplate(params) {
   return request({
     url: '/system/user/importTemplate',
     method: 'get',
+    responseType: 'blob',
     params
   })
 }

src/views/system/role/index.vue

@@ -8,51 +8,55 @@
           clearable
           :maxlength="30"
           size="small"
+          style="width: 150px"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="角色状态" prop="status">
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input
+          v-model="queryParams.roleKey"
+          placeholder="请输入权限字符"
+          clearable
+          size="small"
+          style="width: 150px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="角色状态" prop="flag">
         <el-select
-          v-model="queryParams.status"
+          v-model="queryParams.flag"
           placeholder="请选择角色状态"
           clearable
           size="small"
-          style="width: 240px"
+          style="width: 150px"
         >
           <el-option
             v-for="dict in statusOptions"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="dict.dictValue"
           />
         </el-select>
       </el-form-item>
-      <!--      <el-form-item label="创建日期">-->
-      <!--        <el-date-picker-->
-      <!--          v-model="dateRange[0]"-->
-      <!--          size="small"-->
-      <!--          type="datetime"-->
-      <!--          placeholder="开始日期"-->
-      <!--        />-->
-      <!--        - -->
-      <!--        <el-date-picker-->
-      <!--          v-model="dateRange[1]"-->
-      <!--          size="small"-->
-      <!--          type="datetime"-->
-      <!--          placeholder="结束日期"-->
-      <!--        />-->
-      <!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" size="small" @click="handleQuery">查询</el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
           <el-button
-            v-hasPermi="['system:role:add']"
+            v-hasPermi="['sys:role:add']"
             type="primary"
             size="small"
             @click="handleAdd"
           >新增</el-button>
+          <el-button
+            style="padding: 8px 7px;"
+            v-hasPermi="['sys:role:export']"
+            type="success"
+            size="small"
+            icon="el-icon-download"
+            @click="handleExport"
+          >导出</el-button>
         </el-form-item>
       </div>
     </el-form>
@@ -61,9 +65,9 @@
       <div class="mb12 font-small-bold">角色管理列表</div>
       <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
         <el-table-column type="index" label="序号" width="50" />
-        <el-table-column label="角色编号" prop="roleId">
+        <el-table-column label="角色编号" prop="businessId">
           <template slot-scope="scope">
-            {{ scope.row.roleId || '-' }}
+            {{ scope.row.businessId || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true">
@@ -71,60 +75,53 @@
             {{ scope.row.roleName || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="权限字符" prop="roleKey">
+          <template slot-scope="scope">
+            {{ scope.row.roleKey || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="显示顺序" prop="roleSort">
+        <template slot-scope="scope">
+          {{ scope.row.roleSort || '-' }}
+        </template>
+      </el-table-column>
+        <el-table-column label="状态" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
+            <el-switch
+              v-model="scope.row.flag"
+              active-value="1"
+              inactive-value="0"
+              @change="handleStatusChange(scope.row)"
+            ></el-switch>
           </template>
         </el-table-column>
         <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
           <template slot-scope="scope">
-            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
           </template>
         </el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
-              v-hasPermi="['system:role:edit']"
+              v-hasPermi="['sys:role:update']"
               size="mini"
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
             >修改</el-button>
-            <el-switch
-              v-model="scope.row.status"
-              v-hasPermi="['system:role:toggle']"
-              active-value="0"
-              inactive-value="1"
-              :disabled="true"
-              class="switchDisabledStyle"
-              style="margin-left: 15px"
-              @click.native="handleStatusChange(scope.row)"
-            />
-            <el-dropdown class="table-drop" style="vertical-align: 2px;line-height: 20px;margin-left: 15px">
-              <span class="el-dropdown-link" style="cursor: pointer" >
-                ...
-              </span>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item>
-                  <div @click="handleDataScope(scope.row)">
-                    <el-button
-                      v-hasPermi="['system:role:auth']"
-                      size="mini"
-                      type="text"
-                    >数据权限</el-button>
-                  </div>
-                </el-dropdown-item>
-                <el-dropdown-item>
-                  <div @click="handleDelete(scope.row)">
-                    <el-button
-                      v-hasPermi="['system:role:remove']"
-                      size="mini"
-                      type="text"
-                    >删除</el-button>
-                  </div>
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-circle-check"
+              @click="handleMenu(scope.row)"
+              v-hasPermi="['sys:role:update']"
+            >数据权限</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -149,15 +146,15 @@
         <el-form-item label="角色排序" prop="roleSort">
           <el-input-number v-model="form.roleSort" style="width: 100%" controls-position="right" :min="0" />
         </el-form-item>
-        <!--        <el-form-item label="角色状态">-->
-        <!--          <el-radio-group v-model="form.status">-->
-        <!--            <el-radio-->
-        <!--              v-for="dict in statusOptions"-->
-        <!--              :key="dict.dictValue"-->
-        <!--              :label="dict.dictValue"-->
-        <!--            >{{ dict.dictLabel }}</el-radio>-->
-        <!--          </el-radio-group>-->
-        <!--        </el-form-item>-->
+        <el-form-item label="角色状态">
+          <el-radio-group v-model="form.flag">
+            <el-radio
+              v-for="dict in statusOptions"
+              :key="dict.dictValue"
+              :label="dict.dictValue"
+            >{{ dict.dictLabel }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="菜单权限">
           <el-tree
             ref="menu"
@@ -184,30 +181,28 @@
         <el-form-item label="角色名称">
           <el-input v-model.trim="form.roleName" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />
         </el-form-item>
+        <el-table
+          v-loading="loading"
+          :data="menuList"
+          row-key="businessId"
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+          max-height="400px"
+        >
         <el-form-item label="权限字符">
           <el-input v-model.trim="form.roleKey" placeholder="请输入角色名称" show-word-limit :maxlength="30" :disabled="true" />
         </el-form-item>
-        <el-form-item label="流程数据权限">
-          <el-select v-model.trim="form.dataScope" style="width: 100%" clearable placeholder="请选择流程数据权限">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item v-show="form.dataScope === '2'">
-          <el-tree
-            ref="dept"
-            :data="deptOptions"
-            show-checkbox
-            :check-strictly="true"
-            default-expand-all
-            node-key="id"
-            empty-text="加载中，请稍后"
-            :props="defaultProps"></el-tree>
-        </el-form-item>
+        <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-circle-check"
+              @click="handleDataScope(scope.row)"
+            >修改</el-button>
+          </template>
+        </el-table-column>
+        </el-table>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelDataScope">取 消</el-button>
@@ -219,9 +214,8 @@
 
 <script>
 import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from '@/api/system/role'
-import { treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/system/menu'
+import { roleMenuTreeselectMC, treeselect as menuTreeselect, roleMenuTreeselect } from '@/api/system/menu'
 import { treeselect as deptTreeselect, roleDeptTreeselect } from '@/api/system/dept'
-
 export default {
   name: 'Role',
   data() {
@@ -246,26 +240,24 @@ export default {
       openDataScope: false,
       // 日期范围
       // dateRange: [],
+      // 菜单表格数据
+      menuList: [],
       // 状态数据字典
       statusOptions: [
         {
-          label: '全部',
-          value: ''
+          dictLabel: '启用',
+          dictValue: '0'
         },
         {
-          label: '启用',
-          value: '0'
-        },
-        {
-          label: '停用',
-          value: '1'
+          dictLabel: '停用',
+          dictValue: '1'
         }
       ],
       // 数据范围选项
       dataScopeOptions: [
         {
-          value: '1',
-          label: '全部数据权限'
+          dictValue: '1',
+          dictLabel: '全部数据权限'
         },
         {
           value: '2',
@@ -294,7 +286,7 @@ export default {
         pageSize: 10,
         roleName: undefined,
         roleKey: undefined,
-        status: ''
+        flag: undefined
       },
       // 表单参数
       form: {},
@@ -319,9 +311,9 @@ export default {
   },
   created() {
     this.getList()
-    // this.getDicts('sys_normal_disable'.toUpperCase()).then(response => {
-    //   this.statusOptions = response.data
-    // })
+    // this.getDicts(dictCons['NORMAL_DISABLE']).then(response => {
+    //   this.statusOptions = response.data;
+    // });
   },
   methods: {
     /** 查询角色列表 */
@@ -337,8 +329,15 @@ export default {
     },
     /** 查询菜单树结构 */
     getMenuTreeselect() {
-      roleMenuTreeselect(-1).then(response => {
-        this.menuOptions = response.menus
+      menuTreeselect().then(response => {
+        this.menuOptions = response.data
+      })
+    },
+    /** 查询菜单列表 */
+    getMenuList(roleId) {
+      roleMenuTreeselectMC(roleId).then(response => {
+        this.menuList = this.handleTree(response.data.menus, 'businessId')
+        this.loading = false
       })
     },
     /** 查询部门树结构 */
@@ -359,10 +358,10 @@ export default {
     // 所有部门节点数据
     getDeptAllCheckedKeys() {
       // 目前被选中的部门节点
-      // const checkedKeys = this.$refs.dept.getHalfCheckedKeys()
+      const checkedKeys = this.$refs.dept.getHalfCheckedKeys()
       // // 半选中的部门节点
-      // const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
-      // checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
+      const halfCheckedKeys = this.$refs.dept.getCheckedKeys()
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
       return this.$refs.dept.getCheckedKeys()
     },
     /** 根据角色ID查询菜单树结构 */
@@ -381,21 +380,20 @@ export default {
     },
     // 角色状态修改
     handleStatusChange(row) {
-      const text = row.status === '0' ? '停用' : '启用'
-      const temp = JSON.parse(JSON.stringify(row))
-      this.$confirm(`“${row.roleName}”角色即将被${text}，是否继续？`, '提示', {
+      const text = row.flag === '1' ? '启用' : '停用'
+      this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
+      }).then(function() {
+        return changeRoleStatus(row.businessId, row.flag)
       }).then(() => {
-        temp.status = temp.status === '0' ? '1' : '0'
-        changeRoleStatus(temp.roleId, temp.status).then(() => {
-          this.$message({
-            type: 'success',
-            message: temp.status === '0' ? '启用成功' : '停用成功'
-          })
-          row.status = temp.status
+        this.$message({
+          message: text + '成功',
+          type: 'success'
         })
+      }).catch(function() {
+        row.flag = row.flag === '0' ? '1' : '0'
       })
     },
     // 取消按钮
@@ -418,7 +416,7 @@ export default {
         roleName: undefined,
         roleKey: undefined,
         roleSort: 0,
-        status: '0',
+        flag: undefined,
         menuIds: [],
         deptIds: [],
         remark: undefined
@@ -447,60 +445,67 @@ export default {
       this.reset()
       this.getMenuTreeselect()
       this.open = true
-      this.title = '添加'
+      this.title = '添加角色'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()
-      const roleId = row.roleId || this.ids
-      this.$nextTick(() => {
-        this.getRoleMenuTreeselect(roleId)
-      })
+      const roleId = row.businessId || this.ids
+      const roleMenu = this.getRoleMenuTreeselect(roleId)
       getRole(roleId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = '修改'
+        this.$nextTick(() => {
+          roleMenu.then(res => {
+            this.$refs.menu.setCheckedKeys(res.data.checkedKeys)
+          })
+        })
+        this.title = '修改角色'
       })
     },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
+    /** 分配数据权限操作 选择菜单 */
+    handleMenu(row) {
       this.reset()
-      this.$nextTick(() => {
-        this.getRoleDeptTreeselect(row.roleId)
-      })
-      getRole(row.roleId).then(response => {
+      const roleId = row.businessId || this.ids
+      this.getMenuList(roleId) // 查询菜单列表树形显示
+      getRole(roleId).then(response => {
         this.form = response.data
         this.openDataScope = true
         this.title = '分配数据权限'
       })
     },
+    /** 分配数据权限操作 */
+    handleDataScope(row) {
+      this.deptOptions = []
+      this.form.dataScope = undefined
+      const roleId = this.form.businessId
+      this.form.menuId = row.businessId
+      this.form.menuName = row.menuName
+      const roleDeptTreeselect = this.getRoleDeptTreeselect(roleId, this.form.menuId)
+      this.$nextTick(() => {
+        roleDeptTreeselect.then(res => {
+          this.$refs.dept.setCheckedKeys(res.data.checkedKeys)
+        })
+      })
+      this.title = '分配数据权限'
+    },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs['form'].validate(valid => {
         if (valid) {
-          if (this.form.roleId !== undefined) {
+          if (this.form.businessId !== undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys()
             updateRole(this.form).then(response => {
-              if (response.code === 200) {
-                this.$message({
-                  message: '修改成功',
-                  type: 'success'
-                })
-                this.open = false
-                this.getList()
-              }
+              this.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
             })
           } else {
             this.form.menuIds = this.getMenuAllCheckedKeys()
             addRole(this.form).then(response => {
-              if (response.code === 200) {
-                this.$message({
-                  message: '新增成功',
-                  type: 'success'
-                })
-                this.open = false
-                this.getList()
-              }
+              this.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
             })
           }
         }
@@ -524,7 +529,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const roleIds = row.roleId || this.ids
+      const roleIds = row.businessId || this.ids
       this.$confirm('所选择数据被删除后不可再恢复，是否继续？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',

src/views/system/user/index.vue

@@ -826,9 +826,18 @@ export default {
       this.upload.open = true
     },
     /** 下载模板操作 */
-    importTemplate(params) {
+    importTemplate() {
       importTemplate().then(response => {
-        this.download(response.msg)
+        const blob = new Blob([response])
+        const downloadElement = document.createElement('a')
+        const href = window.URL.createObjectURL(blob)// 创建下载的链接
+        downloadElement.href = href
+        downloadElement.download = '用户导入模板' + '.xls' // 下载后文件名
+        document.body.appendChild(downloadElement)
+        downloadElement.click()// 点击下载
+        document.body.removeChild(downloadElement)// 下载完成移除元素
+        window.URL.revokeObjectURL(href)// 释放掉blob对象
+        // this.download(response.msg);
       })
     },
     // 文件上传中处理