修改

src/api/system/user.js

@@ -76,10 +76,9 @@ export function delUser(userId) {
 }
 
 // 用户密码重置
-export function resetUserPwd(businessId, password) {
+export function resetUserPwd(businessId) {
   const data = {
-    businessId,
-    password
+    businessId
   }
   return request({
     url: '/system/user/resetPassword',

src/views/system/user/index.vue

@@ -211,7 +211,7 @@
               <div>Group</div>
             </template>
             <template slot-scope="scope">
-              {{ scope.row.nltBz === 'D'? '白班' : scope.row.nltBz === 'N'? '夜班' : '-'}}
+              {{ scope.row.nltBz === 'D'? '白班' : scope.row.nltBz === 'N'? '夜班' : '-' }}
             </template>
           </el-table-column>
           <el-table-column align="center" prop="nltLw" :show-overflow-tooltip="true">
@@ -314,7 +314,7 @@
     </el-row>
     <!-- 添加或修改参数配置对话框 -->
     <el-dialog :close-on-click-modal="false" class="userDialog" :title="title" :visible.sync="open" width="60%" append-to-body>
-      <el-form v-loading="updateLoading" ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" v-loading="updateLoading" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
             <el-form-item class="labelHeight" label="工号" prop="username">
@@ -1069,27 +1069,25 @@ export default {
     },
     /** 重置密码按钮操作 */
     handleResetPwd(row) {
-      this.ruleForm.newPassword = ''
+      // this.ruleForm.newPassword = ''
       this.ruleForm.row = row.businessId
-      this.resetPwdDiaLog = !this.resetPwdDiaLog
-    },
-    handleResetPwdSure() {
-      this.$refs.ruleForm.validate(pass => {
-        if (pass) {
-          this.userRestLoading = true
-          resetUserPwd(this.ruleForm.row, this.ruleForm.newPassword).then(response => {
-            if (response.code === 200) {
-              this.$message({
-                message: '修改成功',
-                type: 'success'
-              })
-              this.resetPwdDiaLog = false
-            }
-            this.userRestLoading = false
-          }).catch(e => { this.userRestLoading = false })
-        } else {
-          return false
-        }
+      // this.resetPwdDiaLog = !this.resetPwdDiaLog
+      this.$confirm('所选择用户密码将被重置，是否继续？', '提示', {
+        confirmButtonText: '确定 Confirm',
+        cancelButtonText: '取消 Cancel',
+        cancelButtonClass: 'btn-custom-cancel',
+        type: 'warning'
+      }).then(() => {
+        resetUserPwd(this.ruleForm.row).then(response => {
+          if (response.code === 200) {
+            this.$message({
+              message: '重置成功',
+              type: 'success'
+            })
+            this.resetPwdDiaLog = false
+          }
+          this.userRestLoading = false
+        }).catch(e => { this.userRestLoading = false })
       })
     },
     // 数组值是否相同
@@ -1271,6 +1269,7 @@ export default {
       }
     },
     employeeUpload(file, fileList) {
+      console.log('file', file)
       this.$nextTick(_ => {
         const a = document.querySelectorAll('.el-upload-list__item-name')
         a[0].title = file.name