修改显示工时

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

@@ -312,7 +312,7 @@
                                                     <p style="display: inline-block;" v-if="user.timeType.onlyShowPercent==0">{{$t('time.duration')}}：
                                                         <span v-if="item2.reportTimeType == 0" style="margin-right:10px;">{{typeList[item2.timeType]}}</span>
                                                         <span v-if="item2.reportTimeType == 2" style="margin-right:10px;">{{item2.startTime+'-'+item2.endTime}}</span>
-                                                    {{item2.time == '*' ? item2.time : item2.time.toFixed(1)}}h  
+                                                    {{item2.time == '*' ? item2.time : item2.time.toFixed(2)}}h  
                                                     <el-tag type="danger" size="mini" style="margin-left: 65px" v-if="item2.isOvertime === 1">{{$t('other.WorkOvertime')}}<span v-if="item2.overtimeHours">{{item2.overtimeHours === '*' ? '*' : item2.overtimeHours.toFixed(1)}}h</span></el-tag>
                                                     </p>
                                                     <p style="display: inline-block;" v-else>{{$t('lable.percentageOfTime')}}：
@@ -732,7 +732,7 @@
                         <el-form-item v-if="reportTimeType.type == 3" :label="$t('lable.percentageOfTime')" :prop="'domains.' + index + '.'+timeFields[reportTimeType.type]"
                             :rules="{ required: true, message: $t('defaultText.pleaseSetTheTimeRatio'), trigger: 'blur' }">
                             <div style="width:400px;">
-                                <el-col span="14"><el-slider :disabled="!domain.canEdit" v-model="domain.progress" :min="0" :show-tooltip="false" :step="5" style="width:280px;" @input="domain.workingTime = (workForm.totalDuration*domain.progress/100).toFixed(1)" @change="seleChn(0)" show-input="true" input-size="small"></el-slider></el-col>
+                                <el-col span="14"><el-slider :disabled="!domain.canEdit" v-model="domain.progress" :min="0" :show-tooltip="false" :step="5" style="width:280px;" @input="domain.workingTime = (workForm.totalDuration*domain.progress/100)" @change="seleChn(0)" show-input="true" input-size="small"></el-slider></el-col>
                                 <el-col :span="isBatch?6:10"><span style="margin-left:10px;float:right;"><span style="margin-right:10px;">{{domain.progress}}%</span><span v-if="isBatch == 0">{{domain.workingTime}}{{$t('time.hour')}}</span></span></el-col>
                             </div>
                             <div class="overtime" v-if="user.timeType.fillOvertime || isWeekend"><el-checkbox :disabled="!domain.canEdit" v-model="domain.isOvertime">{{$t('other.WorkOvertime')}}</el-checkbox>
@@ -4252,8 +4252,8 @@
                 var newIndex = index+1;
                 var itemDomain = {
                         projectId: this.workForm.domains[index].projectId,
-                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):(
-                            this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1)
+                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(2):(
+                            this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(2)
                         ),
                         content: "",
                         progress:leftProgress,
@@ -5011,7 +5011,7 @@
                     this.workForm.totalDuration = 0.5
                 }
                 this.workForm.domains.forEach(d=>{
-                    d.workingTime = (d.progress*this.workForm.totalDuration/100).toFixed(1);
+                    d.workingTime = (d.progress*this.workForm.totalDuration/100).toFixed(2);
                 });
                 //计算jsTime
                 if (this.workForm.createDate) {
@@ -5118,7 +5118,7 @@
                 }
                 if (this.reportTimeType.type == 3) {
                     //新增项目时，自动计算
-                    domain.workingTime = (this.reportTimeType.allday * domain.progress/100).toFixed(1);
+                    domain.workingTime = (this.reportTimeType.allday * domain.progress/100).toFixed(2);
                 }
                 //加载昱众的工作职责
                 if (this.user.companyId == this.yuzhongCompId) {
@@ -6721,7 +6721,7 @@
                                 domains: [{
                                     id: null,
                                     projectId: "",
-                                    workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1),
+                                    workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(2),
                                     content: "",
                                     progress:100,
                                     state: 2,
@@ -6751,7 +6751,7 @@
                                     return {
                                         id: null,
                                         projectId: item.projectId,
-                                        workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1),
+                                        workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(2),
                                         content: "",
                                         progress:100,
                                         state: 2,
@@ -6852,7 +6852,7 @@
                                 domains: [{
                                     id: null,
                                     projectId: "",
-                                    workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1),
+                                    workingTime: this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(2),
                                     content: "",
                                     progress:100,
                                     state: 2,
@@ -7548,7 +7548,7 @@
                             he += +zhi[i].workingTime
                         }
                     }
-                    zhi.he = he.toFixed(1) + 'h'
+                    zhi.he = he.toFixed(2) + 'h'
                 }
             },
             //按周填报选择的项目发生变化，需要设置列
@@ -8272,8 +8272,8 @@
                 }
                 var addItem = {
                         projectId: "",
-                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(1):(
-                            this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(1)
+                        workingTime: this.reportTimeType.type == 3?(leftProgress*this.reportTimeType.allday/100).toFixed(2):(
+                            this.reportTimeType.type==2?"":(this.reportTimeType.allday).toFixed(2)
                         ),
                         content: "",
                         progress:leftProgress,

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

@@ -170,7 +170,7 @@
                                       <span v-if="item.multiWorktime==1">{{ $t('other.project') }}</span>
                                       <span>{{$t('time.duration')}}：</span>
                                       <span v-if="item.startTime">{{ item.startTime + '-' + item.endTime }}</span>
-                                      <span>{{item.time.toFixed(1)}}h </span>
+                                      <span>{{item.time.toFixed(2)}}h </span>
                                       <span class="propsbtn" v-if="item.isOvertime === 1">
                                       <el-tag type="danger" size="mini" style="margin-left: 65px">{{ $t('other.WorkOvertime') }}<span v-if="item.overtimeHours">{{item.overtimeHours.toFixed(1)}}{{$t('time.hour')}}</span></el-tag></span>
                                   </p>