Merge branch 'dev_zyh' of United_Software/k_online_ui into dev

src/auto-imports.d.ts

@@ -3,6 +3,7 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
+// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -68,6 +69,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -617,15 +617,6 @@ defineExpose({
       </template>
       <!-- action操作的插槽 -->
       <template #action="{ row }">
-        <el-button
-          v-if="row?.['Mode'] !== 'Air Freight' && canEdiVgm"
-          @click="handleVGM(row)"
-          class="el-button--blue"
-          style="height: 24px"
-        >
-          <span class="font_family icon-icon_vgm_b"></span>
-          <span style="font-size: 12px">VGM</span>
-        </el-button>
         <el-button
           class="recent_button el-button--blue"
           @click="SubscribeShipments(row)"
@@ -642,6 +633,15 @@ defineExpose({
             </svg>
           </span>
         </el-button>
+        <el-button
+          v-if="row?.['Mode'] !== 'Air Freight' && canEdiVgm"
+          @click="handleVGM(row)"
+          class="el-button--blue"
+          style="height: 24px"
+        >
+          <span class="font_family icon-icon_vgm_b"></span>
+          <span style="font-size: 12px">VGM</span>
+        </el-button>
       </template>
       <!-- Transportation Mode字段的插槽 -->
       <template #mode="{ row, column }">