Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs

zhangyanpeng

2020-01-22 a7c8080195f6b936b75a6a4129805e0a6766968f

 src/views/calendarTask.vue

@@ -13,9 +13,9 @@
      <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>
               <span>{{k_+1}}、{{type_itm.typeStr}}</span>
               <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>
@@ -30,15 +30,15 @@
            <el-upload
               class="upload-demo"
               :action="upload_url"
               multiple
					
               :data="upData"
               :limit="3"
               :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>
               <div slot="tip" class="el-upload__tip">文件不超过50M</div>
            </el-upload>
         </div>
         <div style="text-align: left;">
@@ -95,7 +95,7 @@
               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);
               
            },
@@ -125,6 +125,7 @@
          },
               
               handleTask(id, mustAttach, type_itm) {
                  this.upload_url = "/api/api/file/fileUpload/" + id;
                  this.handleTaskType = type_itm;
                  this.dialog_1 = true;
               },
@@ -132,8 +133,34 @@
               doHandleTask() {
                  //此id的明细任务完成
                  let id = this.handleTaskType.id;
                  //请求改变此明细的完成状态；
                  this.desc_task;//描述的内容
                  if(this.handleTaskType.mustAttach) {
                     this.upData = {//设置要传的参数
                        desp: this.desc_task
                     },
							
                     this.$refs.upload.submit();//开始上传
                  }
                  else {
                     let params = this.upData
                     let url = "/api/detail/deal/" + id;
                     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);
                        });
                  }
                  
                  
                  
@@ -142,15 +169,15 @@
                  }
               },
               
               submitUpload() {
                  this.handleTaskType; //要处理的明细数据
               // submitUpload() {
               //    this.handleTaskType; //要处理的明细数据
                  
                  this.upData = {//设置要传的参数
               //    this.upData = {//设置要传的参数
                     
                  },
                  this.upload_url = ""; //设置上传接口
                 this.$refs.upload.submit();//开始上传
               },
               //    },
               //    this.upload_url = ""; //设置上传接口
               //   this.$refs.upload.submit();//开始上传
               // },
               
               Cancel() {
                  this.dialog_1 = false;
@@ -159,7 +186,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);
               },
               
@@ -179,23 +206,47 @@
                     {'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': "项目的id", 'name': "项目名称", 'desc': "项目描述"}, //返回的数组字段
                     {'id': "明细的ID(用于处理时知道是哪个项目哪个类型的处理)", 'name': "类型名称", 'mustAttach': "有无交付物", 'parentId': "项目id"}, //
                  ], */
                  let DayDatas = [
                     {'id': "111", 'name': "测试1项目", 'desc': "此项目主要针对提高效率和销售量"}, //返回的数组字段
                     {'id': "111_1", 'name': "立题服务", 'mustAttach': true, 'parentId': "111"}, //
                     {'id': "111_2", 'name': "方案开发服务", 'mustAttach': false, 'parentId': "111"}, //
                  ];
                  let url = "/api/detail/getDay";
                  let params =  {
                     startTime: this.$moment(date_).format('YYYY-MM-DD')
                  };
                  
                  let list = DayDatas;
                  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 = [];
@@ -223,6 +274,9 @@
                      }
                  }
                  this.DayDataTree = result;
                     }).catch(error => {
                        console.log(error);
                     })
                  
               }