ソースを参照

调整日报和日报待审核显示不一致的问题

Lijy 2 年 前
コミット
fc186c2c14

+ 4 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -120,7 +120,7 @@
                                         <el-tooltip v-if="progressItem.auditState == 2" :content="$t('state.notThrough')" effect="light" placement="top">
                                         <i  class="iconfont firerock-iconshenhebohui"></i>
                                         </el-tooltip>
-                                        </span>
+                                        </span> 
                                 </p>
                                 <p v-if="item.taskId != null">{{$t('other.task')}}:{{item.taskName}}</p>
                                 <p v-if="item.groupId">
@@ -128,7 +128,9 @@
                                     <!-- 阶段 -->
                                     <span v-if="item.stage != null" style="margin-left:10px;"> {{$t('other.inputStage')}}:{{item.stage}}</span>
                                 </p>
-                                <p><span v-if="item.multiWorktime==1">{{ $t('other.project') }}</span>{{$t('time.duration')}}:{{item.time.toFixed(1)}}h <span class="propsbtn" v-if="item.isOvertime === 1">
+                                <p><span v-if="item.multiWorktime==1">{{ $t('other.project') }}</span>{{$t('time.duration')}}:
+                                    <span v-if="item.startTime">{{ item.startTime + '-' + item.endTime }}</span>
+                                    {{item.time.toFixed(1)}}h <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>
                                 <div v-if="item.multiWorktime==0">