linwenxin 5 mesi fa
parent
commit
95818f9cb1

+ 9 - 5
src/views/setting/role/index.vue

@@ -63,7 +63,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="操作" width="180">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="setMenuRole(scope.row.adminRoleId)">设置权限</el-button>
+                    <el-button type="text" @click="setMenuRole(scope.row)">设置权限</el-button>
                     <el-button
                       type="text"
                       @click="addOrEdit('edit', scope.row.adminRoleId)"
@@ -352,14 +352,15 @@ export default {
     },
 
     // 设置权限 - 获取列表
-    setMenuRole(id) {
+    setMenuRole(row) {
+      console.log(row)
       this.$refs.tabPage.addTab({
         activeKey: 'detail',
         key: 'detail',
         label: '设置权限',
         triggerEvent: () => {
           this.$nextTick(() => {
-            this.editId = id
+            this.editId = row.adminRoleId
             function aaa(list) {
               for (var item of list) {
                 if (item.type == 3) {
@@ -371,11 +372,14 @@ export default {
                 }
               }
             }
-            getMenuList({ adminUserId: this.userid }).then(res => {
+            getMenuList({
+              adminUserId: this.userid,
+              parentAdminRoleId: row.parentRoleId
+            }).then(res => {
               aaa(res.data)
               this.menuRoleList = res.data
             })
-            getMenuRoleIds({ adminRoleId: id }).then(res => {
+            getMenuRoleIds({ adminRoleId: row.adminRoleId }).then(res => {
               this.$refs.tree.setCheckedKeys(res.data)
             })
           })

+ 0 - 1
src/views/setting/workContactLetter/workContactLetterPage/index.vue

@@ -321,7 +321,6 @@ export default {
       ]
     },
     // 更多参数
-    // {"WAIT_EXAMINE":"待审核","EXECUTED":"已执行","REVOKE":"已撤销","REDUCTION":"已减免","CANCEL":"已作废","WAIT":"待发送","SEND":"待执行"}
     moreParameters() {
       return [
         {