From ba367fa90ebaaff86ea81ec2aec3491cc58b948c Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 27 Mar 2020 10:32:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/BasicData/MenuManagement.js          | 23 ++++++++---
 src/views/BasicData/MenuManagement/index.vue | 43 ++++++++++++++++----
 2 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/src/api/BasicData/MenuManagement.js b/src/api/BasicData/MenuManagement.js
index a2ea3311..31ec416b 100644
--- a/src/api/BasicData/MenuManagement.js
+++ b/src/api/BasicData/MenuManagement.js
@@ -111,7 +111,7 @@ export function submitAdd(name) {
   })
 }
 // 查询二级模块分给那些角色
-export function searchJS(name) {
+export function getRoleTitle() {
   return request({
     url: '',
     method: 'post',
@@ -119,12 +119,25 @@ export function searchJS(name) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '3',
-      name: ` select 角色功能,title from
+      name: ` select distinct title from
               基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
               inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
-              order by title`,
-      param: `模块名称=${name}`
+              order by title`
+    }
+  })
+}
+export function getRoleNameasd(name) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '3',
+      name: ` select distinct 角色功能 from
+              基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
+              inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
+              where title=\'${name}\'`
     }
   })
 }
-
diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index b97ecd55..4b409515 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -63,6 +63,7 @@
       <el-col :span="7">
         <el-card style="margin-bottom: 10px">
           <el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
+          <el-button size="small" style="float: right" type="success" @click="RoleNameasdShow=!RoleNameasdShow">模块分配情况</el-button>
         </el-card>
         <el-card>
           <div slot="header">
@@ -80,16 +81,22 @@
       </el-col>
     </el-row>
 
-    <el-row v-if="false">
+    <el-row v-show="RoleNameasdShow">
       <el-card>
         <div slot="header">
-          <el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
+          <el-select v-model="TitleValue" placeholder="请选择" size="small" style="width:200px;margin-left:10px" filterable @change="getTitle">
+            <el-option
+              v-for="item in Title"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
         </div>
-        <el-table :data="secondLevelFilter" stripe size="mini" height="200" border>
+        <el-table :data="RoleNameasd" stripe size="mini" height="200" border style="width: 465px">
           <el-table-column label="序号" align="center" type="index" width="50"/>
-          <el-table-column align="center" label="模块名称">
+          <el-table-column align="center" label="模块名称" width="400">
             <template slot-scope="scope">
-              {{ scope.row.title }}
+              {{ scope.row.角色功能 }}
             </template>
           </el-table-column>
         </el-table>
@@ -114,7 +121,7 @@
 </template>
 
 <script>
-import { getRole, getModule, initFisrtLevel, initSecondLevel, returnModule, giveFirstLevel, giveSecondLevel, submitAdd } from '@/api/BasicData/MenuManagement'
+import { getRole, getModule, initFisrtLevel, initSecondLevel, returnModule, giveFirstLevel, giveSecondLevel, submitAdd, getRoleTitle, getRoleNameasd } from '@/api/BasicData/MenuManagement'
 export default {
   name: 'MenuManagement',
   data() {
@@ -140,7 +147,11 @@ export default {
       },
       rules1: {
         moduleName: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }]
-      }
+      },
+      RoleNameasdShow: false,
+      TitleValue: '',
+      Title: [],
+      RoleNameasd: []
     }
   },
   watch: {
@@ -162,6 +173,7 @@ export default {
     this.getRoleName()
     this.initFisrtLevel()
     this.initSecondLevel()
+    this.getRoleTitle()
   },
   methods: {
     // 撤回分配模块
@@ -362,6 +374,23 @@ export default {
     filterNode(value, data) {
       if (!value) return true
       return data.label.indexOf(value) !== -1
+    },
+    // 初始化模块
+    getRoleTitle() {
+      getRoleTitle().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Title.push({
+            value: response.data[i].title,
+            label: response.data[i].title
+          })
+        }
+      })
+    },
+    getTitle() {
+      this.RoleNameasd = []
+      getRoleNameasd(this.TitleValue).then(responmse => {
+        this.RoleNameasd = responmse.data
+      })
     }
   }
 }