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

kimi

2020-03-18 fadf2795757ac6df1c792546725ea177c93d9d7a

 src/views/calendarTask.vue

@@ -13,35 +13,49 @@
      <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"
               :on-success="upSuccess"
               :on-error="upError"
					
               >
               <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 +79,12 @@
                  ],
                  prop:'date' ,//对应日期字段名
                  DayDataTree: [],
						
                  userId:undefined,
                  dialog_1: false,
                  handleTaskType: {},
                  upload_url: "",
                  desc_task: "",
                  upData: {},
                  fileList: [],
           }
        },
@@ -81,9 +97,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 +126,70 @@
                  );
          },
               
               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() {
                  //此id的明细任务完成
                  let id = this.handleTaskType.id;
                  //请求改变此明细的完成状态；
                  if (!this.desc_task) {
                     this.$message('请填写描述');
                     return
                  }
                  this.upData = {//设置要传的参数
                     desp: this.desc_task
                  };
						
                  if(this.handleTaskType.mustAttach) {
                     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();//开始上传
             },
				 
             upSuccess(response, file, fileList) {
                this.$message('上传成功');
             },
				 
             upError(err, file, fileList) {
                this.$message('上传失败');
             },
               
               Cancel() {
                  this.dialog_1 = false;
@@ -139,7 +198,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 +218,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': "项目的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': 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);
                     })
                  
               }