Merge pull request '模块管理分权中心完整' (#12) from feature/cl into dev

Reviewed-on: http://221.226.25.34:3000/liang.cheng/trunk/pulls/12

pc4mobx/organization/components/detach/ManagerDetach.js

@@ -114,7 +114,7 @@ export default class ManagerDetach extends React.Component {
             managerDetach
         } = this.props;
 
-        managerDetach.setNeDialogTitle(i18n.label.newRankScheme());
+        managerDetach.setNeDialogTitle(i18n.label.newManagerDetach());
         managerDetach.setIsNew(true);
         managerDetach.setVisible(true);
         managerDetach.getForm();
@@ -226,19 +226,15 @@ export default class ManagerDetach extends React.Component {
             form2
         } = managerDetach;
 
-        managerDetach.setSchemeName(val);
+        managerDetach.setManagerName(val);
         !this.isEmptyObject(form2.getFormParams()) && managerDetach.updateFields(val);
     }
 
     reRenderColumns(columns) {
         let _this = this;
-        columns.forEach((c, index) => {
+        // columns.forEach((c, index) => {
-            if (c.dataIndex == 'forbidden_tag') {
+          
-                c.render = function (text, record) {
+        // })
-                    return <Switch checked={record.forbidden_tag == "0" ? true : false} onChange={checked => _this.updateForbiddenTag(checked, record.id)} />
-                }
-            };
-        })
     }
 
     updateForbiddenTag(checked, id) {
@@ -274,8 +270,8 @@ export default class ManagerDetach extends React.Component {
             managerDetach
         } = this.props;
 
-        managerDetach.setNeDialogTitle(i18n.label.editRankScheme());
+        managerDetach.setNeDialogTitle(i18n.label.editManagerDetach());
-        managerDetach.setSchemeId(id);
+        managerDetach.setDetachId(id);
         managerDetach.setIsNew(false);
         managerDetach.setVisible(true);
         managerDetach.getForm();
@@ -292,7 +288,7 @@ export default class ManagerDetach extends React.Component {
 
     log = () => {
         window.setLogViewProp({
-            logMoudleType: 1,
+            logMoudleType: 14,
             keys: new Date().getTime(),
         });
     }
@@ -372,7 +368,7 @@ export default class ManagerDetach extends React.Component {
             managerDetach
         } = this.props;
         const {
-            isPanelShow, form2, schemeName, conditionNum, tableStore, nEdialogTitle, visible, condition,
+            isPanelShow, form2, managerName, conditionNum, tableStore, nEdialogTitle, visible, condition,
             form, dialogLoading, isEdit, date, hasRight
         } = managerDetach;
 
@@ -399,7 +395,7 @@ export default class ManagerDetach extends React.Component {
                         <WeaTab ecId={`${this && this.props && this.props.ecId || ''}_WeaTab@9c3zts`}
                             searchType={['base', 'advanced']}
                             showSearchAd={isPanelShow}
-                            searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? schemeName : form2.getFormParams().schemeName}
+                            searchsBaseValue={this.isEmptyObject(form2.getFormParams()) ? managerName : form2.getFormParams().ecManager}
                             setShowSearchAd={bool => managerDetach.setPanelStatus(bool)}
                             hideSearchAd={() => managerDetach.setPanelStatus(false)}
                             searchsAd={isPanelShow ? this.getPanelComponents() : <div></div>}

pc4mobx/organization/components/resource/ResourceCard.js

@@ -236,13 +236,13 @@ export default class ResourceCard extends React.Component {
                                 </div>
                                 <div className='right-button'>
                                     <Button className='item' onClick={() => { window.location.href = `/spa/organization/static/index.html#/main/organization/resourceExtend/${data.user.id}`}}>编辑人员</Button>
-                                    <Button className='item'>调动</Button>
+                                    {/* <Button className='item'>调动</Button>
                                     <Button className='item'>离职</Button>
                                     <Dropdown overlay={menu}>
                                         <Button style={{ marginLeft: 8 }} className='item'>
                                             更多操作 <Icon type="down" />
                                         </Button>
-                                    </Dropdown>
+                                    </Dropdown> */}
                                 </div>
 
                             </div>

pc4mobx/organization/public/i18n.js

@@ -166,6 +166,9 @@ export const i18n = {
 		editResourceBasicType: () => getLabel(386246, '编辑人员资料类型'),
 		forbidden: () => getLabel(531114, '已禁用'),
 		mangerDetachName: () => getLabel(385936, '模块管理分权'),
+		newManagerDetach: () => getLabel(386246, '新建模块管理分权'),
+		editManagerDetach: () => getLabel(386247, '编辑模块管理分权'),
+
 
 		authorizationGroup: () => getLabel(492, '权限组'),
 		allAuthorization: () => getLabel(33363, '全部权限'),

pc4mobx/organization/stores/managerDetach.js

@@ -50,8 +50,7 @@ export class ManagerDetachStore {
         const { current } = this.tableStore;
         if (this.isEmptyObject(this.form2.getFormParams())) {
             params = {
-                ...this.form2.getFormParams(),
+                ecManager: this.managerName
-                managerName: this.managerName
             };
         } else {
             params = {
@@ -191,7 +190,7 @@ export class ManagerDetachStore {
 
     updateFields(val) {
         this.form2.updateFields({
-            managerName: {
+            ecManager: {
                 value: val
             }
         });