From 1c4d8eee8f52e0f6b97a908b20ee5c7bb03da7ce Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Wed, 11 Sep 2024 14:03:55 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E8=AF=A6=E6=83=85=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2:=E4=BF=AE=E6=94=B9=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E4=BB=B7=E5=8E=86=E5=8F=B2=E6=89=80=E6=9C=89=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AD=97=E6=AE=B5,?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=80=E5=90=8E=E4=B8=80=E5=88=97=E4=B8=BA?=
 =?UTF-8?q?=E5=90=88=E8=AE=A1;=E4=BF=AE=E6=94=B9=E9=94=80=E5=94=AE?=
 =?UTF-8?q?=E4=BB=B7=E5=8E=86=E5=8F=B2=E6=89=80=E6=9C=89=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AD=97=E6=AE=B5,=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=80=E5=90=8E=E4=B8=80=E5=88=97=E4=B8=BA=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1,=E5=B8=81=E7=A7=8D=E5=AD=97=E6=AE=B5=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=AD=97=E5=85=B8,=E6=A0=B9=E6=8D=AE=E5=80=BC?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AF=B9=E5=BA=94=E7=9A=84=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/erp/material/detail.html        | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
index 4a086b0d..4481bff8 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/material/detail.html
@@ -127,6 +127,9 @@
     <script th:src="@{/ajax/libs/vue/vue.js}"></script>
     <script th:src="@{/ajax/libs/element-ui/element-ui.js}"></script>
     <script th:inline="javascript">
+
+        var commonCurrencyDatas = [[${@dict.getType('sys_common_currency')}]];
+
         new Vue({
             el: '#app',
             data: function() {
@@ -370,12 +373,13 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].materialNum);
                             }
-                            return sum;
+                            return "总数量: " + sum;
                         }
                     },
                     {
                         field: 'commonCurrency',
-                        title: '币种'
+                        title: '币种',
+                        formatter: function (value, row, index) {return $.table.selectDictLabel(commonCurrencyDatas, value)}
                     },
                     {
                         field: 'taxPrice',
@@ -385,7 +389,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].taxPrice);
                             }
-                            return sum;
+                            return "总含税价格: " +sum;
                         }
                     },
                     {
@@ -396,7 +400,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].noTaxPrice);
                             }
-                            return sum;
+                            return "总不含税价格: " +sum;
                         }
                     },
                     {
@@ -407,7 +411,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].taxSum);
                             }
-                            return sum;
+                            return "总含税总价: " +sum;
                         }
                     },
                     {
@@ -418,7 +422,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].noTaxSum);
                             }
-                            return sum;
+                            return "总不含税总价: " +sum;
                         }
                     },
                     {
@@ -475,7 +479,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].materialNum);
                             }
-                            return sum;
+                            return "总数量: " +sum;
                         }
                     },
                     {
@@ -486,7 +490,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].taxPrice);
                             }
-                            return sum;
+                            return "总含税价格: " +sum;
                         }
                     },
                     {
@@ -497,7 +501,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].noTaxPrice);
                             }
-                            return sum;
+                            return "总不含税价格: " +sum;
                         }
                     },
                     {
@@ -508,7 +512,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].taxSum);
                             }
-                            return sum;
+                            return "总含税总价: " +sum;
                         }
                     },
                     {
@@ -519,7 +523,7 @@
                             for (var i in value) {
                                 sum += parseFloat(value[i].noTaxSum);
                             }
-                            return sum;
+                            return "总不含税总价: " +sum;
                         }
                     },
                     {