diff --git a/src/pages/common/positions/index.tsx b/src/pages/common/positions/index.tsx index 0f875bd..31186b0 100644 --- a/src/pages/common/positions/index.tsx +++ b/src/pages/common/positions/index.tsx @@ -43,11 +43,11 @@ export default function Index({ title = '岗位库' }) { dataIndex: 'name', width: 200, }, - { - title: '岗位编号', - dataIndex: 'code', - width: 200, - }, + // { + // title: '岗位编号', + // dataIndex: 'code', + // width: 200, + // }, { title: '岗位说明', dataIndex: 'remark', diff --git a/src/pages/common/positions/modals/Create.tsx b/src/pages/common/positions/modals/Create.tsx index e752766..3740339 100644 --- a/src/pages/common/positions/modals/Create.tsx +++ b/src/pages/common/positions/modals/Create.tsx @@ -45,12 +45,12 @@ export default function Create(props: MyBetaModalFormProps) { colProps: { span: 24 }, formItemProps: { ...rulesHelper.text }, }, - { - key: 'code', - title: '岗位编号', - colProps: { span: 24 }, - formItemProps: { ...rulesHelper.text }, - }, + // { + // key: 'code', + // title: '岗位编号', + // colProps: { span: 24 }, + // formItemProps: { ...rulesHelper.text }, + // }, { key: 'remark', title: '岗位说明', diff --git a/src/pages/common/positions/modals/Update.tsx b/src/pages/common/positions/modals/Update.tsx index 0477744..aa6596f 100644 --- a/src/pages/common/positions/modals/Update.tsx +++ b/src/pages/common/positions/modals/Update.tsx @@ -46,12 +46,12 @@ export default function Update(props: MyBetaModalFormProps) { colProps: { span: 24 }, formItemProps: { ...rulesHelper.text }, }, - { - key: 'code', - title: '岗位编号', - colProps: { span: 24 }, - formItemProps: { ...rulesHelper.text }, - }, + // { + // key: 'code', + // title: '岗位编号', + // colProps: { span: 24 }, + // formItemProps: { ...rulesHelper.text }, + // }, { key: 'remark', title: '岗位说明', diff --git a/src/pages/company/apps/modals/AppCreate.tsx b/src/pages/company/apps/modals/AppCreate.tsx index fb5cf2f..3183010 100644 --- a/src/pages/company/apps/modals/AppCreate.tsx +++ b/src/pages/company/apps/modals/AppCreate.tsx @@ -63,7 +63,7 @@ export default function Create(props: MyBetaModalFormProps) { name: ['app_type'], valueType: 'dependency', columns: ({ app_type }: any) => { - return app_type === 'MiniProgram' + return app_type !== 'MpOfficial' ? [ MyFormItems.EnumRadio({ key: 'module', diff --git a/src/pages/company/employees/modals/EmployeeCreate.tsx b/src/pages/company/employees/modals/EmployeeCreate.tsx index 809cea0..f17b2e0 100644 --- a/src/pages/company/employees/modals/EmployeeCreate.tsx +++ b/src/pages/company/employees/modals/EmployeeCreate.tsx @@ -35,7 +35,7 @@ export default function Create(props: MyBetaModalFormProps) { }) .then(() => { props.reload?.(); - message.success('编辑成功'); + message.success('添加成功'); return true; }) .catch(() => false) diff --git a/src/pages/company/list/show/$id.tsx b/src/pages/company/list/show/$id.tsx index 44f9066..9506789 100644 --- a/src/pages/company/list/show/$id.tsx +++ b/src/pages/company/list/show/$id.tsx @@ -46,7 +46,7 @@ export default function Show({ title }: { title?: string } = {}) { let items = [ { - label: '项目配置', + label: '应用配置', key: '1', closable: false, children: , @@ -77,17 +77,12 @@ export default function Show({ title }: { title?: string } = {}) { }, { - label: '应用配置', + label: '品牌配置', key: '6', closable: false, children: , }, - { - label: '品牌配置', - key: '7', - closable: false, - children: , - }, + { label: '权限配置', key: '8', @@ -100,6 +95,12 @@ export default function Show({ title }: { title?: string } = {}) { closable: false, children: , }, + { + label: '项目配置', + key: '7', + closable: false, + children: , + }, ]; return ( @@ -121,7 +122,7 @@ export default function Show({ title }: { title?: string } = {}) {
应用配置 ➡️ 组织配置 ➡️ 岗位配置 ➡️ 员工配置 ➡️ 账号配置 ➡️ 品牌配置 - ➡️ 项目配置; + ➡️ 权限配置 ➡️ 客户端配置 ➡️ 项目配置;
diff --git a/src/pages/company/organizations/modals/OrganizationCreate.tsx b/src/pages/company/organizations/modals/OrganizationCreate.tsx index 2bd45c5..e7d6520 100644 --- a/src/pages/company/organizations/modals/OrganizationCreate.tsx +++ b/src/pages/company/organizations/modals/OrganizationCreate.tsx @@ -31,7 +31,7 @@ export default function Create(props: MyBetaModalFormProps) { onFinish={async (values: any) => Apis.Company.Organizations.Store({ ...values, - companies_id: values?.companies_id || props?.item?.companies_id, + companies_id: values?.companies_id || props?.item?.id, parent_id: values?.parent_id?.[values.parent_id.length - 1], }) .then(() => {