From 7a5c5250b66cc6faffbcac9e192073473c50f79f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 28 八月 2026 17:02:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/api/erp/purchase/order/index.ts | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/src/api/erp/purchase/order/index.ts b/src/api/erp/purchase/order/index.ts
index 6964295..798d3b9 100644
--- a/src/api/erp/purchase/order/index.ts
+++ b/src/api/erp/purchase/order/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam, PageResult } from '..\..\..\..\packages\effects\request\src';
+import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@@ -13,13 +13,15 @@
totalCount?: number; // 鍚堣鏁伴噺
totalPrice?: number; // 鍚堣閲戦锛屽崟浣嶏細鍏�
totalProductPrice?: number; // 浜у搧閲戦锛屽崟浣嶏細鍏�
+ totalTaxPrice?: number; // 鍚堣绋庨锛屽崟浣嶏細鍏�
+ remainInvoicePrice?: number; // 鍓╀綑鍙紑绁ㄩ噾棰濓紙璁㈠崟鎬婚噾棰�-宸叉潵绁ㄩ噾棰濓級锛屽崟浣嶏細鍏�
discountPercent?: number; // 浼樻儬鐜囷紝鐧惧垎姣�
discountPrice?: number; // 浼樻儬閲戦锛屽崟浣嶏細鍏�
depositPrice?: number; // 瀹氶噾閲戦锛屽崟浣嶏細鍏�
accountId?: number; // 缁撶畻璐︽埛缂栧彿
status?: number; // 鐘舵��
remark?: string; // 澶囨敞
- fileUrl?: string; // 闄勪欢鍦板潃
+ attachmentList?: { id: number; name?: string; url?: string }[]; // 闄勪欢鍒楄〃
inCount?: number; // 閲囪喘鍏ュ簱鏁伴噺
count?: number; // 鏁伴噺
returnCount?: number; // 閲囪喘閫�璐ф暟閲�
@@ -50,6 +52,7 @@
totalTaxPrice?: number; // 鍚◣鎬讳环锛屽崟浣嶏細鍏�
remark?: string; // 澶囨敞
stockCount?: number; // 搴撳瓨鏁伴噺锛堟樉绀哄瓧娈碉級
+ qcCheckFlag?: boolean; // 鏄惁闇�瑕佹潵鏂欐楠�
}
}
@@ -96,3 +99,30 @@
export function exportPurchaseOrder(params: any) {
return requestClient.download('/erp/purchase-order/export-excel', { params });
}
+
+/** 鑾峰彇閲囪喘瀹℃牳娴佺▼鍒楄〃 */
+export function getPurchaseApproveProcessList() {
+ return requestClient.get<any[]>('/erp/purchase-order/approve-process-list');
+}
+
+/** 鍙嶅鎵癸紙鍗忓悓鍔炲叕宸插姙浠诲姟涓挙鍥炲凡瀹℃牳璁㈠崟锛屽洖閫�涓烘湭瀹℃牳锛� */
+export function reverseApprove(processInstanceId: string) {
+ return requestClient.post('/erp/purchase-order/reverse-approve', null, {
+ params: { processInstanceId },
+ });
+}
+
+/** 鑾峰彇閲囪喘瀹℃牳娴佺▼鍒楄〃鍝嶅簲 */
+export interface ProcessDefinition {
+ id: string; // 娴佺▼瀹氫箟ID
+ key: string; // 娴佺▼Key
+ name: string; // 娴佺▼鍚嶇О
+ version: number; // 鐗堟湰鍙�
+}
+
+/** 纭鏀惰揣 */
+export function confirmReceipt(id: number) {
+ return requestClient.post<number>('/erp/purchase-order/confirm-receipt', null, {
+ params: { id },
+ });
+}
--
Gitblit v1.9.3