diff --git a/src/common/apis/approval/index.ts b/src/common/apis/approval/index.ts index 98e814c..8429a74 100644 --- a/src/common/apis/approval/index.ts +++ b/src/common/apis/approval/index.ts @@ -1,5 +1,6 @@ import { request } from '@/http/axios' import { SubmitApprovalRequestData, SubmitApprovalResponseData, SearchApiReturnApprovalQuery, ApiResponsePageData, ReturnApprovalEntity, HandleApprovalRequestData } from './type' +import { ShopOrderGoodsEntity } from '../shop/type' export const getApprovalListApi = (params: SearchApiReturnApprovalQuery) => { return request>({ @@ -26,3 +27,11 @@ export const handleApprovalApi = (data: HandleApprovalRequestData) => { data }) } + +export const getApprovalOrderGoodsApi = (approvalId: number) => { + return request>({ + url: 'approval/getApprovalOrderGoods', + method: 'get', + params: { approvalId } + }) +} diff --git a/src/common/apis/approval/type.ts b/src/common/apis/approval/type.ts index 731ed09..ffbcc40 100644 --- a/src/common/apis/approval/type.ts +++ b/src/common/apis/approval/type.ts @@ -14,6 +14,7 @@ export interface HandleApprovalRequestData { auditImages: string auditRemark: string userid: string + corpid: string } export interface SearchApiReturnApprovalQuery { diff --git a/src/common/apis/shop/type.ts b/src/common/apis/shop/type.ts index 4343aac..c82186c 100644 --- a/src/common/apis/shop/type.ts +++ b/src/common/apis/shop/type.ts @@ -83,13 +83,30 @@ export interface ShopOrderEntity { } export interface ShopOrderGoodsEntity { + /** 订单商品唯一ID */ orderGoodsId: number + /** 关联订单ID */ orderId: number + /** 审批ID */ + approvalId: number + /** 关联商品ID */ goodsId: number + /** 关联格口ID */ + cellId: number + /** 购买数量 */ quantity: number + /** 购买时单价 */ price: number + /** 商品总金额 */ totalAmount: number + /** 商品名称 */ + goodsName: string + /** 封面图URL */ + coverImg: string + /** 商品状态(1正常 2已退货 3已换货 4已完成 5审核中 6退货未通过) */ status: number + /** 企业微信id */ + corpid: string } export interface GetOrdersByOpenIdDTO { diff --git a/src/pages/approval/handle.vue b/src/pages/approval/handle.vue index 8f619ad..93360cd 100644 --- a/src/pages/approval/handle.vue +++ b/src/pages/approval/handle.vue @@ -26,7 +26,8 @@ const formData = ref({ returnAmount: approvalStore.currentApproval?.goodsPrice || 0, auditImages: '', auditRemark: '', - userid: wxStore.userid + userid: wxStore.userid, + corpid: wxStore.corpid, }) const submitting = ref(false) @@ -167,6 +168,7 @@ onMounted(() => { // 填充历史审批数据 formData.value = { ...formData.value, + corpid: wxStore.corpid, status: approvalStore.currentApproval.status, returnAmount: approvalStore.currentApproval.returnAmount, auditRemark: approvalStore.currentApproval.auditRemark, @@ -223,6 +225,7 @@ const handleSubmit = async () => { submitting.value = true try { formData.value.userid = wxStore.userid; + formData.value.corpid = wxStore.corpid; const { code, msg } = await handleApprovalApi(formData.value) if (code === 0) { diff --git a/src/pages/approval/handleApply.vue b/src/pages/approval/handleApply.vue new file mode 100644 index 0000000..5fd15e8 --- /dev/null +++ b/src/pages/approval/handleApply.vue @@ -0,0 +1,438 @@ + + + + + \ No newline at end of file diff --git a/src/pages/shop/Shop.vue b/src/pages/shop/Shop.vue new file mode 100644 index 0000000..e69de29