提交工时管家代码

fhKeeper/formulahousekeeper/timesheet/src/views/corpreport/list.vue

@@ -2692,7 +2692,6 @@ export default {
           this.userId ? sl.userId = this.userId : ''
           dept ? sl.deptId = dept : ''
         } else if(this.ins == 24) {
-          this.exportReportLoading = true
           if(this.tabsType == 'all') {
             fName = this.$t('fenZuHaoYongJinDuBiao') + '.xlsx'
             url = "/project/exportGroupExpendProcessList"
@@ -2744,6 +2743,7 @@ export default {
           sl.startDate = this.rangeDatas[0]
           sl.endDate = this.rangeDatas[1]
         }
+        this.exportReportLoading = true
           this.http.post(url, sl,
             res => {
                 this.exportReportLoading = false

fhKeeper/formulahousekeeper/timesheet/src/views/project/detail.vue

@@ -221,6 +221,13 @@
                         type: 'bar',
                         barMaxWidth: 30,
                         data: yList,
+                        label: {
+                            normal: {
+                                show: true,
+                                position: 'top',
+                                formatter: `{c} ${this.yAxisValue == 0 ? '元' : '小时'}`,
+                            }
+                        }
                     }]
                 };
                 myChart.setOption(option,{notMerge: true});