From 050f815891df7c732e1ef64f1f32a83da495af11 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 11 二月 2020 23:46:29 +0800
Subject: [PATCH] 时间段调整

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

diff --git a/src/views/list.vue b/src/views/list.vue
index 304336b..0afa51f 100644
--- a/src/views/list.vue
+++ b/src/views/list.vue
@@ -5,7 +5,7 @@
 			<div class="btn-line">
 				<el-button type="primary" @click="addProject">鏂板缓椤圭洰</el-button>
 				<el-button type="primary" v-if="editShow" @click="editProject">缂栬緫椤圭洰</el-button>
-				<el-button type="primary" @click="onSubmit">鏌ョ湅璇︽儏</el-button>
+				<el-button type="primary" @click="showDetail">鏌ョ湅璇︽儏</el-button>
 
 			</div>
 
@@ -75,26 +75,34 @@
 		 :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>
+		  <prodetail @closeNewProject="closeDetail" v-bind:rowData="detailData" ref="newProject2_"></prodetail>
 		</el-dialog>
 	</div>
 </template>
 
 <script>
 	import newProject from '../components/popup/newProject.vue'
+	import prodetail from '../components/popup/prodetail.vue'
 	export default {
 		
 		components: {
-		  newProject
+		  newProject,
+		  prodetail
 		},
 		data() {
 			return {
 				editShow: true,
-				rowData:undefined,
+				
 				loading_table: false,
 				query: "",
+				rowData:undefined,
+				detailData:undefined,
 				dialog_1: false,
+				dialog_2: false,
 				pagenum: 1,
 				pagesize: 15,
 				total: 0,
@@ -116,11 +124,28 @@
 		},
 		methods: {
 			Cancel() {
-				this.$refs.newProject_.Cancel();
+				this.dialog_1 = false;
+			},
+			Cancel2() {
+				this.dialog_2 = false;
+				this.closeDetail();
+			},
+			closeDetail() {
+				this.detailData = undefined;
+			},
+			showDetail() {
+				if(!this.selected){
+					
+					this.$message({message:'璇烽�変腑涓�鏉℃湭鍚姩鐨勯」鐩�', type: 'warning'});
+					return;
+				}
+				this.dialog_2 = true;
 			},
 			tableChange(val) {
 				this.selected = val;
-				if (this.selected.userId == this.userId) {
+				this.detailData = val;
+			//	this.editShow = true;
+				 if (this.selected.userId == this.userId) {
 					this.editShow = true;
 				}else {
 					this.editShow = false;
@@ -201,7 +226,7 @@
 			},
 			addProject() {
 				this.dialog_1 = true;
-				
+				this.rowData = {};
 			},
 			editProject() {
 				if(!this.selected || this.selected.status != "edit"){
@@ -220,7 +245,8 @@
 				
 				
 			},closeNewProject() {
-				this.dialog_1 = false
+				this.dialog_1 = false;
+				query_();
 			},
 			
 		}

--
Gitblit v1.8.0