From 37be1397b89c04d6433fb0cc346e0ca017b6383e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Tue, 12 Dec 2023 15:12:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/RoleUserList.vue | 138 ++++++++++++++----------------
 1 file changed, 65 insertions(+), 73 deletions(-)

diff --git a/src/views/system/RoleUserList.vue b/src/views/system/RoleUserList.vue
index 269a1161..b6be1cf9 100644
--- a/src/views/system/RoleUserList.vue
+++ b/src/views/system/RoleUserList.vue
@@ -32,10 +32,10 @@
         <div class="table-operator" style="margin: 5px 0 10px 2px">
           <a-button @click="handleAdd" type="primary" icon="plus">{{ $t('roleManage.newRole') }}</a-button>
           <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
-<!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--            <a-button type="primary" icon="import">导入</a-button>-->
-<!--          </a-upload>-->
-<!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
+          <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+          <!--            <a-button type="primary" icon="import">导入</a-button>-->
+          <!--          </a-upload>-->
+          <!--          <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
         </div>
 
         <div style="margin-top: 15px">
@@ -55,7 +55,7 @@
             @change="handleTableChange">
           <span slot="action" slot-scope="text, record">
             <a @click="handleOpen(record)">{{ $t('roleManage.userBtn') }}</a>
-            <a-divider type="vertical"/>
+            <a-divider type="vertical" />
 
             <a-dropdown>
               <a class="ant-dropdown-link">
@@ -109,17 +109,20 @@
         <div class="table-operator">
           <!--<a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">{{ $t('roleManage.newUser') }}</a-button>-->
           <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
-          <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">{{ $t('roleManage.existingUsers') }}</a-button>
+          <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">{{
+              $t('roleManage.existingUsers')
+            }}
+          </a-button>
 
           <a-dropdown v-if="selectedRowKeys2.length > 0">
             <a-menu slot="overlay">
               <a-menu-item key="1" @click="batchDel2">
-                <a-icon type="delete"/>
+                <a-icon type="delete" />
                 {{ $t('delete') }}
               </a-menu-item>
             </a-menu>
             <a-button style="margin-left: 8px"> {{ $t('batchOperation') }}
-              <a-icon type="down"/>
+              <a-icon type="down" />
             </a-button>
           </a-dropdown>
         </div>
@@ -139,22 +142,11 @@
             :scroll="{x: '100%', y: yScrollHeight}"
             :rowSelection="{selectedRowKeys: selectedRowKeys2, onChange: onSelectChange2}"
             @change="handleTableChange2">
-           <span slot="action" slot-scope="text, record">
-           <a @click="handleEdit2(record)">{{ $t('edit') }}</a>
-          <a-divider type="vertical"/>
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              <a-icon type="more" class="operate-icon-btn operate-icon-more" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete2(record.id)">
-                  <a>{{ $t('delete') }}</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
+            <template slot="action" slot-scope="text, record">
+              <a-popconfirm :title="$t('areYouSure')" @confirm="() => handleDelete2(record.id)">
+                <a>{{ $t('delete') }}</a>
+              </a-popconfirm>
+            </template>
           </a-table>
         </div>
         <!-- 表单区域 -->
@@ -236,59 +228,59 @@ export default {
       test: {},
       rightcolval: 0,
       columns:
-          [
-            {
-              title: this.$t('roleManage.roleCode'),
-              align: 'center',
-              dataIndex: 'roleCode'
-            },
-            {
-              title: this.$t('roleManage.roleName'),
-              align: 'center',
-              dataIndex: 'roleName'
-            },
-            {
-              title: this.$t('createTime'),
-              dataIndex: 'createTime',
-              align: 'center',
-              sorter: true,
-              customRender: (text) => {
-                return moment(text).format('YYYY-MM-DD')
-              }
-            },
-            {
-              title: this.$t('operation'),
-              dataIndex: 'action',
-              align: 'center',
-              scopedSlots: { customRender: 'action' }
+        [
+          {
+            title: this.$t('roleManage.roleCode'),
+            align: 'center',
+            dataIndex: 'roleCode'
+          },
+          {
+            title: this.$t('roleManage.roleName'),
+            align: 'center',
+            dataIndex: 'roleName'
+          },
+          {
+            title: this.$t('createTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            sorter: true,
+            customRender: (text) => {
+              return moment(text).format('YYYY-MM-DD')
             }
-          ],
+          },
+          {
+            title: this.$t('operation'),
+            dataIndex: 'action',
+            align: 'center',
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
       columns2: [{
         title: this.$t('user.userAccount'),
         align: 'center',
         dataIndex: 'username',
         width: 120
       },
-      {
-        title: this.$t('user.userName'),
-        align: 'center',
-        width: 100,
-        dataIndex: 'realname'
-      },
-      {
-        title: this.$t('status'),
-        align: 'center',
-        width: 80,
-        dataIndex: 'status_dictText'
-      },
+        {
+          title: this.$t('user.userName'),
+          align: 'center',
+          width: 100,
+          dataIndex: 'realname'
+        },
+        {
+          title: this.$t('status'),
+          align: 'center',
+          width: 80,
+          dataIndex: 'status_dictText'
+        },
 
-      {
-        title: this.$t('operation'),
-        dataIndex: 'action',
-        scopedSlots: { customRender: 'action' },
-        align: 'center',
-        width: 120
-      }],
+        {
+          title: this.$t('operation'),
+          dataIndex: 'action',
+          scopedSlots: { customRender: 'action' },
+          align: 'center',
+          width: 120
+        }],
 
       // 高级查询参数
       superQueryParams2: '',
@@ -524,10 +516,10 @@ export default {
 </script>
 <style lang="less" scoped>
 @import '~@assets/less/common.less';
-  /** Button按钮间距 */
-  .ant-btn {
-    margin-left: 8px
-  }
+/** Button按钮间距 */
+.ant-btn {
+  margin-left: 8px
+}
 
 /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
   min-width: 60px;