-

src/views/tenantManage/adminConfig/component/checkAdminList.vue

@@ -216,20 +216,13 @@ export default defineComponent({
 
       //重置密码  （修改操作）
     const resetPass = (row) => {
-      alert('重置密码操作')
-      //  console.log('row')
-      // console.log(row)
-
-      // tableItem.value = {
-      //   nickName: row.nickName,
-      //   userName: row.userName,
-      //   email: row.email,
-      //   phonenumber: row.phonenumber,
-      //   password: row.password,
-      //   status: row.status,
-      //   tenantId: row.tenantId,
-      //   userId:row.userId
-      // }
+       console.log('row')
+      console.log(row)
+
+      tableItem.value = {
+        userId: row.userId,
+      }
+
       DialogArray.value = row
       dialogTitle3.value = '重置密码'
       showDialog3.value = true

src/views/tenantManage/adminConfig/component/resetPass.vue

@@ -7,7 +7,7 @@
     @open="open(0)"
   >
     <div class="dialogOne">
-      <el-form :model="form" :rules="rules" ref="formInfo"  label-width="120px">
+      <el-form :model="form" :rules="rules" ref="formInfo" label-width="120px">
         <el-form-item label="密码" prop="newPassword" type="password">
           <el-input v-model="form.newPassword" show-password />
         </el-form-item>
@@ -64,9 +64,9 @@ export default defineComponent({
       ) {
         callback(new Error('请输入6-18位特殊字符、字母、数字组合的密码'))
       } else {
-        if (this.ruleForm.confirmPwd !== '') {
-          this.$refs.ruleForm.validateField('confirmPwd')
-        }
+        // if (this.ruleForm.confirmPwd !== '') {
+        //   this.$refs.ruleForm.validateField('confirmPwd')
+        // }
         callback()
       }
     }
@@ -81,16 +81,15 @@ export default defineComponent({
     }
 
     const submit = () => {
-      alert('提交')
-
-
       formInfo.value.validate((valid) => {
-
-           alert('验证')
         if (valid) {
-            alert('验证通过')
-
-            api.updatePwd(form.value).then((requset) => {
+        //   formInfo.value.UserId = props.itemInfo.userId
+          api
+            .updatePwd({
+              UserId: props.itemInfo.userId,
+              newPassword: form.value.newPassword,
+            })
+            .then((requset) => {
               if (requset.status === 'SUCCESS') {
                 ElMessage.success({
                   message: '修改成功',
@@ -101,48 +100,11 @@ export default defineComponent({
                 ElMessage.error(requset.msg)
               }
             })
-        //   if (props.dialogTitle === '修改') {
-            
-        //   } else {
-        //     api.updatePwd(form.value).then((requset) => {
-        //       if (requset.status === 'SUCCESS') {
-        //         ElMessage.success({
-        //           message: '配置成功',
-        //           type: 'success',
-        //         })
-        //         close()
-        //       } else {
-        //         ElMessage.error(requset.msg)
-        //       }
-        //     })
-        //   }
         } else {
           console.log('error submit!!')
           return false
         }
       })
-
-
-    //   formInfo.value.validate((valid) => {
-    //     alert('验证')
-    //     if (valid) {
-    //       alert('验证通过')
-    //       api.updatePwd(form.value).then((requset) => {
-    //         if (requset.status === 'SUCCESS') {
-    //           ElMessage.success({
-    //             message: '修改密码成功',
-    //             type: 'success',
-    //           })
-    //           close()
-    //         } else {
-    //           ElMessage.error(requset.msg)
-    //         }
-    //       })
-    //     } else {
-    //       console.log('error submit!!')
-    //       return false
-    //     }
-    //   })
     }
 
     const open = () => {
@@ -153,9 +115,7 @@ export default defineComponent({
 
     // close(): Dialog弹窗关闭之后做的事
     const close = () => {
-      // alert('关闭了')
-      //   resetForm()
-
+ 
       context.emit('closeNo3', false)
       cloneDialog.value = false
     }
@@ -177,8 +137,8 @@ export default defineComponent({
       cloneDialog,
 
       ruleForm,
-      resetForm,
       formInfo,
+      resetForm,
 
       validatePass,
       validatePass2,