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 @@