feat(approval): 添加企业微信相关字段和审批类型支持

在审批列表和类型定义中添加企业微信corpid字段和审批类型字段,以支持多租户和不同类型的审批流程
This commit is contained in:
dzq 2025-06-09 08:22:55 +08:00
parent 2c2ca7745c
commit 33ef5825b0
2 changed files with 30 additions and 2 deletions

View File

@ -25,6 +25,8 @@ export interface SearchApiReturnApprovalQuery {
status?: number status?: number
startTime?: string startTime?: string
endTime?: string endTime?: string
approvalType?: number
corpid?: string
} }
export interface ApiResponsePageData<T> { export interface ApiResponsePageData<T> {
@ -37,16 +39,31 @@ export interface ApiResponsePageData<T> {
} }
export interface ReturnApprovalEntity { export interface ReturnApprovalEntity {
/** 审批编号 */
approvalId: number approvalId: number
/** 关联订单ID */
orderId: number orderId: number
/** 关联商品ID */
goodsId: number goodsId: number
/** 关联订单商品ID */ /** 关联订单商品ID */
orderGoodsId: number orderGoodsId: number
/** 外部归属类型的商品ID */
externalGoodsId?: number
/** 外部归属类型的审批ID */
externalApprovalId?: number
/** 企业微信id */
corpid?: string
/** 申请数量 */
applyQuantity?: number
/** 审批类型0为借还柜 1为固资通 */
approvalType?: number
/** 申请说明 */
applyRemark?: string
/** 归还数量 */ /** 归还数量 */
returnQuantity: number returnQuantity: number
/** 商品单价 */ /** 商品单价 */
goodsPrice: number goodsPrice: number
status: number /** 退还金额 */
returnAmount: number returnAmount: number
/** 归还图片路径数组 */ /** 归还图片路径数组 */
returnImages: string returnImages: string
@ -56,6 +73,10 @@ export interface ReturnApprovalEntity {
returnRemark: string returnRemark: string
/** 审核说明 */ /** 审核说明 */
auditRemark: string auditRemark: string
/** 审批状态(1待审核 2已通过 3已驳回) */
status: number
/** 审批时间 */
approvalTime?: string
createTime: string createTime: string
updateTime: string updateTime: string
/** 商品名称 */ /** 商品名称 */
@ -72,6 +93,8 @@ export interface ReturnApprovalEntity {
isInternal: number isInternal: number
/** 审核人姓名 */ /** 审核人姓名 */
auditName: string auditName: string
/** 支付方式 */
paymentMethod?: string
} }
export type SubmitApprovalResponseData = ApiResponseMsgData<{ export type SubmitApprovalResponseData = ApiResponseMsgData<{

View File

@ -59,11 +59,15 @@ import { getApprovalListApi } from '@/common/apis/approval'
import type { SearchApiReturnApprovalQuery, ReturnApprovalEntity } from '@/common/apis/approval/type' import type { SearchApiReturnApprovalQuery, ReturnApprovalEntity } from '@/common/apis/approval/type'
import type { PickerConfirmEventParams } from 'vant/es'; import type { PickerConfirmEventParams } from 'vant/es';
import { useApprovalStore } from '@/pinia/stores/approval'; import { useApprovalStore } from '@/pinia/stores/approval';
import { useWxStore } from '@/pinia/stores/wx';
const router = useRouter() const router = useRouter();
const wxStore = useWxStore();
// //
const searchParams = reactive<SearchApiReturnApprovalQuery>({ const searchParams = reactive<SearchApiReturnApprovalQuery>({
corpid: wxStore.corpid,
approvalType: 0,
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
}) })
@ -158,6 +162,7 @@ const handleReset = () => {
// //
const onLoad = async () => { const onLoad = async () => {
try { try {
searchParams.corpid = wxStore.corpid;
const { data } = await getApprovalListApi(searchParams) const { data } = await getApprovalListApi(searchParams)
list.value.push(...data.rows) list.value.push(...data.rows)
loading.value = false loading.value = false