Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
Some checks are pending
Gitea Actions Demo / Explore-Gitea-Actions (push) Waiting to run
This commit is contained in:
@@ -59,3 +59,12 @@ export function groupUpdate(data: GroupForm) {
|
||||
export function groupRemove(id: ID | IDS) {
|
||||
return requestClient.deleteWithMsg<void>(`/Property/group/${id}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取节假日数据
|
||||
* @param year
|
||||
*/
|
||||
export async function getHoliday(year: string) {
|
||||
const response = await fetch(`https://timor.tech/api/holiday/year/${year}`);
|
||||
return response.json();
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import type { PageQuery, BaseEntity } from '#/api/common';
|
||||
import type {PageQuery, BaseEntity} from '#/api/common';
|
||||
|
||||
export interface GroupVO {
|
||||
/**
|
||||
@@ -63,7 +63,16 @@ export interface GroupQuery extends PageQuery {
|
||||
attendanceType?: number;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
}
|
||||
|
||||
/**
|
||||
* 假期
|
||||
*/
|
||||
export interface Holiday {
|
||||
holiday: boolean;
|
||||
name: string;
|
||||
date: string;
|
||||
}
|
||||
|
@@ -58,6 +58,8 @@ export interface HouseChargeVO {
|
||||
costItemsVo: CostItemSettingVO;
|
||||
|
||||
chargeStatus: string;
|
||||
|
||||
personId: string;
|
||||
}
|
||||
|
||||
export interface HouseChargeForm extends BaseEntity {
|
||||
|
@@ -1,61 +0,0 @@
|
||||
import type { FactoryVO, FactoryForm, FactoryQuery } from './model';
|
||||
|
||||
import type { ID, IDS } from '#/api/common';
|
||||
import type { PageResult } from '#/api/common';
|
||||
|
||||
import { commonExport } from '#/api/helper';
|
||||
import { requestClient } from '#/api/request';
|
||||
|
||||
/**
|
||||
* 查询厂商管理列表
|
||||
* @param params
|
||||
* @returns 厂商管理列表
|
||||
*/
|
||||
export function factoryList(params?: FactoryQuery) {
|
||||
return requestClient.get<PageResult<FactoryVO>>('/property/factory/list', { params });
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出厂商管理列表
|
||||
* @param params
|
||||
* @returns 厂商管理列表
|
||||
*/
|
||||
export function factoryExport(params?: FactoryQuery) {
|
||||
return commonExport('/property/factory/export', params ?? {});
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询厂商管理详情
|
||||
* @param id id
|
||||
* @returns 厂商管理详情
|
||||
*/
|
||||
export function factoryInfo(id: ID) {
|
||||
return requestClient.get<FactoryVO>(`/property/factory/${id}`);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增厂商管理
|
||||
* @param data
|
||||
* @returns void
|
||||
*/
|
||||
export function factoryAdd(data: FactoryForm) {
|
||||
return requestClient.postWithMsg<void>('/property/factory', data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新厂商管理
|
||||
* @param data
|
||||
* @returns void
|
||||
*/
|
||||
export function factoryUpdate(data: FactoryForm) {
|
||||
return requestClient.putWithMsg<void>('/property/factory', data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除厂商管理
|
||||
* @param id id
|
||||
* @returns void
|
||||
*/
|
||||
export function factoryRemove(id: ID | IDS) {
|
||||
return requestClient.deleteWithMsg<void>(`/property/factory/${id}`);
|
||||
}
|
@@ -1,94 +0,0 @@
|
||||
import type { PageQuery, BaseEntity } from '#/api/common';
|
||||
|
||||
export interface FactoryVO {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
id: string | number;
|
||||
|
||||
/**
|
||||
* 厂商编码
|
||||
*/
|
||||
factoryNo: string;
|
||||
|
||||
/**
|
||||
* 设备厂商名称
|
||||
*/
|
||||
factoryName: string;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
remark: string;
|
||||
|
||||
/**
|
||||
* 数据状态:1有效,0无效
|
||||
*/
|
||||
dataState: number;
|
||||
|
||||
/**
|
||||
* 搜索值
|
||||
*/
|
||||
searchValue: string;
|
||||
|
||||
}
|
||||
|
||||
export interface FactoryForm extends BaseEntity {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
id?: string | number;
|
||||
|
||||
/**
|
||||
* 厂商编码
|
||||
*/
|
||||
factoryNo?: string;
|
||||
|
||||
/**
|
||||
* 设备厂商名称
|
||||
*/
|
||||
factoryName?: string;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
remark?: string;
|
||||
|
||||
/**
|
||||
* 数据状态:1有效,0无效
|
||||
*/
|
||||
dataState?: number;
|
||||
|
||||
/**
|
||||
* 搜索值
|
||||
*/
|
||||
searchValue?: string;
|
||||
|
||||
}
|
||||
|
||||
export interface FactoryQuery extends PageQuery {
|
||||
/**
|
||||
* 厂商编码
|
||||
*/
|
||||
factoryNo?: string;
|
||||
|
||||
/**
|
||||
* 设备厂商名称
|
||||
*/
|
||||
factoryName?: string;
|
||||
|
||||
/**
|
||||
* 数据状态:1有效,0无效
|
||||
*/
|
||||
dataState?: number;
|
||||
|
||||
/**
|
||||
* 搜索值
|
||||
*/
|
||||
searchValue?: string;
|
||||
|
||||
/**
|
||||
* 日期范围参数
|
||||
*/
|
||||
params?: any;
|
||||
}
|
Reference in New Issue
Block a user