diff --git a/src/api/tower/project/index.ts b/src/api/tower/project/index.ts index df73f77..c8cb47e 100644 --- a/src/api/tower/project/index.ts +++ b/src/api/tower/project/index.ts @@ -6,9 +6,7 @@ import type { Project, ProjectParam } from '@/api/tower/project/model'; * 项目数据 */ export async function towerProjectData() { - const res = await request.get( - '/tower/tower-project/data' - ); + const res = await request.get('/tower/tower-project/data'); if (res.data.code === 0) { return res.data.data; } diff --git a/src/api/tower/project/model/index.ts b/src/api/tower/project/model/index.ts index 08f6dbd..1ad5d2f 100644 --- a/src/api/tower/project/model/index.ts +++ b/src/api/tower/project/model/index.ts @@ -56,6 +56,7 @@ export interface Project { export interface ProjectParam extends PageParam { projectId?: number; projectName?: string; + projectStatus?: any; status?: number; keywords?: string; } diff --git a/src/api/tower/rent/index.ts b/src/api/tower/rent/index.ts new file mode 100644 index 0000000..dc1886b --- /dev/null +++ b/src/api/tower/rent/index.ts @@ -0,0 +1,107 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { TowerRent, TowerRentParam } from './model'; +// const merchantCode = String(localStorage.getItem('merchantCode')); + +/** + * 分页查询标准节租金 + */ +export async function pageTowerRent(params: TowerRentParam) { + const res = await request.get>>( + '/tower/tower-rent/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询标准节租金列表 + */ +export async function listTowerRent(params?: TowerRentParam) { + const res = await request.get>('/tower/tower-rent', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加标准节租金 + */ +export async function addTowerRent(data: TowerRent) { + const res = await request.post>( + '/tower/tower-rent', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改标准节租金 + */ +export async function updateTowerRent(data: TowerRent) { + const res = await request.put>('/tower/tower-rent', data); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除标准节租金 + */ +export async function removeTowerRent(id?: number) { + const res = await request.delete>( + '/tower/tower-rent/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除标准节租金 + */ +export async function removeBatchTowerRent(data: (number | undefined)[]) { + const res = await request.delete>( + '/tower/tower-rent/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 检查IP是否存在 + */ +export async function checkExistence( + field: string, + value: string, + id?: number +) { + const res = await request.get>( + '/tower/tower-rent/existence', + { + params: { field, value, id } + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/tower/rent/model/index.ts b/src/api/tower/rent/model/index.ts new file mode 100644 index 0000000..d62155c --- /dev/null +++ b/src/api/tower/rent/model/index.ts @@ -0,0 +1,57 @@ +import type { PageParam } from '@/api'; + +/** + * 标准节租金 + */ +export interface TowerRent { + rentId?: number; + name?: string; + rent?: number; + month?: number; + num?: number; + totalRent?: string; + companyId?: number; + companyName?: string; + // 型号分类图片 + image?: string; + // 使用年限 + yearLife?: number; + // 上级分类 + parentId?: number; + // 是否隐藏 + hide?: number; + // 封面图 + avatar?: string; + // 用户ID + userId?: string; + // 所属门店ID + shopId?: string; + // 排序 + sortNumber?: number; + // 备注 + comments?: string; + // 状态 + status?: number; + // 创建时间 + createTime?: string; + // 更新时间 + updateTime?: string; + // + key?: number; + // + merchantCode?: string; + value?: number; + index?: number; +} + +/** + * 搜索条件 + */ +export interface TowerRentParam extends PageParam { + rentId?: number; + title?: string; + categoryId?: string; + yearLife?: number; + // 商户编号 + merchantCode?: string; +} diff --git a/src/views/goods/category/index.vue b/src/views/goods/category/index.vue index e60f393..34a4037 100644 --- a/src/views/goods/category/index.vue +++ b/src/views/goods/category/index.vue @@ -113,7 +113,7 @@ import type { EleProTable } from 'ele-admin-pro/es'; import CategoryEdit from './components/category-edit.vue'; import type { Category, CategoryParam } from '@/api/goods/category/model'; - import { listCategory } from '@/api/goods/category'; + import { listCategory, removeCategory } from "@/api/goods/category"; // 表格实例 const tableRef = ref | null>(null); diff --git a/src/views/tower/equipment/category/index.vue b/src/views/tower/equipment/category/index.vue index e95368b..28cb487 100644 --- a/src/views/tower/equipment/category/index.vue +++ b/src/views/tower/equipment/category/index.vue @@ -221,11 +221,12 @@ /* 删除单个 */ const remove = (row: Category) => { + console.log(row); if (row.children?.length) { message.error('请先删除子节点'); return; } - const hide = messageLoading('请求中..', 0); + const hide = messageLoading('请求中..' + row.categoryId, 0); removeCategory(row.categoryId) .then((msg) => { hide(); diff --git a/src/views/tower/equipment/components/search.vue b/src/views/tower/equipment/components/search.vue index 86f4618..6e678ee 100644 --- a/src/views/tower/equipment/components/search.vue +++ b/src/views/tower/equipment/components/search.vue @@ -1,237 +1,245 @@ diff --git a/src/views/tower/equipment/index.vue b/src/views/tower/equipment/index.vue index 805b31a..54f8694 100644 --- a/src/views/tower/equipment/index.vue +++ b/src/views/tower/equipment/index.vue @@ -1,17 +1,64 @@