From f7feef4a4ecedbb9885a3403150f438965accb4f Mon Sep 17 00:00:00 2001
From: ColorWhiteDeveloper <2632970487@qq.com>
Date: 星期二, 20 九月 2022 10:12:33 +0800
Subject: [PATCH] 查看用户信息,修改用户部门

---
 src/views/systemSetting/baseSetting/user/updateUser/index.vue |   63 +++++++--------
 src/views/systemSetting/baseSetting/user/createUser/index.vue |    7 -
 src/views/layout/index.vue                                    |    2 
 src/views/layout/components/Main/index.vue                    |    1 
 src/views/systemSetting/baseSetting/user/index.vue            |  136 ++++++++++++++++++++-------------
 src/views/layout/components/Menu/index.vue                    |   20 +++--
 6 files changed, 125 insertions(+), 104 deletions(-)

diff --git a/src/views/layout/components/Main/index.vue b/src/views/layout/components/Main/index.vue
index 43c14f7..3de4d9c 100644
--- a/src/views/layout/components/Main/index.vue
+++ b/src/views/layout/components/Main/index.vue
@@ -25,7 +25,6 @@
   min-width: 1024px;
   padding: 0;
   .content {
-    background-color: #070f22;
     padding: 11px;
   }
 }
diff --git a/src/views/layout/components/Menu/index.vue b/src/views/layout/components/Menu/index.vue
index 422737c..fda6148 100644
--- a/src/views/layout/components/Menu/index.vue
+++ b/src/views/layout/components/Menu/index.vue
@@ -21,33 +21,37 @@
                 <span class="secondSpan">鍩烘湰璁剧疆</span>
               </template>
               <!-- 鐢ㄦ埛绠$悊 -->
-              <el-submenu index="/home/system/base/user" class="thirdMenu">
+              <el-menu-item index="/home/system/user">鐢ㄦ埛绠$悊</el-menu-item>
+              <!-- <el-submenu index="/home/system/base/user" class="thirdMenu">
                 <template slot="title">
                   <span class="thirdSpan">鐢ㄦ埛绠$悊</span>
                 </template>
                 <el-menu-item index="/home/system/user">鐢ㄦ埛鍒楄〃</el-menu-item>
-              </el-submenu>
+              </el-submenu> -->
               <!-- 瑙掕壊绠$悊 -->
-              <el-submenu index="/home/system/base/role" class="thirdMenu">
+              <el-menu-item index="/home/system/role">瑙掕壊绠$悊</el-menu-item>
+              <!-- <el-submenu index="/home/system/base/role" class="thirdMenu">
                 <template slot="title">
                   <span class="thirdSpan">瑙掕壊绠$悊</span>
                 </template>
                 <el-menu-item index="/home/system/role">瑙掕壊绠$悊鍒楄〃</el-menu-item>
-              </el-submenu>
+              </el-submenu> -->
               <!-- 鏉冮檺绠$悊 -->
-              <el-submenu index="/home/system/base/authority" class="thirdMenu">
+              <el-menu-item index="/home/system/authority">鏉冮檺绠$悊</el-menu-item>
+              <!-- <el-submenu index="/home/system/base/authority" class="thirdMenu">
                 <template slot="title">
                   <span class="thirdSpan">鏉冮檺绠$悊</span>
                 </template>
                 <el-menu-item index="/home/system/authority">璁剧疆鏉冮檺</el-menu-item>
-              </el-submenu>
+              </el-submenu> -->
               <!-- 閮ㄩ棬绠$悊 -->
-              <el-submenu index="/home/system/base/department" class="thirdMenu">
+              <el-menu-item index="/home/system/department">閮ㄩ棬绠$悊</el-menu-item>
+              <!-- <el-submenu index="/home/system/base/department" class="thirdMenu">
                 <template slot="title">
                   <span class="thirdSpan">閮ㄩ棬绠$悊</span>
                 </template>
                 <el-menu-item index="/home/system/department">閮ㄩ棬绠$悊</el-menu-item>
-              </el-submenu>
+              </el-submenu> -->
             </el-submenu>
             <!-- 骞冲彴璁剧疆 -->
             <el-submenu index="/home/article/add" class="secondMenu">
diff --git a/src/views/layout/index.vue b/src/views/layout/index.vue
index 112b4ad..3fc3602 100644
--- a/src/views/layout/index.vue
+++ b/src/views/layout/index.vue
@@ -41,7 +41,7 @@
 }
 
 .el-main {
-  background-color: #f0f2f5;
+  background-color: #070f22;
   color: #333;
   text-align: center;
   line-height: 160px;
diff --git a/src/views/systemSetting/baseSetting/user/createUser/index.vue b/src/views/systemSetting/baseSetting/user/createUser/index.vue
index a56064a..e46f6cd 100644
--- a/src/views/systemSetting/baseSetting/user/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/createUser/index.vue
@@ -302,13 +302,10 @@
     props:['refresh']
 }
 </script>
-<style lang="scss" scpoed>
+<style lang="scss">
 .createUser {
     border-radius: 1px;
-    // min-width: 1024px;
-    // min-height: 1450px;
     background-color: #09152f;
-
     header {
         display: flex;
         justify-content: space-between;
@@ -331,13 +328,11 @@
     }
 
     main {
-        // border-top: 1px solid #f0f2f5;
         border: 1px solid #fff;
         text-align: left;
         padding: 0 55px;
         background-color: #09152f;
         .mainTitle {
-            // margin-left: 60px;
             color: #666;
             font-weight: 600;
             line-height: 100px;
diff --git a/src/views/systemSetting/baseSetting/user/index.vue b/src/views/systemSetting/baseSetting/user/index.vue
index d79fa2d..e7b25e6 100644
--- a/src/views/systemSetting/baseSetting/user/index.vue
+++ b/src/views/systemSetting/baseSetting/user/index.vue
@@ -52,16 +52,17 @@
                         <template slot-scope="scope">
                             <div class="operation">
                                 <!-- <span @click="handleChangeRole(scope.row)">淇敼瑙掕壊</span> -->
-                                <span>鏌ョ湅</span>
+                                <span @click="handleFind(scope.row)">鏌ョ湅</span>
+                                <span class="line">|</span>
                                 <!-- <span>淇敼瀵嗙爜</span> -->
                                 <!-- <span>鍒犻櫎</span> -->
-                                <span>淇敼閮ㄩ棬</span>
+                                <span @click="handleUpdate(scope.row)">淇敼閮ㄩ棬</span>
                             </div>
                         </template>
                     </el-table-column>
                 </el-table>
                 <el-dialog :visible.sync="dialogUpdate" width="45%">
-                    <updateUser />
+                    <updateUser :updateFlag="updateFlag" :userInfo=userInfo />
                 </el-dialog>
             </div>
         </main>
@@ -80,7 +81,8 @@
             tableData: [],
             dialogCreate: false,
             dialogUpdate: false,
-            user: '',
+            updateFlag: false,
+            userInfo:'',
         }
     },
     created() {
@@ -125,6 +127,18 @@
                 return 'success-row';
             }
             return '';
+        },
+        // 鏌ョ湅鐢ㄦ埛淇℃伅(涓嶅彲淇敼)
+        handleFind(rowData){
+            this.dialogUpdate = true;
+            this.updateFlag = false;
+            this.userInfo = rowData;
+        },
+        // 淇敼鐢ㄦ埛閮ㄩ棬淇℃伅
+        handleUpdate(rowData){
+            this.dialogUpdate = true;
+            this.updateFlag = true;
+            this.userInfo = rowData
         }
     }
 }
@@ -138,6 +152,7 @@
     header {
         background-color: #09152f;
         border: 1pox solid #fff;
+
         .headerContent {
             padding: 0 40px;
             display: flex;
@@ -155,6 +170,12 @@
 
                 .el-input {
                     flex: 2;
+                    color: #1d3f57;
+
+                    .el-input__inner {
+                        background-color: #09152f;
+                        border: 1px solid #17324c;
+                    }
                 }
 
             }
@@ -183,64 +204,71 @@
 
     main {
         background-color: #09152f;
-        padding-top: 20px;
-        // padding: 0 40px;
+        margin-top: 20px;
         padding-bottom: 50px;
         border: 1pox solid #fff;
+
         .mainTitle {
             line-height: 60px;
+        }
+
+        .el-table {
+            color: #4b9bb7;
+            font-size: 10px;
+
+            .operation {
+                display: flex;
+                color: #0079fe;
+                .line{
+                    padding: 0 2px;
+                }
+                span:hover {
+                    cursor: pointer;
+                }
+            }
+        }
+
+        .el-table .warning-row {
+            background: #06122c;
+        }
+
+        .el-table .success-row {
+            background: #071f39;
+        }
+
+        .switchStyle .el-switch__label {
+            position: absolute;
+            display: none;
+            color: #fff;
+        }
+
+        .el-switch__core {
+            background-color: rgba(166, 166, 166, 1);
+        }
+
+        .switchStyle .el-switch__label--left {
+            z-index: 9;
+            left: 20px;
+        }
+
+        .switchStyle .el-switch__label--right {
+            z-index: 9;
+            left: 4px;
+        }
+
+        .switchStyle .el-switch__label.is-active {
+            display: block;
+        }
+
+        .switchStyle.el-switch .el-switch__core,
+        .el-switch .el-switch__label {
+            width: 50px !important;
         }
     }
 }
 
-.el-table {
-    color: #4b9bb7;
-    font-size: 10px;
-    .operation {
-        display: flex;
-        // justify-content: space-around;
-        color: #0079fe;
-        span{
-            margin-left: 10px;
-        }
-        span:hover {
-            cursor: pointer;
-        }
-    }
-}
-.el-dialog__header,.el-dialog__body{
+.el-dialog__header,
+.el-dialog__body {
     background-color: #06122c;
 }
-.el-table .warning-row {
-    background: #06122c;
-}
-.el-input__inner{
-    background-color: #09152f;
-}
-.el-table .success-row {
-    background: #071f39;
-}
-.switchStyle .el-switch__label {
-    position: absolute;
-    display: none;
-    color: #fff;
-  }
- .el-switch__core{
-    background-color: rgba(166, 166, 166, 1) ;
-  }
-  .switchStyle .el-switch__label--left {
-    z-index: 9;
-    left: 20px;
-  }
-  .switchStyle .el-switch__label--right {
-    z-index: 9;
-    left: 4px;
-  }
-  .switchStyle .el-switch__label.is-active {
-    display: block;
-  }
-  .switchStyle.el-switch .el-switch__core,
-  .el-switch .el-switch__label {
-    width: 50px !important;
-  }
 </style>
\ No newline at end of file
diff --git a/src/views/systemSetting/baseSetting/user/updateUser/index.vue b/src/views/systemSetting/baseSetting/user/updateUser/index.vue
index 72f9605..37f46b2 100644
--- a/src/views/systemSetting/baseSetting/user/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/updateUser/index.vue
@@ -1,11 +1,7 @@
 <template>
-    <div class="createUser">
+    <div class="updateUser">
         <header>
-            <div class="headerTitle">鏂板璐︽埛</div>
-            <div class="headerTip">
-                <span>*</span>
-                <label>涓哄繀濉」</label>
-            </div>
+            <div class="headerTitle">{{updateFlag ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅' :'鏌ョ湅鐢ㄦ埛淇℃伅'}}</div>
         </header>
         <main>
             <div class="mainTitle">鍩虹淇℃伅</div>
@@ -13,12 +9,12 @@
                 <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
                     label-position="right">
                     <!-- 鐢ㄦ埛鍚嶇О -->
-                    <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="nickName">
-                        <el-input v-model="user.nick_name" placeholder="濉啓鐢ㄦ埛鍚嶇О"></el-input>
+                    <el-form-item class="optionItem" label="鐢ㄦ埛鍚嶇О:" prop="username">
+                        <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" :disabled="true"></el-input>
                     </el-form-item>
                     <!-- 鐢ㄦ埛瀵嗙爜 -->
                     <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
-                        <el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�"></el-input>
+                        <el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" :disabled="true"></el-input>
                     </el-form-item>
                     <!-- 鎵�灞炵敤鎴峰鍚� -->
                     <!-- <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="true_name">
@@ -33,18 +29,18 @@
                     </el-form-item> -->
                     <!-- 鏄惁鍏氬憳 -->
                     <el-form-item class="optionItem" label="鏄惁鍏氬憳:" prop="isDy">
-                        <el-radio-group v-model="user.member">
+                        <el-radio-group v-model="user.isDy" disabled>
                             <el-radio :label="1">鏄�</el-radio>
                             <el-radio :label="0">鍚�</el-radio>
                         </el-radio-group>
                     </el-form-item>
                     <!-- 鎵�灞炴墜鏈哄彿鐮� -->
                     <el-form-item class="optionItem" label="鎵�灞炴墜鏈哄彿鐮�:" prop="mobile">
-                        <el-input v-model="user.phone" placeholder="璇峰~鍐欐墜鏈哄彿鐮�"></el-input>
+                        <el-input v-model="user.mobile" placeholder="璇峰~鍐欐墜鏈哄彿鐮�" :disabled="true"></el-input>
                     </el-form-item>
                     <!-- 閭鍦板潃 -->
                     <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
-                        <el-input v-model="user.mail" placeholder="璇峰~鍐欓偖绠卞湴鍧�"></el-input>
+                        <el-input v-model="user.email" placeholder="璇峰~鍐欓偖绠卞湴鍧�" :disabled="true"></el-input>
                     </el-form-item>
                     <!-- 閫夋嫨瑙掕壊 -->
                     <!-- <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
@@ -56,14 +52,13 @@
                     </el-form-item> -->
                     <!-- 鐢ㄦ埛绫诲瀷 -->
                     <el-form-item class="optionItem" label="鐢ㄦ埛绫诲瀷:" prop="userType">
-                        <el-select v-model="user.type" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷">
-                            <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
-                                :disabled="item.disabled">
+                        <el-select v-model="user.userType" placeholder="璇烽�夋嫨鐢ㄦ埛绫诲瀷" disabled>
+                            <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
                     <!-- 搴ф満/鍒嗘満 -->
-                    <el-form-item class="optionItem" label="搴ф満/鍒嗘満:" prop="zj">
+                    <!-- <el-form-item class="optionItem" label="搴ф満/鍒嗘満:" prop="zj">
                         <div class="optionHandleSp">
                             <el-input class="areaNumber" v-model="user.zj.areaNumber" placeholder="鐢佃瘽鍖哄彿">
                             </el-input>
@@ -72,19 +67,18 @@
                             <el-input class="moreNumber" v-model="user.zj.moreNumber" placeholder="鍒嗘満鍙风爜">
                             </el-input>
                         </div>
-                    </el-form-item>
+                    </el-form-item> -->
                     <!-- 鎵�灞為儴闂� -->
                     <el-form-item class="optionItem" label="鎵�灞為儴闂�:" prop="departmentId">
-                        <el-select v-model="user.department" placeholder="璇烽�夋嫨鎵�灞為儴闂�">
+                        <el-select v-model="user.department" placeholder="璇烽�夋嫨鎵�灞為儴闂�" :disabled="!updateFlag">
                             <el-option v-for="item in typeList" :key="item.name" :label="item.departName" :value="item.id">
                             </el-option>
                         </el-select>
                     </el-form-item>
                     <!-- 褰撳墠鑱屽姟 -->
                     <el-form-item class="optionItem" label="褰撳墠鑱屽姟:" prop="jobTitle">
-                        <el-select v-model="user.work" placeholder="璇烽�夋嫨褰撳墠鑱屽姟">
-                            <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
-                                :disabled="item.disabled">
+                        <el-select v-model="user.work" placeholder="璇烽�夋嫨褰撳墠鑱屽姟" disabled>
+                            <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -96,9 +90,8 @@
                     <!-- <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
                         <el-input v-model="user.ip" placeholder="璇峰~鍐欐墍灞瀒p鍦板潃"></el-input>
                     </el-form-item> -->
-                    <el-form-item class="optionBtn">
-                        <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦</el-button>
-                        <el-button class="btn reset">閲嶇疆</el-button>
+                    <el-form-item  v-if="updateFlag">
+                        <div class="optionBtn"><el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦</el-button></div>
                     </el-form-item>
                 </el-form>
 
@@ -267,6 +260,7 @@
     },
     created() { 
         const that = this ;
+        this.user = JSON.parse(JSON.stringify(that.userInfo));
         // 鑾峰彇瑙掕壊鍒楄〃
         // this.$axios.get('')
         // 鑾峰彇鐢ㄦ埛绫诲瀷鍒楄〃
@@ -280,26 +274,28 @@
     },
     methods: {
         handleUser() {
-            const that = this;
-            console.log(this.user);
-            // this.$axios.post('sccg/admin/register',that.user).then(res=>{
-            //     console.log(res);
-            // })
+            const {user} = this;
+            this.$axios.post('sccg/depart/status',{
+                id:user.departmentId,
+                status:user.status?1:0,
+            }).then(res=>{
+                console.log(res);
+            })
         }
     },
-    props:[]
+    props:['userInfo','updateFlag']
 }
 </script>
 <style lang="scss" scpoed>
-.createUser {
+.updateUser {
     border-radius: 1px;
     // min-width: 1024px;
     // min-height: 1450px;
-    background-color: #fff;
+    background-color: #06122c;
 
     header {
         display: flex;
-        justify-content: space-between;
+        justify-content: center;
         height: 60px;
         line-height: 60px;
         padding: 0 20px;
@@ -318,7 +314,6 @@
     }
 
     main {
-        border-top: 1px solid #f0f2f5;
         text-align: left;
         padding: 0 55px;
         .mainTitle {

--
Gitblit v1.8.0