Merge branch 'xqc_115'

src/views/system_manage/departManage.vue

@@ -80,9 +80,9 @@
 					width="200"
 					align="center">
 						<template slot-scope="scope">
-							<el-tag size="small" 
+							<!-- <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?$t('SystemManage.DepartManage.use_tag01'):scope.row.LabelVal==2?$t('SystemManage.DepartManage.use_tag02'):scope.row.LabelVal==3?$t('SystemManage.DepartManage.use_tag03'):scope.row.LabelVal==4?$t('SystemManage.DepartManage.use_tag04'):$t('SystemManage.DepartManage.use_tag05')}}</el-tag>
+								: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?$t('SystemManage.DepartManage.use_tag01'):scope.row.LabelVal==2?$t('SystemManage.DepartManage.use_tag02'):scope.row.LabelVal==3?$t('SystemManage.DepartManage.use_tag03'):scope.row.LabelVal==4?$t('SystemManage.DepartManage.use_tag04'):$t('SystemManage.DepartManage.use_tag05')}}</el-tag> -->
 							<span style="position: relative;">{{scope.row.RealName}}</span>
 						</template>
 					</el-table-column>

src/views/system_manage/enAuthManage.vue

@@ -46,7 +46,7 @@
               {{ row[item.key] === 0 ? $t('SystemManage.EnAuthSet.enable') : $t('SystemManage.EnAuthSet.opened')  }}
             </span>
             <div v-else-if="item.key === 'RealName'">
-              <el-tag
+              <!-- <el-tag
                 size="small"
                 v-if="row.LabelVal"
                 :style="
@@ -66,7 +66,7 @@
                     ? $t('SystemManage.DepartManage.use_tag04')
                     : $t('SystemManage.DepartManage.use_tag05')
                 }}</el-tag
-              >
+              > -->
               <span style="position: relative">{{ row.RealName }}</span>
             </div>
             <span v-else>{{ row[item.key] }}</span>