From 6185245482b56d004b4668c0d2ed95959a18bbc2 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Thu, 9 Oct 2025 14:56:54 +0800
Subject: [PATCH] =?UTF-8?q?fix(order):=E4=BF=AE=E6=AD=A3=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=8A=98=E6=89=A3=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91=E4=B8=8E?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=89=E6=8B=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改订单审批页面中软件、硬件及维护产品的折扣计算方式
- 更新edit页面中的供应商根据订单渠道自动填充逻辑
- 调整product-list模板中折扣显示文本内容
---
 .../src/main/resources/templates/layout/product-list.html   | 2 +-
 .../src/main/resources/templates/project/order/add.html     | 4 +++-
 .../src/main/resources/templates/project/order/approve.html | 6 +++---
 .../src/main/resources/templates/project/order/edit.html    | 4 ++++
 4 files changed, 11 insertions(+), 5 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 eaf73478..5228b2fc 100644
--- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html
+++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html
@@ -268,7 +268,7 @@
     border: 1px solid;
     flex-direction: row;
     justify-content: flex-end;
-"><div style="width: 65svw;display: flex;justify-content: center;"><span ><span class="discount-text">利润折扣</span>，折扣率<span id="allPriceCountValueSpan"></span>
+"><div style="width: 65svw;display: flex;justify-content: center;"><span ><span class="discount-text">利润折扣</span>，折扣<span id="allPriceCountValueSpan"></span>
 <select id="allPriceCountValue" onchange="changeAllPriceCount(${id})" >
 <option value="1" ${(!discountFold || discountFold===1)?'selected':''} >100%</option>
 <option value="0.988" ${discountFold===0.988?'selected':''} >98.8%</option>
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/add.html b/ruoyi-admin/src/main/resources/templates/project/order/add.html
index 4c6fc9c9..3771b52f 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/add.html
@@ -613,7 +613,9 @@
     }
 
     function updatePaymentOptions() {
-        var orderChannel = $('[name="orderChannel"]').val();
+        let orderChannel = $('[name="orderChannel"]').val();
+
+        $('[name="supplier"]').val(orderChannel === '1' ?  "广州佳都技术有限公司":"紫光汇智信息技术有限公司")
         var $paymentMethodSelect = $('#paymentMethod');
         $paymentMethodSelect.empty();
         $paymentMethodSelect.append('<option value="">请选择</option>');
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 4f3e336e..b265d275 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/approve.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/approve.html
@@ -1231,7 +1231,7 @@ ${
         let maintenanceProjectProductInfoList = [[${projectOrderInfo.maintenanceProjectProductInfoList}]]
         softwareProjectProductInfoList ? softwareProjectProductInfoList.forEach((ele) => {
 
-                ele.allPriceDisCount = preciseCurrencyRound(ele.allPrice * discountFold)
+            ele.allPriceDisCount = preciseCurrencyRound(preciseCurrencyRound(ele.price*discountFold) * ele.quantity)
                 ele.allPriceDisCountFormat = formatAmountNumber(ele.allPriceDisCount)
 
                 ele.cataloguePriceFormmat = ele.cataloguePrice ? formatAmountNumber(ele.cataloguePrice) : ""
@@ -1245,7 +1245,7 @@ ${
             }) : '';
         hardwareProjectProductInfoList ? hardwareProjectProductInfoList.forEach((ele) => {
 
-                ele.allPriceDisCount = preciseCurrencyRound(ele.allPrice * discountFold)
+                ele.allPriceDisCount = preciseCurrencyRound(preciseCurrencyRound(ele.price*discountFold) * ele.quantity)
                 ele.allPriceDisCountFormat = formatAmountNumber(ele.allPriceDisCount)
 
                 ele.cataloguePriceFormmat = ele.cataloguePrice ? formatAmountNumber(ele.cataloguePrice) : ""
@@ -1260,7 +1260,7 @@ ${
             }) : '';
         maintenanceProjectProductInfoList ? maintenanceProjectProductInfoList.forEach((ele) => {
 
-            ele.allPriceDisCount = preciseCurrencyRound(ele.allPrice * discountFold)
+            ele.allPriceDisCount = preciseCurrencyRound(preciseCurrencyRound(ele.price*discountFold) * ele.quantity)
             ele.allPriceDisCountFormat = formatAmountNumber(ele.allPriceDisCount)
 
                 ele.cataloguePriceFormmat = ele.cataloguePrice ? formatAmountNumber(ele.cataloguePrice) : ""
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
index 18c3ff15..7b802831 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html
@@ -927,6 +927,10 @@
             
             // 调用原有的更新付款选项函数
             updatePaymentOptions(false);
+            let orderChannel = $('[name="orderChannel"]').val();
+
+            $('[name="supplier"]').val(orderChannel === '1' ?  "广州佳都技术有限公司":"紫光汇智信息技术有限公司")
+
         });
         updatePaymentOptions(true);
         // Set payment method from database