填报表自行选择时间处理完成

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

@@ -168,39 +168,30 @@
                         </el-select>
                         <span v-if="reportTimeType.type == 1">小时</span>
 
-                        <!-- 是否加班 -->
-                            <!-- <el-checkbox v-model="domain.isOvertime">加班</el-checkbox> -->
-
-                        <!-- <div class="overtime">
-                            <input type="checkbox" :checked='selected' @click="check">
-                            <span>加班</span>
-                        </div> -->
-                        <!-- /是否加班 -->
-                        
                         <span v-if="reportTimeType.type == 2">
                         <!--时间范围选择 -->
-                        <el-time-select 
+                        <el-time-picker 
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
                             placeholder="起始时间"
                             style="width:120px;"
+                            format="HH:mm"
                             v-model="domain.startTime"
                             :picker-options="{
                             start: '08:00',
-                            step: '00:30',
                             end: '23:30'
                             }">
-                        </el-time-select> - <el-time-select 
+                        </el-time-picker> - <el-time-picker 
                         :disabled="workForm.domains.length==0?true:(workForm.domains[index].state>=2?false:true)"
                             placeholder="结束时间"
                             style="width:120px;"
+                            format="HH:mm"
                             v-model="domain.endTime"
                             :picker-options="{
                             start: '08:00',
-                            step: '00:30',
                             end: '23:30',
                             minTime: domain.startTime
                             }">
-                        </el-time-select>
+                        </el-time-picker>
                         </span>
                         <div class="overtime"><el-checkbox v-model="domain.isOvertime">加班</el-checkbox></div>
                     </el-form-item>
@@ -1074,8 +1065,18 @@
                             } 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);
+                                // 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);
+
                             }
                             
                             
@@ -1086,7 +1087,6 @@
                             }
                             
                             formData.append("createDate", this.workForm.createDate);
-                            console.log(this.workForm.domains[i].isOvertime,123);
                             if(this.workForm.domains[i].isOvertime == undefined ) {
                                 this.workForm.domains[i].isOvertime = '0'
                                 formData.append("isOvertime", this.workForm.domains[i].isOvertime);
@@ -1097,10 +1097,7 @@
                                 this.workForm.domains[i].isOvertime = '1'
                                 formData.append("isOvertime", this.workForm.domains[i].isOvertime);
                             }
-                            // formData.append("isOvertime", this.workForm.domains[i].isOvertime);
                         }
-                        console.log(123,this.workForm);
-                        console.log(formData);
                         this.http.uploadFile( this.port.report.editPort, formData,
                         res => {
                             this.listLoading = false;
@@ -1129,7 +1126,6 @@
                     }
                 });
             },
-
             // 跳转
             junpToDeskTop(id) {
                 let day = this.choseDay > 9 ? "-" + (this.choseDay + 1) : "-0" + (this.choseDay + 1);