Merge branch 'dev'

src/views/order/podUs/index.vue

@@ -717,10 +717,18 @@
             }"
             >{{ item.quantity }}</span
           >
-          <span v-if="item.status==='INTERCEPTED' && (interceptionStatus.production['0'] || interceptionStatus.shipment['0'])" class="tabs-node-quantity">+{{
-              ((interceptionStatus.production['0'] || 0) +
-              (interceptionStatus.shipment['0'] || 0)) || ''
-            }}</span>
+          <span
+            v-if="
+              item.status === 'INTERCEPTED' &&
+              (interceptionStatus.production['0'] ||
+                interceptionStatus.shipment['0'])
+            "
+            class="tabs-node-quantity"
+            >+{{
+              (interceptionStatus.production['0'] || 0) +
+                (interceptionStatus.shipment['0'] || 0) || ''
+            }}</span
+          >
         </div>
         <!-- <div
             v-if="item.status === 'EXCEPTION_ORDER'"
@@ -2897,7 +2905,7 @@ const handleRefreshAddress = async (row: PodUsOrderListData) => {
     },
   )
 }
-const updateAddressType = ref(1)
+const updateAddressType = ref<1 | 2>(1)
 const handleUpdateAddress = async (row: PodUsOrderListData, type: 1 | 2) => {
   const { data } = await getAllCountryApi()
   countryList.value = data
@@ -3330,7 +3338,6 @@ const loadTabData = async () => {
       status: 'INTERCEPTED',
       statusName: '拦截',
       quantity: shipmentCount + productionCount,
-
     })
   } catch (error) {
     // showError(error)
@@ -4480,10 +4487,7 @@ const operationLog = async (
 }
 
 const addressInfoVisible = ref(false)
-const showAddressInfo = (row: PodUsOrderListData) => {
-  currentItem.value = row
-  addressInfoVisible.value = true
-}
+
 const handleSuccess = () => {
   loadTabData()
   search()
@@ -6015,11 +6019,11 @@ useRouter().beforeEach((to, from, next) => {
   justify-content: space-between;
   align-items: center;
 }
-.tabs-node-quantity{
+.tabs-node-quantity {
   position: relative;
-  color:red;
+  color: red;
   font-size: 12px;
-  top:-10px;
-  right:0px;
+  top: -10px;
+  right: 0px;
 }
 </style>