From 6452b887dc9cce00d0ab7db5086769f4ddcb64cd Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Mon, 5 Feb 2024 21:47:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/dict-data/model/index.ts | 3 +- src/api/tower/equipment/model/index.ts | 105 ++++---- src/api/tower/purchase/index.ts | 113 ++++++++ src/api/tower/purchase/model/index.ts | 37 +++ src/views/tower/customer/index.vue | 2 +- .../purchase/components/category-edit.vue | 249 ++++++++++++++++++ .../purchase/components/purchase-edit.vue | 233 ++++++++++++++++ .../purchase/dict/components/dict-edit.vue | 175 ++++++++++++ src/views/tower/purchase/dict/index.vue | 225 ++++++++++++++++ src/views/tower/purchase/index.vue | 200 ++++++++++++++ src/views/tower/rent/components/rent-edit.vue | 2 +- 11 files changed, 1289 insertions(+), 55 deletions(-) create mode 100644 src/api/tower/purchase/index.ts create mode 100644 src/api/tower/purchase/model/index.ts create mode 100644 src/views/tower/purchase/components/category-edit.vue create mode 100644 src/views/tower/purchase/components/purchase-edit.vue create mode 100644 src/views/tower/purchase/dict/components/dict-edit.vue create mode 100644 src/views/tower/purchase/dict/index.vue create mode 100644 src/views/tower/purchase/index.vue diff --git a/src/api/system/dict-data/model/index.ts b/src/api/system/dict-data/model/index.ts index 7041eba..3eea5c5 100644 --- a/src/api/system/dict-data/model/index.ts +++ b/src/api/system/dict-data/model/index.ts @@ -12,8 +12,9 @@ export interface DictData { dictDataCode?: string; // 字典数据名称 dictDataName?: string; + dictCode?: string; // 排序号 - sortNumber?: string; + sortNumber?: any; // 备注 comments?: string; // 创建时间 diff --git a/src/api/tower/equipment/model/index.ts b/src/api/tower/equipment/model/index.ts index 1966e94..52710e8 100644 --- a/src/api/tower/equipment/model/index.ts +++ b/src/api/tower/equipment/model/index.ts @@ -1,61 +1,62 @@ -import type { PageParam } from "@/api"; -import { Project } from "@/api/tower/project/model"; +import type { PageParam } from '@/api'; +import { Project } from '@/api/tower/project/model'; export interface TowerEquipment { - equipmentId?: number; - name?: string; - model?: string; - equipmentNo?: string; - factoryNo?: string; - factoryDate?: string; - manufactor?: string; - lifeYear?: any; - surplusYear?: number; - scrapDate?: string; - beianNo?: string; - licenceNo?: string; - company?: string; - organization?: string; - warehouse?: string; - source?: string; - filingNo?: string; - machineNo?: string; - maxLiftingHeight?: string; - armLength?: string; - isOutOrg?: boolean; - buyDate?: string; - currentLocation?: string; - designHeight?: number; - height?: number; - ratedLoad?: string; - files?: string; - file1?: string; - file2?: string; - file3?: string; - file4?: string; - file5?: string; - file6?: string; - file7?: string; - users?: string; - status?: number; - comments?: string; - userId?: number; - deleted?: number; - tenantId?: number; - createTime?: number; - maxRatedLoad?: string; - securityStatus?: string; - projectName?: string; - competentDepartment?: string; - projectList?: Project[]; + equipmentId?: number; + name?: string; + model?: string; + equipmentNo?: string; + factoryNo?: string; + factoryDate?: string; + manufactor?: string; + lifeYear?: any; + surplusYear?: number; + scrapDate?: string; + beianNo?: string; + licenceNo?: string; + company?: string; + organization?: string; + warehouse?: string; + source?: string; + filingNo?: string; + machineNo?: string; + maxLiftingHeight?: string; + armLength?: string; + isOutOrg?: boolean; + buyDate?: string; + currentLocation?: string; + designHeight?: number; + height?: number; + ratedLoad?: string; + files?: string; + file1?: string; + file2?: string; + file3?: string; + file4?: string; + file5?: string; + file6?: string; + file7?: string; + users?: string; + status?: number; + comments?: string; + userId?: number; + deleted?: number; + tenantId?: number; + createTime?: number; + maxRatedLoad?: string; + securityStatus?: string; + projectName?: string; + competentDepartment?: string; + projectList?: Project[]; } /** * 搜索条件 */ export interface TowerEquipmentParam extends PageParam { - equipmentId?: number; - name?: string; - status?: number; - yearFilter?: number; + equipmentId?: number; + name?: string; + status?: number; + scrapDate?: string; + yearFilter?: number; } diff --git a/src/api/tower/purchase/index.ts b/src/api/tower/purchase/index.ts new file mode 100644 index 0000000..f845b8b --- /dev/null +++ b/src/api/tower/purchase/index.ts @@ -0,0 +1,113 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { TowerPurchase, TowerPurchaseParam } from './model'; +// const merchantCode = String(localStorage.getItem('merchantCode')); + +/** + * 分页查询采购入库 + */ +export async function pageTowerPurchase(params: TowerPurchaseParam) { + const res = await request.get>>( + '/tower/tower-purchase/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询采购入库列表 + */ +export async function listTowerPurchase(params?: TowerPurchaseParam) { + const res = await request.get>( + '/tower/tower-purchase', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加采购入库 + */ +export async function addTowerPurchase(data: TowerPurchase) { + const res = await request.post>( + '/tower/tower-purchase', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改采购入库 + */ +export async function updateTowerPurchase(data: TowerPurchase) { + const res = await request.put>( + '/tower/tower-purchase', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除采购入库 + */ +export async function removeTowerPurchase(id?: number) { + const res = await request.delete>( + '/tower/tower-purchase/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除采购入库 + */ +export async function removeBatchTowerPurchase(data: (number | undefined)[]) { + const res = await request.delete>( + '/tower/tower-purchase/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-purchase/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/purchase/model/index.ts b/src/api/tower/purchase/model/index.ts new file mode 100644 index 0000000..a44be9f --- /dev/null +++ b/src/api/tower/purchase/model/index.ts @@ -0,0 +1,37 @@ +import type { PageParam } from '@/api'; + +/** + * 采购入库 + */ +export interface TowerPurchase { + purchaseId?: number; + name?: string; + purchaseCode?: string; + purchaseType?: string; + price?: number; + companyName?: string; + userId?: number; + sortNumber?: number; + comments?: string; + status?: number; + createTime?: string; + updateTime?: string; + key?: number; + merchantCode?: string; + value?: number; + index?: number; +} + +/** + * 搜索条件 + */ +export interface TowerPurchaseParam extends PageParam { + rentId?: number; + title?: string; + categoryId?: string; + yearLife?: number; + name?: string; + companyName: string; + // 商户编号 + merchantCode?: string; +} diff --git a/src/views/tower/customer/index.vue b/src/views/tower/customer/index.vue index a6826b3..1b62836 100644 --- a/src/views/tower/customer/index.vue +++ b/src/views/tower/customer/index.vue @@ -151,7 +151,7 @@ title: '客户名称', dataIndex: 'name', key: 'name', - width: 280, + width: 380, ellipsis: true }, { diff --git a/src/views/tower/purchase/components/category-edit.vue b/src/views/tower/purchase/components/category-edit.vue new file mode 100644 index 0000000..bd6ca25 --- /dev/null +++ b/src/views/tower/purchase/components/category-edit.vue @@ -0,0 +1,249 @@ + + + + + + diff --git a/src/views/tower/purchase/components/purchase-edit.vue b/src/views/tower/purchase/components/purchase-edit.vue new file mode 100644 index 0000000..719ab6d --- /dev/null +++ b/src/views/tower/purchase/components/purchase-edit.vue @@ -0,0 +1,233 @@ + + + + + + diff --git a/src/views/tower/purchase/dict/components/dict-edit.vue b/src/views/tower/purchase/dict/components/dict-edit.vue new file mode 100644 index 0000000..56415ed --- /dev/null +++ b/src/views/tower/purchase/dict/components/dict-edit.vue @@ -0,0 +1,175 @@ + + + + diff --git a/src/views/tower/purchase/dict/index.vue b/src/views/tower/purchase/dict/index.vue new file mode 100644 index 0000000..c1e82e4 --- /dev/null +++ b/src/views/tower/purchase/dict/index.vue @@ -0,0 +1,225 @@ + + + + + diff --git a/src/views/tower/purchase/index.vue b/src/views/tower/purchase/index.vue new file mode 100644 index 0000000..80e99e6 --- /dev/null +++ b/src/views/tower/purchase/index.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/views/tower/rent/components/rent-edit.vue b/src/views/tower/rent/components/rent-edit.vue index f877bf5..23f2a97 100644 --- a/src/views/tower/rent/components/rent-edit.vue +++ b/src/views/tower/rent/components/rent-edit.vue @@ -22,7 +22,7 @@ - +