From e0cc9278a0bcbf480446f87a78b9d7ddd8819eeb Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 18 八月 2025 11:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

---
 ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
index 4cb5738..0219604 100644
--- a/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/estimatedReceivableBill/index.vue
@@ -452,7 +452,17 @@
           billId: newForm.value.id,
           fileName: newForm.value.attachment
         }
-        addEstimatedReceivableLog(data).then((res1) => {
+       if (newForm.value.attachment == null || newForm.value.attachment === '' || newForm.value.attachment === undefined) {
+             estimatedReceivableBillSettlement(newForm.value).then((res) => {
+              if (res.code === 200) {
+                onLoad(page.value);
+                proxy.$message.success('鎿嶄綔鎴愬姛');
+                dialog.visible = false;
+                newForm.value = {};
+              }
+            })
+        }else{ 
+               addEstimatedReceivableLog(data).then((res1) => {
           if (res1.code === 200) {
             estimatedReceivableBillSettlement(newForm.value).then((res) => {
               if (res.code === 200) {
@@ -464,6 +474,9 @@
             })
           }
         })
+        }
+
+   
       } else {
         // 琛ㄥ崟楠岃瘉澶辫触
         return false;

--
Gitblit v1.8.0