zhudie hace 1 año
padre
commit
507a316a0f

+ 1 - 1
src/api/system/user-operate.ts

@@ -147,7 +147,7 @@ export function getUserList(params: QueryUser | null): Promise<UserList> {
 
 interface ResetCodeType {
   password?: string;
-  userId?: string;
+  userId?: number;
 }
 
 // 修改密码

+ 3 - 2
src/views/system/user/ResetCodeDrawer.vue

@@ -85,8 +85,9 @@
 
   const formParams = ref<UserType>(defaultValueRef());
 
-  async function openDrawer(username?) {
+  async function openDrawer(username?,userId?) {
     formParams.value.username = username;
+    formParams.value.userId = userId;
     isDrawer.value = true;
   }
 
@@ -106,7 +107,7 @@
       }
       const addData = {
         password: formParams.value.password,
-        userId: formParams.value.username,
+        userId: formParams.value.userId!,
       };
       resetCode(addData).then(() => {
         emit('change');

+ 1 - 1
src/views/system/user/component/ActionColomns.vue

@@ -2,7 +2,7 @@
   <div class="flex items-center justify-center">
     <el-space :size="space">
       <div v-for="item in props.actionIcons" :key="item.label" @click="item.onClick">
-        <div v-if="item.label === '重置密码'" style="font-size: 10px;color: #629bf9;cursor: pointer;">{{item.label}}</div>
+        <div v-if="item.label === '重置密码'" style="font-size: 12px;color: #629bf9;cursor: pointer;">{{item.label}}</div>
         <el-tooltip v-else :content="item.label" effect="light">
           <el-icon v-if="props.style === 'icon'" :color="props.color" :size="props.size">
             <component :is="item.icon" />

+ 0 - 2
src/views/system/user/component/UserQuery.vue

@@ -84,8 +84,6 @@ const props = defineProps<Props>();
   } = storeToRefs(useUserDetail);
   const { conditionSearch } = useUserDetail;
 
-
-
   // 重置查询条件
   const resetSearch = () => {
     queryType.value = '';

+ 1 - 1
src/views/system/user/user.vue

@@ -210,7 +210,7 @@ const sceneInfos = useSceneInfos();
   function handleResetCode(record: Recordable) {
     drawerTitle.value = '重置密码';
     const { openDrawer } = ResetCodeDrawerRef.value;
-    openDrawer(record.userId);
+    openDrawer(record.username,record.userId);
   }
 
   function handleDelete(record: Recordable) {