From e62608497038672d5591e386173b3de5bb62b867 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Wed, 7 Aug 2024 09:15:14 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E5=B7=B2=E6=94=B6?=
 =?UTF-8?q?=E6=AC=BE=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/receivedDetail.vue             | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/pagesShipment/components/receivedDetail.vue b/src/pagesShipment/components/receivedDetail.vue
index 16066db..0ef7d33 100644
--- a/src/pagesShipment/components/receivedDetail.vue
+++ b/src/pagesShipment/components/receivedDetail.vue
@@ -50,7 +50,22 @@
 
       <view class="more">
         <view v-for="(item, index) in gridList3" :key="index">
-          <text v-if="item.name">{{ item.name }}：</text
+          <view v-if="item.name" style="display: inline-flex"
+            >{{ item.name
+            }}<uni-tooltip v-if="item.isTip" placement="bottom">
+              <u-icon color="#C1C1C1" name="info-circle" size="14"></u-icon>
+              <template v-slot:content>
+                <view
+                  style="
+                    min-width: 100px;
+                    overflow: scroll;
+                    word-break: break-word;
+                  "
+                >
+                  {{ item.info }}
+                </view>
+              </template> </uni-tooltip
+            >：</view
           ><text
             >{{ item.isBefore ? item.unit : "" }}
             <text v-if="item.name === '净重误差'">
@@ -105,16 +120,16 @@ const payMethodMap: any = {
 };
 const props = withDefaults(
   defineProps<{
-    currentOrder: Order;
+    currentOrder: any;
   }>(),
   {
     currentOrder: {
-      id: ''
+      id: "",
     },
   }
 );
 const state = reactive<{
-  order: Shipment;
+  order: any;
   [attrName: string]: any;
 }>({
   order: {
@@ -167,12 +182,23 @@ const gridList3 = reactive([
     isBefore: false,
   },
   {},
+  {
+    name: "结算净重",
+    enName: "settlementNet",
+    num: 0,
+    unit: "KG",
+    isBefore: false,
+    isTip: true,
+    info: "基地或钢厂出具结算单的毛重-皮重",
+  },
   {
     name: "结算重量",
     enName: "settlementWeight",
     num: 0,
     unit: "KG",
     isBefore: false,
+    isTip: true,
+    info: "基地或钢厂出具结算单的毛重-皮重-扣杂",
   },
   {
     name: "结算单价",
@@ -230,6 +256,8 @@ const gridList3 = reactive([
     num: "",
     unit: "KG",
     isBefore: false,
+    isTip: true,
+    info: "货场过磅净重-结算净重",
   },
 ]);