From 53068704a969db52d1f868d39dfe66700eca594d Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Wed, 19 Apr 2023 16:16:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/process.scss                                 | 2 +-
 src/components/OrgTable.vue                                 | 3 ++-
 src/components/ProcessChooseTree.vue                        | 5 +++--
 src/views/permissionApplication/components/reportDialog.vue | 6 ++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/assets/css/process.scss b/src/assets/css/process.scss
index 3644f2c..21c5f67 100644
--- a/src/assets/css/process.scss
+++ b/src/assets/css/process.scss
@@ -29,7 +29,7 @@
   margin-bottom: 20px;
 }
 .pagination{
-  margin-top: 10px;
+  margin-top: 20px;
 }
 
 // 表单的样式
diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue
index 7bc6db8..8191732 100644
--- a/src/components/OrgTable.vue
+++ b/src/components/OrgTable.vue
@@ -145,6 +145,7 @@
           :total="total"
           @current-change="handlePageChange"
           @size-change="handlePageSizeChange"
+          layout="total, sizes, prev, pager, next, jumper"
         ></el-pagination>
         <template v-if="btnFlag">
           <!-- 已选择的用户 -->
@@ -889,7 +890,7 @@ export default {
   }
 }
 .dialog-footer{
-  margin-top: 10px;
+  margin-top: 20px;
   ::v-deep .el-button {
     width: 80px;
     height: 36px;
diff --git a/src/components/ProcessChooseTree.vue b/src/components/ProcessChooseTree.vue
index e81746c..042656c 100644
--- a/src/components/ProcessChooseTree.vue
+++ b/src/components/ProcessChooseTree.vue
@@ -123,10 +123,11 @@
         class="pagination"
         :current-page="page"
         :page-sizes="[5, 10, 20]"
-          :pageSize="pageSize"
-          :total="total"
+        :pageSize="pageSize"
+        :total="total"
         @current-change="handlePageChange"
         @size-change="handlePageSizeChange"
+        layout="total, sizes, prev, pager, next, jumper"
       ></pagination>
 
       <!-- 已选择的用户 -->
diff --git a/src/views/permissionApplication/components/reportDialog.vue b/src/views/permissionApplication/components/reportDialog.vue
index 2cd5dd4..d1b9a4b 100644
--- a/src/views/permissionApplication/components/reportDialog.vue
+++ b/src/views/permissionApplication/components/reportDialog.vue
@@ -30,7 +30,7 @@
       </el-row>
       </el-form>
     <div class="table">
-      <vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe height="auto"
+      <vxe-table :data="tableData" :empty-render="{name: 'NotData'}" align="center" border stripe max-height="100%"
                  ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
         <vxe-column type="checkbox" width="60"></vxe-column>
         <vxe-column show-overflow show-header-overflow field="labelOneName" :title="tagsForm.tags01.name"></vxe-column>
@@ -194,7 +194,6 @@ export default {
 .table{
   padding: 10px 20px;
   width: 100%;
-  height: 550px;
 }
 .addreport{
   ::v-deep .el-dialog__header {
@@ -210,9 +209,8 @@ export default {
   }
 }
 .done {
-  margin: 30px 20px 10px;
+  margin: 10px 20px 10px;
   text-align: right;
-  padding:20px 0 10px ;
 
   ::v-deep .el-button {
     width: 80px;