Merge remote-tracking branch 'origin/dev' into dev

src/views/finance/index.vue

@@ -98,7 +98,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="firstData" :height="isTrue ? 'calc(100% - 244px)' : 'calc(100% - 194px)'"
+        <el-table :data="firstData" :height="isTrue ? 'calc(100% - 294px)' : 'calc(100% - 194px)'"
           style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
@@ -234,7 +234,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="secondData" :height="isTrue ? 'calc(100% - 246px)' : 'calc(100% - 196px)'"
+        <el-table :data="secondData" :height="isTrue ? 'calc(100% - 294px)' : 'calc(100% - 194px)'"
           style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>
@@ -371,7 +371,7 @@
             </el-col>
           </el-row>
         </el-form>
-        <el-table :data="thirdData" :height="isTrue ? 'calc(100% - 246px)' : 'calc(100% - 196px)'"
+        <el-table :data="thirdData" :height="isTrue ? 'calc(100% - 294px)' : 'calc(100% - 194px)'"
           style="width: 100%; margin-top: 20px;">
           <el-table-column prop="orderNo" label="订单号" width="120"></el-table-column>
           <el-table-column prop="companyALlName" label="保险公司" width="120"></el-table-column>

src/views/receivable/handingFee/invoiceRecord.vue

@@ -157,11 +157,11 @@ let tableData = ref([])
 let pages = ref(1)
 let size = ref(10)
 let total = ref(0)
-const handleSizeChange = (val) => {
+const handleSizeChange = (val: number) => {
   size.value = val
   initList()
 }
-const handleCurrentChange = (page) => {
+const handleCurrentChange = (page: number) => {
   pages.value = page
   initList()
 }