From 51635013b16ffc32ac231aa65cf4b9cfdec4f147 Mon Sep 17 00:00:00 2001
From: zwq <zwq229436@163.com>
Date: Fri, 3 Nov 2023 10:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue                     | 12 +++++++++++-
 .../index.vue                                        |  4 ----
 src/views/system/user/index.vue                      |  5 +++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5ad48d2..8e2f8ba 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -51,6 +51,7 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import NotifyMessage from '@/layout/components/Message'
+import { getUserProfile } from "@/api/system/user";
 import {getPath} from "@/utils/ruoyi";
 
 export default {
@@ -67,7 +68,6 @@ export default {
     ...mapGetters([
       'sidebar',
       'avatar',
-      'nickname',
       'device'
     ]),
     setting: {
@@ -87,6 +87,16 @@ export default {
       }
     }
   },
+  data() {
+    return {
+      nickname: ''
+    };
+  },
+  created() {
+      getUserProfile().then(response => {
+        this.nickname = response.data.nickname;
+      });
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
diff --git a/src/views/fpw/finishWarehouseStorehouseStorageHistory/index.vue b/src/views/fpw/finishWarehouseStorehouseStorageHistory/index.vue
index ed33956..1f7dbe6 100644
--- a/src/views/fpw/finishWarehouseStorehouseStorageHistory/index.vue
+++ b/src/views/fpw/finishWarehouseStorehouseStorageHistory/index.vue
@@ -68,10 +68,6 @@ const warehouseStorehouseStorageState = [
 		name: '出库',
 		id: 1,
 	},
-	{
-		name: '移库',
-		id: 2,
-	},
 ];
 export default {
 	mixins: [basicPage],
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1ad8996..4f69fa5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -207,9 +207,9 @@
           <el-select v-model="form.roleIds" multiple placeholder="请选择">
             <el-option
                 v-for="item in roleOptions"
-                :key="parseInt(item.id)"
+                :key="item.id"
                 :label="item.name"
-                :value="parseInt(item.id)"
+                :value="item.id"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -549,6 +549,7 @@ export default {
     /** 提交按钮（角色权限） */
     submitRole: function() {
       if (this.form.id !== undefined) {
+        console.log(this.form.roleIds)
         assignUserRole({
           userId: this.form.id,
           roleIds: this.form.roleIds,