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/payment/invoice-application.vue

@@ -1,6 +1,6 @@
 <template>
   <basic-container class="invoice-page">
-    <section class="invoice-page__search">
+    <section v-if="searchVisible" class="invoice-page__search">
       <el-form :model="query" label-position="right" label-width="88px" @submit.prevent>
         <div class="invoice-page__search-grid">
           <el-form-item label="单据号">
@@ -79,18 +79,26 @@
             >导出</el-button
           >
         </div>
-        <div class="invoice-page__toolbar-right">
-          <el-tooltip content="刷新" placement="top">
-            <el-button text :icon="Refresh" @click="loadTable" />
-          </el-tooltip>
-        </div>
+        <table-header-tools
+          :columns="columns"
+          v-model:visible-column-keys="visibleColumnKeys"
+          v-model:table-size="tableSize"
+          v-model:search-visible="searchVisible"
+          @refresh="loadTable"
+        />
       </div>
 
-      <el-table v-loading="loading" :data="rows" border @selection-change="selection = $event">
+      <el-table
+        v-loading="loading"
+        :data="rows"
+        :size="tableSize"
+        border
+        @selection-change="selection = $event"
+      >
         <el-table-column type="selection" width="52" fixed="left" align="center" />
         <el-table-column type="index" label="序号" width="64" fixed="left" align="center" />
         <el-table-column
-          v-for="column in columns"
+          v-for="column in visibleColumns"
           :key="column.prop"
           v-bind="column"
           align="center"
@@ -161,7 +169,7 @@
                 v-if="
                   mkEnabled &&
                   hasPermission('invoice_application_approve') &&
-                  row.approvalStatus === 'reviewing'
+                  ['reviewing', 'approved'].includes(row.approvalStatus)
                 "
                 type="primary"
                 @click="handleMkAudit(row)"
@@ -218,12 +226,13 @@
 </template>
 
 <script>
-import { ArrowDown, ArrowUp, Refresh } from '@element-plus/icons-vue';
+import { ArrowDown, ArrowUp } from '@element-plus/icons-vue';
 import { mapGetters } from 'vuex';
 import * as XLSX from 'xlsx';
 import * as api from '@/api/payment/invoiceApplication';
 import * as formalSettlementApi from '@/api/settlement/formalSettlement';
 import { invoiceApplicationTableColumns } from '@/option/payment/invoiceApplication';
+import TableHeaderTools from '@/components/table-header-tools/main.vue';
 import organizationSearch from '@/mixins/organization-search';
 import { getMKApprovalUrl } from '@/api/system/business-process';
 import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval';
@@ -239,17 +248,20 @@ const emptyQuery = () => ({
 
 export default {
   name: 'InvoiceApplication',
+  components: { TableHeaderTools },
   mixins: [organizationSearch],
   data() {
     return {
       ArrowDown,
       ArrowUp,
-      Refresh,
       query: emptyQuery(),
       searchExpanded: false,
+      searchVisible: true,
+      tableSize: 'default',
       approvalStatusOptions: api.approvalStatusOptions,
       kingdeeStatusOptions: api.kingdeeStatusOptions,
       columns: invoiceApplicationTableColumns,
+      visibleColumnKeys: invoiceApplicationTableColumns.map(column => column.prop),
       rows: [],
       selection: [],
       loading: false,
@@ -260,6 +272,9 @@ export default {
   },
   computed: {
     ...mapGetters(['permission']),
+    visibleColumns() {
+      return this.columns.filter(column => this.visibleColumnKeys.includes(column.prop));
+    },
   },
   mounted() {
     this.loadOrganizationOptions();
@@ -531,7 +546,6 @@ export default {
   padding: 12px 0;
 }
 .invoice-page__toolbar-left,
-.invoice-page__toolbar-right,
 .invoice-page__links {
   display: flex;
   align-items: center;