From c32c11f75f1bfd274b01140866fef0367e954e27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 9 Jun 2021 23:31:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/components/tools/UserMenu.vue  | 28 ++-----------------
 .../src/views/bill/dialog/BillDetail.vue      |  5 +---
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/jshERP-web/src/components/tools/UserMenu.vue b/jshERP-web/src/components/tools/UserMenu.vue
index 3e5e61f8..4eecb9ae 100644
--- a/jshERP-web/src/components/tools/UserMenu.vue
+++ b/jshERP-web/src/components/tools/UserMenu.vue
@@ -39,41 +39,17 @@
     <header-notice class="action"/>
     <a-dropdown>
       <span v-if="isDesktop()" class="action ant-dropdown-link user-dropdown-menu">
-<!--        <a-avatar class="avatar" size="small" :src="getAvatar()"/>-->
         <span>欢迎您，{{ nickname() }}</span>
       </span>
       <a-menu slot="overlay" class="user-dropdown-menu-wrapper">
-        <a-menu-item key="0">
-          <router-link :to="{ name: 'account-center' }">
-            <a-icon type="user"/>
-            <span>个人中心</span>
-          </router-link>
-        </a-menu-item>
-        <a-menu-item key="1">
-          <router-link :to="{ name: 'account-settings-base' }">
-            <a-icon type="setting"/>
-            <span>账户设置</span>
-          </router-link>
-        </a-menu-item>
         <a-menu-item key="3"  @click="systemSetting">
            <a-icon type="tool"/>
-           <span>系统设置</span>
+           <span>界面设置</span>
         </a-menu-item>
         <a-menu-item key="4" @click="updatePassword">
           <a-icon type="setting"/>
           <span>密码修改</span>
         </a-menu-item>
-       <!-- <a-menu-item key="2" disabled>
-          <a-icon type="setting"/>
-          <span>测试</span>
-        </a-menu-item>
-        <a-menu-divider/>
-        <a-menu-item key="3">
-          <a href="javascript:;" @click="handleLogout">
-            <a-icon type="logout"/>
-            <span>退出登录</span>
-          </a>
-        </a-menu-item>-->
       </a-menu>
     </a-dropdown>
     <span class="action">
@@ -157,7 +133,7 @@
       },
       /* update_end author:zhaoxin date:20191129 for: 做头部菜单栏导航*/
       ...mapActions(["Logout"]),
-      ...mapGetters(["nickname","userInfo"]),
+      ...mapGetters(["nickname","loginName","userInfo"]),
       // getAvatar(){
       //   return getFileAccessHttpUrl(this.avatar())
       // },
diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index d0088a7b..97983634 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -29,10 +29,7 @@
                   {{model.number}}
                 </a-form-item>
               </a-col>
-              <a-col :lg="6" :md="12" :sm="24">
-                <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="单据日期">
-                </a-form-item>
-              </a-col>
+              <a-col :lg="6" :md="12" :sm="24"></a-col>
               <a-col :lg="6" :md="12" :sm="24"></a-col>
             </a-row>
             <a-table