公司/发布扩展页面

pc4mobx/organization/components/company/CompanyExtend.js

@@ -2,13 +2,15 @@ import { Button, Modal,message,Row,Col, Spin} from 'antd';
 import isEmpty from 'lodash/isEmpty'
 import cloneDeep from 'lodash/cloneDeep'
 import forEach from 'lodash/forEach'
-import { WeaAlertPage, WeaTools,WeaTableEdit,WeaSearchGroup,WeaRightMenu, WeaFormItem, WeaTab} from 'ecCom'
+import { WeaAlertPage, WeaTools, WeaTableEdit, WeaSearchGroup, WeaRightMenu, WeaFormItem, WeaTab,WeaTop } from 'ecCom'
 import { WeaSwitch } from 'comsMobx';
 import { inject, observer } from 'mobx-react';
 import * as mobx from 'mobx';
 import { i18n } from '../../public/i18n';
 
 const toJS = mobx.toJS;
+import '../../style/common.less';
+
 
 @inject('companyExtend')
 @inject('company')
@@ -16,14 +18,10 @@ const toJS = mobx.toJS;
 export default class CompanyExtend extends React.Component {
 
   componentDidMount() {
-    const {companyExtend} = this.props;
-    companyExtend.setTopButtons(this.getTopButtons.bind(this));
-    companyExtend.setTopRightMenus(this.getRightMenu.bind(this));
-    companyExtend.setTopShowDropIcon(true);
     this.init();
   }
   init = () => {
-    // const {companyExtend, companyExtend, setParentRightMenu} = this.props;
+    const { companyExtend } = this.props;
     companyExtend.init();
     // companyExtend.hrmId=hrmId;
     companyExtend.getData();
@@ -113,8 +111,8 @@ export default class CompanyExtend extends React.Component {
               label={`${field.label}`}
               error={form.getError(field)}
               tipPosition={tipPosition}
-                    labelCol={{span: `${window.HrmLabelCol}`}}
+              labelCol={{ span: `${field.labelcol}` }}
-                    wrapperCol={{span: `${window.HrmWrapperCol}`}}>
+              wrapperCol={{ span: `${field.fieldcol}` }}>
               <WeaSwitch ecId={`${this && this.props && this.props.ecId || ''}_WeaSwitch@d4vaqk@${j}`} fieldConfig={field} form={form} />
             </WeaFormItem>),
             colSpan: 1
@@ -122,7 +120,7 @@ export default class CompanyExtend extends React.Component {
         }
       });
       group.push(<WeaSearchGroup ecId={`${this && this.props && this.props.ecId || ''}_WeaSearchGroup@x9hby9@${i}`} className={`${isEditor ? 'hrm-center' : ''}`}
-          needTigger={true} hide={c.hide} title={c.title} showGroup={c.defaultshow} items={items} />)
+        needTigger={true} hide={c.hide} title={c.title} showGroup={c.defaultshow} items={items} col={2} />)
     });
     return group;
   }
@@ -210,9 +208,16 @@ export default class CompanyExtend extends React.Component {
     this.init();
   }
 
+  changeData(key) {
+    const {
+      companyExtend
+    } = this.props;
+    companyExtend.changeData(key);
+}
+
   render() {
     const { companyExtend } = this.props;
-    const {loading, detailSelectedKey, tabInfo} = companyExtend;
+    const { loading, detailSelectedKey, tabInfo,topTab,selectedKey } = companyExtend;
 
     // if(!hasRight && !loading){
     //   return (
@@ -222,9 +227,24 @@ export default class CompanyExtend extends React.Component {
     //   )
     // }
 
-    try{
+    // try {
       return (
         <div className='hrm-my-cardInfo' style={{ height: '100%', position: 'relative' }}>
+          <WeaRightMenu ecId={`${this && this.props && this.props.ecId || ''}_WeaRightMenu@k6oc4u`}
+            datas={this.getRightMenu()}
+          >
+            <WeaTop ecId={`${this && this.props && this.props.ecId || ''}_WeaTop@bj98s7`}
+              loading={true}
+              buttons={this.getTopButtons()}
+              showDropIcon={true}
+              dropMenuDatas={this.getRightMenu()}
+            >
+              <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
+                datas={topTab}
+                keyParam="viewCondition" //主键
+                selectedKey={selectedKey}
+                onChange={this.changeData.bind(this)}
+              />
               <Spin ecId={`${this && this.props && this.props.ecId || ''}_Spin@4fj4z2`} spinning={loading}>
                 {this.getSearchs()}
                 {
@@ -242,13 +262,16 @@ export default class CompanyExtend extends React.Component {
                   </div>
                 }
               </Spin>
+            </WeaTop>
+          </WeaRightMenu>
+
         </div>
       )
-    }catch(e){
+    // } catch (e) {
-      return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}>
+    //   return <WeaAlertPage ecId={`${this && this.props && this.props.ecId || ''}_WeaAlertPage@h1wgnu`}>
-          <div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
+    //     <div style={{ color: '#000' }}>{i18n.message.authFailed()}</div>
-      </WeaAlertPage>
+    //   </WeaAlertPage>
-    }
+    // }
   }
 }
 

pc4mobx/organization/public/i18n.js

@@ -822,6 +822,8 @@ export const i18n = {
 		'531692': () => getLabel('531692', '说明：总部节点的人员编号设置主要用于新建分部时将总部的编号设置自动复制给新分部，不用于全局的开关控制，实际根据各分部的开关独立控制。'),
 	},
 	button: {
+		back: () => getLabel(1290, '返回'),
+
 		batchOpen: () => getLabel(534249, '批量解锁'),
 		collect: () => getLabel(28111, '收藏'),
 		helper: () => getLabel(275, '帮助'),

pc4mobx/organization/stores/company.js

@@ -18,62 +18,15 @@ export class CompanyStore {
   @observable form2 = new WeaForm();
   @observable form = new WeaForm();
   @observable form1 = new WeaForm();
-  @observable schemeName = "";
   @observable conditionNum = 2;
   @observable ids = ""; //选择行id
   @observable searchConditionLoading = true;
-  @observable nEdialogTitle = "";
   @observable visible = false;
-  @observable dialogLoading = true;
-  @observable schemeId = "";
   @observable date = "";
 
   @action
   getHasRight() {
-    this.topMenu = [
+   
-      {
-        isBatch: "1",
-        isTop: "1",
-        menuFun: "new",
-        menuIcon: "icon-coms-New-Flow",
-        menuName: "新建",
-        type: "BTN_Addnew",
-      },
-      {
-        isBatch: "1",
-        isTop: "1",
-        menuFun: "batchDelete",
-        menuIcon: "icon-coms-Batch-delete",
-        menuName: "批量删除",
-        type: "BTN_BatchDelete",
-      },
-    ];
-    this.rightMenu = [
-      {
-        isBatch: "0",
-        isTop: "1",
-        menuFun: "new",
-        menuIcon: "icon-coms-New-Flow",
-        menuName: "新建",
-        type: "BTN_Addnew",
-      },
-      {
-        isBatch: "0",
-        isTop: "0",
-        menuFun: "log",
-        menuIcon: "icon-coms-Print-log",
-        menuName: "日志",
-        type: "BTN_log",
-      },
-      {
-        isBatch: "0",
-        isTop: "0",
-        menuFun: "custom",
-        menuIcon: "icon-coms-task-list",
-        menuName: "显示列定制",
-        type: "BTN_COLUMN",
-      },
-    ];
   }
 
   updateFields(val) {

pc4mobx/organization/stores/index.js

@@ -6,6 +6,8 @@ import { JobGradeStore } from "./jobgrade";
 import { OfficeManageStore } from "./officeManage";
 import { SequenceStore } from "./sequence";
 import { GroupStore } from "./group";
+import {CompanyExtendStore} from "./companyextend";
+import {CompanyStore} from "./company"
 
 module.exports = {
   simpleOrgStore: new SimpleOrgStore(),
@@ -16,4 +18,6 @@ module.exports = {
   officeManageStore: new OfficeManageStore(),
   sequence: new SequenceStore(),
   group: new GroupStore(),
+  companyExtend: new CompanyExtendStore(),
+  company: new CompanyStore()
 };

pc4mobx/organization/style/common.less

@@ -30,3 +30,21 @@
   height: calc(100% - 47px);
   overflow: auto;
 }
+
+//公司、分部管理
+.hrm-my-cardInfo {
+  padding-bottom: 20px;
+  background: #fff;
+  a {
+      color: #123885;
+      &:hover {
+          color: red;
+      }
+  }
+
+  .hrm-center {
+      .ant-col-24 .wea-form-cell {
+          padding-left: 25%;
+      }
+  }
+}