diff --git a/pc4mobx/organization/apis/managerDetach.js b/pc4mobx/organization/apis/managerDetach.js index 6d001cb..c80c271 100644 --- a/pc4mobx/organization/apis/managerDetach.js +++ b/pc4mobx/organization/apis/managerDetach.js @@ -4,11 +4,23 @@ import { } from 'ecCom' export const getSearchList = (params) => { - return WeaTools.callApi('/api/bs/hrmorganization/scheme/getTable', 'GET', params); + return WeaTools.callApi('/api/bs/hrmorganization/detach/getTable', 'GET', params); +} + +export const getHasRight = (params) => { + return WeaTools.callApi('/api/bs/hrmorganization/detach/getTableBtn', 'GET', params); +} + +export const getAdvanceSearchCondition = (params) => { + return WeaTools.callApi('/api/bs/hrmorganization/detach/getSearchCondition', 'GET', params); +} + +export const getSchemeForm = (params) => { + return WeaTools.callApi('/api/bs/hrmorganization/detach/getForm', 'GET', params); } export const deleteTableData = (params) => { - return fetch('/api/bs/hrmorganization/scheme/deleteByIds', { + return fetch('/api/bs/hrmorganization/detach/deleteByIds', { method: 'POST', mode: 'cors', headers: { @@ -18,12 +30,9 @@ export const deleteTableData = (params) => { }) } -export const getAdvanceSearchCondition = (params) => { - return WeaTools.callApi('/api/bs/hrmorganization/scheme/getSearchCondition', 'GET', params); -} export const add = (params) => { - return fetch('/api/bs/hrmorganization/scheme/save', { + return fetch('/api/bs/hrmorganization/detach/save', { method: 'POST', mode: 'cors', headers: { @@ -34,7 +43,7 @@ export const add = (params) => { } export const edit = (params) => { - return fetch('/api/bs/hrmorganization/scheme/updateScheme', { + return fetch('/api/bs/hrmorganization/detach/update', { method: 'POST', mode: 'cors', headers: { @@ -44,11 +53,6 @@ export const edit = (params) => { }) } -export const getSchemeForm = (params) => { - return WeaTools.callApi('/api/bs/hrmorganization/scheme/getSchemeForm', 'GET', params); -} -export const getHasRight = (params) => { - return WeaTools.callApi('/api/bs/hrmorganization/scheme/getTableBtn', 'GET', params); -} \ No newline at end of file + diff --git a/pc4mobx/organization/components/NewAndEditDialog.js b/pc4mobx/organization/components/NewAndEditDialog.js index 2aba860..d0b166a 100644 --- a/pc4mobx/organization/components/NewAndEditDialog.js +++ b/pc4mobx/organization/components/NewAndEditDialog.js @@ -51,7 +51,7 @@ export default class NewAndEditDialog extends React.Component { ) }) }) - return
{arr}
+ return
{arr}
} onChange = data => { @@ -162,7 +162,7 @@ export default class NewAndEditDialog extends React.Component { loading ?
- : this.getSearchGroupForm()} + : conditionLen > 1 ? this.getSearchGroupForm() : this.getForm()} diff --git a/pc4mobx/organization/components/company/company.js b/pc4mobx/organization/components/company/company.js index ec4013f..c70f87e 100644 --- a/pc4mobx/organization/components/company/company.js +++ b/pc4mobx/organization/components/company/company.js @@ -1,7 +1,7 @@ /** * @Author: 程亮 * @Date: 2022-05-18 16:23:32 - * @LastEditTime: 2022-09-08 17:35:40 + * @LastEditTime: 2022-10-26 15:53:23 * @Description: * @FilePath: /trunk/src4js/pc4mobx/organization/components/company/company.js */ @@ -592,8 +592,8 @@ export default class Company extends React.Component { isFormInit={form1.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={300} - conditionLen={4} + height={400} + conditionLen={2} save={() => this.handleSave()} onCancel={() => company.setNewVisible(false)} saveAndSetting = {() => this.handleSaveAndSetting()} diff --git a/pc4mobx/organization/components/department/department.js b/pc4mobx/organization/components/department/department.js index 25f0857..06cb355 100644 --- a/pc4mobx/organization/components/department/department.js +++ b/pc4mobx/organization/components/department/department.js @@ -1,7 +1,7 @@ /** * @Author: 程亮 * @Date: 2022-06-02 09:19:37 - * @LastEditTime: 2022-09-02 15:22:00 + * @LastEditTime: 2022-10-26 15:53:37 * @Description: * @FilePath: /trunk/src4js/pc4mobx/organization/components/department/department.js */ @@ -684,8 +684,8 @@ export default class Department extends React.Component { isFormInit={form1.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={300} - conditionLen={13} + height={400} + conditionLen={2} save={() => this.handleSave()} onCancel={() => department.setNewVisible(false)} saveAndSetting={() => this.handleSaveAndSetting()} diff --git a/pc4mobx/organization/components/detach/ManagerDetach.js b/pc4mobx/organization/components/detach/ManagerDetach.js index cf549ab..d7c0678 100644 --- a/pc4mobx/organization/components/detach/ManagerDetach.js +++ b/pc4mobx/organization/components/detach/ManagerDetach.js @@ -426,8 +426,8 @@ export default class ManagerDetach extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={250} - conditionLen={3} + height={200} + conditionLen={1} save={() => this.handleSave()} onCancel={() => managerDetach.setVisible(false)} /> diff --git a/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js b/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js index 883998f..32b0d26 100644 --- a/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js +++ b/pc4mobx/organization/components/fieldDefinedSet/FieldDefined.js @@ -20,6 +20,7 @@ import { i18n } from '../../public/i18n'; const { ButtonSelect } = WeaDropdown; +import { renderNoright } from '../../util'; @inject('fieldDefined') @@ -126,7 +127,7 @@ export default class FieldDefined extends Component { }} /> ] - }, title = moduleType === 'subCompany' ? i18n.module.subCompanyFieldDef() : moduleType === 'department' ? i18n.module.departmentFieldDef() : i18n.module.resourceFieldDef(), + }, title = moduleType === 'subCompany' ? i18n.module.subCompanyFieldDef() : moduleType === 'department' ? i18n.module.departmentFieldDef() : moduleType === 'job' ? i18n.module.jobFieldDef() : i18n.module.resourceFieldDef(), topProps = { title, icon: , @@ -144,50 +145,43 @@ export default class FieldDefined extends Component { } } let children = []; - debugger - if (hasRight) { - const { - data, - onSelectedTreeNode, - selectedKeys, - onExpand, - treeExpandKeys - } = store.toJS(treeConfig); - const treeCom = ( - + + if (hasRight === false) { + return renderNoright(); + } + const { + data, + onSelectedTreeNode, + selectedKeys, + onExpand, + treeExpandKeys + } = store.toJS(treeConfig); + const treeCom = ( + + ) + children = [ + ( + + + + { + + + + } + + + ) - children = [ - ( - - - - { - - - - } - - - - ) - ] - } else { - children = [ - ( - -
{i18n.message.authFailed()}
- - ) - ]; - } + ] return ( -
+ hasRight &&
{children}
) diff --git a/pc4mobx/organization/components/job/Job.js b/pc4mobx/organization/components/job/Job.js index 3de6483..d1a5c82 100644 --- a/pc4mobx/organization/components/job/Job.js +++ b/pc4mobx/organization/components/job/Job.js @@ -1,7 +1,7 @@ /** * @Author: 程亮 * @Date: 2022-05-26 14:05:59 - * @LastEditTime: 2022-09-01 15:08:26 + * @LastEditTime: 2022-10-26 15:49:00 * @Description: * @FilePath: /trunk/src4js/pc4mobx/organization/components/job/Job.js */ @@ -659,8 +659,8 @@ export default class Job extends React.Component { isFormInit={form1.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={300} - conditionLen={13} + height={400} + conditionLen={2} save={() => this.handleSave()} onCancel={() => job.setNewVisible(false)} saveAndSetting = {() => this.handleSaveAndSetting()} diff --git a/pc4mobx/organization/components/office/components/leftTree.js b/pc4mobx/organization/components/office/components/leftTree.js index c7f6ab8..fec3c23 100644 --- a/pc4mobx/organization/components/office/components/leftTree.js +++ b/pc4mobx/organization/components/office/components/leftTree.js @@ -354,8 +354,8 @@ class LeftTree extends Component { isFormInit={form1.isFormInit} loading={loading} isEdit={true} - height={250} - conditionLen={3} + height={150} + conditionLen={1} save={() => this.handleSave()} onCancel={() => officeManageStore.setOfficeVisible({ diff --git a/pc4mobx/organization/components/office/officeManage.js b/pc4mobx/organization/components/office/officeManage.js index 6ead8fb..a9de814 100644 --- a/pc4mobx/organization/components/office/officeManage.js +++ b/pc4mobx/organization/components/office/officeManage.js @@ -492,8 +492,8 @@ export default class OfficeManage extends Component { isFormInit={form.isFormInit} loading={dialogLoading || loading} isEdit={true} - height={250} - conditionLen={3} + height={400} + conditionLen={1} save={() => this.handleSave()} onCancel={() => { officeManageStore.setVisible(false); diff --git a/pc4mobx/organization/components/postionrank/JobGrade.js b/pc4mobx/organization/components/postionrank/JobGrade.js index 669ee7d..b1c4e3c 100644 --- a/pc4mobx/organization/components/postionrank/JobGrade.js +++ b/pc4mobx/organization/components/postionrank/JobGrade.js @@ -461,8 +461,8 @@ export default class JobGrade extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={350} - conditionLen={3} + height={280} + conditionLen={1} save={() => this.handleSave()} onCancel={() => jobGrade.setVisible(false)} moduleName={"jobGrade"} diff --git a/pc4mobx/organization/components/postionrank/JobLevel.js b/pc4mobx/organization/components/postionrank/JobLevel.js index 0b1a491..2ae2a7b 100644 --- a/pc4mobx/organization/components/postionrank/JobLevel.js +++ b/pc4mobx/organization/components/postionrank/JobLevel.js @@ -456,8 +456,8 @@ export default class JobLevel extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={300} - conditionLen={3} + height={250} + conditionLen={1} save={() => this.handleSave()} onCancel={() => jobLevel.setVisible(false)} /> diff --git a/pc4mobx/organization/components/postionrank/RankScheme.js b/pc4mobx/organization/components/postionrank/RankScheme.js index 4ea0567..cd06e10 100644 --- a/pc4mobx/organization/components/postionrank/RankScheme.js +++ b/pc4mobx/organization/components/postionrank/RankScheme.js @@ -430,8 +430,8 @@ export default class RankScheme extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={250} - conditionLen={3} + height={200} + conditionLen={1} save={() => this.handleSave()} onCancel={() => rankScheme.setVisible(false)} /> diff --git a/pc4mobx/organization/components/resource/ResourceBasicInfo.js b/pc4mobx/organization/components/resource/ResourceBasicInfo.js index eb9fb07..305a0a2 100644 --- a/pc4mobx/organization/components/resource/ResourceBasicInfo.js +++ b/pc4mobx/organization/components/resource/ResourceBasicInfo.js @@ -444,7 +444,7 @@ export default class ResourceBasicInfo extends React.Component { } = this.props; const { isPanelShow, form2, fname, conditionNum, tableStore, nEdialogTitle, visible, condition, - form, dialogLoading, isEdit, date, hasRight, treeConfig, treeLoading + form, dialogLoading, isEdit, date, hasRight, treeConfig, treeLoading,operateType } = resourceBasicInfo; if (hasRight === false) { @@ -517,8 +517,8 @@ export default class ResourceBasicInfo extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={300} - conditionLen={3} + height={operateType == 2 ? 180 : 230} + conditionLen={1} save={() => this.handleSave()} onCancel={() => resourceBasicInfo.setVisible(false)} /> diff --git a/pc4mobx/organization/components/resource/resource.js b/pc4mobx/organization/components/resource/resource.js index 646370a..0464614 100644 --- a/pc4mobx/organization/components/resource/resource.js +++ b/pc4mobx/organization/components/resource/resource.js @@ -466,8 +466,8 @@ export default class Resource extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={350} - conditionLen={3} + height={400} + conditionLen={2} save={() => this.handleSave()} onCancel={() => resource.setVisible(false)} // saveAndSetting={() => this.handleSaveAndSetting()} diff --git a/pc4mobx/organization/components/sequence/Sequence.js b/pc4mobx/organization/components/sequence/Sequence.js index 8fc5288..61af8ac 100644 --- a/pc4mobx/organization/components/sequence/Sequence.js +++ b/pc4mobx/organization/components/sequence/Sequence.js @@ -435,8 +435,8 @@ export default class Sequence extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={300} - conditionLen={3} + height={250} + conditionLen={1} save={() => this.handleSave()} onCancel={() => sequence.setVisible(false)} /> diff --git a/pc4mobx/organization/components/staff/Staff.js b/pc4mobx/organization/components/staff/Staff.js index 5a0ce31..c1ce46e 100644 --- a/pc4mobx/organization/components/staff/Staff.js +++ b/pc4mobx/organization/components/staff/Staff.js @@ -532,8 +532,8 @@ export default class Staff extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={400} - conditionLen={3} + height={350} + conditionLen={1} save={() => this.handleSave()} onCancel={() => staff.setVisible(false)} moduleName={"staff"} diff --git a/pc4mobx/organization/components/staff/StaffScheme.js b/pc4mobx/organization/components/staff/StaffScheme.js index 8929728..cc24a11 100644 --- a/pc4mobx/organization/components/staff/StaffScheme.js +++ b/pc4mobx/organization/components/staff/StaffScheme.js @@ -429,8 +429,8 @@ export default class StaffScheme extends React.Component { isFormInit={form.isFormInit} loading={dialogLoading} isEdit={isEdit} - height={450} - conditionLen={3} + height={400} + conditionLen={1} save={() => this.handleSave()} onCancel={() => staffScheme.setVisible(false)} moduleName={"staffScheme"} diff --git a/pc4mobx/organization/public/i18n.js b/pc4mobx/organization/public/i18n.js index 8c00f7d..3571909 100644 --- a/pc4mobx/organization/public/i18n.js +++ b/pc4mobx/organization/public/i18n.js @@ -12,6 +12,7 @@ export const i18n = { subCompanyFieldDef: () => getLabel(81876, '分部字段定义'), departmentFieldDef: () => getLabel(81877, '部门字段定义'), resourceFieldDef: () => getLabel(81878, '人员卡片字段定义'), + jobFieldDef: () => getLabel(81878, '岗位字段定义'), roleSetting: () => getLabel(16527, '角色设置'), batchMaintenance: () => getLabel(33923, '批量维护'), batchAdjustSubCompany: () => getLabel(385879, '批量调整分部信息'), diff --git a/pc4mobx/organization/style/common.less b/pc4mobx/organization/style/common.less index 512675e..9574fd8 100644 --- a/pc4mobx/organization/style/common.less +++ b/pc4mobx/organization/style/common.less @@ -7,6 +7,7 @@ margin-top: -8px; } + .hrm-dialog-form { padding-top: 27px; padding-right: 8%;