From 29757bf552fe56c8545ccce13bc699a689a96741 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Thu, 26 Dec 2019 16:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=B9=E5=93=A8=E9=83=A8=E9=97=A8=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/zh-CN.js                            |  1 +
 src/views/modules/sys/role-add-or-update.vue | 39 +++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index 59387b99..9a587149 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -362,6 +362,7 @@ t.role.menuList = '菜单授权'
 t.role.deptList = '数据授权'
 t.role.appMenuList = '工作端菜单授权'
 t.role.categoryList = '项目处理类型授权'
+t.role.whistleDeptList = '吹哨部门授权'
 
 t.user = {}
 t.user.username = '用户名'
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index d6837edb..2c87f943 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="visible" width="1400px"
+  <el-dialog :visible.sync="visible" width="1500px"
              :title="!dataForm.id ? $t('add') : $t('update')"
              :close-on-click-modal="false"
              :close-on-press-escape="false">
@@ -29,7 +29,7 @@
                   :placeholder="$t('role.remark')"></el-input>
       </el-form-item>
       <el-row>
-        <el-col :span="8">
+        <el-col :span="5">
           <el-form-item size="mini"
                         :label="$t('role.menuList')">
             <el-tree :data="menuList"
@@ -41,7 +41,7 @@
             </el-tree>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="5">
           <el-form-item size="mini"
                         :label="$t('role.deptList')">
             <el-tree :data="deptList"
@@ -53,7 +53,7 @@
             </el-tree>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item size="mini"
                         :label="$t('role.appMenuList')">
             <el-tree :data="appMenuList"
@@ -65,7 +65,7 @@
             </el-tree>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item size="mini"
                         :label="$t('role.categoryList')">
             <el-tree :data="categoryList"
@@ -77,6 +77,18 @@
             </el-tree>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item size="mini"
+                        :label="$t('role.whistleDeptList')">
+            <el-tree :data="whistleDeptList"
+                     :props="{ label: 'name', children: 'children' }"
+                     node-key="id"
+                     ref="whistleDeptListTree"
+                     accordion
+                     show-checkbox>
+            </el-tree>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
     <template slot="footer">
@@ -95,6 +107,7 @@ export default {
       visible: false,
       menuList: [],
       deptList: [],
+      whistleDeptList: [],
       appMenuList: [],
       categoryList: [],
       roleTypeList: [],
@@ -105,6 +118,7 @@ export default {
         deptIdList: [],
         appMenuIdList: [],
         categoryIdList: [],
+        whistleDeptIdList: [],
         remark: '',
         typeKey: ''
       }
@@ -131,11 +145,13 @@ export default {
         this.$refs.deptListTree.setCheckedKeys([])
         this.$refs.appMenuListTree.setCheckedKeys([])
         this.$refs.categoryListTree.setCheckedKeys([])
+        this.$refs.whistleDeptListTree.setCheckedKeys([])
         Promise.all([
           this.getMenuList(),
           this.getDeptList(),
           this.getAppMenuList(),
-          this.getCategoryList()
+          this.getCategoryList(),
+          this.getWhistleDeptList()
         ]).then(() => {
           if (this.dataForm.id) {
             this.getInfo()
@@ -161,6 +177,15 @@ export default {
         this.deptList = res.data
       }).catch(() => { })
     },
+    // 获取吹哨部门列表
+    getWhistleDeptList () {
+      return this.$http.get('/sys/dept/list').then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.whistleDeptList = res.data
+      }).catch(() => { })
+    },
     // 获取App菜单列表
     getAppMenuList () {
       return this.$http.get('/sys/appmenu/select').then(({ data: res }) => {
@@ -193,6 +218,7 @@ export default {
         this.$refs.deptListTree.setCheckedKeys(this.dataForm.deptIdList)
         this.dataForm.appMenuIdList.forEach(item => this.$refs.appMenuListTree.setChecked(item, true))
         this.dataForm.categoryIdList.forEach(item => this.$refs.categoryListTree.setChecked(item, true))
+        this.$refs.whistleDeptListTree.setCheckedKeys(this.dataForm.whistleDeptIdList)
       }).catch(() => { })
     },
     // 表单提交
@@ -214,6 +240,7 @@ export default {
           ...this.$refs.categoryListTree.getCheckedKeys(),
           ...this.$refs.categoryListTree.getHalfCheckedKeys()
         ]
+        this.dataForm.whistleDeptIdList = this.$refs.whistleDeptListTree.getCheckedKeys()
         this.$http[!this.dataForm.id ? 'post' : 'put']('/sys/role', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)