From bb8920e3a094139ba781af0499adf292bf070095 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 25 May 2022 11:50:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=AC=E5=8F=B8/=E5=88=86?=
 =?UTF-8?q?=E9=83=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/company/company.js   | 16 ++++++++++------
 pc4mobx/organization/stores/company.js           | 14 +++++++++-----
 pc4mobx/organization/stores/companyextend.js     |  4 +++-
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index fd68a08..279c8e5 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -1,7 +1,7 @@
 /**
  * @Author: 程亮
  * @Date: 2022-05-18 16:23:32
- * @LastEditTime: 2022-05-24 14:29:44
+ * @LastEditTime: 2022-05-25 11:00:00
  * @Description: 
  * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js
  */
@@ -286,7 +286,7 @@ export default class Company extends React.Component {
         } = company;
 
         const btn = [
-            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => { company.getTableInfo(); company.setPanelStatus(false) }}>{i18n.button.search()}</Button>),
+            (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@bx87i8`} type="primary" onClick={() => { company.setCurrent(1); company.setPageSize(10);company.getTableInfo(); company.setPanelStatus(false) }}>{i18n.button.search()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@218ju6`} onClick={() => form.reset()}>{i18n.button.reset()}</Button>),
             (<Button ecId={`${this && this.props && this.props.ecId || ''}_Button@5u9mfz`} onClick={() => company.setPanelStatus(false)}>{i18n.button.cancel()}</Button>),
         ];
@@ -362,7 +362,7 @@ export default class Company extends React.Component {
             tableStore, dataSource, columns, loading, date, nEdialogTitle, dialogLoading,
             form1, isEdit, newVisible, deptDataSource, deptColumns, selectedRowKeys, total,current,pageSize,init
         } = company;
-
+        console.log("init",total)
 
         const rowSelection = {
             onChange(selectedRowKeys, selectedRows) {
@@ -370,7 +370,7 @@ export default class Company extends React.Component {
             },
         };
 
-        const pagination = {
+        let pagination = {
             current:current,
             pageSize:pageSize,
             total: total,
@@ -412,14 +412,18 @@ export default class Company extends React.Component {
                             advanceHeight={Math.ceil(conditionNum / 2) * 52 + 20}
                             hasMask={false}
                             buttonsAd={this.getTabBtn()}
-                            onSearch={() => company.getTableInfo()}
+                            onSearch={() => {
+                                company.setCurrent(1);
+                                company.setPageSize(10);
+                                company.getTableInfo()
+                            }}
                             onSearchChange={val => this.onSearchChange(val)}
                         />
                         {
                             init ? <div className='hrm-new-weatable-spin'>
                                 <Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4ygl4a`} spinning={init}></Spin>
                             </div> :
-                                <WeaTable rowKey={record => record.id}
+                                <WeaTable rowKey={record => record.id} ecId={`${this && this.props && this.props.ecId || ''}_WeaTable@pgmg3x`}
                                     loading={loading}
                                     dataSource={dataSource} childrenColumnName="children"
                                     columns={this.reRenderColumns(columns)}
diff --git a/pc4mobx/organization/stores/company.js b/pc4mobx/organization/stores/company.js
index 4baecc8..a365ad3 100644
--- a/pc4mobx/organization/stores/company.js
+++ b/pc4mobx/organization/stores/company.js
@@ -52,7 +52,7 @@ export class CompanyStore {
   @observable selectedRowKeys = '';
   @observable date = '';
   @observable init = true; //是否首次加载
-  @observable total = 0;
+  @observable total = '';
   @observable current = 1;
   @observable pageSize = 10;
 
@@ -70,7 +70,7 @@ export class CompanyStore {
       params = {
         ...params,
         ...this.form.getFormParams(),
-        compName: this.companyName,
+        compName: this.companyName
       };
     } else {
       params = {
@@ -82,11 +82,11 @@ export class CompanyStore {
       return response.json()
     }).then(res => {
       if (res.code === 200) {
-          res.data.pageInfo.list && this.setDataSource(res.data.pageInfo.list);
           res.data.pageInfo.columns && this.setColumns(res.data.pageInfo.columns);
-          res.data.pageInfo.total && this.setTotal(res.data.pageInfo.total);
+          this.setTotal(res.data.pageInfo.total);
+          res.data.pageInfo.list && this.setDataSource(res.data.pageInfo.list);
           this.setLoading(false);
-          this.init = false
+          this.setInit(false);
       } else {
         message.warning(res.msg);
       }
@@ -362,4 +362,8 @@ save() {
     this.pageSize = pageSize;
   }
 
+  setInit(bool) {
+    this.init = bool;
+  }
+
 }
\ No newline at end of file
diff --git a/pc4mobx/organization/stores/companyextend.js b/pc4mobx/organization/stores/companyextend.js
index 8b317a2..95ba257 100644
--- a/pc4mobx/organization/stores/companyextend.js
+++ b/pc4mobx/organization/stores/companyextend.js
@@ -123,7 +123,8 @@ export class CompanyExtendStore {
     this.setLoading(true);
     let params = {
       viewAttr: this.isEditor ? 2 : 1,
-      id: this.id
+      id: this.id,
+      viewCondition:this.selectedKey
     }
     Api.getCompanyExtendForm(params).then((res) => {
       if (res.code === 200) {
@@ -215,6 +216,7 @@ export class CompanyExtendStore {
 
   changeData(key) {
     this.setSelectedKey(key);
+    this.getData();
   }
 
   setId(id) {