From 0bc5590c046304b674882036662a73f55ef5616b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 18 Apr 2023 10:51:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81-=E8=96=AA=E8=B5=84=E8=B4=A6?=
 =?UTF-8?q?=E5=A5=97=E7=9A=84=E8=96=AA=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=BF=BB=E9=A1=B5=E7=9A=84bug=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E7=9A=84?=
 =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E5=AF=B9=E6=AF=94=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=B8=8B=E8=BD=BD=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/calculateDetail/compareDetailImportModal.js  |  9 +++++++--
 .../ledgerPage/components/ledgerSalaryItemAddModal.js  | 10 ++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js
index 1c276127..9fc924e1 100644
--- a/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js
+++ b/pc4mobx/hrmSalary/pages/calculateDetail/compareDetailImportModal.js
@@ -1,7 +1,7 @@
 import React from "react";
 import ImportModal from "../../components/importModal";
 import { inject, observer } from "mobx-react";
-import { getQueryString } from "../../util/url";
+import { convertToUrlString, getQueryString } from "../../util/url";
 
 @inject("calculateStore", "standingBookStore")
 @observer
@@ -35,7 +35,12 @@ export default class CompareDetailImportModal extends React.Component {
     if (this.props.id) {
       url = "/api/bs/hrmsalary/salaryacct/comparisonresult/importtemplate/export?salaryAcctRecordId=" + this.props.id;
     } else {
-      url = `/api/bs/hrmsalary/siaccount/comparisonwelfare/importtemplate/export`;
+      const payload = {
+        billMonth: getQueryString("billMonth"),
+        paymentOrganization: getQueryString("paymentOrganization"),
+        paymentStatus: 0
+      };
+      url = `/api/bs/hrmsalary/siaccount/comparisonwelfare/importtemplate/export?${convertToUrlString(payload)}`;
     }
     window.open(url);
   }
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index 20562453..de378287 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
@@ -13,6 +13,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
       name: "",
       selectedRowKeys: [],
       dataSource: [],
+      dataSourceCopy: [],
       columns: [],
       pageInfo: {
         current: 1,
@@ -24,7 +25,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
 
   componentWillReceiveProps(nextProps, nextContext) {
     if (nextProps.visible !== this.props.visivle && nextProps.visible) {
-      this.setState({ selectedRowKeys: [] }, () => {
+      this.setState({ selectedRowKeys: [], dataSourceCopy: [] }, () => {
         this.listSalaryItem();
       });
     }
@@ -32,7 +33,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
 
   listSalaryItem = () => {
     const { itemGroups } = this.props;
-    const { name, pageInfo, loading } = this.state;
+    const { name, pageInfo, loading, dataSourceCopy } = this.state;
     let excludeIds = [];
     itemGroups.map(item => {
       item.items && item.items.map(i => {
@@ -50,6 +51,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
       if (status) {
         const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
         this.setState({
+          dataSourceCopy: [...dataSourceCopy, ...dataSource],
           pageInfo: { ...pageInfo, current, pageSize, total },
           dataSource,
           columns
@@ -80,11 +82,11 @@ export default class LedgerSalaryItemAddModal extends React.Component {
   };
 
   handleAdd = () => {
-    const { dataSource, selectedRowKeys } = this.state;
+    const { dataSourceCopy, selectedRowKeys } = this.state;
     const { onAddSalaryItems, id, onCancel, itemGroups } = this.props;
     const arrItems = _.find(itemGroups, it => it.uuid === id).items || [];
     let selectItems = [];
-    dataSource.map((item) => {
+    dataSourceCopy.map((item) => {
       item = { ...item };
       selectedRowKeys.map((key, keyIdx) => {
         if (item.id === key) {