From 84326b11401f217cd483d13bc72cec4ffd5da7ce Mon Sep 17 00:00:00 2001
From: bob <bob.zhang@highdatas.com>
Date: 星期三, 25 十一月 2020 10:02:22 +0800
Subject: [PATCH] 2020-11-13

---
 src/views/list.vue |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/views/list.vue b/src/views/list.vue
index 6b3c9f1..5b7a84c 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -1,7 +1,7 @@
 <template>
+	<!-- 宸插畬鎴愮殑涓嶄慨鏀归渶灏� finish1 鏀规垚 finish -->
 	<div>
 		<div align="left">
-
 			<div class="btn-line">
 				<!-- <el-button type="primary" @click="addProject">鏂板缓椤圭洰</el-button> -->
 				<el-button type="primary" v-if="editShow" @click="editProject">缂栬緫椤圭洰</el-button>
@@ -51,27 +51,28 @@
 		<el-table  highlight-current-row
 				ref="data_table"
 				@current-change="tableChange"
+				@sort-change="sortChange"
 				v-loading="loading_table"
 				size="small"
 				:data="tableData" 
 				:header-cell-style="{'width': '100%', 'text-align': 'center'}" 
 				:row-class-name="tableRowClassName">
 				<el-table-column type="index" width="50"> </el-table-column>
-			<el-table-column prop="code" label="椤圭洰鍙�" width="130">
+			<el-table-column prop="code" label="椤圭洰鍙�" width="130" sortable="custom">
 			</el-table-column>
-			<el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" show-overflow-tooltip>
+			<el-table-column prop="name" label="椤圭洰鍚嶇О" width="120" sortable="custom" show-overflow-tooltip>
 			</el-table-column>
-			<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" align="center" :formatter="status_">
+			<el-table-column prop="status" label="褰撳墠鐘舵��" width="100" sortable="custom" align="center" :formatter="status_">
 			</el-table-column>
-			<el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" width="100" align="center">
+			<el-table-column prop="totalCnt" label="鏈嶅姟椤圭洰鏁�" width="120"  align="center">
 			</el-table-column>
-			<el-table-column prop="finishCnt" label="宸插畬鎴愰」鐩�" width="100" align="center">
+			<el-table-column prop="finishCnt" label="宸插畬鎴愰」鐩�" width="120"  align="center">
 			</el-table-column>
-			<el-table-column prop="delayCnt" label="寤舵湡椤圭洰" width="100" align="center">
+			<el-table-column prop="delayCnt" label="寤舵湡椤圭洰" width="100"  align="center">
 			</el-table-column>
-			<el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100" align="center" :formatter="dateFormat_">
+			<el-table-column prop="startTime" label="寮�濮嬫椂闂�" width="100" sortable="custom" align="center" :formatter="dateFormat_">
 			</el-table-column>
-			<el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" align="center" :formatter="dateFormat_" >
+			<el-table-column prop="endTime" label="缁撴潫鏃堕棿" width="100" sortable="custom" align="center" :formatter="dateFormat_" >
 			</el-table-column>
 			<el-table-column prop="desc" label="椤圭洰鎻忚堪" show-overflow-tooltip></el-table-column>
 			<el-table-column label="鎿嶄綔" align="center" width="300">
@@ -197,6 +198,8 @@
 					"Randomised controlled trial (RCT)",
 					"Other"
 				],
+				
+				orderBy: "",
 			}
 		},
 		mounted() { //缁勪欢閰嶇疆鍚庯紝椤甸潰鏄剧ず鍓嶃�傜敤浜庡姞杞芥暟鎹�
@@ -209,6 +212,29 @@
 			this.getData();
 		},
 		methods: {
+			sortChange(column, prop, order) {
+				this.orderBy = "";
+				if (column.prop && column.order) {
+					this.orderBy = this.toLine(column.prop);
+					if (column.order == "descending") {
+						this.orderBy += " desc";
+					}
+				}
+				
+				this.query_();
+			},
+			
+			// 涓嬪垝绾胯浆鎹㈤┘宄�
+			toHump(name) {
+			    return name.replace(/\_(\w)/g, function(all, letter){
+			        return letter.toUpperCase();
+			    });
+			},
+			// 椹煎嘲杞崲涓嬪垝绾�
+			toLine(name) {
+			  return name.replace(/([A-Z])/g,"_$1").toLowerCase();
+			},
+			
 			download() {
 				if (!this.selected) {
 					this.$message({message:'璇烽�夋嫨涓嬭浇鏉$洰', type: 'warning'});
@@ -346,6 +372,10 @@
 					params.type = query.type;
 				}
 				
+				if(this.orderBy) {
+					params.orderBy = this.orderBy;
+				}
+				
 				this.$axios.get(url, {
 						params
 					})
@@ -402,8 +432,9 @@
 				this.rowData = {};
 			},
 			editProject() {
-				if(!this.selected || this.selected.status == "finish"){
-					
+				//宸插畬鎴愮殑涓嶄慨鏀归渶灏� finish1 鏀规垚 finish
+			//	if(!this.selected || this.selected.status == "finish"){
+				if(!this.selected || this.selected.status == "finish1"){
 					this.$message({message:'璇烽�変腑涓�鏉℃湭瀹屾垚鐨勯」鐩�', type: 'warning'});
 				}else {
 					this.rowData = {

--
Gitblit v1.8.0