Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/components/taskComponent.vue

@@ -915,12 +915,15 @@ export default {
                 this.getDetail(obj.curProjectId)
             }
             this.curProjectId = obj.task.projectId;
-            this.getTaskDetail(obj.id);
+            // this.getTaskDetail(obj.id);
             this.getTaskProgressList(obj.id); // 获取任务进展列表 
             this.gain(obj.task); // 获取评论列表
             this.getDailyList(obj.id) // 获取来自日报
             this.getRelationTaskList(obj.num, obj.id)
             this.getTaskFileList(obj.num,obj.id)
+            setTimeout(() => {
+                this.getTaskDetail(obj.id);
+            }, 200)
         }
         this.getrelation();
     },

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -1121,7 +1121,6 @@
                     <el-date-picker
                         v-model="exportParam.dateRange" :editable="false" 
                         format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
-                        :clearable="true" 
                         :range-separator="$t('other.to')"
                         type="daterange" 
                         :start-placeholder="$t('time.startDate')"