解决编辑日报时，之前的时间范围丢失

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

@@ -172,20 +172,20 @@
                         <!--时间范围选择 -->
                         <el-time-picker 
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
+                            v-model="domain.startTime"
                             placeholder="起始时间"
                             style="width:120px;"
                             format="HH:mm"
-                            v-model="domain.startTime"
                             :picker-options="{
                             start: '08:00',
                             end: '23:30'
                             }">
                         </el-time-picker> - <el-time-picker 
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
+                            v-model="domain.endTime"
                             placeholder="结束时间"
                             style="width:120px;"
                             format="HH:mm"
-                            v-model="domain.endTime"
                             :picker-options="{
                             start: '08:00',
                             end: '23:30',
@@ -194,6 +194,30 @@
                         </el-time-picker>
                         </span>
                         <div class="overtime"><el-checkbox v-model="domain.isOvertime">加班</el-checkbox></div>
+                    <!--  -->
+                        <!-- <el-time-select 
+                        :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
+                            placeholder="起始时间"
+                            style="width:120px;"
+                            v-model="domain.startTime"
+                            :picker-options="{
+                            start: '08:00',
+                            step: '00:30',
+                            end: '23:30'
+                            }">
+                        </el-time-select> - <el-time-select 
+                        :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
+                            placeholder="结束时间"
+                            style="width:120px;"
+                            v-model="domain.endTime"
+                            :picker-options="{
+                            start: '08:00',
+                            step: '00:30',
+                            end: '23:30',
+                            minTime: domain.startTime
+                            }">
+                        </el-time-select> -->
+                    <!--  -->
                     </el-form-item>
                     
                     <el-form-item label="投入项目" :prop="'domains.' + index + '.projectId'"
@@ -326,7 +350,8 @@
                     label: 'label'
                 },
                 isNew: false,
-                selected: false
+                selected: false,
+                valuet: new Date()
             };
         },
         methods: {
@@ -889,6 +914,8 @@
                             var arr = [];
                             this.canEdit = false;
                             for(var i in list.report) {
+                                var flg = null
+                                list.report[i].isOvertime == 1 ? flg = true : flg = false
                                 arr.push({
                                     id: list.report[i].id,
                                     projectId: list.report[i].projectId,
@@ -900,6 +927,11 @@
                                     taskList: list.report[i].taskList,
                                     subProjectId: list.report[i].subProjectId,
                                     taskId: list.report[i].taskId,
+                                    startTime: `Fri May 14 2021 ${list.report[i].startTime}:12 GMT+0800 (中国标准时间)`,
+                                    // startTime: list.report[i].startTime,
+                                    endTime: `Fri May 14 2021 ${list.report[i].endTime}:12 GMT+0800 (中国标准时间)`,
+                                    // endTime: list.report[i].endTime
+                                    isOvertime: flg
                                 })
                                 if (list.report[i].state >= 2) {
                                     this.canEdit = true;
@@ -946,7 +978,7 @@
                     this.isDisable = true;
                 }
                 let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);
-                this.workForm.createDate = this.date + day;
+                this.workForm.createDate = this.date + day; // 获取个人某天的日报
                 this.getReport(i);
                 this.dialogVisible = true;
             },

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -310,6 +310,8 @@
                             let array = [];
                             for(var i in list) {
                                 var projectName = "";
+                                var flg = null
+                                list[i].isOvertime == 1 ? flg = true : flg = false
                                 for(var j in this.project) {
                                     if(this.project[j].id == list[i].projectId) {
                                         projectName = this.project[j].projectName;
@@ -323,7 +325,10 @@
                                     content: list[i].content,
                                     state: list[i].state,
                                     timeType: list[i].timeType,
-                                    label: timeType[list[i].timeType].label
+                                    label: timeType[list[i].timeType].label,
+                                    startTime: list[i].startTime,
+                                    endTime: list[i].endTime,
+                                    isOvertime: flg
                                 })
                                 if (list[i].state >= 2) {
                                     this.canEdit = true;