From efc830622e1c61ec334b4b4fff142a7cd47a6462 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Tue, 18 Jun 2024 15:57:20 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E5=AE=9A=E4=BB=B7=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AE=A1=E7=AE=97=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=20=E7=BB=8F=E8=90=A5=E6=A6=82=E5=86=B5=E4=B8=AD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=9D=E7=95=99=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PagesStatistics/businessOverview.vue | 6 +++---
 src/pagesReceive/form/pricingForm.vue    | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/PagesStatistics/businessOverview.vue b/src/PagesStatistics/businessOverview.vue
index b65193e..dba2a6e 100644
--- a/src/PagesStatistics/businessOverview.vue
+++ b/src/PagesStatistics/businessOverview.vue
@@ -22,7 +22,7 @@
           <view v-for="(item, index) in gridList1" :key="index">
             <text v-if="item.name">{{ item.name }}：</text
             ><text v-if="item.name"
-              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, 2) }}
+              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, 0) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -33,7 +33,7 @@
             <text v-if="item.name">{{ item.name }}：</text
             >
             <text :class="{'highLight': item.isHighLight || false}"  v-if="item.name"
-              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal) }}
+              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, 0) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -43,7 +43,7 @@
           <view v-for="(item, index) in gridList3" :key="index">
             <text>{{ item.name }}：</text
             ><text :class="item.isHighLight ? 'highLight' : ''"
-              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, item.decimal)}}
+              >{{ item.isBefore ? item.unit : "" }} {{ formatMoney(item.num, 0)}}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
diff --git a/src/pagesReceive/form/pricingForm.vue b/src/pagesReceive/form/pricingForm.vue
index f840241..c65efd8 100644
--- a/src/pagesReceive/form/pricingForm.vue
+++ b/src/pagesReceive/form/pricingForm.vue
@@ -550,10 +550,11 @@ watch(
           model1.order.netWeight * ((100 - model1.order.subtractNum) / 100);
       }
     }
-    model1.order.totalPrice =
-      Math.round(
-        (model1.order.price || 0) * (model1.order.netWeight || 0) * 100
-      ) / 100;
+    // 定价的时候不对totalPrice 进行处理
+    // model1.order.totalPrice =
+    //   Math.round(
+    //     (model1.order.price || 0) * (model1.order.netWeight || 0) * 100
+    //   ) / 100;
 
     // 货款金额默认=预估总价，当系统自动算出预估总价时，值需同步
     if (<number>model1.order.balanceTotalPrice <= 0) {