hotfix/2.14.2.2406.02

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;

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
       },

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 => {