From 19e96f1d0dd936fdc8d92364bd773856020a85f7 Mon Sep 17 00:00:00 2001
From: shizhong <124974919@qq.com>
Date: Wed, 20 Sep 2023 12:21:52 +0800
Subject: [PATCH] Merge branch 'dev' of
 https://gitee.com/ls0/yudao-ui-admin-vue3 into dev

---
 src/views/member/user/index.vue | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue
index 0cadf5d1..a7f576aa 100644
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -109,16 +109,32 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" width="140px" fixed="right">
         <template #default="scope">
           <el-button
             link
             type="primary"
             @click="goMemberDetail(scope.row.id)"
-            v-hasPermi="['member:user:update']"
           >
             详情
           </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['member:user:update']"
+          >
+            编辑
+          </el-button>
+          <!-- todo 放到更多菜单中 -->
+          <el-button
+            link
+            type="primary"
+            @click="updateLevelFormRef.open(scope.row.id)"
+            v-hasPermi="['member:user:update-level']"
+          >
+            修改等级
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -130,6 +146,11 @@
       @pagination="getList"
     />
   </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <UserForm ref="formRef" @success="getList" />
+  <!-- 修改用户等级弹窗 -->
+  <UpdateLevelForm ref="updateLevelFormRef" @success="getList" />
 </template>
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
@@ -138,6 +159,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import MemberTagSelect from '@/views/member/tag/components/MemberTagSelect.vue'
 import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect.vue'
 import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue'
+import UpdateLevelForm from '@/views/member/user/UpdateLevelForm.vue'
 
 defineOptions({ name: 'MemberUser' })
 
@@ -156,6 +178,7 @@ const queryParams = reactive({
   groupId: null
 })
 const queryFormRef = ref() // 搜索的表单
+const updateLevelFormRef = ref() // 修改会员等级表单
 
 /** 查询列表 */
 const getList = async () => {