!11 1

Merge pull request !11 from reset/feature/cl

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();

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>
                 }
             }
         })

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();
   }

pc4mobx/organization/stores/company.js

@@ -182,6 +182,10 @@ export class CompanyStore {
     this.ids = ids;
   }
 
+  setId(id) {
+    this.id =id;
+  }
+
   scLoadingReset() {
     this.searchConditionLoading = true;
   }