Browse Source

每月研发工时未显示数据的bug

ljb 8 months ago
parent
commit
61c2d80b9e

+ 1 - 1
src/views/yf-cost-manage/yf-cost-statistics/person-cost-statistics/person-allocation-list.vue

@@ -92,7 +92,7 @@ export default window.$crudCommon({
       return summaryMethod(columns, data, this.option.sumColumnList, 'personnelType');
       return summaryMethod(columns, data, this.option.sumColumnList, 'personnelType');
     },
     },
     handleExport() {
     handleExport() {
-      exportBloByPost(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+      exportBloByPost(`/api/kd-scientific/technician/myyfryrgfyfpb/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.pageTitle}.xlsx`);
         downloadXls(res.data, `${this.pageTitle}.xlsx`);
       });
       });
     },
     },

+ 2 - 2
src/views/yf-cost-manage/yf-cost-statistics/person-cost-statistics/project-allocation-list.vue

@@ -51,7 +51,7 @@
 
 
 <script>
 <script>
 import YearMonthSelect from "@/components/year-month-select";
 import YearMonthSelect from "@/components/year-month-select";
-import {exportBlob} from "@/api/common";
+import {exportBloByPost} from "@/api/common";
 import {getToken} from "@/util/auth";
 import {getToken} from "@/util/auth";
 import {downloadXls, summaryMethod} from "@/util/util";
 import {downloadXls, summaryMethod} from "@/util/util";
 import moment from "moment";
 import moment from "moment";
@@ -92,7 +92,7 @@ export default window.$crudCommon({
       return summaryMethod(columns, data, this.option.sumColumnList, 'xmmc');
       return summaryMethod(columns, data, this.option.sumColumnList, 'xmmc');
     },
     },
     handleExport() {
     handleExport() {
-      exportBlob(`/api/kd-scientific/attendance/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
+      exportBloByPost(`/api/kd-scientific/technician/myyfxmrgfyhzb/export?${this.website.tokenHeader}=${getToken()}`, this.params).then(res => {
         downloadXls(res.data, `${this.pageTitle}.xlsx`);
         downloadXls(res.data, `${this.pageTitle}.xlsx`);
       });
       });
     },
     },

+ 3 - 1
src/views/yf-cost-manage/yf-cost-statistics/person-cost-statistics/yf-work-hours-allocation-list.vue

@@ -183,6 +183,7 @@ export default window.$crudCommon({
   },
   },
   methods: {
   methods: {
     refreshTableCol(yearAndMonth) {
     refreshTableCol(yearAndMonth) {
+      this.allMonthCols = [];
       let yearMonth = moment(yearAndMonth).format("YYYY-MM").split("-");
       let yearMonth = moment(yearAndMonth).format("YYYY-MM").split("-");
       const monthDays = getMonthDatesWithMarkers(Number(yearMonth[0]), Number(yearMonth[1]));
       const monthDays = getMonthDatesWithMarkers(Number(yearMonth[0]), Number(yearMonth[1]));
       for (let i=monthDays.length; i<31; i++) {
       for (let i=monthDays.length; i<31; i++) {
@@ -210,8 +211,8 @@ export default window.$crudCommon({
             align: 'center',
             align: 'center',
             isWorkDay: ChineseHoliday.isWorkday(item.dateString),
             isWorkDay: ChineseHoliday.isWorkday(item.dateString),
             showOverflowTooltip: true,
             showOverflowTooltip: true,
-            hide: item.hide
           };
           };
+          this.allMonthCols.push(moment(item.dateString).format('yyyyMMDD'),);
         }
         }
         if (!ChineseHoliday.isWorkday(item.dateString)) {
         if (!ChineseHoliday.isWorkday(item.dateString)) {
           col.labelClassName = 'red';
           col.labelClassName = 'red';
@@ -265,6 +266,7 @@ export default window.$crudCommon({
       }
       }
       return item;
       return item;
     });
     });
+    console.log(data)
     return data;
     return data;
   },
   },
 });
 });