diff --git a/pc4mobx/organization/components/detach/ManagerDetach.js b/pc4mobx/organization/components/detach/ManagerDetach.js index d7c0678..929e496 100644 --- a/pc4mobx/organization/components/detach/ManagerDetach.js +++ b/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) => { - if (c.dataIndex == 'forbidden_tag') { - c.render = function (text, record) { - return _this.updateForbiddenTag(checked, record.id)} /> - } - }; - }) + // columns.forEach((c, index) => { + + // }) } updateForbiddenTag(checked, id) { @@ -274,8 +270,8 @@ export default class ManagerDetach extends React.Component { managerDetach } = this.props; - managerDetach.setNeDialogTitle(i18n.label.editRankScheme()); - managerDetach.setSchemeId(id); + managerDetach.setNeDialogTitle(i18n.label.editManagerDetach()); + 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 { managerDetach.setPanelStatus(bool)} hideSearchAd={() => managerDetach.setPanelStatus(false)} searchsAd={isPanelShow ? this.getPanelComponents() :
} diff --git a/pc4mobx/organization/components/resource/ResourceCard.js b/pc4mobx/organization/components/resource/ResourceCard.js index ca6bfe9..f34b456 100644 --- a/pc4mobx/organization/components/resource/ResourceCard.js +++ b/pc4mobx/organization/components/resource/ResourceCard.js @@ -236,13 +236,13 @@ export default class ResourceCard extends React.Component {
- + {/* - + */}
diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js index 3571909..6fa00b6 100644 --- a/pc4mobx/organization/public/i18n.js +++ b/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, '全部权限'), diff --git a/pc4mobx/organization/stores/managerDetach.js b/pc4mobx/organization/stores/managerDetach.js index d7ad9df..9e7ea88 100644 --- a/pc4mobx/organization/stores/managerDetach.js +++ b/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(), - managerName: this.managerName + ecManager: this.managerName }; } else { params = { @@ -191,7 +190,7 @@ export class ManagerDetachStore { updateFields(val) { this.form2.updateFields({ - managerName: { + ecManager: { value: val } });