From d3ae08fbd8634429150f8a54bc779efdfd9aa1e2 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 19:02:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin-web/src/views/systemManger/server/user/index.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/admin-web/src/views/systemManger/server/user/index.vue b/admin-web/src/views/systemManger/server/user/index.vue
index 2271281..0a651d3 100644
--- a/admin-web/src/views/systemManger/server/user/index.vue
+++ b/admin-web/src/views/systemManger/server/user/index.vue
@@ -109,7 +109,7 @@
{ title: '缂栧彿', field: 'userCode', align: 'left' },
{ title: '鐢ㄦ埛濮撳悕', field: 'userName', align: 'left' },
{ title: '鐧诲綍鍚�', field: 'userPhone', align: 'center' },
- { title: '鎵�灞炴満鏋�', field: 'userPhone', align: 'center', width: 150 },
+ { title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'center', width: 150 },
{ title: '閮ㄩ棬', field: 'sysDeptName', align: 'center' },
{
field: 'status',
@@ -236,13 +236,21 @@
this.$modal
.confirm('鏄惁纭鍒濆鍖栧悕绉颁负"' + row.userName + '"鐨勫瘑鐮侊紵')
.then(function () {
- user.updPassWord(row).then((res) => {});
+ user.updPassWord(row).then((res) => {
+ });
})
.then((res) => {
- this.$message.success('鍒濆鍖栧瘑鐮佹垚鍔燂紒');
+ this.$modal
+ .confirm('鍒濆鍖栧瘑鐮佹垚鍔燂紝鏂板瘑鐮佷负锛�123456')
+ .then((res) => {
+
+ })
+ .catch(() => {
+ });
this.search();
})
- .catch(() => {});
+ .catch(() => {
+ });
},
// 鏌ヨtable鍒楄〃
search(pageNum) {
--
Gitblit v1.9.1