From 419345c0df73648cabdb5fbfdbb3744bd957a81a Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 21 一月 2020 14:20:06 +0800
Subject: [PATCH] 添加没有上传物的描述

---
 src/views/calendarTask.vue |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/src/views/calendarTask.vue b/src/views/calendarTask.vue
index 93960d9..929cb04 100644
--- a/src/views/calendarTask.vue
+++ b/src/views/calendarTask.vue
@@ -16,32 +16,44 @@
 				<span>{{task_itm.desc}}</span>
 				<div v-for="(type_itm, k_) in task_itm.children" :key="k_" class="right_row_">
 					<span>{{k_+1}}銆亄{type_itm.name}}</span>
-					<el-button size="mini" type="primary" style="float: right; margin-top: 10px;" @click="handleTask(type_itm.id, type_itm.mustAttach)">澶勭悊浠诲姟</el-button>
+					<el-button size="mini" type="primary" style="float: right; margin-top: 10px;" @click="handleTask(type_itm.id, type_itm.mustAttach, type_itm)">澶勭悊浠诲姟</el-button>
 				</div>
 			</div>
 		</div>
 		
-		<el-dialog @close="Cancel" width="20%" top="10%" :visible.sync="dialog_1">
+		<el-dialog @close="Cancel" width="40%" top="10%" :visible.sync="dialog_1">
 			<div slot="title" class="dialog-title" style="text-align: left;">
-			  <span> 涓婁紶浜や粯鐗� </span>
+			  <span> 浠诲姟澶勭悊 </span>
 			</div>
 				<!-- 涓婁紶鏂囦欢-->
-			<div style="height: 100px;">
+			<div v-if="handleTaskType.mustAttach" style="height: 150px;">
 				<el-upload
 					class="upload-demo"
 					:action="upload_url"
 					multiple
+					:data="upData"
 					:limit="3"
 					:file-list="fileList"
+					:auto-upload='false'
 					ref="upload"
 					>
-					<el-button size="medium" type="text">鐐瑰嚮涓婁紶</el-button>
+					<el-button size="medium" type="text">閫夋嫨鏂囦欢</el-button>
 					<div slot="tip" class="el-upload__tip">鏂囦欢涓嶈秴杩�500kb</div>
 				</el-upload>
+			</div>
+			<div style="text-align: left;">
+				<span>鎻忚堪</span>
+				<el-input
+					type="textarea"
+					:rows="2"
+					placeholder="璇疯緭鍏ュ唴瀹�"
+					v-model="desc_task">
+				</el-input>
 			</div>
 			
 			<!-- 澶勭悊瀹屾垚 -->
 			<div slot="footer" class="dialog-footer">
+				<el-button v-if="handleTaskType.mustAttach" @click="submitUpload">鐐瑰嚮涓婁紶</el-button>
 				<el-button @click="Cancel">鍙� 娑�</el-button>
 				<el-button type="primary" @click="doHandleTask">澶勭悊瀹屾垚</el-button>
 			</div>
@@ -69,6 +81,8 @@
 						dialog_1: false,
 						handleTaskType: {},
 						upload_url: "",
+						desc_task: "",
+						upData: {},
 						fileList: [],
         	}
         },
@@ -110,26 +124,32 @@
 						);
           },
 					
-					handleTask(id, mustAttach) {
-						this.handleTaskType.id = id;
-						if(mustAttach) {
-							this.dialog_1 = true;
-						}
-						else {
-							this.doHandleTask();
-						}
-						
+					handleTask(id, mustAttach, type_itm) {
+						this.handleTaskType = type_itm;
+						this.dialog_1 = true;
 					},
 					
 					doHandleTask() {
 						//姝d鐨勬槑缁嗕换鍔″畬鎴�
 						let id = this.handleTaskType.id;
 						//璇锋眰鏀瑰彉姝ゆ槑缁嗙殑瀹屾垚鐘舵�侊紱
+						this.desc_task;//鎻忚堪鐨勫唴瀹�
+						
+						
 						
 						if (this.dialog_1) {
 							this.Cancel();
 						}
+					},
+					
+					submitUpload() {
+						this.handleTaskType; //瑕佸鐞嗙殑鏄庣粏鏁版嵁
 						
+						this.upData = {//璁剧疆瑕佷紶鐨勫弬鏁�
+							
+						},
+						this.upload_url = ""; //璁剧疆涓婁紶鎺ュ彛
+					  this.$refs.upload.submit();//寮�濮嬩笂浼�
 					},
 					
 					Cancel() {
@@ -160,6 +180,8 @@
 							{'date': "2020-01-11", 'task': 2},
 						], */
 						
+						
+						
 					},
 					
 					getDayData(date_) {//鑾峰彇鎸囧畾鏃ョ殑浠诲姟銆傚'2019-12-21'瀛楃涓层�傚湪鍙充晶鏄剧ず鐨�
@@ -170,7 +192,7 @@
 						let DayDatas = [
 							{'id': "111", 'name': "娴嬭瘯1椤圭洰", 'desc': "姝ら」鐩富瑕侀拡瀵规彁楂樻晥鐜囧拰閿�鍞噺"}, //杩斿洖鐨勬暟缁勫瓧娈�
 							{'id': "111_1", 'name': "绔嬮鏈嶅姟", 'mustAttach': true, 'parentId': "111"}, //
-							{'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", 'mustAttach': true, 'parentId': "111"}, //
+							{'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", 'mustAttach': false, 'parentId': "111"}, //
 						];
 						
 						let list = DayDatas;

--
Gitblit v1.8.0