From b848a5cbbcc80c994aaf6156c365ce725867ad57 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期四, 13 十月 2022 17:57:58 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_ui

---
 src/views/systemSetting/baseSetting/user/components/main/index.vue |   72 +++++++++++++++++++----------------
 1 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue
index cdf66b5..1ecd2f8 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -18,6 +18,9 @@
                 <el-table-column prop="mobile" label="鑱旂郴鏂瑰紡" min-width="7">
                 </el-table-column>
                 <el-table-column prop="note" label="鎵�灞炶鑹�" min-width="8">
+                    <template slot-scope="scope">
+                        <span>{{filterRole(scope.row.roles)}}</span>
+                    </template>
                 </el-table-column>
                 <el-table-column prop="departName" label="鎵�灞為儴闂�" min-width="8">
                 </el-table-column>
@@ -147,9 +150,9 @@
                 if (list === 3) {
                     await this.mulDelte(this.tempList);
                 } else if (list === 2) {
-                    await this.mulUpdateStatus(this.tempList,0);
+                    await this.mulUpdateStatus(this.tempList, 0);
                 } else {
-                    await this.mulUpdateStatus(this.tempList,1);
+                    await this.mulUpdateStatus(this.tempList, 1);
                 }
                 this.myIdx = 0;
             } else {
@@ -199,13 +202,13 @@
                 .catch(err => { console.log(err) })
         },
         // 鎵归噺淇敼璐﹀彿
-        mulUpdateStatus(idArr,flag) {
+        mulUpdateStatus(idArr, flag) {
             console.log(flag);
-            this.$confirm( flag === 1 ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤鐢ㄦ埛鍚�?" :'鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤鐢ㄦ埛鍚�?' ) 
+            this.$confirm(flag === 1 ? "鎮ㄧ‘瀹氳杩涜鎵归噺鍚敤鐢ㄦ埛鍚�?" : '鎮ㄧ‘瀹氳杩涜鎵归噺绂佺敤鐢ㄦ埛鍚�?')
                 .then(_ => {
                     this.$axios({
                         method: 'post',
-                        url: 'sccg/admin/updateStatusBatch?ids=' + idArr + '&status='+flag,
+                        url: 'sccg/admin/updateStatusBatch?ids=' + idArr + '&status=' + flag,
                     })
                         .then(res => {
                             if (res.code === 200) {
@@ -230,11 +233,8 @@
         },
         selectAll() {
             this.$refs.multipleTable.toggleAllSelection();
-
         },
         disSame(list) {
-            // console.log(this.$refs.multipleTable);
-            // const row = this.$refs.table.data
             list.forEach(row => {
                 this.$refs.multipleTable.toggleRowSelection(row)
             })
@@ -260,12 +260,17 @@
             this.getUserList();
         },
         handleClose(done) {
-            this.$confirm('纭鍏抽棴锛�')
-                .then(_ => {
-                    this.dialogUpdate = false
-                    done();
-                })
-                .catch(_ => { });
+            if (this.updateFlag) {
+                this.$confirm('纭鍏抽棴锛�')
+                    .then(_ => {
+                        this.dialogUpdate = false;
+                        this.updateFlag = false;
+                        done();
+                    })
+                    .catch(_ => { });
+            }else{
+                done();
+            }
         },
         // 褰撳墠椤垫敼鍙樿Е鍙戜簨浠�
         changeCurrentPage(page) {
@@ -311,10 +316,9 @@
             this.$axios.get(`sccg/admin/list?keyword=${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.pages * pageSize;
+                    that.totalNum = res.data.total;
                     that.tableData = res.data.records;
                     this.renderFlag = true;
                 }
@@ -339,6 +343,23 @@
             }
             return '';
         },
+        // 澶勭悊鐢ㄦ埛鎵�灞炶鑹�
+        filterRole(arr){
+            let str = '';
+            if(arr.length === 0){
+                return;
+            }
+            arr.forEach((item,index)=>{
+                if(item!==null){
+                    if(index<arr.length-1){
+                        str+=item.name +',';
+                    }else{
+                        str+=item.name;
+                    }
+                }
+            })
+            return str;
+        }
     },
     props: ['refresh', 'keyword', 'resetFresh'],
     watch: {
@@ -367,11 +388,11 @@
     border: 1pox solid #fff;
 
     .mainTitle {
-        line-height: 60px;
+        line-height:60px;
     }
 
     .tools {
-        display: flex;
+        display : flex;
         justify-content: space-between;
         align-items: center;
         padding: 0 20px;
@@ -439,12 +460,6 @@
     .el-table {
         color: #4b9bb7;
         font-size: 10px;
-
-        &::v-deep .el-table__empty-block {
-            background-color: #09152f;
-            color: #4b9bb7;
-        }
-
         .operation {
             display: flex;
 
@@ -457,15 +472,6 @@
             }
         }
     }
-
-    .el-table::v-deep .warning-row {
-        background: #06122c;
-    }
-
-    .el-table::v-deep .success-row {
-        background: #071f39;
-    }
-
     &::v-deep .switchStyle .el-switch__label {
         position: absolute;
         display: none;

--
Gitblit v1.8.0