update: 优化

src/PagesStatistics/businessOverview.vue

@@ -22,7 +22,8 @@
           <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, item.decimal) }}
+              >{{ item.isBefore ? item.unit : "" }}
+              {{ formatMoney(item.num, item.decimal) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -30,10 +31,13 @@
 
         <view class="box">
           <view v-for="(item, index) in gridList2" :key="index">
-            <text v-if="item.name">{{ item.name }}：</text
+            <text v-if="item.name">{{ item.name }}：</text>
+            <text
+              :class="{ highLight: item.isHighLight || false }"
+              v-if="item.name"
             >
-            <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, item.decimal) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -43,7 +47,8 @@
           <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, item.decimal) }}
               {{ item.isBefore ? "" : item.unit }}
             </text>
           </view>
@@ -106,9 +111,6 @@ const handleOk = (v: any) => {
   currentTab.value = 5;
   getOverview();
 };
-const randomNum = (index: number) => {
-  return Math.floor(Math.random() * (10000 - 1 + 1)) + 1 + index;
-};
 
 const gridList1 = reactive([
   {
@@ -202,7 +204,6 @@ const gridList2 = reactive([
     num: "",
     isHighLight: true,
     decimal: 0,
-
   },
   {
     name: "",

src/PagesStatistics/customer/detail.vue

@@ -42,9 +42,17 @@
           <view class="box">
             <view v-for="(item, index) in gridList2" :key="index">
               <text v-if="item.name">{{ item.name }}：</text
-              ><text
-                >{{ item.isBefore ? item.unit : "" }}
-                {{ item.num }}
+              ><text>
+                {{ item.isBefore ? item.unit : "" }}
+                <!-- ------- -->
+                <text v-if="item.name === '净重误差'">
+                  {{
+                    (state.order.netWeight || 0) -
+                    (state.order.settlementNet || 0)
+                  }}
+                </text>
+                <text v-else> {{ item.num }}</text>
+                <!-- -------- -->
                 {{ item.isBefore ? "" : item.unit }}
               </text>
             </view>

src/pagesShipment/form/settlementForm.vue

@@ -325,7 +325,7 @@ const formAttrList = reactive<ComType>([
         model1.order.incidentals = null;
         model1.order.realIncome = null;
         model1.order.paymentMethodName = null;
-        model1.order.settlementNotes = '';
+        model1.order.settlementNotes = "";
       }
       recordSettlementUnit.value = v;
     },
@@ -778,8 +778,9 @@ onLoad((option) => {
           }),
           settlementUnit:
             res.data.settlementUnit !== null ? res.data.settlementUnit : 1,
+          settlementWeight: res.data.settlementWeight,
+          estimatePrice: res.data.estimatePrice,
         };
-
         recordSettlementUnit.value = model1.order.settlementUnit;
       }
     });

src/pagesShipment/review/index.vue

@@ -236,10 +236,7 @@ const contrlModalParams = reactive<{ [attrName: string]: any }>({
     ],
   },
 });
-const state = reactive<{
-  order: Shipment;
-  [attrName: string]: any;
-}>({
+const state = reactive<any>({
   order: {
     id: "",
     buttonType: 0,