From 3d7c55acca7efa5e5a95d1e54a57dd3aca148421 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 18 Apr 2023 15:51:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=86=E8=8A=82=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/process.scss                   |  4 +-
 src/components/OrgTable.vue                   | 44 ++++++++++++++-----
 src/components/ProcessFooter.vue              | 20 ++++++---
 .../components/reportTable.vue                |  4 +-
 src/views/permissionApplication/launch.vue    |  2 +-
 5 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/src/assets/css/process.scss b/src/assets/css/process.scss
index fe852b7..4d6d8e6 100644
--- a/src/assets/css/process.scss
+++ b/src/assets/css/process.scss
@@ -17,7 +17,7 @@
   margin-top: 25px;
   width:100%;
   padding: 10px 30px;
-  border: 1px dotted #ccc;
+  border: 1px solid rgb(242,242,242);
 }
 .base_title{
   display: inline-block;
@@ -38,7 +38,7 @@
     color:#555 !important;
   }
   .el-form-item.el-input__inner,.el-form-item {
-    height: 40px;
+
     line-height: 40px;
     font-size: 15px;
   }
diff --git a/src/components/OrgTable.vue b/src/components/OrgTable.vue
index a02c7b2..848c346 100644
--- a/src/components/OrgTable.vue
+++ b/src/components/OrgTable.vue
@@ -15,22 +15,28 @@
             :model="searchForm"
             inline
             class="label-input-form"
-            label-width="55px"
+            label-width="100px"
             @keyup.enter.native="handleSearch">
             <el-row :gutter="24">
 
               <el-col :xl="6" :lg="8">
-                <el-form-item label="姓名" class="search-item">
+                <el-form-item label="用户名" class="search-item">
                   <!--            <el-input-->
                   <!--                v-model="searchForm.uname"-->
                   <!--                placeholder="根据姓名查询"-->
                   <!--                clearable></el-input>-->
-                  <el-input :placeholder="'根据姓名查询'" class="search-item" v-model="searchForm.uname"/>
+                  <el-input :placeholder="'请输入用户名'" class="search-item" v-model="searchForm.account"/>
                 </el-form-item>
               </el-col>
               <el-col :xl="6" :lg="8">
-                <el-form-item label="工号" class="search-item">
-                  <el-input :placeholder="'根据工号查询'" class="search-item" v-model="searchForm.workNum"/>
+                <el-form-item label="角色名" class="search-item">
+<!--                  <el-input :placeholder="'根据角色名查询'" class="search-item" v-model="searchForm.roleName"/>-->
+                  <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-col>
               <el-col :xl="6" :lg="24">
@@ -85,7 +91,7 @@
             </el-table-column>
             <!--                                v-if="workNumFlag"-->
             <el-table-column
-              label="工号"
+              label="用户名"
               width="120"
               prop="ACCOUNT"
               align="center"
@@ -98,6 +104,12 @@
               align="center"
               show-overflow-tooltip>
             </el-table-column>
+            <el-table-column
+              prop="ROLENAME"
+              label="角色"
+              align="center"
+              show-overflow-tooltip>
+            </el-table-column>
             <el-table-column
               prop="EMAIL"
               label="邮箱"
@@ -122,7 +134,7 @@
               label="部门"
               align="center"
               show-overflow-tooltip>
-              <template #default="{ row }">{{ row.departmentName || row.DEPATMENT || row.orgName }}
+              <template #default="{ row }">{{ row.departmentName || row.DEPARTMENT || row.orgName }}
               </template>
             </el-table-column>
 
@@ -315,6 +327,7 @@ export default {
   },
   data () {
     return {
+      roleList: [],
       activeName: 'first',
       menuTreeLoading: false,
       zNodesTree: [],
@@ -326,7 +339,9 @@ export default {
         orgId: '',
         orgName: '',
         USNAME: '',
-        uname: ''
+        uname: '',
+        roleName: '',
+        account: ''
       },
       tableData: [],
       tableChecked: null,
@@ -346,7 +361,6 @@ export default {
       treeCheckNode: [],
       checkedName: '',
       zNodesRole: [],
-      roleList: [],
       repeatFlag: false,
       isShowOrg: true
     }
@@ -460,7 +474,9 @@ export default {
         orgId: '',
         orgName: '',
         USNAME: '',
-        uname: ''
+        uname: '',
+        account: '',
+        roleName: ''
       }
       this.getRoleAndUserByOrgIdPage()
     },
@@ -681,7 +697,12 @@ export default {
     handleMouseLeave () {
       this.visibleOrgClearBtn = false
     },
-
+    // 角色列表
+    getSysRole () {
+      this.$api.role.getSysRole().then(({ data }) => {
+        this.roleList = data
+      })
+    },
     handleCleanChecked () {
       this.$confirm('您是否确定移除全部已选中', '确定移除', {
         confirmButtonText: '确定',
@@ -784,6 +805,7 @@ export default {
   },
   mounted () {
     this.isVisible = this.visible
+    this.getSysRole()
     if (!this.dialogModel) {
       this.checkedName = this.config.valueName || ''
       if (this.config.value !== '') {
diff --git a/src/components/ProcessFooter.vue b/src/components/ProcessFooter.vue
index a3bf72a..3176087 100644
--- a/src/components/ProcessFooter.vue
+++ b/src/components/ProcessFooter.vue
@@ -51,7 +51,7 @@
           class="common-button-primary"
           @click="handleTransfer"
           :loading="TransferLoading"
-          v-if="showTransfer"
+          v-if="showTransfer" round
         >转办</el-button>
         <el-button
           type="primary"
@@ -59,25 +59,25 @@
           class="common-button-primary"
           @click="handleSave"
           :loading="saveLoading"
-          v-if="showSave">
+          v-if="showSave" round>
           保存
         </el-button>
         <el-button
           type="primary"
           size="large"
-          class="common-button-primary"
+          class="common-button-primary resetColor"
           @click="handleReset"
           :loading="resetLoading"
-          v-if="showReset">
+          v-if="showReset" round>
           重置
         </el-button>
         <el-button
           type="primary"
           size="large"
-          class="common-button-primary"
+          class="common-button-primary submitColor"
           @click="handleSubmit"
           :loading="submitLoading"
-          v-if="showSubmit"
+          v-if="showSubmit" round
         >{{ submitBTNTextShow }}</el-button>
       </div>
       <!--      <el-button-->
@@ -391,4 +391,12 @@ export default {
     box-shadow: 0 -1px 2px 0px #e8e8e8;
   }
 }
+.resetColor{
+  background-color:#02a7f0 ;
+  border: none;
+}
+.submitColor{
+  background-color:#8400ff;
+  border: none;
+}
 </style>
diff --git a/src/views/permissionApplication/components/reportTable.vue b/src/views/permissionApplication/components/reportTable.vue
index 1a7d8b2..0257dee 100644
--- a/src/views/permissionApplication/components/reportTable.vue
+++ b/src/views/permissionApplication/components/reportTable.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="reportTable">
-    <el-button v-if="!disabled" class="addbtn" size="big" @click="addReport">添加报告</el-button>
-    <el-button v-if="!disabled" class="delbtn" size="big" @click="deleteAll">批量删除</el-button>
+    <el-button v-if="!disabled" class="addbtn" size="small" @click="addReport">添加报告</el-button>
+    <el-button v-if="!disabled" class="delbtn" size="small" @click="deleteAll">批量删除</el-button>
     <div class="table">
       <vxe-table :data="processTable" :empty-render="{name: 'NotData'}" align="center" border stripe v-table-min-height="500"
       ref="xTable" @checkbox-all="selectAllEvent" @checkbox-change="selectChangeEvent">
diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue
index 6788a57..f7be0c3 100644
--- a/src/views/permissionApplication/launch.vue
+++ b/src/views/permissionApplication/launch.vue
@@ -75,7 +75,7 @@
             <el-row>
               <el-col :span="24" >
                 <el-form-item label="说明:">
-                  <el-input type="textarea" v-model="assignForm.remark"></el-input>
+                  <el-input type="textarea" v-model="assignForm.remark" placeholder="请输入说明"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>