Merge branch 'dev' into dev_zyh

src/views/DestinationDelivery/src/components/CreateNewBooking/src/CreateNewbooking.vue

@@ -472,6 +472,8 @@ const SearchShipment = () => {
   let obj = {
     text_search: CreateNewBOokingSearch.value,
     vessel: VesselNametest.value,
+    consignee: ConsigneeValue.value,
+    shipper: ShipperValue.value,
     eta_start: ETATimeList.value != null ? ETATimeList.value[0] : '',
     eta_end: ETATimeList.value != null ? ETATimeList.value[1] : '',
     ata_start: ATATimeList.value != null ? ATATimeList.value[0] : '',
@@ -717,11 +719,13 @@ onUnmounted(() => {
 <template>
   <div>
     <div class="Title" :style="{width: isWide? 'calc(100% - 232px)' : 'calc(100% - 64px)'}" >
-      <div v-if="a == undefined">Create New Booking</div>
-      <div v-else>Modify Booking</div>
-      <div class="flex">
-        <el-button @click="CancelRulesVisible = true" class="el-button--default create-button"><span class="font_family icon-icon_return_b"></span> Cancel</el-button>
-        <el-button :disabled="isNotSubmit" @click="SubmitBooking" class="el-button--main create-button"><span class="font_family icon-icon_submit_b"></span> Submit</el-button>
+      <div class="title_flex">
+        <div v-if="a == undefined">Create New Booking</div>
+        <div v-else>Modify Booking</div>
+        <div class="flex">
+          <el-button @click="CancelRulesVisible = true" class="el-button--default create-button"><span class="font_family icon-icon_return_b"></span> Cancel</el-button>
+          <el-button :disabled="isNotSubmit" @click="SubmitBooking" class="el-button--main create-button"><span class="font_family icon-icon_submit_b"></span> Submit</el-button>
+        </div>
       </div>
     </div>
     <div class="booking-info" v-if="a != undefined">
@@ -1206,21 +1210,25 @@ onUnmounted(() => {
 <style lang="scss" scoped>
 .Title {
   position: fixed;
-  display: flex;
   border: 1px solid var(--color-border);
   border-top: none;
   border-width: 1px 0 1px 0;
   font-size: var(--font-size-6);
   font-weight: 700;
   padding: 0 37px 0 24px;
-  align-items: center;
-  justify-content: space-between;
   height: 68px;
   top: 48px;
   z-index: 1000;
   background-color: var(--color-mode);
   box-sizing: border-box;
 }
+.title_flex {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 68px;
+}
 .flex {
   display: flex;
 }

src/views/DestinationDelivery/src/components/CreateNewBooking/src/components/NewbookingTable.vue

@@ -21,7 +21,8 @@ const tableData = ref<VxeGridProps<any>>({
   maxHeight: 288,
   columns: [],
   data: [],
-  scrollY: { enabled: true, oSize: 20, gt: 30 },
+  scrollY: { enabled: true, oSize: 20, gt: 20, scrollToTopOnChange: true },
+  scrollX: { enabled: true, gt: 10, scrollToLeftOnChange: true },
   emptyText: ' ',
   showHeaderOverflow: true,
   showOverflow: true,