From 7345595fdb083a70e8c708dce246af34b2d7f69f Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 23 六月 2024 23:45:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b3-work-time-management/work-time-statistics.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b3-work-time-management/work-time-statistics.vue b/src/components/do/b3-work-time-management/work-time-statistics.vue
index 710d6f7..8f32955 100644
--- a/src/components/do/b3-work-time-management/work-time-statistics.vue
+++ b/src/components/do/b3-work-time-management/work-time-statistics.vue
@@ -125,7 +125,9 @@
inputType:聽'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
},
entity:{
- month:getYearAndMonthAndDays()
+ month:getYearAndMonthAndDays(),
+ name:'',
+ departLims:''
},
entityCopy:{},
entityCopy0:{},
@@ -194,13 +196,13 @@
let entity = {...this.entity}
entity.month = entity.month.split('-')[0]+'-'+entity.month.split('-')[1]
this.outLoading = true
- this.$axios.get(this.$api.auxiliaryOriginalHours.exportOriginalHours,{
- params:entity,
+ this.$axios.post(this.$api.auxiliaryOriginalHours.exportOriginalHours,{
+ ...entity
+ // params:entity,
},{responseType: "blob"}).then(res => {
this.outLoading = false
this.$message.success('瀵煎嚭鎴愬姛')
const blob = new Blob([res],{ type: 'application/octet-stream' });
- console.log(blob)
const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
--
Gitblit v1.9.3