From e52c239ad1b11fc63d6f13b18f29d3f3bdaced15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 11 May 2023 10:13:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E5=BD=92=E9=9B=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance/components/attendanceDataComp.js    |  4 ++--
 .../components/ledgerSalaryItemAddModal.js         | 14 +++++++++-----
 .../components/ledgerSalaryItemPreviewModal.js     |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
index 6f58700a..2395f7f1 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/attendanceDataComp.js
@@ -142,13 +142,13 @@ class AttendanceDataComp extends Component {
       }
     });
   };
-  handleViewAttendanceData = ({ id, salaryCycle }) => {
+  handleViewAttendanceData = ({ id, attendCycle }) => {
     const { attendanceViewPayload } = this.state;
     this.setState({
       attendanceViewPayload: {
         ...attendanceViewPayload,
         visible: true, attendQuoteId: id,
-        salaryYearMonth: salaryCycle
+        salaryYearMonth: attendCycle
       }
     });
   };
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
index de378287..4d8608cb 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemAddModal.js
@@ -28,10 +28,12 @@ export default class LedgerSalaryItemAddModal extends React.Component {
       this.setState({ selectedRowKeys: [], dataSourceCopy: [] }, () => {
         this.listSalaryItem();
       });
+    } else {
+      this.setState({ pageInfo: { current: 1, pageSize: 10, total: 0 } });
     }
   }
 
-  listSalaryItem = () => {
+  listSalaryItem = (extra = {}) => {
     const { itemGroups } = this.props;
     const { name, pageInfo, loading, dataSourceCopy } = this.state;
     let excludeIds = [];
@@ -43,17 +45,19 @@ export default class LedgerSalaryItemAddModal extends React.Component {
     const payload = {
       excludeIds,
       name,
-      ...pageInfo
+      ...pageInfo,
+      ...extra
     };
     this.setState({ loading: { ...loading, query: true } });
     listSalaryItem(payload).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
         const { pageNum: current, pageSize, total, columns, list: dataSource } = data;
+        const tmpV = !_.isEmpty(dataSource) ? dataSource : [];
         this.setState({
-          dataSourceCopy: [...dataSourceCopy, ...dataSource],
+          dataSourceCopy: [...dataSourceCopy, ...tmpV],
           pageInfo: { ...pageInfo, current, pageSize, total },
-          dataSource,
+          dataSource: tmpV,
           columns
         });
       }
@@ -135,7 +139,7 @@ export default class LedgerSalaryItemAddModal extends React.Component {
             placeholder="请输入薪资项目名称"
             value={name}
             onChange={(name) => this.setState({ name })}
-            onSearch={() => this.listSalaryItem()}
+            onSearch={() => this.listSalaryItem({ current: 1 })}
           />
         </div>
         <WeaTable
diff --git a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js
index b9c0243d..09c1df43 100644
--- a/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js
+++ b/pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemPreviewModal.js
@@ -15,7 +15,7 @@ export default class LedgerSalaryItemPreviewModal extends React.Component {
     _.map(_.filter(itemGroups, it => !_.isEmpty(it.items)), child => {
       let columnItem = {
         title: child.name,
-        children: child.items.map(i => {
+        children: _.filter(child.items, t => t.itemHide !== "1").map(i => {
           return {
             title: i.name,
             dataIndex: i.id,