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()