From 355d7d39a67bc1fc27ed1e391799ff7fcc3b2aa7 Mon Sep 17 00:00:00 2001
From: zhangyanpeng <bob.zhang@highdatas.com>
Date: 星期二, 11 二月 2020 14:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs
---
src/views/calendarTask.vue | 198 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 136 insertions(+), 62 deletions(-)
diff --git a/src/views/calendarTask.vue b/src/views/calendarTask.vue
index 93960d9..f65229a 100644
--- a/src/views/calendarTask.vue
+++ b/src/views/calendarTask.vue
@@ -13,35 +13,47 @@
<div class="z_right" >
<div v-for="(task_itm, k) in DayDataTree" :key="k" class="right_row">
<h3>{{task_itm.name}}</h3>
- <span>{{task_itm.desc}}</span>
+ <span>{{task_itm.desp}}</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>
+ <span>{{k_+1}}銆亄{type_itm.typeStr}}</span>
+ <el-button size="mini" type="primary" v-if="userId === task_itm.userId" 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" v-if="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
- :limit="3"
+
+ :data="upData"
+ :limit="1"
:file-list="fileList"
+ :auto-upload='false'
ref="upload"
>
- <el-button size="medium" type="text">鐐瑰嚮涓婁紶</el-button>
- <div slot="tip" class="el-upload__tip">鏂囦欢涓嶈秴杩�500kb</div>
+ <el-button size="medium" type="text">閫夋嫨鏂囦欢</el-button>
+ <div slot="tip" class="el-upload__tip">鏂囦欢涓嶈秴杩�50M</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>
@@ -65,10 +77,12 @@
],
prop:'date' ,//瀵瑰簲鏃ユ湡瀛楁鍚�
DayDataTree: [],
-
+ userId:undefined,
dialog_1: false,
handleTaskType: {},
upload_url: "",
+ desc_task: "",
+ upData: {},
fileList: [],
}
},
@@ -81,9 +95,9 @@
let nowDate = new Date();
var imoment = this.$moment(nowDate);
let iformat = imoment.format('YYYY-MM');
- let systemDate = iformat + '-01';
+ let systemDate = iformat + '-01 00:00:00';
this.getDatedef(systemDate);
-
+ this.userId = localStorage.getItem('userId');
},
methods: {
@@ -110,27 +124,58 @@
);
},
- handleTask(id, mustAttach) {
- this.handleTaskType.id = id;
- if(mustAttach) {
- this.dialog_1 = true;
- }
- else {
- this.doHandleTask();
- }
-
+ handleTask(id, mustAttach, type_itm) {
+ this.upload_url = "/api/api/file/fileUpload/" + id;
+ this.handleTaskType = type_itm;
+ this.dialog_1 = true;
},
doHandleTask() {
//姝d鐨勬槑缁嗕换鍔″畬鎴�
let id = this.handleTaskType.id;
- //璇锋眰鏀瑰彉姝ゆ槑缁嗙殑瀹屾垚鐘舵�侊紱
+ if(this.handleTaskType.mustAttach) {
+ this.upData = {//璁剧疆瑕佷紶鐨勫弬鏁�
+ desp: this.desc_task
+ },
+
+ this.$refs.upload.submit();//寮�濮嬩笂浼�
+ }
+ else {
+ var me = this;
+ let params = this.upData
+ let url = "/api/detail/deal/" + id;
+ this.$axios.get(url, {
+ params
+ })
+ .then(data_ => {
+ console.log(data_);
+ if(data_.data.success) {
+ this.$message('澶勭悊鎴愬姛');
+ me.Cancel();
+ }else {
+ this.$message({message:'澶勭悊浠诲姟澶辫触', type: 'warning'});
+ }
+ }).catch(error => {
+ console.log(error);
+ });
+ }
+
+
if (this.dialog_1) {
this.Cancel();
}
-
},
+
+ // submitUpload() {
+ // this.handleTaskType; //瑕佸鐞嗙殑鏄庣粏鏁版嵁
+
+ // this.upData = {//璁剧疆瑕佷紶鐨勫弬鏁�
+
+ // },
+ // this.upload_url = ""; //璁剧疆涓婁紶鎺ュ彛
+ // this.$refs.upload.submit();//寮�濮嬩笂浼�
+ // },
Cancel() {
this.dialog_1 = false;
@@ -139,7 +184,7 @@
dateChange(date_) {
var imoment = this.$moment(date_);
let iformat = imoment.format('YYYY-MM');
- let systemDate = iformat + '-01';
+ let systemDate = iformat + '-01 00:00:00';
this.getDatedef(systemDate);
},
@@ -159,48 +204,77 @@
{'date': "2020-01-01", 'task': 3}, //杩斿洖鐨勬暟缁勫瓧娈靛寘鍚繖涓や釜瀛楁
{'date': "2020-01-11", 'task': 2},
], */
+ let url = "/api/detail/getMonth";
+ let params = {
+ startTime: this.$moment(month_).format('YYYY-MM-DD')
+ };
+ this.$axios.get(url, {
+ params
+ })
+ .then(data_ => {
+ console.log(data_);
+ let datas= data_.data.data;
+ datas = datas.map(el => {
+ var imoment = this.$moment(el.date);
+ // 鏍煎紡鍖栨垚锛屽勾鏈堟棩
+ let iformat = imoment.format('YYYY-MM-DD');
+ el.date = iformat;
+ return el;
+ })
+ this.datedef = datas;
+ }).catch(error => {
+ console.log(error);
+ });
},
getDayData(date_) {//鑾峰彇鎸囧畾鏃ョ殑浠诲姟銆傚'2019-12-21'瀛楃涓层�傚湪鍙充晶鏄剧ず鐨�
- /* aa:[
- {'id': "椤圭洰鐨刬d", 'name': "椤圭洰鍚嶇О", 'desc': "椤圭洰鎻忚堪"}, //杩斿洖鐨勬暟缁勫瓧娈�
- {'id': "鏄庣粏鐨処D(鐢ㄤ簬澶勭悊鏃剁煡閬撴槸鍝釜椤圭洰鍝釜绫诲瀷鐨勫鐞�)", 'name': "绫诲瀷鍚嶇О", 'mustAttach': "鏈夋棤浜や粯鐗�", 'parentId': "椤圭洰id"}, //
- ], */
- let DayDatas = [
- {'id': "111", 'name': "娴嬭瘯1椤圭洰", 'desc': "姝ら」鐩富瑕侀拡瀵规彁楂樻晥鐜囧拰閿�鍞噺"}, //杩斿洖鐨勬暟缁勫瓧娈�
- {'id': "111_1", 'name': "绔嬮鏈嶅姟", 'mustAttach': true, 'parentId': "111"}, //
- {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", 'mustAttach': true, 'parentId': "111"}, //
- ];
+ let url = "/api/detail/getDay";
+ let params = {
+ startTime: this.$moment(date_).format('YYYY-MM-DD')
+ };
- let list = DayDatas;
- let parId = "";
- let obj = {};
- let result = [];
-
- list.map(el => {
- obj[el.id] = el;
- })
- for(let i=0, len = list.length; i < len; i++) {
- let id = list[i].parentId;
- //璁剧疆鏄剧ず瀛楁
- list[i].value = list[i].id;
- list[i].label = list[i].name;
-
- if(id == parId || !id) {
- if(!obj[list[i].id].children) {
- obj[list[i].id].children = [];
- }
- result.push(list[i]);
- continue;
- }
- if(obj[id].children) {
- obj[id].children.push(list[i]);
- } else {
- obj[id].children = [list[i]];
- }
- }
- this.DayDataTree = result;
+ this.$axios.get(url, {
+ params
+ })
+ .then(data_ => {
+ console.log(data_);
+ // let DayDatas = [
+ // {'id': "111", 'name': "娴嬭瘯1椤圭洰", 'desc': "姝ら」鐩富瑕侀拡瀵规彁楂樻晥鐜囧拰閿�鍞噺"}, //杩斿洖鐨勬暟缁勫瓧娈�
+ // {'id': "111_1", 'name': "绔嬮鏈嶅姟", 'mustAttach': true, 'parentId': "111"}, //
+ // {'id': "111_2", 'name': "鏂规寮�鍙戞湇鍔�", 'mustAttach': false, 'parentId': "111"}, //
+ // ];
+ let list = data_.data.data;
+ let parId = "";
+ let obj = {};
+ let result = [];
+
+ list.map(el => {
+ obj[el.id] = el;
+ })
+ for(let i=0, len = list.length; i < len; i++) {
+ let id = list[i].parentId;
+ //璁剧疆鏄剧ず瀛楁
+ list[i].value = list[i].id;
+ list[i].label = list[i].name;
+
+ if(id == parId || !id) {
+ if(!obj[list[i].id].children) {
+ obj[list[i].id].children = [];
+ }
+ result.push(list[i]);
+ continue;
+ }
+ if(obj[id].children) {
+ obj[id].children.push(list[i]);
+ } else {
+ obj[id].children = [list[i]];
+ }
+ }
+ this.DayDataTree = result;
+ }).catch(error => {
+ console.log(error);
+ })
}
--
Gitblit v1.8.0