Merge remote-tracking branch 'origin/master'

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

@@ -312,8 +312,8 @@
                                                     <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.toFixed(1)}}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.toFixed(1)}}h</span></el-tag>
+                                                    {{item2.time == '*' ? item2.time : item2.time.toFixed(1)}}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')}}：
                                                         <span style="margin-right:10px;">{{item2.progress}}%</span>
@@ -322,7 +322,7 @@
                                                     <p>{{$t('other.matters')}}：<span v-html="item2.content"></span></p>
                                                     </div>
                                                     <div v-if="item2.multiWorktime==1" >
-                                                        <p>{{$t('other.projectDuration')}}：{{item2.time.toFixed(1)}}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.toFixed(1)}}h</span></el-tag></p>
+                                                        <p>{{$t('other.projectDuration')}}：{{item2.time == '*' ? item2.time : item2.time.toFixed(1)}}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>
                                                         <div v-for="(timeItem, tIndex) in item2.worktimeList" :key="tIndex"
                                                             style="border: 0.5px #ddd solid;margin-bottom:5px;padding:5px;">
                                                             <p style="display: inline-block;">{{$t('time.duration')}}：
@@ -2700,6 +2700,9 @@
             
             // 过滤
             amounts(value) {
+                if(value == '*') {
+                    return '*'
+                }
                 if(value == NaN || value == undefined || value == 'undefined' || value == null || value == 'null') {
                     return 0
                 }