From a956b0ea73c9891a6e0e1325d093f6b63e3e8501 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期四, 03 九月 2026 13:52:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/purchase/request/index.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/views/erp/purchase/request/index.vue b/src/views/erp/purchase/request/index.vue
index cd97ba8..26539b3 100644
--- a/src/views/erp/purchase/request/index.vue
+++ b/src/views/erp/purchase/request/index.vue
@@ -17,6 +17,7 @@
getApproveProcessList,
getPurchaseRequestPage,
submitPurchaseRequest,
+ syncPurchaseRequestStatus,
} from '#/api/erp/purchase/request';
import { $t } from '#/locales';
@@ -145,11 +146,18 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
- return await getPurchaseRequestPage({
+ const result = await getPurchaseRequestPage({
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
});
+ const processingItems = (result.list || []).filter(
+ (item) => item.status === 10 && item.processInstanceId,
+ );
+ if (processingItems.length > 0) {
+ await syncPurchaseRequestStatus(processingItems);
+ }
+ return result;
},
},
},
@@ -210,8 +218,8 @@
<template #status="{ row }">
<Tag v-if="row.status === 0" color="default">鏈彁浜�</Tag>
<Tag v-else-if="row.status === 10" color="processing">瀹℃壒涓�</Tag>
- <Tag v-else-if="row.status === 20" color="success">瀹℃牳閫氳繃</Tag>
- <Tag v-else-if="row.status === 30" color="error">瀹℃牳涓嶉�氳繃</Tag>
+ <Tag v-else-if="row.status === 20" color="success">瀹℃壒閫氳繃</Tag>
+ <Tag v-else-if="row.status === 30" color="error">瀹℃壒涓嶉�氳繃</Tag>
<Tag v-else-if="row.status === 40" color="warning">宸插彇娑�</Tag>
</template>
<template #inStatus="{ row }">
--
Gitblit v1.9.3