From 51cdbeb7d0173eef7e6b98797524f689d61fdb21 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 12 Dec 2024 09:26:28 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E3=80=81?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=BB=8F=E7=90=86=E5=AE=A1=E6=89=B9=E3=80=81?=
 =?UTF-8?q?=E5=89=AF=E6=80=BB=E7=BB=8F=E7=90=86=E5=AE=A1=E6=89=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=EF=BC=8C=E5=AD=97=E6=AE=B5=E5=A6=82=E4=B8=8B=EF=BC=9A=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=95=B0=E5=90=88=E8=AE=A1=EF=BC=8C=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1=E3=80=81=E4=B8=8D=E5=90=AB=E7=A8=8E=E6=80=BB?=
 =?UTF-8?q?=E4=BB=B7=E3=80=81=E5=90=AB=E7=A8=8E=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/purchaseOrder/detail.html        | 33 +++++++++++++++++++
 .../purchaseOrder/taskCgjlVerify.html         | 28 ++++++++++++++++
 .../purchaseOrder/taskFzjlVerify.html         | 28 ++++++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
index 36505a03..4a2927f4 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
@@ -93,7 +93,32 @@
                 </div>
             </div>
         </div>
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <h3 class="mb-4">采购合计：</h3>
+                </div>
+            </div>
+            <div class="form-group row">
 
+                <label for="materialSum" class="col-sm-1 control-label">物料数：</label>
+                <div class="col-sm-2">
+                    <input id="materialSum" th:field="*{materialSum}" name="materialSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="actualPurchaseSum" class="col-sm-1 control-label">采购合计：</label>
+                <div class="col-sm-2">
+                    <input id="actualPurchaseSum" th:field="*{actualPurchaseSum}"  name="actualPurchaseSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="noRmbSum" class="col-sm-1 control-label">不含税总价：</label>
+                <div class="col-sm-2">
+                    <input id="noRmbSum" th:field="*{noRmbSum}"  name="noRmbSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="rmbSum" class="col-sm-1 control-label">含税总价：</label>
+                <div class="col-sm-2">
+                    <input id="rmbSum" th:field="*{rmbSum}"  name="rmbSum" class="form-control" type="text" readonly>
+                </div>
+            </div>
+        </div>
     </form>
 
 
@@ -132,6 +157,7 @@
             showRefresh: false,
             showToggle: false,
             showColumns:false,
+            showFooter:true,
             modalName: "选择物料",
             columns: [{checkbox: true},
                 {
@@ -190,6 +216,13 @@
                 {
                     title: '实际采购数',
                     field: 'actualPurchaseNum',
+                    footerFormatter: function (value) {
+                        var sum = 0;
+                        for (var i in value) {
+                            sum += parseFloat(value[i].actualPurchaseNum)|| 0;
+                        }
+                        return "采购合计: " + sum.toFixed(2);
+                    }
                 },
                 {
                     title: '共享库存占用数',
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
index 4a201d4e..8f69aaa4 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskCgjlVerify.html
@@ -127,6 +127,34 @@
             </div>
         </div>
 
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <h3 class="mb-4">采购合计：</h3>
+                </div>
+            </div>
+            <div class="form-group row">
+
+                <label for="materialSum" class="col-sm-1 control-label">物料数：</label>
+                <div class="col-sm-2">
+                    <input id="materialSum" th:field="*{materialSum}" name="materialSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="actualPurchaseSum" class="col-sm-1 control-label">采购合计：</label>
+                <div class="col-sm-2">
+                    <input id="actualPurchaseSum" th:field="*{actualPurchaseSum}"  name="actualPurchaseSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="noRmbSum" class="col-sm-1 control-label">不含税总价：</label>
+                <div class="col-sm-2">
+                    <input id="noRmbSum" th:field="*{noRmbSum}"  name="noRmbSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="rmbSum" class="col-sm-1 control-label">含税总价：</label>
+                <div class="col-sm-2">
+                    <input id="rmbSum" th:field="*{rmbSum}"  name="rmbSum" class="form-control" type="text" readonly>
+                </div>
+            </div>
+        </div>
+
+
     </form>
 
 
diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html
index 82a12641..df2f0c52 100644
--- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html
+++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/taskFzjlVerify.html
@@ -127,6 +127,34 @@
             </div>
         </div>
 
+        <div class="container">
+            <div class="row">
+                <div class="col-12">
+                    <h3 class="mb-4">采购合计：</h3>
+                </div>
+            </div>
+            <div class="form-group row">
+
+                <label for="materialSum" class="col-sm-1 control-label">物料数：</label>
+                <div class="col-sm-2">
+                    <input id="materialSum" th:field="*{materialSum}" name="materialSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="actualPurchaseSum" class="col-sm-1 control-label">采购合计：</label>
+                <div class="col-sm-2">
+                    <input id="actualPurchaseSum" th:field="*{actualPurchaseSum}"  name="actualPurchaseSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="noRmbSum" class="col-sm-1 control-label">不含税总价：</label>
+                <div class="col-sm-2">
+                    <input id="noRmbSum" th:field="*{noRmbSum}"  name="noRmbSum" class="form-control" type="text" readonly>
+                </div>
+                <label for="rmbSum" class="col-sm-1 control-label">含税总价：</label>
+                <div class="col-sm-2">
+                    <input id="rmbSum" th:field="*{rmbSum}"  name="rmbSum" class="form-control" type="text" readonly>
+                </div>
+            </div>
+        </div>
+
+
     </form>