From 37a6ace3b51bc1d7bb562242c8a70b51ba3b6680 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期三, 18 三月 2020 13:23:09 +0800
Subject: [PATCH] 调整上传和时间限制

---
 src/views/list.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/list.vue b/src/views/list.vue
index 78e85d3..b7f0699 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -75,7 +75,7 @@
 		 :total="total">
 		</el-pagination>
 		
-		<el-dialog @close="Cancel"  width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
+		<el-dialog v-if="dialog_1"  @close="Cancel"  width="70%" top="50px" :visible.sync="dialog_1" append-to-body>
 		  <newProject @closeNewProject="closeNewProject" v-bind:rowData="rowData" ref="newProject_"></newProject>
 		</el-dialog>
 		<el-dialog v-if="dialog_2" @close="Cancel2"  width="70%" top="50px" :visible.sync="dialog_2" append-to-body>
@@ -125,6 +125,7 @@
 		methods: {
 			Cancel() {
 				this.dialog_1 = false;
+				this.query_();
 			},
 			Cancel2() {
 				this.dialog_2 = false;
@@ -144,7 +145,8 @@
 			tableChange(val) {
 				this.selected = val;
 				this.detailData = val;
-				if (this.selected.userId == this.userId) {
+			//	this.editShow = true;
+				 if (this.selected.userId == this.userId) {
 					this.editShow = true;
 				}else {
 					this.editShow = false;
@@ -225,17 +227,19 @@
 			},
 			addProject() {
 				this.dialog_1 = true;
-				
+				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