角色圈定范围 列表显示调整

src/utils/filter.js

@@ -250,5 +250,25 @@ const vueFilter = {
         return '屏蔽';
     }
   },
+  areaText: (value) => {
+    let text = '-';
+    if(value.regions.length == 0) {
+        text = '-'
+    } else if(value.regions.length == 1) {
+        text = value.regions[0];
+    } else if(value.regions.length > 1){
+        let len = value.regions.length;
+        text = value.regions[0]+'('+len+')';
+    }
+    return text;
+  },
+  areaList: (value) => {
+    let list = '';
+    for(let i=0; i<value.length ; i++) {
+        list += value[i]+',';
+    } 
+    list = list.substring(0, list.length - 1);
+    return list
+  },
 }
 export default vueFilter
\ No newline at end of file

src/views/system/item-role.vue

@@ -86,11 +86,15 @@
         </el-table-column>
         <el-table-column prop="area" label="负责区域" align="center">
           <template slot-scope="scope">
-            <el-popover placement="bottom" title width="200" trigger="hover" class="more-text">
+            <span v-if="scope.row.projeceRole == 'L2'">全部地区</span>
+            <span v-if="scope.row.projeceRole == 'L4'">-</span>
+            <span v-if="scope.row.projeceRole == 'L3' && scope.row.regions.length == 0">-</span>
+            <span v-if="scope.row.projeceRole == 'L3' && scope.row.regions.length == 1">{{ scope.row.regions[0] }}</span>
+            <el-popover v-if="scope.row.projeceRole == 'L3' && scope.row.regions.length > 1" placement="bottom" title width="200" trigger="hover" class="more-text">
               <p class="more-text">
-                {{ scope.row.regions }}
+                {{ scope.row.regions | areaList }}
               </p>
-              <p slot="reference">{{ scope.row.regions }}</p>
+              <p slot="reference">{{ scope.row | areaText }}</p>
             </el-popover>
           </template>
         </el-table-column>
@@ -611,6 +615,23 @@ export default {
       this.allSelectedKeys = allSelectedKeys;
       this.initCheckList(allSelectedKeys);
     },
+    getTreeCheck() {
+      let cData = [],
+        oldData = (this.treeData.length && this.treeData.slice()) || [],
+        checkedKeys = this.$refs.tree.getCheckedKeys(),
+        halfCheckedKeys = this.$refs.tree.getHalfCheckedKeys(),
+        savedCheckedKeys = this.handlerCheckedData(oldData, checkedKeys).map(
+          key => {
+            return { type: 1, key: key };
+          }
+        ),
+        savedHalfCheckedKeys = halfCheckedKeys.map(key => {
+          return { type: 2, key: key };
+        }),
+        allSelectedKeys = savedCheckedKeys.concat(savedHalfCheckedKeys);
+        // console.log('allSelectedKeys值：',allSelectedKeys)
+      return allSelectedKeys;
+    },
     // 递归删除列表中所有子节点
     delSubKeysByNode(node, checkedKeys) {
       let idIndex;
@@ -753,6 +774,7 @@ export default {
               type: 'success'
             });
             vm.dialogArea = false;
+            vm.queryRoleList();
           } else {
             vm.$message.error(res.message);
           }