From a7dc7b230fcc6abc6ee5a7bfadb90789b03d2ca8 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 07 九月 2026 16:45:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/erp/purchase/request/modules/form.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/views/erp/purchase/request/modules/form.vue b/src/views/erp/purchase/request/modules/form.vue
index fbfb14c..ff87d9a 100644
--- a/src/views/erp/purchase/request/modules/form.vue
+++ b/src/views/erp/purchase/request/modules/form.vue
@@ -13,6 +13,8 @@
import {
createPurchaseRequest,
getPurchaseRequest,
+ resetPurchaseRequestStatus,
+ syncPurchaseRequestStatus,
updatePurchaseRequest,
} from '#/api/erp/purchase/request';
import { $t } from '#/locales';
@@ -88,6 +90,13 @@
remark: item.remark,
}));
try {
+ console.log('[DEBUG] formType:', formType.value, 'status:', formData.value?.status, 'type:', typeof formData.value?.status);
+ if (formType.value === 'edit' && Number(formData.value?.status) !== 0) {
+ if (Number(formData.value?.status) !== 30) {
+ await syncPurchaseRequestStatus([formData.value!]);
+ }
+ await resetPurchaseRequestStatus(formData.value!.id!);
+ }
await (formType.value === 'create'
? createPurchaseRequest(data)
: updatePurchaseRequest(data));
@@ -113,6 +122,7 @@
modalApi.lock();
try {
formData.value = await getPurchaseRequest(data.id);
+ await formApi.setValues(formData.value);
if (formData.value?.attachmentList?.length) {
const blobIds = formData.value.attachmentList.map((item) => ({
uid: String(item.id),
@@ -121,9 +131,8 @@
status: 'done',
id: item.id,
}));
- formApi.setFieldValue('blobIds', blobIds);
+ await formApi.setFieldValue('blobIds', blobIds);
}
- await formApi.setValues(formData.value);
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3