diff --git a/.umirc.ts b/.umirc.ts index 190286d..a10f7e4 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -18,8 +18,8 @@ export default defineConfig({ proxy: { '/api/': { target: 'http://10.39.13.78:8001/', - // target: 'https://test-admin.linyikj.com.cn/', - // target: 'https://admin.linyikj.com.cn/', + // target: 'https://test-company.linyikj.com.cn/', + // target: 'https://company.linyikj.com.cn/', changeOrigin: true, pathRewrite: { '^': '' }, }, diff --git a/src/gen/ApiTypes.d.ts b/src/gen/ApiTypes.d.ts index bfc8b29..abb4d8e 100644 --- a/src/gen/ApiTypes.d.ts +++ b/src/gen/ApiTypes.d.ts @@ -196,6 +196,9 @@ declare namespace ApiTypes { "id": number; // id "is_contact": boolean; // 是否是常用联系人 }; + type Import = { + "upload_file"?: mimes:xlsx,xls; // 上传的时候必填文件 + }; } namespace HouseRegisters { type List = { @@ -1055,7 +1058,7 @@ declare namespace ApiTypes { } namespace CompanyProjectReceiptAccounts { type List = { - "asset_projects_id"?: number; // 所属项目id,[ref:asset_projects] + "projects_id"?: number; // 所属项目id,[ref:asset_projects] }; type Store = { "projects_id": number; // 所属项目id,[ref:asset_projects] diff --git a/src/gen/Apis.ts b/src/gen/Apis.ts index e608473..f6c7e8c 100644 --- a/src/gen/Apis.ts +++ b/src/gen/Apis.ts @@ -121,6 +121,12 @@ export const Apis = { ChangeIsContact(data: ApiTypes.Archive.HouseOccupants.ChangeIsContact): Promise { return request('company/archive/house_occupants/change_is_contact', { data }); }, + Import(data?: ApiTypes.Archive.HouseOccupants.Import): Promise { + return request('company/archive/house_occupants/import', { data }); + }, + DownloadTemplate(): Promise { + return request('company/archive/house_occupants/download_template', {responseType: 'blob',}); + }, }, HouseRegisters: { List(data?: ApiTypes.Archive.HouseRegisters.List): Promise { diff --git a/src/gen/Enums.ts b/src/gen/Enums.ts index 50c75ba..6263842 100644 --- a/src/gen/Enums.ts +++ b/src/gen/Enums.ts @@ -282,7 +282,7 @@ export const BannersTypeEnum= { // 缓存类型 export const CacheTypeEnum= { - 'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#d249bd","value":"MobilePhoneVerificationCode"}, + 'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#827a7d","value":"MobilePhoneVerificationCode"}, }; // CompaniesMerchantTypeEnum @@ -729,6 +729,7 @@ export const HouseRegistersTypeEnum= { 'UpdateInfo': {"text":"修改信息","color":"#722ed1","value":"UpdateInfo"}, 'UpdatePhone': {"text":"修改电话","color":"#13c2c2","value":"UpdatePhone"}, 'GoodsRelease': {"text":"物品放行","color":"#a0d911","value":"GoodsRelease"}, + 'VisitorApplies': {"text":"来访申请","color":"#a0d911","value":"VisitorApplies"}, }; // HouseRegistersUsagePlanEnum diff --git a/src/pages/company/employees/index.tsx b/src/pages/company/employees/index.tsx index 200159c..3cc4ba9 100644 --- a/src/pages/company/employees/index.tsx +++ b/src/pages/company/employees/index.tsx @@ -44,11 +44,11 @@ export default function Index({ title = '员工管理' }) { title="重置" type="default" isConfirm={true} - description={`确定要重置用户「${item.name}」的密码为「12345678」吗?`} + description={`确定要重置用户「${item.name}」的密码为「ly#123」吗?`} onConfirm={() => Apis.Company.CompanyEmployees.ResetPassword({ id: item.id, - password: '12345678', + password: 'ly#123', }).then(() => action?.reload()) } /> diff --git a/src/pages/company/employees/modals/EmployeeCreate.tsx b/src/pages/company/employees/modals/EmployeeCreate.tsx index a5b6728..213991d 100644 --- a/src/pages/company/employees/modals/EmployeeCreate.tsx +++ b/src/pages/company/employees/modals/EmployeeCreate.tsx @@ -36,7 +36,7 @@ export default function Create(props: MyBetaModalFormProps) { ...values, companies_id: values?.companies_id || props?.item?.id, // type: CompanyEmployeesTypeEnum.External.value, - password: '12345678', + password: 'ly#123', organizations_id: values?.organizations_id?.[values.organizations_id.length - 1], }) diff --git a/src/pages/customer/archive/index.tsx b/src/pages/customer/archive/index.tsx index 3cee2ea..a446bb2 100644 --- a/src/pages/customer/archive/index.tsx +++ b/src/pages/customer/archive/index.tsx @@ -1,6 +1,7 @@ import { MyButtons, MyColumns, + MyImportModal, MyPageContainer, MyProTableProps, } from '@/common'; @@ -31,17 +32,17 @@ export default function Index({ title = '房屋档案' }) { request={async (params, sort) => MyProTableProps.request(params, sort, Apis.Asset.AssetHouses.List) } - // toolBarRender={(action) => [ - // , - // ]} + toolBarRender={(action) => [ + , + ]} columns={[ MyColumns.ID({ search: false }), Selects?.AssetProjects({