From 36e0e40bddf008d8c16784d9c932544c6d42b6f5 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, 1 Mar 2023 11:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=E5=BC=95=E7=94=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance/components/fieldMangComp.js               | 9 ++++-----
 .../hrmSalary/pages/dataAcquisition/attendance/index.js  | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
index d71b2ca2..dccabcf8 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/components/fieldMangComp.js
@@ -32,7 +32,7 @@ class FieldMangComp extends Component {
     this.getAttendanceFieldList();
   }
 
-  getAttendanceFieldList = (extraPayload) => {
+  getAttendanceFieldList = (extraPayload = {}) => {
     const { fieldTableStore } = this.props;
     const { loading, pageInfo } = this.state;
     const module = { ...pageInfo, ...extraPayload };
@@ -40,9 +40,9 @@ class FieldMangComp extends Component {
     getAttendanceFieldList(module).then(({ status, data }) => {
       this.setState({ loading: { ...loading, query: false } });
       if (status) {
-        const { dataKey, pageInfo } = data;
+        const { dataKey, pageInfo: pageInfoData } = data;
         const { datas } = dataKey;
-        const { list: dataSource, pageNum: current, pageSize, total } = pageInfo;
+        const { list: dataSource, pageNum: current, pageSize, total } = pageInfoData;
         fieldTableStore.getDatas(datas);
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total },
@@ -53,8 +53,7 @@ class FieldMangComp extends Component {
   };
   getColumns = () => {
     const { showOperateBtn } = this.props;
-    console.log(this.props.fieldTableStore, toJS(this.props.fieldTableStore.columns));
-    return _.map(_.filter([], item => !!item.hide), child => ({
+    return _.map(_.filter(toJS(this.props.fieldTableStore.columns), item => !!item.hide), child => ({
       ...child,
       render: (text, record) => {
         switch (child.dataIndex) {
diff --git a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
index 34ad7276..03df6384 100644
--- a/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
+++ b/pc4mobx/hrmSalary/pages/dataAcquisition/attendance/index.js
@@ -66,7 +66,7 @@ class Index extends Component {
     const buttons = selectedKey === "DATA" ? [
       <Button type="primary">引用</Button>,
       <Button type="ghost">导入</Button>
-    ] : [<Button type="primary">新建</Button>];
+    ] : [<Button type="primary" onClick={() => console.log(this.fieldMangRef)}>新建</Button>];
     return (
       <div className="attendanceRefWrapper">
         <WeaTab
@@ -74,7 +74,7 @@ class Index extends Component {
           searchType={selectedKey === "FIELD" ? ["base"] : []} searchsBasePlaceHolder="请输入字段名称"
           onChange={v => this.setState({ selectedKey: v })}
           searchsBaseValue={fieldName} onSearchChange={fieldName => this.setState({ fieldName })}
-          onSearch={() => this.fieldMangRef.getAttendanceFieldList({ fieldName })}
+          onSearch={() => this.fieldMangRef.getAttendanceFieldList({ fieldName, current: 1 })}
         />
         {
           selectedKey === "DATA" && this.getAttendanceDataScreen()