فهرست منبع

可配置,工时报工页面仅显示用时占比,不显示小时数。

QuYueTing 9 ماه پیش
والد
کامیت
78e415e085

+ 7 - 0
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/TimeType.java

@@ -611,6 +611,13 @@ public class TimeType extends Model<TimeType> {
     private String thirdAuditor;
 
 
+    /**
+     * 工时报告页面,查看时仅显示比例;
+     */
+    @TableField("only_show_percent")
+    private Integer onlyShowPercent;
+
+
     @Override
     protected Serializable pkVal() {
         return this.companyId;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 2 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/TimeTypeMapper.xml


+ 6 - 2
fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -165,7 +165,7 @@
                                         {{item1.name}}
                                     </span>
                                     <span style="margin-left:30px;">
-                                        <span style="margin-right:20px;">
+                                        <span style="margin-right:20px;" v-if="user.timeType.onlyShowPercent==0">
                                             <!-- <i v-if="parseFloat(item1.reportTime)>parseFloat(item1.calculateTime)+0.5" style="color:red;margin-right:8px;" class="fa fa-exclamation-triangle"></i> -->
                                             <!-- 工作总时长: -->
                                             {{$t('other.totalWorkingHours')}}
@@ -304,12 +304,16 @@
                                                         <span style="margin-left:10px;" v-if="user.companyId==3092">-- {{ $t('fuWu') }} :{{ item2.sapServiceName }}</span>
                                                     </p>
                                                     <div v-if="item2.multiWorktime==0">
-                                                    <p style="display: inline-block;">{{$t('time.duration')}}:
+                                                    <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>
                                                     </p>
+                                                    <p style="display: inline-block;" v-else>{{$t('lable.percentageOfTime')}}:
+                                                        <span style="margin-right:10px;">{{item2.progress}}%</span>
+                                                    </p>
+                                                    
                                                     <p>{{$t('other.matters')}}:<span v-html="item2.content"></span></p>
                                                     </div>
                                                     <div v-if="item2.multiWorktime==1" >