From d52cf8170e80e4f4826f2f53b6d57ef987cdf94a Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Wed, 18 May 2022 17:51:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organization/components/company/CompanyExtend.js  |  3 ++-
 pc4mobx/organization/components/company/company.js    | 11 ++++++++++-
 pc4mobx/organization/components/tree/index.js         |  1 -
 pc4mobx/organization/stores/company.js                |  4 ++++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/pc4mobx/organization/components/company/CompanyExtend.js b/pc4mobx/organization/components/company/CompanyExtend.js
index 721c6d2..7fa7d9a 100644
--- a/pc4mobx/organization/components/company/CompanyExtend.js
+++ b/pc4mobx/organization/components/company/CompanyExtend.js
@@ -21,7 +21,8 @@ export default class CompanyExtend extends React.Component {
     this.init();
   }
   init = () => {
-    const { companyExtend } = this.props;
+    const { companyExtend,company } = this.props;
+    const {id} = company;
     companyExtend.init();
     // companyExtend.hrmId=hrmId;
     companyExtend.getData();
diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js
index d73302a..87539ba 100644
--- a/pc4mobx/organization/components/company/company.js
+++ b/pc4mobx/organization/components/company/company.js
@@ -200,7 +200,13 @@ export default class Company extends React.Component {
         !this.isEmptyObject(form.getFormParams()) && company.updateFields(val);
     }
 
+
+
+    ///spa/organization/static/index.html#/main/organization/companyExtend
     reRenderColumns(columns) {
+        const {
+            company
+        } = this.props;
         let _this = this;
         columns.forEach((c, index) => {
             if (c.dataIndex == 'forbiddenTag') {
@@ -210,7 +216,10 @@ export default class Company extends React.Component {
             };
             if (c.dataIndex == 'compName') {
                 c.render = function (text, record) {
-                    return <a href='/spa/organization/static/index.html#/main/organization/companyExtend' target='_blank'>{text}</a>
+                    return <a onClick={() => {
+                        company.setId(record.id);
+                        window.open('/spa/organization/static/index.html#/main/organization/companyExtend',"_blank")
+                    }}>{text}</a>
                 }
             }
         })
diff --git a/pc4mobx/organization/components/tree/index.js b/pc4mobx/organization/components/tree/index.js
index 878c3e2..fd9d17a 100644
--- a/pc4mobx/organization/components/tree/index.js
+++ b/pc4mobx/organization/components/tree/index.js
@@ -26,7 +26,6 @@ const WeaLogViewComp = WeaLogView.Component;
 export default class simpleOrg extends React.Component {
 
   componentWillMount() { // 初始化渲染页面
-    debugger
     const { simpleOrgStore: { doInit } } = this.props;
     doInit();
   }
diff --git a/pc4mobx/organization/stores/company.js b/pc4mobx/organization/stores/company.js
index b560629..f5d6826 100644
--- a/pc4mobx/organization/stores/company.js
+++ b/pc4mobx/organization/stores/company.js
@@ -182,6 +182,10 @@ export class CompanyStore {
     this.ids = ids;
   }
 
+  setId(id) {
+    this.id =id;
+  }
+
   scLoadingReset() {
     this.searchConditionLoading = true;
   }