Merge branch 'ETA_1.0.1' into debug

src/utils/buttonConfig.js

@@ -454,4 +454,12 @@ export const baseConfigPermission = {
     etaBaseConfig_watermark:'etaBaseConfig:watermark',
     etaBaseConfig_watermark_ybChart:'etaBaseConfig:watermark:ybChart',//如果没权限,表单不显示也不校验
 
+}
+
+/*-----------外部链接配置-------- */
+export const outlinkConfigPermission = {
+    outlinkListConfig_list:'outlinkListConfig:list',//查看列表
+    outlinkListConfig_add:'outlinkListConfig:add',//添加
+    outlinkListConfig_edit:'outlinkListConfig:edit',//编辑
+    outlinkListConfig_del:'outlinkListConfig:del',//删除
 }

src/views/system_manage/outlinkListConfig.vue

@@ -1,7 +1,8 @@
 <template>
   <div id="outlink-list-config" class="outlink-list-config">
     <div class="outlink-top-button-zone">
-      <el-button type="primary" @click="addOutlink">添加菜单</el-button>
+      <el-button type="primary" @click="addOutlink" 
+      v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_add">添加菜单</el-button>
     </div>
     <el-table :data="outlinkData" border @sort-change="sortChange">
       <el-table-column label="菜单名称" prop="Title" align="center">
@@ -21,8 +22,10 @@
       </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="{ row }">
-          <span class="table-button" @click="editOutlink(row)">编辑</span>
-          <span class="table-button" style="color: #C54322;" @click="deleteOutlink(row)">删除</span>
+          <span class="table-button" @click="editOutlink(row)" 
+          v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_edit">编辑</span>
+          <span class="table-button" style="color: #C54322;" @click="deleteOutlink(row)"
+          v-permission="permissionBtn.outlinkConfigPermission.outlinkListConfig_del">删除</span>
         </template>
       </el-table-column>
       <div slot="empty" style="line-height: 44px; margin: 60px 0; color: #999">
@@ -94,6 +97,7 @@ import mPage from '@/components/mPage.vue';
     },
     methods: {
       getOutlinkData(){
+        if(!this.permissionBtn.checkPermissionBtn(this.permissionBtn.outlinkConfigPermission.outlinkListConfig_list)) return 
         outlinkConfigInterence.getOutlinkList(this.queryParams).then(res=>{
           if(res.Ret == 200){
             this.outlinkData = res.Data.List || []