无设备处理

src/views/auth/userList/index.vue

@@ -1,46 +1,46 @@
 <template>
-    <div class='default-main'>
+    <div class="default-main">
         <TableHeader>
             <template v-slot:select>
-                <el-form-item label='用户状态'>
-                    <el-select v-model='tableStore.table.params.searchState' placeholder='选择用户状态'>
+                <el-form-item label="用户状态">
+                    <el-select v-model="tableStore.table.params.searchState" placeholder="选择用户状态">
                         <el-option
-                            v-for='(item, index) in userState'
-                            :label='item.label'
-                            :key='index'
-                            :value='item.value'
+                            v-for="(item, index) in userState"
+                            :label="item.label"
+                            :key="index"
+                            :value="item.value"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='用户类型:'>
-                    <el-select v-model='tableStore.table.params.casualUser' placeholder='选择用户类型'>
+                <el-form-item label="用户类型:">
+                    <el-select v-model="tableStore.table.params.casualUser" placeholder="选择用户类型">
                         <el-option
-                            v-for='(item, index) in casualUser'
-                            :label='item.label'
-                            :key='index'
-                            :value='item.value'
+                            v-for="(item, index) in casualUser"
+                            :label="item.label"
+                            :key="index"
+                            :value="item.value"
                         ></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label='关键词:'>
+                <el-form-item label="关键词:">
                     <el-input
-                        style='width: 240px'
-                        v-model='tableStore.table.params.searchValue'
+                        style="width: 240px"
+                        v-model="tableStore.table.params.searchValue"
                         clearable
-                        placeholder='仅根据用户名/登录名'
+                        placeholder="仅根据用户名/登录名"
                     />
                 </el-form-item>
             </template>
             <template v-slot:operation>
-                <el-button :icon='Plus' type='primary' @click='addUser'>添加</el-button>
+                <el-button :icon="Plus" type="primary" @click="addUser">添加</el-button>
             </template>
         </TableHeader>
-        <Table ref='tableRef' />
-        <PopupEdit ref='popupEditRef'></PopupEdit>
-        <PopupPwd ref='popupPwdRef'></PopupPwd>
+        <Table ref="tableRef" />
+        <PopupEdit ref="popupEditRef"></PopupEdit>
+        <PopupPwd ref="popupPwdRef"></PopupPwd>
     </div>
 </template>
-<script setup lang='ts'>
+<script setup lang="ts">
 import { Plus } from '@element-plus/icons-vue'
 import { ref, onMounted, provide } from 'vue'
 import { ElMessageBox, ElMessage } from 'element-plus'
@@ -119,7 +119,15 @@ const tableStore = new TableStore({
                         return row.state !== 1
                     },
                     click: row => {
-                        popupPwdRef.value.open(row.id, row.loginName)
+                        ElMessageBox.prompt('二次校验密码确认', '注销用户', {
+                            confirmButtonText: '确认',
+                            cancelButtonText: '取消',
+                            inputType: 'password'
+                        }).then(({ value }) => {
+                            passwordConfirm(value).then(res => {
+                                popupPwdRef.value.open(row.id)
+                            })
+                        })
                     }
                 },
                 {
@@ -154,17 +162,16 @@ const tableStore = new TableStore({
                             confirmButtonText: '确认',
                             cancelButtonText: '取消',
                             inputType: 'password'
-                        })
-                            .then(({ value }) => {
-                                passwordConfirm(value).then(res => {
-                                    deluser({
-                                        id: row.id
-                                    }).then(() => {
-                                        ElMessage.success('注销成功')
-                                        tableStore.index()
-                                    })
+                        }).then(({ value }) => {
+                            passwordConfirm(value).then(res => {
+                                deluser({
+                                    id: row.id
+                                }).then(() => {
+                                    ElMessage.success('注销成功')
+                                    tableStore.index()
                                 })
                             })
+                        })
                     }
                 }
             ]

src/views/auth/userList/popupPwd.vue

@@ -2,9 +2,6 @@
     <el-dialog class="cn-operate-dialog" v-model="dialogVisible" title="修改密码">
         <el-scrollbar>
             <el-form :inline="false" :model="form" label-width="120px" :rules="rules" ref="formRef">
-                <el-form-item label="校验密码" prop="password">
-                    <el-input v-model="form.password" type="password" placeholder="请输入校验密码" show-password />
-                </el-form-item>
                 <el-form-item label="新密码" prop="newPwd">
                     <el-input v-model="form.newPwd" type="password" placeholder="请输入新密码" show-password />
                 </el-form-item>
@@ -29,26 +26,17 @@ import TableStore from '@/utils/tableStore'
 import { ElMessage } from 'element-plus'
 import { validatePwd } from '@/utils/common'
 import { passwordConfirm, updatePassword } from '@/api/user-boot/user'
+import { debug } from 'console'
 
 const formRef = ref()
 const tableStore = inject('tableStore') as TableStore
 const form = reactive({
     id: '',
-    password: '',
     newPwd: '',
     confirmPwd: '',
     loginName: ''
 })
 const rules = {
-    password: [
-        { required: true, message: '请输入校验密码', trigger: 'blur' },
-        {
-            min: 6,
-            max: 16,
-            message: '长度在 6 到 16 个字符',
-            trigger: 'blur'
-        }
-    ],
     newPwd: [
         { required: true, message: '请输入密码', trigger: 'blur' },
         {
@@ -84,10 +72,9 @@ const rules = {
 }
 const dialogVisible = ref(false)
 const title = ref('新增菜单')
-const open = (id: string,loginName: string) => {
+const open = (id: string, loginName: string) => {
     form.id = id
     form.loginName = loginName
-    form.password = ''
     form.newPwd = ''
     form.confirmPwd = ''
     dialogVisible.value = true
@@ -95,14 +82,12 @@ const open = (id: string,loginName: string) => {
 const submit = async () => {
     formRef.value.validate((valid: boolean) => {
         if (valid) {
-            passwordConfirm(form.password, form.loginName).then((res: any) => {
-                updatePassword({
-                    id: form.id,
-                    newPassword: form.newPwd
-                }).then((res: any) => {
-                    ElMessage.success('密码修改成功')
-                    dialogVisible.value = false
-                })
+            updatePassword({
+                id: form.id,
+                newPassword: form.newPwd
+            }).then((res: any) => {
+                ElMessage.success('密码修改成功')
+                dialogVisible.value = false
             })
         }
     })