From 724520c48e018a24411fef725d41d87030631656 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Tue, 30 Sep 2025 16:08:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E5=90=AF=E7=94=A8=E5=B9=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AE=9E=E9=99=85=E9=87=87=E8=B4=AD=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 approve.html 中启用实际采购金额的显示逻辑
- 在 product-list.html 中添加实际采购金额的格式化显示- 在 product-list.html 中同步更新实际采购金额的隐藏字段值
- 确保金额字段在页面加载时正确初始化和显示
---
 .../src/main/resources/templates/layout/product-list.html | 2 ++
 .../main/resources/templates/project/order/approve.html   | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/layout/product-list.html b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
index 3266aa0a..eaf73478 100644
--- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html
+++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
@@ -291,6 +291,8 @@
             // allPriceDiscount+=parseFloat($(this).val())
         })
         $('#allPriceCount').text(formatAmountNumber(allPriceDiscount))
+        $('#displayactualPurchaseAmount')?.val(formatAmountNumber(allPriceDiscount))
+        $('#actualPurchaseAmount')?.val(allPriceDiscount)
     }
     function addProduct(data) {
         let length = $('#productTable tbody').find('tr').length
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/approve.html b/ruoyi-admin/src/main/resources/templates/project/order/approve.html
index 0637b90f..4f3e336e 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/approve.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/approve.html
@@ -823,10 +823,10 @@
         if (shipmentAmount) {
             document.getElementById('displayshipmentAmount').value = formatAmountNumber(shipmentAmount);
         }
-        // let actualPurchaseAmount = [[${projectOrderInfo.actualPurchaseAmount}]] || ''
-        // if (actualPurchaseAmount) {
-        //     document.getElementById('displayactualPurchaseAmount').value=actualPurchaseAmount.toLocaleString('en-US');
-        // }
+        let actualPurchaseAmount = [[${projectOrderInfo.actualPurchaseAmount}]] || ''
+        if (actualPurchaseAmount) {
+            document.getElementById('displayactualPurchaseAmount').value=actualPurchaseAmount.toLocaleString('en-US');
+        }
         // initProductList()
 
         initProjectList()