From c433debb841bed58f8eb33a862f05dfb4c2c0793 Mon Sep 17 00:00:00 2001 From: dzq Date: Sat, 14 Jun 2025 17:54:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(approval):=20=E6=B7=BB=E5=8A=A0=E8=B5=84?= =?UTF-8?q?=E4=BA=A7=E5=AE=A1=E6=89=B9=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增资产审批接口和类型定义 - 在审批页面添加审批数量控制和商品格口信息展示 - 优化审批表单验证逻辑和界面布局 --- src/common/apis/approval/index.ts | 19 ++- src/common/apis/approval/type.ts | 29 ++++ src/pages/approval/handleApply.vue | 211 +++++++++++++++++------------ src/pages/me/index.vue | 2 + 4 files changed, 176 insertions(+), 85 deletions(-) diff --git a/src/common/apis/approval/index.ts b/src/common/apis/approval/index.ts index e648c43..797c6d8 100644 --- a/src/common/apis/approval/index.ts +++ b/src/common/apis/approval/index.ts @@ -1,5 +1,5 @@ import { request } from '@/http/axios' -import { SubmitApprovalRequestData, SubmitApprovalResponseData, SearchApiReturnApprovalQuery, ApiResponsePageData, ReturnApprovalEntity, HandleApprovalRequestData, SearchReturnApprovalAssetQuery, ReturnApprovalAssetDTO } from './type' +import { SubmitApprovalRequestData, SubmitApprovalResponseData, SearchApiReturnApprovalQuery, ApiResponsePageData, ReturnApprovalEntity, HandleApprovalRequestData, SearchReturnApprovalAssetQuery, ReturnApprovalAssetDTO, HandleApprovalAssetRequestData, ApprovalGoodsCellEntity } from './type' import { ShopOrderGoodsEntity } from '../shop/type' export const getApprovalListApi = (params: SearchApiReturnApprovalQuery) => { @@ -49,6 +49,15 @@ export const handleApprovalApi = (data: HandleApprovalRequestData) => { }) } + +export const handleApprovalAssetApi = (data: HandleApprovalAssetRequestData) => { + return request>({ + url: 'approval/handle/asset', + method: 'post', + data + }) +} + export const getApprovalOrderGoodsApi = (approvalId: number) => { return request>({ url: 'approval/getApprovalOrderGoods', @@ -56,3 +65,11 @@ export const getApprovalOrderGoodsApi = (approvalId: number) => { params: { approvalId } }) } + +export const getApprovalGoodsCellApi = (approvalId: number) => { + return request>({ + url: 'approval/getApprovalGoodsCell', + method: 'get', + params: { approvalId } + }) +} diff --git a/src/common/apis/approval/type.ts b/src/common/apis/approval/type.ts index e02898f..8482885 100644 --- a/src/common/apis/approval/type.ts +++ b/src/common/apis/approval/type.ts @@ -20,6 +20,11 @@ export interface HandleApprovalRequestData { auditUserid: string } +export interface HandleApprovalAssetRequestData extends HandleApprovalRequestData { + /** 审批商品ID */ + approvalGoodsList: ApprovalGoodsEntity[] +} + export interface SearchApiReturnApprovalQuery { pageNum: number pageSize: number @@ -121,6 +126,7 @@ export interface ApprovalGoodsEntity { belongType: number; price: number; applyQuantity: number; + approvalQuantity?: number; coverImg?: string; } @@ -143,6 +149,29 @@ export interface SearchReturnApprovalAssetQuery { codeCheck?: number; } +export interface ApprovalGoodsCellEntity { + /** 主键ID */ + approvalGoodsCellId: number; + /** 审批ID */ + approvalId: number; + /** 申请领用商品ID */ + approvalGoodsId: number; + /** 商店ID */ + shopId: number; + /** 柜机ID */ + cabinetId: number; + /** 格口ID */ + cellId: number; + /** 分配数量 */ + allocateQuantity: number; + /** 商店名称 */ + shopName: string; + /** 柜机名称 */ + cabinetName: string; + /** 格口号 */ + cellNo: number; +} + export type SubmitApprovalResponseData = ApiResponseMsgData<{ approvalId: number status: number diff --git a/src/pages/approval/handleApply.vue b/src/pages/approval/handleApply.vue index 225b6d8..0224070 100644 --- a/src/pages/approval/handleApply.vue +++ b/src/pages/approval/handleApply.vue @@ -1,10 +1,10 @@