diff --git a/.env.development b/.env.development index fbcc74b..47e6eb1 100644 --- a/.env.development +++ b/.env.development @@ -1,6 +1,6 @@ VITE_APP_NAME=后台管理(开发环境) -VITE_API_URL=http://127.0.0.1:9200/api -#VITE_SERVER_API_URL=http://127.0.0.1:8000/api +#VITE_API_URL=http://127.0.0.1:9200/api +VITE_SERVER_API_URL=http://127.0.0.1:8000/api #VITE_API_URL=https://cms-api.s209.websoft.top/api diff --git a/src/api/glt/gltTicketOrder/index.ts b/src/api/glt/gltTicketOrder/index.ts new file mode 100644 index 0000000..afbc068 --- /dev/null +++ b/src/api/glt/gltTicketOrder/index.ts @@ -0,0 +1,105 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { GltTicketOrder, GltTicketOrderParam } from './model'; + +/** + * 分页查询送水订单 + */ +export async function pageGltTicketOrder(params: GltTicketOrderParam) { + const res = await request.get>>( + '/glt/glt-ticket-order/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询送水订单列表 + */ +export async function listGltTicketOrder(params?: GltTicketOrderParam) { + const res = await request.get>( + '/glt/glt-ticket-order', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加送水订单 + */ +export async function addGltTicketOrder(data: GltTicketOrder) { + const res = await request.post>( + '/glt/glt-ticket-order', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改送水订单 + */ +export async function updateGltTicketOrder(data: GltTicketOrder) { + const res = await request.put>( + '/glt/glt-ticket-order', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除送水订单 + */ +export async function removeGltTicketOrder(id?: number) { + const res = await request.delete>( + '/glt/glt-ticket-order/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除送水订单 + */ +export async function removeBatchGltTicketOrder(data: (number | undefined)[]) { + const res = await request.delete>( + '/glt/glt-ticket-order/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询送水订单 + */ +export async function getGltTicketOrder(id: number) { + const res = await request.get>( + '/glt/glt-ticket-order/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/glt/gltTicketOrder/model/index.ts b/src/api/glt/gltTicketOrder/model/index.ts new file mode 100644 index 0000000..ce8bd0b --- /dev/null +++ b/src/api/glt/gltTicketOrder/model/index.ts @@ -0,0 +1,51 @@ +import type { PageParam } from '@/api'; + +/** + * 送水订单 + */ +export interface GltTicketOrder { + // + id?: number; + // 用户水票ID + userTicketId?: number; + // 门店ID + storeId?: number; + // 配送员 + riderId?: number; + // 仓库ID + warehouseId?: number; + // 关联收货地址 + addressId?: number; + // 收货地址 + address?: string; + // 买家留言 + buyerRemarks?: string; + // 用于统计 + price?: string; + // 购买数量 + totalNum?: number; + // 用户ID + userId?: number; + // 排序(数字越小越靠前) + sortNumber?: number; + // 备注 + comments?: string; + // 状态, 0正常, 1冻结 + status?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 送水订单搜索条件 + */ +export interface GltTicketOrderParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/system/userVerify/model/index.ts b/src/api/system/userVerify/model/index.ts index c13c863..b406e62 100644 --- a/src/api/system/userVerify/model/index.ts +++ b/src/api/system/userVerify/model/index.ts @@ -30,6 +30,10 @@ export interface UserVerify { sfz2?: string; // 机构名称 organizationName?: string; + // 操作员 + adminId?: number; + // 操作员名称 + adminName?: string; // 备注 comments?: string; // 状态, 0在线, 1离线 diff --git a/src/views/system/userVerify/components/userVerifyEdit.vue b/src/views/system/userVerify/components/userVerifyEdit.vue index c1139d0..309d7ec 100644 --- a/src/views/system/userVerify/components/userVerifyEdit.vue +++ b/src/views/system/userVerify/components/userVerifyEdit.vue @@ -136,6 +136,8 @@ const form = reactive({ id: undefined, userId: undefined, + adminId: undefined, + adminName: undefined, type: undefined, name: undefined, realName: undefined, diff --git a/src/views/system/userVerify/index.vue b/src/views/system/userVerify/index.vue index 652e011..adaa9fb 100644 --- a/src/views/system/userVerify/index.vue +++ b/src/views/system/userVerify/index.vue @@ -31,6 +31,19 @@ >原因:{{ record.comments }} + +