Compare commits
No commits in common. "1cdddded82994367b0eddb89dbfebd80331a4f86" and "f5eaece8abdc7e1952dba809bd287aa64ab37453" have entirely different histories.
1cdddded82
...
f5eaece8ab
@ -14,8 +14,8 @@ export default defineConfig({
|
||||
},
|
||||
proxy: {
|
||||
'/api/': {
|
||||
// target: 'http://yt:8003',
|
||||
target: 'http://10.39.13.80:8003',
|
||||
target: 'http://yt:8003',
|
||||
// target: 'http://10.39.13.80:8003',
|
||||
// target: 'http://we6f9c65.natappfree.cc',
|
||||
// target: 'https://loanos-test.nchl.net/',
|
||||
changeOrigin: true,
|
||||
|
||||
40
src/gen/ApiTypes.d.ts
vendored
40
src/gen/ApiTypes.d.ts
vendored
@ -345,38 +345,6 @@ declare namespace ApiTypes {
|
||||
"keywords"?: string; // 关键词
|
||||
};
|
||||
}
|
||||
namespace CompanyPositions {
|
||||
type List = {
|
||||
"name"?: string; // 模糊搜索：名称
|
||||
};
|
||||
type Store = {
|
||||
"companies_id": number; // 所属机构id,[ref:companies]
|
||||
"name": string; // 岗位名称
|
||||
"code": string; // 岗位编号
|
||||
"sort"?: number; // 排序
|
||||
"status"?: number; // 状态
|
||||
"remark"?: string; // 备注
|
||||
};
|
||||
type Update = {
|
||||
"id": number; // id
|
||||
"companies_id": number; // 所属机构id,[ref:companies]
|
||||
"name": string; // 岗位名称
|
||||
"code": string; // 岗位编号
|
||||
"sort"?: number; // 排序
|
||||
"status"?: number; // 状态
|
||||
"remark"?: string; // 备注
|
||||
};
|
||||
type Show = {
|
||||
"id": number; // id
|
||||
};
|
||||
type Delete = {
|
||||
"id": number; // id
|
||||
};
|
||||
type Select = {
|
||||
"companies_id"?: number; // 所属机构id,[ref:companies]
|
||||
"keywords"?: string; // 关键词
|
||||
};
|
||||
}
|
||||
namespace CompanyReceiptAccounts {
|
||||
type List = {
|
||||
"name"?: string; // 模糊搜索：名称
|
||||
@ -422,7 +390,7 @@ declare namespace ApiTypes {
|
||||
"companies_id": number; // 所属机构id,[ref:companies]
|
||||
"type": string; // 类型,[enum:OrganizationsTypeEnum]
|
||||
"name": string; // 名称
|
||||
"managers_id"?: number; // 负责人IDid,[ref:company_employees]
|
||||
"managers_id": number; // 负责人IDid,[ref:company_employees]
|
||||
"manager_phone"?: string; // 负责人电话
|
||||
"manager_email"?: string; // 负责人邮箱
|
||||
"status"?: number; // 状态
|
||||
@ -433,9 +401,10 @@ declare namespace ApiTypes {
|
||||
};
|
||||
type Update = {
|
||||
"id": number; // id
|
||||
"companies_id": number; // 所属机构id,[ref:companies]
|
||||
"type": string; // 类型,[enum:OrganizationsTypeEnum]
|
||||
"name": string; // 名称
|
||||
"managers_id"?: number; // 负责人IDid,[ref:company_employees]
|
||||
"managers_id": number; // 负责人IDid,[ref:company_employees]
|
||||
"manager_phone"?: string; // 负责人电话
|
||||
"manager_email"?: string; // 负责人邮箱
|
||||
"status"?: number; // 状态
|
||||
@ -461,11 +430,10 @@ declare namespace ApiTypes {
|
||||
"id": number; // id
|
||||
};
|
||||
type Select = {
|
||||
"companies_id"?: number; // 所属机构id,[ref:companies]
|
||||
"keywords"?: string; // 关键词
|
||||
"type"?: string; // 机构类型:CompanyTypeEnum
|
||||
};
|
||||
type SelectTree = {
|
||||
"companies_id"?: number; // 所属机构id,[ref:companies]
|
||||
"keywords"?: string; // -
|
||||
"type"?: string; // -
|
||||
"parent_id"?: number; // -
|
||||
|
||||
@ -182,26 +182,6 @@ export const Apis = {
|
||||
return request('admin/company/company_employees/select', { data });
|
||||
},
|
||||
},
|
||||
CompanyPositions: {
|
||||
List(data?: ApiTypes.Company.CompanyPositions.List): Promise<MyResponseType> {
|
||||
return request('admin/company/company_positions/list', { data });
|
||||
},
|
||||
Store(data: ApiTypes.Company.CompanyPositions.Store): Promise<MyResponseType> {
|
||||
return request('admin/company/company_positions/store', { data });
|
||||
},
|
||||
Update(data: ApiTypes.Company.CompanyPositions.Update): Promise<MyResponseType> {
|
||||
return request('admin/company/company_positions/update', { data });
|
||||
},
|
||||
Show(data: ApiTypes.Company.CompanyPositions.Show): Promise<MyResponseType> {
|
||||
return request('admin/company/company_positions/show', { data });
|
||||
},
|
||||
Delete(data: ApiTypes.Company.CompanyPositions.Delete): Promise<MyResponseType> {
|
||||
return request('admin/company/company_positions/delete', { data });
|
||||
},
|
||||
Select(data?: ApiTypes.Company.CompanyPositions.Select): Promise<MyResponseType> {
|
||||
return request('admin/company/company_positions/select', { data });
|
||||
},
|
||||
},
|
||||
CompanyReceiptAccounts: {
|
||||
List(data?: ApiTypes.Company.CompanyReceiptAccounts.List): Promise<MyResponseType> {
|
||||
return request('admin/company/company_receipt_accounts/list', { data });
|
||||
|
||||
@ -26,11 +26,6 @@ export default function Index({ title = '机构管理' }) {
|
||||
]}
|
||||
columns={[
|
||||
MyColumns.ID(),
|
||||
MyColumns.EnumTag({
|
||||
title: '类型',
|
||||
dataIndex: 'merchant_type',
|
||||
valueEnum: CompaniesMerchantTypeEnum,
|
||||
}),
|
||||
{
|
||||
title: '组织名称',
|
||||
dataIndex: 'name',
|
||||
@ -39,25 +34,29 @@ export default function Index({ title = '机构管理' }) {
|
||||
title: '组织简称',
|
||||
dataIndex: 'short_name',
|
||||
},
|
||||
|
||||
MyColumns.EnumTag({
|
||||
title: '类型',
|
||||
dataIndex: 'merchant_type',
|
||||
valueEnum: CompaniesMerchantTypeEnum,
|
||||
}),
|
||||
{
|
||||
title: '营业执照号',
|
||||
dataIndex: 'business_license_number',
|
||||
},
|
||||
// {
|
||||
// title: '联系人',
|
||||
// dataIndex: 'contact_name',
|
||||
// },
|
||||
// {
|
||||
// title: '手机号',
|
||||
// dataIndex: 'contact_phone',
|
||||
// },
|
||||
// {
|
||||
// title: '联系人邮箱',
|
||||
// dataIndex: 'contact_email',
|
||||
// },
|
||||
{
|
||||
title: '联系人',
|
||||
dataIndex: 'contact_name',
|
||||
},
|
||||
{
|
||||
title: '手机号',
|
||||
dataIndex: 'contact_phone',
|
||||
},
|
||||
{
|
||||
title: '联系人邮箱',
|
||||
dataIndex: 'contact_email',
|
||||
},
|
||||
MyColumns.UpdatedAt(),
|
||||
// MyColumns.CreatedAt(),
|
||||
MyColumns.CreatedAt(),
|
||||
MyColumns.Option({
|
||||
render: (_, item: any, index, action) => (
|
||||
<Space key={index}>
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
import {
|
||||
MyBetaModalFormProps,
|
||||
MyButtons,
|
||||
MyFormItems,
|
||||
MyModalFormProps,
|
||||
rulesHelper,
|
||||
} from '@/common';
|
||||
import { Address } from '@/components/Address';
|
||||
import { Apis } from '@/gen/Apis';
|
||||
import { CompaniesMerchantTypeEnum } from '@/gen/Enums';
|
||||
import { BetaSchemaForm } from '@ant-design/pro-components';
|
||||
import { message } from 'antd';
|
||||
|
||||
@ -13,15 +15,12 @@ export default function Create(props: MyBetaModalFormProps) {
|
||||
return (
|
||||
<BetaSchemaForm<ApiTypes.Company.Companies.Store>
|
||||
{...MyModalFormProps.props}
|
||||
title={`添加机构`}
|
||||
title={`添加${props.title}`}
|
||||
wrapperCol={{ span: 24 }}
|
||||
width="800px"
|
||||
trigger={<MyButtons.Create title={`添加机构`} />}
|
||||
trigger={<MyButtons.Create title={`添加${props.title}`} />}
|
||||
onFinish={async (values) =>
|
||||
Apis.Company.Companies.Store({
|
||||
...values,
|
||||
merchant_type: 'PropertyManagement',
|
||||
})
|
||||
Apis.Company.Companies.Store(values)
|
||||
.then(() => {
|
||||
props.reload?.();
|
||||
message.success(props.title + '成功');
|
||||
@ -46,17 +45,8 @@ export default function Create(props: MyBetaModalFormProps) {
|
||||
title: '营业执照号',
|
||||
colProps: { span: 8 },
|
||||
formItemProps: { ...rulesHelper.text },
|
||||
fieldProps: {
|
||||
maxLength: 18,
|
||||
},
|
||||
},
|
||||
// MyFormItems.EnumRadio({
|
||||
// key: 'merchant_type',
|
||||
// title: '商户类型',
|
||||
// colProps: { span: 8 },
|
||||
// valueEnum: CompaniesMerchantTypeEnum,
|
||||
// required: true,
|
||||
// }),
|
||||
|
||||
{
|
||||
key: 'contact_name',
|
||||
title: '联系人姓名',
|
||||
@ -78,30 +68,30 @@ export default function Create(props: MyBetaModalFormProps) {
|
||||
title: '联系人邮箱',
|
||||
colProps: { span: 8 },
|
||||
},
|
||||
// {
|
||||
// key: 'contact_address',
|
||||
// title: '联系人地址',
|
||||
// colProps: { span: 24 },
|
||||
// },
|
||||
|
||||
{
|
||||
key: 'contact_address',
|
||||
title: '联系人地址',
|
||||
colProps: { span: 24 },
|
||||
},
|
||||
MyFormItems.EnumRadio({
|
||||
key: 'merchant_type',
|
||||
title: '商户类型',
|
||||
colProps: { span: 24 },
|
||||
valueEnum: CompaniesMerchantTypeEnum,
|
||||
required: true,
|
||||
}),
|
||||
Address.Cascader({
|
||||
key: 'casacader',
|
||||
title: '联系地址',
|
||||
colProps: { span: 16 },
|
||||
title: '选择地址',
|
||||
colProps: { span: 24 },
|
||||
keys: ['province', 'city', 'area', 'street'],
|
||||
required: true,
|
||||
}),
|
||||
{
|
||||
key: 'address',
|
||||
title: '详细地址',
|
||||
colProps: { span: 8 },
|
||||
colProps: { span: 24 },
|
||||
},
|
||||
// MyFormItems.UploadImages({
|
||||
// key: 'business_license_image',
|
||||
// title: '营业执照',
|
||||
// max: 1,
|
||||
// colProps: { span: 6 },
|
||||
// }),
|
||||
]}
|
||||
/>
|
||||
);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user