fix:修改B端所有表格的高度

src/views/acceptanceManagement/index.vue

@@ -42,7 +42,7 @@
             ref="commTable"
             v-loading="loading"
             :columns="columns"
-            :table-options="tableOptions"
+            :table-options="getTableOptions"
             :data="tableData"
             :count="total"
             parent-component="AcceptanceManagement"

src/views/acceptanceManagement/indexTable.js

@@ -133,6 +133,27 @@ export default {
           }
         }
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/biddingManagement/index.vue

@@ -41,7 +41,7 @@
           ref="commTable"
           v-loading="loading"
           :columns="columns"
-          :table-options="tableOptions"
+          :table-options="getTableOptions"
           :data="tableData"
           :count="total"
           parent-component="BiddingManagement"

src/views/biddingManagement/indexTable.js

@@ -112,6 +112,27 @@ export default {
         }
         return true
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/contactUs/indexTable.js

@@ -4,8 +4,8 @@ export default {
       loading: false,
       tableOptions: {
         sortTable: true,
-        maxHeight: 'calc(100vh - 406px)',
-        height: 'calc(100vh - 406px)'
+        maxHeight: 'calc(100vh - 290px)',
+        height: 'calc(100vh - 290px)'
       },
       columns: [
         {

src/views/creditManage/projectCredit/index.vue

@@ -40,7 +40,7 @@
               :columns="activeName === 'pending'? columns : columnsAll"
               :data="tableData"
               :count="total"
-              :table-options="tableOptions"
+              :table-options="getTableOptions"
               parent-component="ProjectCredit"
             />
           </el-tabs>

src/views/creditManage/projectCredit/indexTable.js

@@ -175,6 +175,24 @@ export default {
           return true
         }
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          maxHeight: 'calc(100vh - 470px)',
+          height: 'calc(100vh - 470px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          maxHeight: 'calc(100vh - 420px)',
+          height: 'calc(100vh - 420px)'
+        }
+      }
+      return {
+        maxHeight: 'calc(100vh - 366px)',
+        height: 'calc(100vh - 366px)'
+      }
     }
   }
 }

src/views/creditManage/resolutionManage/index.vue

@@ -29,7 +29,7 @@
           :data="tableData"
           :count="total"
           parent-component="ProjectCredit"
-          :table-options="tableOptions"
+          :table-options="getTableOptions"
         />
       </el-tabs>
     </template>
@@ -60,6 +60,12 @@ export default {
       btnPermission: JSON.parse(sessionStorage.getItem('buttons')) || []
     }
   },
+  computed: {
+    getTableColumn() {
+      const list = this.activeName == 'all' ? this.columnsAll : this.columns
+      return list
+    }
+  },
   mounted() {
     this.fetchData()
     this.getStatusList()
@@ -103,10 +109,10 @@ export default {
         })
       } else if (type === 'edit') {
         this.$router.push({
-          name: row.taskName == '授信决议确认' ? 'CreditResolutionConfirm' : row.taskName == '复议调整申请' ?  'ReviewAdjustment' : row.taskName == '复议调整审批' ? 'ReviewApproval' : 'CreditResolution',
+          name: row.taskName == '授信决议确认' ? 'CreditResolutionConfirm' : row.taskName == '复议调整申请' ? 'ReviewAdjustment' : row.taskName == '复议调整审批' ? 'ReviewApproval' : 'CreditResolution',
           params: { id: 'child', infoId: row.id, taskId: row.taskId }
         })
-      } else if(type == 'timeAxis') {
+      } else if (type == 'timeAxis') {
         this.timeAxisClick(row)
       }
     },
@@ -117,12 +123,6 @@ export default {
         this.$refs.timeAxis.fetchData()
       })
     }
-  },
-  computed: {
-    getTableColumn() {
-      let list = this.activeName == 'all' ? this.columnsAll : this.columns
-      return list
-    }
   }
 }
 </script>

src/views/creditManage/resolutionManage/indexTable.js

@@ -139,11 +139,32 @@ export default {
     tablePower() {
       return ({ item }) => {
         const { power } = item
-        if(power && !this.btnPermission.includes(power)) {
+        if (power && !this.btnPermission.includes(power)) {
           return false
         }
         return true
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/creditManage/supplierManage/mainContent.vue

@@ -31,7 +31,7 @@
         :columns="columns"
         :data="tableData"
         :count="total"
-        :table-options="tableOptions"
+        :table-options="getTableOptions"
       />
     </el-tabs>
     <cy-dialog ref="timeAxisDialog" title="进度时间轴" top="15vh">
@@ -163,6 +163,27 @@ export default {
           }
         }
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   },
   created() {

src/views/divideAccountsManage/index.vue

@@ -46,8 +46,8 @@ export default {
         // { userName: '1111', statusName: '已完成' }
       ],
       tableOptions: {
-        maxHeight: 'calc(100vh - 406px)',
-        height: 'calc(100vh - 406px)'
+        maxHeight: 'calc(100vh - 336px)',
+        height: 'calc(100vh - 336px)'
       },
       columns: [
         {

src/views/exemptionFollow/index.vue

@@ -43,7 +43,7 @@
           :columns="columns"
           :data="tableData"
           :count="total"
-          :table-options="tableOptions"
+          :table-options="getTableOptions"
         />
       </el-tabs>
     </template>
@@ -220,6 +220,18 @@ export default {
           }
         }
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      return {
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   },
   created() {

src/views/financingManage/index.vue

@@ -43,7 +43,7 @@
           :columns="columns"
           :data="tableData"
           :count="total"
-          :table-options="tableOptions"
+          :table-options="getTableOptions"
           parent-component="FinancingManage"
         />
       </el-tabs>
@@ -203,6 +203,18 @@ export default {
           }
         }
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      return {
+        maxHeight: 'calc(100vh - 366px)',
+        height: 'calc(100vh - 366px)'
+      }
     }
   },
   mounted() {
@@ -228,8 +240,9 @@ export default {
           this.total = records
         })
       } else {
-        getList(params).then(({ rows }) => {
+        getList(params).then(({ rows, records }) => {
           this.tableData = rows
+          this.total = records
         })
       }
     },

src/views/invoicesManagement/index.vue

@@ -42,7 +42,7 @@
             ref="commTable"
             v-loading="loading"
             :columns="columns"
-            :table-options="tableOptions"
+            :table-options="getTableOptions"
             :data="tableData"
             :count="total"
           />
@@ -140,7 +140,7 @@ export default {
         return
       }
 
-      if(type == 'downloadContract') {
+      if (type == 'downloadContract') {
         request({
           url: '/saleInvoice/downloadAllInvoiceFile',
           responseType: 'arraybuffer',

src/views/invoicesManagement/indexTable.js

@@ -117,20 +117,41 @@ export default {
     tablePower() {
       return ({ item, tab, row }) => {
         const { tabPower, rowPower, power, satausPower } = item
-        if(power && !this.btnPermission.includes(power)) {
+        if (power && !this.btnPermission.includes(power)) {
           return false
         }
-        if(rowPower && (!row.taskName || !rowPower.includes(row.taskName))) {
+        if (rowPower && (!row.taskName || !rowPower.includes(row.taskName))) {
           return false
         }
-        if(satausPower && (!row.status || !row.status.name || !satausPower.includes(row.status.name))) {
+        if (satausPower && (!row.status || !row.status.name || !satausPower.includes(row.status.name))) {
           return false
         }
-        if(tabPower && !tabPower.includes(tab)) {
+        if (tabPower && !tabPower.includes(tab)) {
           return false
         }
         return true
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/purchaseContractManagement/index.vue

@@ -42,7 +42,7 @@
             ref="commTable"
             v-loading="loading"
             :columns="columns"
-            :table-options="tableOptions"
+            :table-options="getTableOptions"
             :data="tableData"
             :count="total"
           />

src/views/purchaseContractManagement/indexTable.js

@@ -137,6 +137,27 @@ export default {
         }
         return true
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/refundManage/index.vue

@@ -42,7 +42,7 @@
           ref="commTable"
           v-loading="loading"
           :columns="getTableColumns"
-          :table-options="tableOptions"
+          :table-options="getTableOptions"
           :data="tableData"
           :count="total"
         />

src/views/refundManage/indexTable.js

@@ -206,7 +206,7 @@ export default {
               {
                 msg: '编辑',
                 icon: 'iconfont icon-xiugai',
-                // power: 'applyRefund',
+                power: '',
                 tabPower: ['pending'],
                 // rowPower: [''],
                 category: 'edit'
@@ -258,6 +258,27 @@ export default {
         return this.allTableColumns
       }
       return this.reFoundTableColumns
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/salesContractManagement/index.vue

@@ -42,7 +42,7 @@
             ref="commTable"
             v-loading="loading"
             :columns="columns"
-            :table-options="tableOptions"
+            :table-options="getTableOptions"
             :data="tableData"
             :count="total"
             parent-component="SalesContractManagement"

src/views/salesContractManagement/indexTable.js

@@ -127,20 +127,41 @@ export default {
     tablePower() {
       return ({ item, tab, row }) => {
         const { tabPower, rowPower, power, satausPower } = item
-        if(power && !this.btnPermission.includes(power)) {
+        if (power && !this.btnPermission.includes(power)) {
           return false
         }
-        if(rowPower && (!row.taskName || !rowPower.includes(row.taskName))) {
+        if (rowPower && (!row.taskName || !rowPower.includes(row.taskName))) {
           return false
         }
-        if(satausPower && (!row.status || !row.status.name || !satausPower.includes(row.status.name))) {
+        if (satausPower && (!row.status || !row.status.name || !satausPower.includes(row.status.name))) {
           return false
         }
-        if(tabPower && !tabPower.includes(tab)) {
+        if (tabPower && !tabPower.includes(tab)) {
           return false
         }
         return true
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/settlementManagement/index.vue

@@ -42,7 +42,7 @@
             ref="commTable"
             v-loading="loading"
             :columns="columns"
-            :table-options="tableOptions"
+            :table-options="getTableOptions"
             :data="tableData"
             :count="total"
           />
@@ -137,7 +137,7 @@ export default {
       })
     },
     handlerOperate(type, row) {
-      if(type == 'edit') {
+      if (type == 'edit') {
         this.$router.push({
           name: 'SettlementEdit',
           params: { id: 'child', infoId: row.id, taskId: row.taskId, type: row.taskName },
@@ -145,9 +145,9 @@ export default {
             infoId: row.id, taskId: row.taskId, type: row.taskName
           }
         })
-      } else if(type == 'timeAxis') {
+      } else if (type == 'timeAxis') {
         this.timeAxisClick(row)
-      } else if(type == 'downloadContract') {
+      } else if (type == 'downloadContract') {
         request({
           url: '/bill/downloadAllSettlementFile',
           responseType: 'arraybuffer',
@@ -158,7 +158,7 @@ export default {
         }).then(res => {
           exportFile(res)
         })
-      } else if(type == 'downloadFile') {
+      } else if (type == 'downloadFile') {
         request({
           url: '/bill/download/report',
           responseType: 'arraybuffer',

src/views/settlementManagement/indexTable.js

@@ -92,7 +92,7 @@ export default {
                 msg: '编辑',
                 icon: 'iconfont icon-xiugai',
                 tabPower: ['pending'],
-                category: 'edit',
+                category: 'edit'
               },
               {
                 msg: '查看',
@@ -139,17 +139,38 @@ export default {
     tablePower() {
       return ({ item, tab, row }) => {
         const { tabPower, rowPower, power } = item
-        if(power && !this.btnPermission.includes(power)) {
+        if (power && !this.btnPermission.includes(power)) {
           return false
         }
-        if(rowPower && (!row.status || !row.status.name || !rowPower.includes(row.status.name))) {
+        if (rowPower && (!row.status || !row.status.name || !rowPower.includes(row.status.name))) {
           return false
         }
-        if(tabPower && !tabPower.includes(tab)) {
+        if (tabPower && !tabPower.includes(tab)) {
           return false
         }
         return true
       }
+    },
+    getTableOptions() {
+      if (this.activeName === 'all') {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 406px)',
+          height: 'calc(100vh - 406px)'
+        }
+      }
+      if (this.total > 0) {
+        return {
+          sortTable: true,
+          maxHeight: 'calc(100vh - 360px)',
+          height: 'calc(100vh - 360px)'
+        }
+      }
+      return {
+        sortTable: true,
+        maxHeight: 'calc(100vh - 306px)',
+        height: 'calc(100vh - 306px)'
+      }
     }
   }
 }

src/views/systemManage/logManage/indexTable.js

@@ -6,8 +6,8 @@ export default {
       tableData: [],
       tableOptions: {
         sortTable: true,
-        maxHeight: 'calc(100vh - 406px)',
-        height: 'calc(100vh - 406px)'
+        maxHeight: 'calc(100vh - 335px)',
+        height: 'calc(100vh - 335px)'
       },
       columns: [
         {
@@ -17,26 +17,26 @@ export default {
         {
           label: '登录名',
           prop: 'loginName',
-          showTooltip: true,
+          showTooltip: true
         },
         {
           label: '姓名',
           prop: 'name',
-          showTooltip: true,
+          showTooltip: true
         },
         {
           label: '事件',
           showTooltip: true,
-          prop: 'remark',
+          prop: 'remark'
         },
         {
           label: '操作',
           show: true,
           render: (h, row) => {
             return (
-              <el-tooltip class='item' effect='dark' content="查看" placement='top' >
+              <el-tooltip class='item' effect='dark' content='查看' placement='top' >
                 <span class='table-icon-box'>
-                  <i class="iconfont icon-Magnifier" onClick={() => { this.handlerOperate("see", row) }}></i>
+                  <i class='iconfont icon-Magnifier' onClick={() => { this.handlerOperate('see', row) }}></i>
                 </span>
               </el-tooltip>
             )

src/views/systemManage/processManage/indexTable.js

@@ -5,26 +5,24 @@ export default {
       loading: false,
       tableOptions: {
         sortTable: true,
-        maxHeight: 'calc(100vh - 406px)',
-        height: 'calc(100vh - 406px)'
+        maxHeight: 'calc(100vh - 340px)',
+        height: 'calc(100vh - 340px)'
       },
       columns: [
         {
           label: '序号',
           index: true,
-          width: 300
+          width: 200
         },
         {
           label: '流程定义名称',
           prop: 'name',
-          width: 600,
           showTooltip: true
         },
         {
           label: '版本',
           showTooltip: true,
-          prop: 'version',
-          width: 500
+          prop: 'version'
         },
         {
           label: '操作',

src/views/userManagement/indexTable.js

@@ -7,8 +7,8 @@ export default {
       tableData: [],
       tableOptions: {
         sortTable: true,
-        maxHeight: 'calc(100vh - 200px)',
-        height: 'calc(100vh - 200px)'
+        maxHeight: 'calc(100vh - 336px)',
+        height: 'calc(100vh - 336px)'
       },
       columns: [{
         type: 'selection',