Explorar el Código

15.6 测试bug修复+1

hbchen hace 1 año
padre
commit
160b1a5dfd

+ 5 - 1
src/views/dataReport_manage/statistic/newCustomlist.vue

@@ -282,7 +282,11 @@ export default {
 				'RoadShowTotal': 'roadShowTotal',
 				'LastViewTime': 'viewTime',
 				'ExpireDay': 'expireDay',
-				'ShareSeller':'ShareSellerName'
+				'ShareSeller':'shareSellerName',
+				'SellerName':'sellerName',
+				'Status':'status',
+				'ServiceYears':'serviceYears',
+				'LatestServiceRecord':'latestServiceRecord'
 			}
 
 			this.sort_obj = {

+ 5 - 2
src/views/roadshow_manage/compononts/activityDetailDia.vue

@@ -13,6 +13,7 @@
 			class="table-cont"
 			max-height="300"
 			border
+			ref="tableRef"
 		>
 			<el-table-column
 				v-for="item in tableColumns"
@@ -20,7 +21,9 @@
 				:label="item.label"
 				:width="item.widthsty"
 				:min-width="item.minwidthsty"
+				:prop="item.key"
 				align="center"
+				:sortable="region=='oversea' && (item.key=='time')"
 			>
 				<template slot-scope="{row}">
 
@@ -85,8 +88,7 @@ export default {
 		isShow(newval) {
 			if(newval) {
 				this.initState();
-				console.log(this.form)
-				this.getStatisticDetail();
+				this.getStatisticDetail();				
 			}
 		}
 	},
@@ -211,6 +213,7 @@ export default {
 						},
 						{ ...dynamic_column }
 				]	
+			this.$refs.tableRef && this.$refs.tableRef.clearSort()
 		}
 	},
 	created() {},