编辑日报时间BUG解决

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -2135,9 +2135,11 @@ toolbar: 'bold italic underline strikethrough | fontsizeselect | forecolor backc
     position: relative;
 }
 .remind {
-    width: 30%;
-    height: 100%;
+    width: 90px;
+    height: 80%;
     position: absolute;
+    background: #fff;
+    padding: 10px;
     left: 0;
     top: 0;
 }

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

@@ -176,6 +176,7 @@
                             placeholder="起始时间"
                             style="width:120px;"
                             format="HH:mm"
+                            value-format="HH:mm"
                             :picker-options="{
                             start: '08:00',
                             end: '23:30'
@@ -186,6 +187,7 @@
                             placeholder="结束时间"
                             style="width:120px;"
                             format="HH:mm"
+                            value-format="HH:mm"
                             :picker-options="{
                             start: '08:00',
                             end: '23:30',
@@ -927,10 +929,10 @@
                                     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
+                                    // startTime: `Fri May 16 2021 ${list.report[i].startTime}:12 GMT+0800 (中国标准时间)`,
+                                    startTime: list.report[i].startTime,
+                                    // endTime: `Fri May 16 2021 ${list.report[i].endTime}:12 GMT+0800 (中国标准时间)`,
+                                    endTime: list.report[i].endTime,
                                     isOvertime: flg
                                 })
                                 if (list.report[i].state >= 2) {
@@ -1097,18 +1099,10 @@
                             } else if (this.reportTimeType.type == 1){
                                 formData.append("workingTime", this.workForm.domains[i].workingTime);
                             } else if (this.reportTimeType.type == 2) {
-                                // formData.append("startTime", this.workForm.domains[i].startTime);
-                                // formData.append("endTime", this.workForm.domains[i].endTime);
-                                var e = this.workForm.domains[i].endTime
-                                var s = this.workForm.domains[i].startTime
-                                var endTime = e.getHours() + ':' + e.getMinutes()
-                                this.dayDefault = endTime.split(' ')[1]
-                                formData.append("endTime", endTime);
-
-                                var startTime = s.getHours() + ':' + s.getMinutes()
-                                this.dayDefault = startTime.split(' ')[1]
-                                formData.append("startTime", startTime);
 
+                                formData.append("endTime", this.workForm.domains[i].endTime);
+                                formData.append("startTime", this.workForm.domains[i].startTime);
+                                
                             }
                             
                             
@@ -1157,6 +1151,9 @@
                         });
                     }
                 });
+            },
+            cli() {
+                
             },
             // 跳转
             junpToDeskTop(id) {