From ecc1b232f0a3c753db5b121e9a6ecb181c4bc277 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 20 九月 2022 16:04:42 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui into master

---
 src/views/systemSetting/baseSetting/user/index.vue |   80 ++++++++++++++++++++++++++-------------
 1 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/views/systemSetting/baseSetting/user/index.vue b/src/views/systemSetting/baseSetting/user/index.vue
index f430f12..b642c21 100644
--- a/src/views/systemSetting/baseSetting/user/index.vue
+++ b/src/views/systemSetting/baseSetting/user/index.vue
@@ -6,12 +6,13 @@
                     <span>绛涢�夋潯浠�:</span>
                     <el-input placeholder="璇疯緭鍏ュ唴瀹�" v-model="search"></el-input>
                     <div class="findBtn">
-                        <el-button type="primary" @click="handlePhone">鏌ヨ</el-button>
+                        <el-button type="primary" @click="getUserList">鏌ヨ</el-button>
                     </div>
                 </div>
                 <div class="addUser">
                     <el-button class="addBtn" type="primary" @click="dialogCreate = true">娣诲姞鐢ㄦ埛</el-button>
-                    <el-dialog :visible.sync="dialogCreate" width="45%">
+                    <el-dialog :visible.sync="dialogCreate" width="45%" v-if="dialogCreate"
+                        :before-close="handleClose1">
                         <createUser :refresh="getUserList" />
                     </el-dialog>
                 </div>
@@ -63,8 +64,9 @@
                     </el-table-column>
                 </el-table>
                 <!-- 鏌ョ湅淇敼椤甸潰 -->
-                <el-dialog :visible.sync="dialogUpdate" width="45%">
-                    <updateUser :updateFlag="updateFlag" :userInfo=userInfo />
+                <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
+                    :before-close="handleClose2">
+                    <updateUser :updateFlag="updateFlag" :userInfo=userInfo  />
                 </el-dialog>
                 <!-- 鍒嗛〉 -->
                 <div class="pagination">
@@ -120,16 +122,17 @@
         // 鑾峰彇鐢ㄦ埛鍒楄〃
         getUserList() {
             const that = this;
+            const { currentPage, pageSize, search } = this;
             this.dialogCreate = false;
-            // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
-            this.$axios.get('sccg/admin/list').then(res => {
+            // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
+            this.$axios.get(`sccg/admin/list?mobile=${search}&current=${currentPage}&pageSize=${pageSize}`).then(res => {
                 if (res.code === 200) {
                     res.data.records.forEach(item => {
                         item.createTime = helper(item.createTime);
                         item.status == 1 ? item.status = true : item.status = false;
                     })
-                    that.totalNum = res.data.records.length;
-                    that.tableData = res.data.records.slice((that.currentPage - 1) * 10, that.currentPage * 10)
+                    that.totalNum = res.data.pages * pageSize;
+                    that.tableData = res.data.records;
                 }
             })
         },
@@ -169,27 +172,50 @@
             this.currentPage = page;
             this.getUserList();
         },
-        // 鐢ㄦ埛鏌ヨ(鏆傛椂鏀寔鐢佃瘽鍙风爜)
-        handlePhone() {
-            const { search, getUserList } = this;
+        // 鍒涘缓寮圭獥鍏抽棴
+        handleClose1(done) {
             const that = this;
-            if (search == '') {
-                getUserList();
-                return;
-            }
-            this.dialogCreate = false;
-            // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
-            this.$axios.get(`sccg/admin/list?mobile=${search}`).then(res => {
-                if (res.code === 200) {
-                    res.data.records.forEach(item => {
-                        item.createTime = helper(item.createTime);
-                        item.status == 1 ? item.status = true : item.status = false;
-                    })
-                    that.totalNum = res.data.records.length;
-                    that.tableData = res.data.records.slice((that.currentPage - 1) * 10, that.currentPage * 10)
-                }
-            })
+            this.$confirm('纭鍏抽棴锛�')
+                .then(_ => {
+                    that.dialogCreate = false;
+                    done();
+                })
+                .catch(_ => { });
+        },
+        //   鏌ョ湅寮圭獥鍏抽棴
+        handleClose2(done) {
+            const that = this;
+            this.$confirm('纭鍏抽棴锛�')
+                .then(_ => {
+                    this.dialogUpdate = false;
+                    done();
+                })
+                .catch(_ => { });
         }
+        // 鐢ㄦ埛鏌ヨ(鏆傛椂鏀寔鐢佃瘽鍙风爜)
+        // handlePhone() {
+        //     const { search, getUserList } = this;
+        //     if (search == '') {
+        //         getUserList();
+        //         return;
+        //     }
+        //     this.handlePhoneSearch(search);
+        // },
+        // handlePhoneSearch(search){
+        //     this.dialogCreate = false;
+        //     const that = this;
+        //     // 鑾峰彇鎵嬫満鍙风敤鎴蜂俊鎭�
+        //     this.$axios.get(`sccg/admin/list?mobile=${search}`).then(res => {
+        //         if (res.code === 200) {
+        //             res.data.records.forEach(item => {
+        //                 item.createTime = helper(item.createTime);
+        //                 item.status == 1 ? item.status = true : item.status = false;
+        //             })
+        //             that.totalNum = res.data.records.length;
+        //             that.tableData = res.data.records.slice((that.currentPage - 1) * that.pageSize, that.currentPage * that.pageSize)
+        //         }
+        //     })
+        // }
     }
 }
 </script>

--
Gitblit v1.8.0