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

zhangyanpeng

2020-02-11 355d7d39a67bc1fc27ed1e391799ff7fcc3b2aa7

 src/views/calendarTask.vue

@@ -16,7 +16,7 @@
            <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.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>
               <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>
@@ -77,7 +77,7 @@
                  ],
                  prop:'date' ,//对应日期字段名
                  DayDataTree: [],
						
                  userId:undefined,
                  dialog_1: false,
                  handleTaskType: {},
                  upload_url: "",
@@ -97,7 +97,7 @@
               let iformat = imoment.format('YYYY-MM');
               let systemDate = iformat + '-01 00:00:00';
               this.getDatedef(systemDate);
					
               this.userId = localStorage.getItem('userId');
            },
            
        methods: {
@@ -141,6 +141,7 @@
                     this.$refs.upload.submit();//开始上传
                  }
                  else {
                     var me = this;
                     let params = this.upData
                     let url = "/api/detail/deal/" + id;
                     this.$axios.get(url, {
@@ -148,15 +149,12 @@
                        })
                        .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;
                           if(data_.data.success) {
                              this.$message('处理成功');
                              me.Cancel();
                           }else {
                              this.$message({message:'处理任务失败', type: 'warning'});
                           }
                        }).catch(error => {
                           console.log(error);
                        });