Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-10-12 8ca53c7666756073f2103a9235f927faf84a151e

 ruoyi-ui/src/views/system/user/index.vue

@@ -582,9 +582,7 @@
        cancelButtonText: "取消"
      }).then(({ value }) => {
          resetUserPwd(row.userId, value).then(response => {
            if (response.code === 200) {
              this.msgSuccess("修改成功，新密码是：" + value);
            }
          });
        }).catch(() => {});
    },
@@ -594,19 +592,15 @@
        if (valid) {
          if (this.form.userId != undefined) {
            updateUser(this.form).then(response => {
              if (response.code === 200) {
                this.msgSuccess("修改成功");
                this.open = false;
                this.getList();
              }
            });
          } else {
            addUser(this.form).then(response => {
              if (response.code === 200) {
                this.msgSuccess("新增成功");
                this.open = false;
                this.getList();
              }
            });
          }
        }
@@ -624,7 +618,7 @@
        }).then(() => {
          this.getList();
          this.msgSuccess("删除成功");
        }).catch(function() {});
        })
    },
    /** 导出按钮操作 */
    handleExport() {
@@ -637,7 +631,7 @@
          return exportUser(queryParams);
        }).then(response => {
          this.download(response.msg);
        }).catch(function() {});
        })
    },
    /** 导入按钮操作 */
    handleImport() {