From ab83d8321f1a61e15a47362c20c896fdb6b9195f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 06 三月 2025 17:37:57 +0800
Subject: [PATCH] bug修复
---
src/views/CNAS/externalService/supplierManage/index.vue | 2 +-
src/views/performance/manHour/workTimeManagement.vue | 3 ++-
src/api/cnas/personal/personalList.js | 2 +-
src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/api/cnas/personal/personalList.js b/src/api/cnas/personal/personalList.js
index 567c481..a96377e 100644
--- a/src/api/cnas/personal/personalList.js
+++ b/src/api/cnas/personal/personalList.js
@@ -30,7 +30,7 @@
return request({
url: "/personBasicInfo/exportPersonBasicInfoById",
method: "get",
- data: query,
+ params: query,
responseType: "blob"
});
}
diff --git a/src/views/CNAS/externalService/supplierManage/index.vue b/src/views/CNAS/externalService/supplierManage/index.vue
index b16a2a7..ec7cba1 100644
--- a/src/views/CNAS/externalService/supplierManage/index.vue
+++ b/src/views/CNAS/externalService/supplierManage/index.vue
@@ -13,7 +13,7 @@
</el-form>
</div>
<div>
- <el-button size="medium" @click="exportExcel">瀵� 鍑�</el-button>
+<!-- <el-button size="medium" @click="exportExcel">瀵� 鍑�</el-button>-->
<el-button size="medium" type="primary" @click="showDialog('add')">鏂� 澧�</el-button>
</div>
</div>
diff --git a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
index eac1bed..eab557f 100644
--- a/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
+++ b/src/views/CNAS/personnel/personnelInfo/tabs/personnel-information.vue
@@ -688,6 +688,7 @@
methods: {
// 涓嬭浇妗ｆ
downPerson() {
+ console.log('this.clickNodeVal.userId',this.clickNodeVal.userId)
exportPersonBasicInfoById({ id: this.clickNodeVal.userId }).then(res => {
const blob = new Blob([res], { type: 'application/msword' });
this.$download.saveAs(blob, '浜哄憳妗ｆ.docx');
diff --git a/src/views/performance/manHour/workTimeManagement.vue b/src/views/performance/manHour/workTimeManagement.vue
index 9e7a9c0..7fb4049 100644
--- a/src/views/performance/manHour/workTimeManagement.vue
+++ b/src/views/performance/manHour/workTimeManagement.vue
@@ -518,9 +518,10 @@
param = { ...entity, ...this.page };
} else {
param = { ...this.entity, ...this.page };
- param.dateTime = JSON.stringify(param.dateTime);
+ param.dateTime = param.dateTime?.length > 0 ? JSON.stringify(param.dateTime) : null;
}
delete param.total;
+ console.log('11111111111111111')
selectAuxiliaryWorkingHoursDay({ ...param })
.then((res) => {
this.tableLoading = false;
--
Gitblit v1.9.3