Merge branch 'dev' into 'master'

Dev

See merge request !75

src/views/order/podUs/index.vue

@@ -717,6 +717,10 @@
             }"
             >{{ 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>
         </div>
         <!-- <div
             v-if="item.status === 'EXCEPTION_ORDER'"
@@ -3296,6 +3300,7 @@ const loadTabData = async () => {
       status: 'INTERCEPTED',
       statusName: '拦截',
       quantity: shipmentCount + productionCount,
+
     })
   } catch (error) {
     // showError(error)
@@ -5974,4 +5979,11 @@ useRouter().beforeEach((to, from, next) => {
   justify-content: space-between;
   align-items: center;
 }
+.tabs-node-quantity{
+  position: relative;
+  color:red;
+  font-size: 12px;
+  top:-10px;
+  right:0px;
+}
 </style>