Merge branch 'master' into feature/bfi-api-rate

# Conflicts:
#	src/components/vehicle-attachment-table/main.vue
#	src/option/payment/paymentApplication.js
#	src/views/payment/payment-application.vue
#	src/views/payment/receipt-claim-record.vue
#	src/views/vehicle/customer-archive.vue

src/views/settlement/formal-settlement.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container class="formal-page">
-    <section class="formal-page__search">
+    <section v-show="searchVisible" class="formal-page__search">
       <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="formal-page__search-grid">
           <el-form-item v-for="field in visibleSearchFields" :key="field.prop" :label="field.label">
@@ -66,6 +66,7 @@
             :has-permission="hasPermissionFn"
             :sync-loading="syncLoading"
             :mk-enabled="mkEnabled"
+            v-model:search-visible="searchVisible"
             @create="openCreate"
             @payment="openPaymentDialog"
             @sync="handleSync"
@@ -86,6 +87,7 @@
             :has-permission="hasPermissionFn"
             :sync-loading="syncLoading"
             :mk-enabled="mkEnabled"
+            v-model:search-visible="searchVisible"
             @create="openCreate"
             @payment="openPaymentDialog"
             @sync="handleSync"
@@ -214,6 +216,7 @@ export default {
       ArrowUp,
       query: emptyQuery(),
       searchExpanded: false,
+      searchVisible: true,
       activeSettlementType: 'payable',
       searchFields: formalSettlementSearchFields,
       columns: formalSettlementTableColumns,
@@ -262,6 +265,12 @@ export default {
         this.mkEnabled = false;
       });
   },
+  activated() {
+    if (sessionStorage.getItem('formal-settlement-list-refresh') === '1') {
+      sessionStorage.removeItem('formal-settlement-list-refresh');
+      this.loadTable();
+    }
+  },
   methods: {
     hasPermission(code) {
       return this.permission?.[code] !== false;