From da6a8266f6c428f7ec9ce417765a3e8202b871a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 26 Jun 2024 10:02:45 +0800
Subject: [PATCH]  hotfix/2.14.2.2406.02

---
 .../analysisOfSalaryStatistics/components/salaryDetails.js  | 6 +++++-
 pc4mobx/hrmSalary/pages/payrollFiles/config/index.js        | 3 ++-
 pc4mobx/hrmSalary/stores/payrollFiles.js                    | 3 ++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
index 9d8d2816..3f01a8bf 100644
--- a/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
+++ b/pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/salaryDetails.js
@@ -99,13 +99,17 @@ class SalaryDetails extends Component {
     }).catch(() => this.setState({ loading: false }));
   };
   handleExportSalaryList = (key) => {
+    const { attendanceStore: { tableStore } } = this.props;
     let { selectedRowKeys, payload } = this.state;
     if (key === "SELECTED" && selectedRowKeys.length === 0) {
       message.warning(getLabel(543345, "请选择需要导出的数据！"));
       return;
     }
     WeaLoadingGlobal.start();
-    const promise = API.exportSalaryList({ ...payload, ids: key === "SELECTED" ? selectedRowKeys : [] });
+    const promise = API.exportSalaryList({
+      ...payload, ids: key === "SELECTED" ? selectedRowKeys : [],
+      columns: _.map(_.filter(toJS(tableStore.columns), (item) => item.display === "true" && item.dataIndex !== "acctTimes"), o => o.dataIndex)
+    });
   };
   getColumns = () => {
     const { attendanceStore: { tableStore } } = this.props;
diff --git a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
index 25b815a0..e1ee1288 100644
--- a/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
+++ b/pc4mobx/hrmSalary/pages/payrollFiles/config/index.js
@@ -324,10 +324,11 @@ export const salaryFileSearchConditions = [
       },
       {
         conditionType: "SELECT",
-        domkey: ["taxAgentId"],
+        domkey: ["taxAgentIds"],
         fieldcol: 16,
         label: getLabel(537996, "个税扣缴义务人"),
         labelcol: 8,
+        multiple: true,
         options: [],
         viewAttr: 2
       },
diff --git a/pc4mobx/hrmSalary/stores/payrollFiles.js b/pc4mobx/hrmSalary/stores/payrollFiles.js
index c9095936..d70e0113 100644
--- a/pc4mobx/hrmSalary/stores/payrollFiles.js
+++ b/pc4mobx/hrmSalary/stores/payrollFiles.js
@@ -24,11 +24,12 @@ export class PayrollFilesStore {
   @action("薪资档案-列表查询")
   queryList = (payload = {}, searchItemsValue = {}, url = "") => {
     return new Promise((resolve, reject) => {
-      const { departmentIds, positionIds, subcompanyIds, statuses, ...extra } = searchItemsValue;
+      const { departmentIds, positionIds, subcompanyIds, statuses, taxAgentIds, ...extra } = searchItemsValue;
       API.queryList({
         departmentIds: departmentIds ? departmentIds.split(",") : [],
         positionIds: positionIds ? positionIds.split(",") : [],
         subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : [],
+        taxAgentIds: taxAgentIds ? taxAgentIds.split(",") : [],
         statuses: statuses ? statuses.split(",") : [],
         ...payload, ...extra, url
       }).then(res => {