Merge branch 'crm14.1' into sandbox

src/views/dataEntry_manage/databaseList.vue

@@ -244,21 +244,20 @@
 								},scope.row)"
 								>编辑</el-button>
 							<el-button size="mini" type="text" @click.stop="reCalculateHandler" v-if="scope.row.EdbType===2" :loading="calculateLoading">重新计算</el-button>
-							<el-button v-permission="permissionBtn.edbDataPermission.edbData_toImgs"
+							<el-button v-if="permissionBtn.checkPermissionBtn(permissionBtn.edbDataPermission.edbData_toImgs)"
 								size="mini" type="text" @click.stop="createChartHandle(scope.row.EdbInfoId)">一键成图</el-button>
-							<el-button v-permission="permissionBtn.edbDataPermission.edbData_copyData"
+							<el-button v-if="permissionBtn.checkPermissionBtn(permissionBtn.edbDataPermission.edbData_copyData)"
 								size="mini" type="text" @click="copyCode">复制数据</el-button>
 							<!-- <lookEdbHistory :showType="2" :edbId="selected_edbid" v-if="scope.row.EdbType===2"/> -->
-							<el-button v-permission="permissionBtn.edbDataPermission.edbData_edbSource"
-							size="mini" type="text"
-							v-if="scope.row.EdbType===2" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
+							<el-button size="mini" type="text"
+							v-if="scope.row.EdbType===2&&permissionBtn.checkPermissionBtn(permissionBtn.edbDataPermission.edbData_edbSource)" @click="isLookHistory=true;lookEdbId=selected_edbid">指标溯源</el-button>
 							
-							<el-button v-permission="permissionBtn.edbDataPermission.edbData_enNameSetting"
+							<el-button v-if="permissionBtn.checkPermissionBtn(permissionBtn.edbDataPermission.edbData_enNameSetting)"
 								size="mini" type="text" @click="openEnNameDia">设置英文名称</el-button>
-							<el-button v-permission="permissionBtn.edbDataPermission.edbData_newestValue"
-								size="mini" type="text" @click.stop="updateNewestDataHandle" v-if="scope.row.Button.InsertNewDataButton" >{{scope.row.DataInsertConfig.Date?'编辑最新值':'添加最新值'}}</el-button>
-							<el-button v-permission="permissionBtn.edbDataPermission.edbData_refreshAll"
-								size="mini" type="text" @click.stop="refreshBaseHandler" v-if="scope.row.EdbType===1" :loading="refreshLoading">全部刷新</el-button>
+							<el-button size="mini" type="text" @click.stop="updateNewestDataHandle" 
+							v-if="scope.row.Button.InsertNewDataButton&&permissionBtn.checkPermissionBtn(permissionBtn.edbDataPermission.edbData_newestValue)" >{{scope.row.DataInsertConfig.Date?'编辑最新值':'添加最新值'}}</el-button>
+							<el-button size="mini" type="text" @click.stop="refreshBaseHandler" 
+								v-if="scope.row.EdbType===1&&permissionBtn.checkPermissionBtn(permissionBtn.edbDataPermission.edbData_refreshAll)" :loading="refreshLoading">全部刷新</el-button>
 						</template>
 					</el-table-column>
 					<div slot="empty" style="padding: 50px 0 320px;">

src/views/system_manage/departManage.vue

@@ -77,8 +77,9 @@
 					label="姓名"
 					align="center">
 						<template slot-scope="scope">
-							<el-tag v-permission="permissionBtn.sysDepartPermission.sysDepart_saveUser_LabelVal"
-								size="small" v-if="scope.row.LabelVal" :style="scope.row.LabelVal==1||scope.row.LabelVal==2?'color:#fff;background:#409EFF':'color:#409EFF;background:#ECF5FF'" style="position:absolute;left:10px">{{scope.row.LabelVal==1?'超管':scope.row.LabelVal==2?'管理员':scope.row.LabelVal==3?'部门经理':scope.row.LabelVal==4?'组长':'主管'}}</el-tag>
+							<el-tag size="small" 
+								v-if="scope.row.LabelVal&&permissionBtn.checkPermissionBtn(permissionBtn.sysDepartPermission.sysDepart_saveUser_LabelVal)" 
+								:style="scope.row.LabelVal==1||scope.row.LabelVal==2?'color:#fff;background:#409EFF':'color:#409EFF;background:#ECF5FF'" style="position:absolute;left:10px">{{scope.row.LabelVal==1?'超管':scope.row.LabelVal==2?'管理员':scope.row.LabelVal==3?'部门经理':scope.row.LabelVal==4?'组长':'主管'}}</el-tag>
 							<span style="position: relative;">{{scope.row.RealName}}</span>
 						</template>
 					</el-table-column>

src/views/system_manage/operateAuthManage.vue

@@ -89,8 +89,8 @@
           <template slot-scope="{row}">
             <template v-if="item.key==='handle'">
               <span class="editsty" @click="edbAuthSetHandle(row)" v-if="[3,4].includes(default_tab
-        )">权限设置</span>
-              <span class="editsty" @click="editAuthHandle(row)">编辑</span>
+        )&&authBtn('auth')">权限设置</span>
+              <span class="editsty" @click="editAuthHandle(row)" v-if="[3,4].includes(default_tab)?authBtn('edit'):authTabs.length">编辑</span>
             </template>
 
             <span v-else>{{ row[item.key] }}</span>