From 0d5445d024d0ff16f4e0b18f6a30cecdea2b8261 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 18 Apr 2023 17:58:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E4=BA=BA=E7=9A=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OrgTable.vue               | 11 ++--
 src/components/ProcessApprovalHistory.vue |  4 +-
 src/components/ProcessChooseTree.vue      | 69 +++++++++--------------
 3 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue
index 848c346..632d218 100644
--- a/src/components/OrgTable.vue
+++ b/src/components/OrgTable.vue
@@ -140,13 +140,14 @@
 
           </el-table>
         </div>
-        <pagination
-          :page="page"
+        <el-pagination
+          :current-page="page"
+          :page-sizes="[5, 10, 20]"
           :pageSize="pageSize"
           :total="total"
-          @pageChange="handlePageChange"
-          @pageSizeChange="handlePageSizeChange"
-        ></pagination>
+          @current-change="handlePageChange"
+          @size-change="handlePageSizeChange"
+        ></el-pagination>
         <template v-if="btnFlag">
           <!-- 已选择的用户 -->
           <template v-if="maxSelected !== 1">
diff --git a/src/components/ProcessApprovalHistory.vue b/src/components/ProcessApprovalHistory.vue
index aa62a44..c34fed5 100644
--- a/src/components/ProcessApprovalHistory.vue
+++ b/src/components/ProcessApprovalHistory.vue
@@ -7,6 +7,7 @@
       v-loading="loading"
       :header-cell-style="{ color: '#606266', fontSize: '13px',
        height: '48px'}"
+      border
       @sort-change="sortChange">
       <el-table-column
         show-overflow-tooltip
@@ -160,9 +161,6 @@ export default {
 <style lang="scss" scoped>
 .table-box{
   width: 100%;
-  .el-table{
-    border: 1px solid #e5e5e5;
-  }
 }
 .lookFile{
   color: #0c91e5;
diff --git a/src/components/ProcessChooseTree.vue b/src/components/ProcessChooseTree.vue
index eae4260..f03ed76 100644
--- a/src/components/ProcessChooseTree.vue
+++ b/src/components/ProcessChooseTree.vue
@@ -15,46 +15,16 @@
           inline
           class="label-input-form"
           @keyup.enter.native="handleSearch">
-          <el-form-item label="部门" class="search-item">
-            <el-input v-model="searchForm.orgId" v-show="false"/>
-            <el-popover
-                placement="bottom"
-                popper-class="user-dept-popper"
-                trigger="click"
-                :value="false"
-            >
-              <el-input
-                  @mouseenter.native="handleMouseEnter"
-                  @mouseleave.native="handleMouseLeave"
-                  slot="reference"
-                  v-model="searchForm.orgName"
-                  placeholder="根据部门查询"
-                  readonly
-                  clearable
-                  id="orgInput">
-                <i slot="suffix"
-                   class="org el-icon-circle-close"
-                   @click.stop="handleOrgDel"
-                   v-show="visibleOrgClearBtn"></i>
-              </el-input>
-              <div class="api">
-                <laws-tree
-                  :zNodes="orgZNodes"
-                  ref="orgTree"
-                  :editable="false"
-                  treeDivId="orgTree"
-                  deptSelect
-                  @treeDblClick="handleSearchOrgChecked"
-                  style="width: 200px;height: 400px;overflow: auto;">
-                </laws-tree>
-              </div>
-            </el-popover>
+          <el-form-item label="角色名" class="search-item">
+            <el-select v-model="searchForm.roleName" class="icon-auth" placeholder="请选择角色名">
+              <el-option label="全部" value=""></el-option>
+              <template v-for="item in roleList">
+                <el-option :label="item.rname" :value="item.rname" :key="item.rid"></el-option>
+              </template>
+            </el-select>
           </el-form-item>
-          <el-form-item label="姓名" class="search-item">
-            <el-input
-                v-model="searchForm.uname"
-                placeholder="根据姓名查询"
-                clearable></el-input>
+          <el-form-item label="用户名" class="search-item">
+            <el-input :placeholder="'请输入用户名'" class="search-item" v-model="searchForm.account"/>
           </el-form-item>
           <el-form-item class="search-item btn-box">
             <el-button
@@ -109,7 +79,7 @@
           </el-table-column>
           <el-table-column
               v-if="workNumFlag"
-              label="工号"
+              label="用户名"
               width="120"
               prop="ACCOUNT"
               align="center">
@@ -283,7 +253,9 @@ export default {
         orgId: '',
         orgName: '',
         USNAME: '',
-        uname: ''
+        uname: '',
+        account: '',
+        roleName: ''
       },
       tableData: [],
       tableChecked: null,
@@ -308,6 +280,12 @@ export default {
     }
   },
   methods: {
+    // 角色列表
+    getSysRole () {
+      this.$api.role.getSysRole().then(({ data }) => {
+        this.roleList = data
+      })
+    },
     handleClose () {
       this.searchForm = {
         orgId: '',
@@ -383,7 +361,9 @@ export default {
         orgId: '',
         orgName: '',
         USNAME: '',
-        uname: ''
+        uname: '',
+        account: '',
+        roleName: ''
       }
       this.getRoleAndUserByOrgIdPage()
     },
@@ -678,7 +658,7 @@ export default {
   },
   mounted () {
     this.isVisible = this.visible
-
+    this.getSysRole()
     if (!this.dialogModel) {
       this.checkedName = this.config.valueName || ''
       if (this.config.value !== '') {
@@ -773,4 +753,7 @@ export default {
     }
   }
 }
+.dialog-footer{
+  margin: 20px;
+}
 </style>