From 2d3f651d17e6c017ab92d38d537ac8bbd7bd7876 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 20:29:12 +0800
Subject: [PATCH] Revert "feat:1.采购合同号按照录入日期生成"
---
src/views/procurementManagement/procurementLedger/index.vue | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index 6b6ab77..9bbe87e 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -619,7 +619,7 @@
},
rules: {
purchaseContractNumber: [
- { required: false, message: "璇疯緭鍏�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏�", trigger: "blur" },
],
projectName: [
{ required: true, message: "璇疯緭鍏ラ」鐩悕绉�", trigger: "blur" },
@@ -1006,7 +1006,18 @@
form.value.entryDate = getCurrentDate();
- if (type === "edit" && row?.id) {
+ if (type === "add") {
+ // 鏂板鏃剁敓鎴愰噰璐悎鍚屽彿
+ try {
+ const purchaseNoRes = await createPurchaseNo();
+ if (purchaseNoRes?.data) {
+ form.value.purchaseContractNumber = purchaseNoRes.data;
+ }
+ } catch (error) {
+ console.error("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�:", error);
+ proxy.$modal.msgWarning("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�");
+ }
+ } else if (type === "edit" && row?.id) {
// 缂栬緫鏃跺姞杞芥暟鎹�
currentId.value = row.id;
try {
@@ -1086,7 +1097,7 @@
// 鎻愪氦琛ㄥ崟
const submitForm = () => {
- proxy.$refs["formRef"].validate(async valid => {
+ proxy.$refs["formRef"].validate(valid => {
if (valid) {
if (productData.value.length > 0) {
// 鏂板鏃讹紝闇�瑕佷粠姣忎釜浜у搧瀵硅薄涓垹闄� id 瀛楁
@@ -1114,20 +1125,6 @@
const submitData = { ...form.value };
if (operationType.value === "add") {
delete submitData.id;
- }
-
- // 濡傛灉閲囪喘鍚堝悓鍙蜂负绌猴紝鍒欐牴鎹綍鍏ユ棩鏈熻嚜鍔ㄧ敓鎴�
- if (!submitData.purchaseContractNumber) {
- try {
- const purchaseNoRes = await createPurchaseNo(submitData.entryDate);
- if (purchaseNoRes?.data) {
- submitData.purchaseContractNumber = purchaseNoRes.data;
- }
- } catch (error) {
- console.error("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�:", error);
- proxy.$modal.msgWarning("鐢熸垚閲囪喘鍚堝悓鍙峰け璐�");
- return;
- }
}
addOrEditPurchase(submitData).then(res => {
--
Gitblit v1.9.3