From 41dabb0db9619b8dbb8a311966e0b9920f67f7c8 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期四, 03 十一月 2022 16:10:40 +0800
Subject: [PATCH] 门前三包和趋势分析

---
 src/views/systemSetting/baseSetting/user/components/main/index.vue |  162 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 86 insertions(+), 76 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..4ccec1b 100644
--- a/src/views/systemSetting/baseSetting/user/components/main/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue
@@ -8,7 +8,7 @@
                 @selection-change="tableChange">
                 <el-table-column type="selection" min-width="5">
                 </el-table-column>
-                <el-table-column label="鐢ㄦ埛ID" min-width="4">
+                <el-table-column label="鐢ㄦ埛ID" min-width="6">
                     <template slot-scope="scope">{{ scope.row.id }}</template>
                 </el-table-column>
                 <el-table-column prop="nickName" label="鐢ㄦ埛鍚嶇О" min-width="10">
@@ -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>
@@ -30,12 +33,13 @@
                 </el-table-column>
                 <el-table-column prop="status" label="鍚敤" min-width="5">
                     <template slot-scope="scope">
-                        <el-switch class="switchStyle" v-model="scope.row.status" active-text="寮�" inactive-text="鍏�"
-                            active-color="#3fef9a" inactive-color="#000212" @change="handleChangeStatus(scope.row)">
+                        <!-- @change="handleChangeStatus(scope.row)" -->
+                        <el-switch class="switchStyle" v-model="scope.row.status"
+                            active-color="#3fef9a" inactive-color="#000212" disabled>
                         </el-switch>
                     </template>
                 </el-table-column>
-                <el-table-column prop="operation" label="鎿嶄綔" min-width="22">
+                <el-table-column prop="operation" label="鎿嶄綔" min-width="20">
                     <template slot-scope="scope">
                         <div class="operation">
                             <span @click="handleChangeRole(scope.row,'role')">淇敼瑙掕壊</span>
@@ -51,9 +55,14 @@
                     </template>
                 </el-table-column>
             </el-table>
-            <!-- 鏌ョ湅淇敼椤甸潰 -->
+            <!-- 鏌ョ湅椤甸潰 -->
+            <el-dialog :visible.sync="dialogView" width="45%" v-if="dialogView"
+                title="鏌ョ湅鐢ㄦ埛淇℃伅">
+                <MyView :userInfo=userInfo></MyView>
+            </el-dialog>
+            <!-- 淇敼椤甸潰 -->
             <el-dialog :visible.sync="dialogUpdate" width="45%" v-if="dialogUpdate"
-                :title="updateFlag ? flag.role ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅' : flag.depart ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅': '淇敼鐢ㄦ埛瀵嗙爜' :'鏌ョ湅鐢ㄦ埛淇℃伅'"
+                :title="updateFlag ? flag.role ? '淇敼鐢ㄦ埛瑙掕壊淇℃伅' : flag.depart ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅': '淇敼鐢ㄦ埛瀵嗙爜' :''"
                 :before-close="handleClose">
                 <updateUser :updateFlag="updateFlag" :userInfo=userInfo :flag=flag @closeDialog="closeDialog"
                     :getUserList="getUserList" v-if="!flag.password" />
@@ -62,10 +71,10 @@
             <!-- tools -->
             <div class="tools">
                 <div class="funs">
-                    <div class="funsItem">
+                    <div class="funsItem funs-sp">
                         <el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
                     </div>
-                    <div class="funsItem">
+                    <div class="funsItem funs-sp">
                         <el-checkbox v-model="unsame" @change="disSame(tableData)">鍙嶉��</el-checkbox>
                     </div>
                     <div class="funsItem">
@@ -90,18 +99,20 @@
 import helper from '@/utils/mydate'
 import updateUser from '../updateUser';
 import MyPwd from '../password'
+import MyView from '../myView'
 export default {
     components: {
-        updateUser, MyPwd
+        updateUser, MyPwd,MyView
     },
     data() {
         return {
             tableData: [],
             search: "",
             dialogUpdate: false,
+            dialogView:false,
             updateFlag: false,
             userInfo: '',
-            totalNum: 200,
+            totalNum: 0,
             pageSize: 10,
             currentPage: 1,
             renderFlag: false,
@@ -147,9 +158,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 +210,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 +241,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 +268,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 +324,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;
                 }
@@ -322,13 +334,8 @@
         },
         // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
         handleFind(rowData) {
-            this.dialogUpdate = true;
-            this.updateFlag = false;
+            this.dialogView = true;
             this.userInfo = rowData;
-            const { flag } = this;
-            for (let key in flag) {
-                flag[key] = false;
-            }
         },
         // 璁剧疆琛ㄦ牸鏂戦┈绾�
         tableRowClassName({ row, rowIndex }) {
@@ -339,6 +346,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,23 +391,24 @@
     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;
 
         .funs {
             display: flex;
-
+            .funs-sp{
+                border: 1px solid #17324c;
+            }
             .funsItem {
                 line-height: 28px;
                 display: flex;
                 align-items: center;
-                border: 1px solid #17324c;
                 border-radius: 4px;
                 font-size: 12px;
                 margin-left: 10px;
@@ -439,17 +464,11 @@
     .el-table {
         color: #4b9bb7;
         font-size: 10px;
-
-        &::v-deep .el-table__empty-block {
-            background-color: #09152f;
-            color: #4b9bb7;
-        }
-
         .operation {
             display: flex;
-
+            font-size: 10px;
             .line {
-                padding: 0 5px;
+                padding: 0 1px;
             }
 
             span:hover {
@@ -457,42 +476,33 @@
             }
         }
     }
+    // &::v-deep .switchStyle .el-switch__label {
+    //     position: absolute;
+    //     display: none;
+    //     color: #fff;
+    // }
 
-    .el-table::v-deep .warning-row {
-        background: #06122c;
-    }
+    // &::v-deep .el-switch__core {
+    //     background-color: rgba(166, 166, 166, 1);
+    // }
 
-    .el-table::v-deep .success-row {
-        background: #071f39;
-    }
+    // &::v-deep .switchStyle .el-switch__label--left {
+    //     z-index: 9;
+    //     left: 20px;
+    // }
 
-    &::v-deep .switchStyle .el-switch__label {
-        position: absolute;
-        display: none;
-        color: #fff;
-    }
+    // &::v-deep .switchStyle .el-switch__label--right {
+    //     z-index: 9;
+    //     left: 4px;
+    // }
 
-    &::v-deep .el-switch__core {
-        background-color: rgba(166, 166, 166, 1);
-    }
+    // &::v-deep .switchStyle .el-switch__label.is-active {
+    //     display: block;
+    // }
 
-    &::v-deep .switchStyle .el-switch__label--left {
-        z-index: 9;
-        left: 20px;
-    }
-
-    &::v-deep .switchStyle .el-switch__label--right {
-        z-index: 9;
-        left: 4px;
-    }
-
-    &::v-deep .switchStyle .el-switch__label.is-active {
-        display: block;
-    }
-
-    &::v-deep .switchStyle.el-switch .el-switch__core,
-    &::v-deep .el-switch .el-switch__label {
-        width: 56px !important;
-    }
+    // &::v-deep .switchStyle.el-switch .el-switch__core,
+    // &::v-deep .el-switch .el-switch__label {
+    //     width: 56px !important;
+    // }
 }
 </style>
\ No newline at end of file

--
Gitblit v1.8.0