pay/pay-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-admin into develop
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m44s
Details

Browse Source 
* 'develop' of ssh://code.linyikj.com.cn:2222/pay/pay-admin:
  fix：细节修复

# Conflicts:
#	src/pages/company/list/show/$id.tsx
This commit is contained in:
Your Name 2026-01-26 19:55:44 +08:00
commit 6056d990d5
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/common/positions/index.tsx
View File

@ -43,11 +43,11 @@ export default function Index({ title = '岗位库' }) {
dataIndex: 'name', dataIndex: 'name',
width: 200, width: 200,
}, },
{ // {
title: '岗位编号', // title: '岗位编号',
dataIndex: 'code', // dataIndex: 'code',
width: 200, // width: 200,
}, // },
{ {
title: '岗位说明', title: '岗位说明',
dataIndex: 'remark', dataIndex: 'remark',

12
src/pages/common/positions/modals/Create.tsx
View File

@ -45,12 +45,12 @@ export default function Create(props: MyBetaModalFormProps) {
colProps: { span: 24 }, colProps: { span: 24 },
formItemProps: { ...rulesHelper.text }, formItemProps: { ...rulesHelper.text },
}, },
{ // {
key: 'code', // key: 'code',
title: '岗位编号', // title: '岗位编号',
colProps: { span: 24 }, // colProps: { span: 24 },
formItemProps: { ...rulesHelper.text }, // formItemProps: { ...rulesHelper.text },
}, // },
{ {
key: 'remark', key: 'remark',
title: '岗位说明', title: '岗位说明',

12
src/pages/common/positions/modals/Update.tsx
View File

@ -46,12 +46,12 @@ export default function Update(props: MyBetaModalFormProps) {
colProps: { span: 24 }, colProps: { span: 24 },
formItemProps: { ...rulesHelper.text }, formItemProps: { ...rulesHelper.text },
}, },
{ // {
key: 'code', // key: 'code',
title: '岗位编号', // title: '岗位编号',
colProps: { span: 24 }, // colProps: { span: 24 },
formItemProps: { ...rulesHelper.text }, // formItemProps: { ...rulesHelper.text },
}, // },
{ {
key: 'remark', key: 'remark',
title: '岗位说明', title: '岗位说明',

2
src/pages/company/apps/modals/AppCreate.tsx
View File

@ -63,7 +63,7 @@ export default function Create(props: MyBetaModalFormProps) {
name: ['app_type'], name: ['app_type'],
valueType: 'dependency', valueType: 'dependency',
columns: ({ app_type }: any) => { columns: ({ app_type }: any) => {
return app_type === 'MiniProgram' return app_type !== 'MpOfficial'
? [ ? [
MyFormItems.EnumRadio({ MyFormItems.EnumRadio({
key: 'module', key: 'module',

2
src/pages/company/employees/modals/EmployeeCreate.tsx
View File

@ -35,7 +35,7 @@ export default function Create(props: MyBetaModalFormProps) {
}) })
.then(() => { .then(() => {
props.reload?.(); props.reload?.();
message.success('编辑成功'); message.success('添加成功');
return true; return true;
}) })
.catch(() => false) .catch(() => false)

2
src/pages/company/organizations/modals/OrganizationCreate.tsx
View File

@ -31,7 +31,7 @@ export default function Create(props: MyBetaModalFormProps) {
onFinish={async (values: any) => onFinish={async (values: any) =>
Apis.Company.Organizations.Store({ Apis.Company.Organizations.Store({
...values, ...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], parent_id: values?.parent_id?.[values.parent_id.length - 1],
}) })
.then(() => { .then(() => {