From fadf2795757ac6df1c792546725ea177c93d9d7a Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 18 三月 2020 14:03:10 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

---
 src/views/list.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/list.vue b/src/views/list.vue
index ff4631b..b7f0699 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -230,14 +230,16 @@
 				this.rowData = {};
 			},
 			editProject() {
-				if(!this.selected || this.selected.status != "edit"){
+				if(!this.selected || this.selected.status == "finish"){
 					
-					this.$message({message:'璇烽�変腑涓�鏉℃湭鍚姩鐨勯」鐩�', type: 'warning'});
+					this.$message({message:'璇烽�変腑涓�鏉℃湭瀹屾垚鐨勯」鐩�', type: 'warning'});
 				}else {
 					this.rowData = {
 						id:this.selected.id,
 						desp:this.selected.desp,
 						name: this.selected.name,
+						beginDate: this.selected.beginDate,
+						endDate: this.selected.endDate,
 						objective:this.selected.reseachType,
 						items:[this.$moment(this.selected.startTime).format('YYYY-MM-DD'),this.$moment(this.selected.endTime).format('YYYY-MM-DD')]
 					}

--
Gitblit v1.8.0