From 2bb0e066fdc522beb51dd13f6a72cd67bd5d6a58 Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期日, 09 十月 2022 18:06:46 +0800
Subject: [PATCH] 修改bug,店铺管理新增、查询

---
 src/views/systemSetting/baseSetting/user/components/updateUser/index.vue |  102 ++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
index f41388a..bcad673 100644
--- a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
@@ -41,9 +41,9 @@
                     </el-form-item>
                     <!-- 閫夋嫨瑙掕壊 -->
                     <el-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
-                        <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags @change="handleChangeRole">
-                            <el-option v-for="item in roleList" :key="item.id" :label="item.name"
-                                :value="item.id">
+                        <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags
+                            @change="handleChangeRole" :disabled="!flag.role">
+                            <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id">
                             </el-option>
                         </el-select>
                         <!-- <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" :disabled="!flag.role">
@@ -85,11 +85,11 @@
                     </el-form-item>
                     <!-- 濉啓鎵�灞瀖ac鍦板潃 -->
                     <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
-                        <el-input v-model="user.mac" placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃"></el-input>
+                        <el-input v-model="user.mac" placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃" disabled></el-input>
                     </el-form-item>
                     <!-- 濉啓鎵�灞瀒p鍦板潃 -->
                     <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
-                        <el-input v-model="user.ip" placeholder="璇峰~鍐欐墍灞瀒p鍦板潃"></el-input>
+                        <el-input v-model="user.ip" placeholder="璇峰~鍐欐墍灞瀒p鍦板潃" disabled></el-input>
                     </el-form-item>
                     <el-form-item v-if="updateFlag">
                         <div class="optionBtn">
@@ -302,22 +302,61 @@
         },
         // 淇敼鐢ㄦ埛淇℃伅
         handleUser() {
+            const { depart, role } = this.flag;
             this.$refs.user.validate((valid) => {
                 if (valid) {
                     const { user } = this;
-                    this.$axios({
-                        method: 'post',
-                        url: 'sccg/admin/role/update?adminId=' + user.id + '&roleIds='+user.role,
-                        data: user
-                    })
-                        .then(res => {
-                            this.$message({
-                                type: res.code === 200 ? 'success' : 'warning',
-                                message: res.message,
-                            })
-                            this.getUserList();
-                            this.$emit('closeDialog', { flag: false });
+                    user.isDy = `${user.isDy}`;
+                    if (depart) {
+                        console.log(this.user);
+                        this.$axios({
+                            method: 'post',
+                            url: `sccg/admin/update/${user.id}`,
+                            data: {
+                                "id": user.id,
+                                "username": user.username,
+                                "password": user.password,
+                                "icon": user.icon,
+                                "email": user.email,
+                                "nickName": user.nickName,
+                                "note": user.note,
+                                "createTime": user.createTime,
+                                "loginTime": user.loginTime,
+                                "status": user.status ? 1 : 0,
+                                "macAddress": user.macAddress,
+                                "ipAddress": user.ipAddress,
+                                "isDy": `${user.isDy}`,
+                                "sex": `${user.sex}`,
+                                "jobTitle": user.jobTitle,
+                                "departmentId": user.departmentId,
+                                "departName": user.departName,
+                                "userType": user.userType,
+                                "zj": user.zj,
+                                "mobile": user.mobile,
+                            }
                         })
+                            .then(res => {
+                                this.$message({
+                                    type: res.code === 200 ? 'success' : 'warning',
+                                    message: res.message,
+                                })
+                                this.getUserList();
+                                this.$emit('closeDialog', { flag: false });
+                            })
+                    } else {
+                        this.$axios({
+                            method: 'post',
+                            url: 'sccg/admin/role/update?adminId=' + user.id + '&roleIds=' + user.role,
+                        })
+                            .then(res => {
+                                this.$message({
+                                    type: res.code === 200 ? 'success' : 'warning',
+                                    message: res.message,
+                                })
+                                this.getUserList();
+                                this.$emit('closeDialog', { flag: false });
+                            })
+                    }
                 } else {
                     return false;
                 }
@@ -334,24 +373,24 @@
                 })
         },
         // 鏀瑰彉鐢ㄦ埛瑙掕壊
-        handleChangeRole(data){
+        handleChangeRole(data) {
             console.log(this.user.role);
             // console.log(data);
         },
         // 鑾峰彇鐢ㄦ埛鐨勮鑹插垪琛�
-        getUserRole(id){
+        getUserRole(id) {
             this.$axios({
-                method:'get',
-                url:`sccg/admin/role/${id}`
+                method: 'get',
+                url: `sccg/admin/role/${id}`
             })
-            .then(res=>{
-                console.log(res);
-                const arr = [];
-                res.data.forEach(item=>{
-                    arr.push(item.id);
+                .then(res => {
+                    console.log(res);
+                    const arr = [];
+                    res.data.forEach(item => {
+                        arr.push(item.id);
+                    })
+                    this.user.role = arr;
                 })
-                this.user.role = arr;
-            })
         }
     },
     props: ['userInfo', 'updateFlag', 'flag', 'closeDialog', 'getUserList']
@@ -361,13 +400,16 @@
 .updateUser {
     border-radius: 1px;
     background-color: #09152f;
-    :deep(.el-tag){
+
+    :deep(.el-tag) {
         background-color: #09152f;
     }
-    .el-select-dropdown.is-multiple .el-select-dropdown__item.selected{
+
+    .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
         background-color: #09152f;
         color: #4b9bb7;
     }
+
     // .el-select-dropdown__item :deep(.selected){
     //     background-color: #09152f;
     //     color: #4b9bb7;

--
Gitblit v1.8.0