Merge branch 'xqc_388' into debug

src/utils/buttonConfig.js

@@ -385,6 +385,9 @@ export const edbDataPermission = {
     // edbData_publicClassifyOpt_edit: 'edbData:publicClassifyOpt:edit',//公开目录编辑分类
     edbData_publicClassifyOpt_del: 'edbData:publicClassifyOpt:del',//公开目录删除分类
     edbData_publicClassifyOpt_batch_move: 'edbData:publicClassifyOpt:batch:move',//公开目录批量移动
+
+    edbData_viewDataList_basicbase:'edbData:viewDataList:basicbase',//查看数据查看页面数据明细
+    edbData_viewDataList_database:'edbData:viewDataList:database',//查看指标加工页面数据明细
 }
 /*
  * ---------------------------------------------------------------------------ETA预测指标------------------------------------------------

src/views/dataEntry_manage/databaseComponents/edbDetailData.vue

@@ -46,7 +46,7 @@
 					<tableNoData :text="defaultWarn"/>
 			</div>
 		</el-table>
-		<template v-if="showDataList">
+		<template v-if="showDataList&&viewDataList">
 		<ul 
 			class="value-ul" 
 			ref="valueUl" 
@@ -109,6 +109,13 @@ export default {
 			default:false
 		}
 	},
+	computed:{
+		viewDataList(){
+			if(this.$route.path==='/edbBasicbase') return this.permissionBtn.isShowBtn('edbDataPermission','edbData_viewDataList_basicbase')
+			if(this.$route.path==='/database') return this.permissionBtn.isShowBtn('edbDataPermission','edbData_viewDataList_database')
+			return true
+		}
+	},
 	data() {
 		return {
 

src/views/dataEntry_manage/databaseList.vue

@@ -458,7 +458,7 @@
 								:table-colums-two="tableColumsTwo"
 								:data-list="dataList"
 								:haveMore="haveMore"
-								:showDataList="false"
+								:showDataList="true"
 								@getNextData="()=>{page_no++;getDataList();}"
 							/>
 						</div>