Browse Source

Merge branch 'dev_g' of United_Software/k_online_ui into dev

Jack Zhou 11 months ago
parent
commit
c3de5e53bf

+ 1 - 2
src/auto-imports.d.ts

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

+ 2 - 1
src/views/Booking/src/BookingView.vue

@@ -397,8 +397,9 @@ const SearchInput = () => {
     <div class="heaer_top">
       <div class="search">
         <el-input
-          placeholder="Enter Booking/HBL/PO/Container/Carrier Booking No. "
+          placeholder="Enter Booking/HBL/PO/Carrier Booking No. "
           v-model="BookingSearch"
+          @keyup.enter="SearchInput"
         >
           <template #prefix>
             <span class="iconfont_icon">

+ 5 - 2
src/views/Dashboard/src/DashboardView.vue

@@ -1218,8 +1218,11 @@ const ClickParams = (val: any) => {
   vertical-align: -2px;
 }
 .Management {
-  max-height: 800px;
-  overflow-y: auto;
+  max-height: 640px;
+  overflow-y: hidden;
+}
+.Management:hover {
+  overflow-y: scroll;
 }
 .title {
   font-weight: 700;

+ 1 - 0
src/views/Tracking/src/TrackingView.vue

@@ -645,6 +645,7 @@ const SearchInput = () => {
         <el-input
           placeholder="Enter Booking/HBL/PO/Container/Carrier Booking No. "
           v-model="TrackingSearch"
+          @keyup.enter="SearchInput"
         >
           <template #prefix>
             <span class="iconfont_icon">