From 6c63d016a37fdbb8f68d9c29f0c87f1ddbf637fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=A5=E5=A6=8D?= <3096114695@qq.com>
Date: Thu, 13 Jul 2023 14:41:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2078+16=E4=B8=AA=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=AA=8C=E6=94=B6=E9=97=AE=E9=A2=98=E5=85=A8=E9=83=A8=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/laborManagement/payoff.js         | 4 ++--
 src/views/projectFront/laborManage/Payoff/index.vue | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/assets/js/api/laborManagement/payoff.js b/src/assets/js/api/laborManagement/payoff.js
index e18af172..461c2d09 100644
--- a/src/assets/js/api/laborManagement/payoff.js
+++ b/src/assets/js/api/laborManagement/payoff.js
@@ -30,12 +30,12 @@ export function payrollRecordDetailById(data) {
 
 // 导出人员工资pdf 
 export function exportSalaryPdf(params) {
-  window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/salaryPdf?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}`;
+  window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/salaryPdf?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}&userEnterpriseId=${params.enterpriseId||''}`;
 }
 
 // 导出工资列表excel 
 export function exportSalaryExcel(params) {
-  window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/excelProjectWages?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}`;
+  window.location.href = axios.defaults.baseURL +`xmgl/workerWagesPayment/excelProjectWages?projectSn=${params.projectSn}&teamId=${params.teamId||''}&departmentId=${params.departmentId||''}&payMonth=${params.payMonth||''}&payStatus=${params.payStatus||''}&userEnterpriseId=${params.enterpriseId||''}`;
 }
 
 // 导入工资列表excel 
diff --git a/src/views/projectFront/laborManage/Payoff/index.vue b/src/views/projectFront/laborManage/Payoff/index.vue
index eb53a397..da7928da 100644
--- a/src/views/projectFront/laborManage/Payoff/index.vue
+++ b/src/views/projectFront/laborManage/Payoff/index.vue
@@ -111,6 +111,7 @@
                 <el-button @click="handleExportExcel">导出 Excel</el-button>
                 <el-upload
                   style="display: inline-block; margin-left: 15px"
+                  ref="upload"
                   class="upload-demo"
                   name="excelFile"
                   :action="
@@ -512,7 +513,8 @@ export default {
         teamId: this.queryParams.teamId,
         departmentId: this.queryParams.departmentId,
         payStatus:this.queryParams.payStatus,
-        payMonth: this.queryParams.payMonth
+        payMonth: this.queryParams.payMonth,
+        enterpriseId: this.queryParams.enterpriseId 
       }
       exportSalaryPdf(params)
     },
@@ -523,15 +525,18 @@ export default {
         teamId: this.queryParams.teamId,
         departmentId: this.queryParams.departmentId,
         payStatus:this.queryParams.payStatus,
-        payMonth: this.queryParams.payMonth
+        payMonth: this.queryParams.payMonth,
+        enterpriseId: this.queryParams.enterpriseId 
       }
       // console.log('导出参数',params)
       exportSalaryExcel(params)
     },
     handleUploadSuccess(res) {
+      console.log('导入成功')
       if (res.code == 200) {
         this.$message.success(res.message);
         this.getEnterpriseList()
+        this.$refs.upload.clearFiles();
       } else {
         this.$message.error(res.message);
       }