From 1a295aae843dd9ba3830a2c304d74b6ed338a983 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 2 Jan 2025 18:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=B8=85=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Navmenu/index.vue              |  8 +++++++
 src/layout/header.vue                         | 24 ++++++++++++-------
 src/views/Login.vue                           | 10 +++++++-
 src/views/demand-details/index.vue            | 16 ++++++-------
 .../orderManagement/components/order-home.vue |  2 --
 .../components/order-home.vue                 |  2 --
 6 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/components/Navmenu/index.vue b/src/components/Navmenu/index.vue
index 1989e23..55d0a1d 100644
--- a/src/components/Navmenu/index.vue
+++ b/src/components/Navmenu/index.vue
@@ -36,6 +36,14 @@ const navMenuList = computed(() => {
             { name: '需求管理', routerName: 'sourcingNeed' },
             { name: '通知公告', routerName: 'enterpriseZone' },
         ]
+
+    if (isType == 3)
+        return [
+            { name: '首页', routerName: 'home' },
+            { name: '装备共享大厅', routerName: 'equipList' },
+            { name: '租赁需求大厅', routerName: 'parity' },
+            { name: '通知公告', routerName: 'enterpriseZone' },
+        ]
 })
 
 const navMenuClick = (name: any) => {
diff --git a/src/layout/header.vue b/src/layout/header.vue
index 16cc389..f5746c4 100644
--- a/src/layout/header.vue
+++ b/src/layout/header.vue
@@ -239,16 +239,22 @@ const onCarts = () => {
 }
 
 const onJumpUser = () => {
-    const roles = store.userInfo.roles
-    if (roles?.length > 0) {
-        const isAdmin = roles.some((e: any) => e.roleKey == 'admin')
-        if (isAdmin) {
-            // window.location.href = `http://192.168.137.101:80/?token=${store.token}`
-            window.open(`http://36.33.26.201:17788/glweb/login?token=${store.token}`)
-        } else {
-            router.push({ name: 'my-user' })
-        }
+    const isType: any = localStorage.getItem('rolesType')
+    if (isType == 3) {
+        window.open(`http://36.33.26.201:17788/glweb/login?token=${store.token}`)
+    } else {
+        router.push({ name: 'my-user' })
     }
+    // const roles = store.userInfo.roles
+    // if (roles?.length > 0) {
+    //     const isAdmin = roles.some((e: any) => e.roleKey == 'admin')
+    //     if (isAdmin) {
+    //         // window.location.href = `http://192.168.137.101:80/?token=${store.token}`
+    //         window.open(`http://36.33.26.201:17788/glweb/login?token=${store.token}`)
+    //     } else {
+    //         router.push({ name: 'my-user' })
+    //     }
+    // }
 }
 
 // 查看消息
diff --git a/src/views/Login.vue b/src/views/Login.vue
index dade4d3..5ee2bb6 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -61,7 +61,15 @@ const handlerLogin = async () => {
         //     });
         // }
 
-        localStorage.setItem('rolesType', '1')
+        const roles = result.roles
+
+        const isAdmin = roles.some((e: any) => e == 'admin')
+
+        if (isAdmin) {
+            localStorage.setItem('rolesType', '3')
+        } else {
+            localStorage.setItem('rolesType', '1')
+        }
         store.editcurrentMenuItem('goodsManagement')
         // 跳转登录页面
         if (route.query && route.query.redirect) {
diff --git a/src/views/demand-details/index.vue b/src/views/demand-details/index.vue
index cd28434..fd39197 100644
--- a/src/views/demand-details/index.vue
+++ b/src/views/demand-details/index.vue
@@ -245,14 +245,14 @@ const equipBaseInfoList = reactive([
         label: '所属地市',
         key: 'provinceName,cityName,areaName,address',
     },
-    // {
-    //     label: '预估数量',
-    //     key: 'leaseNum',
-    // },
-    // {
-    //     label: '预估租赁天数',
-    //     key: 'leaseDay',
-    // },
+    {
+        label: '预估数量',
+        key: 'leaseTotalNum',
+    },
+    {
+        label: '预估租赁天数',
+        key: 'leaseDay',
+    },
     {
         label: '租赁开始日期',
         key: 'leaseStartTime',
diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue
index 77e8d1a..0eba79f 100644
--- a/src/views/user/orderManagement/components/order-home.vue
+++ b/src/views/user/orderManagement/components/order-home.vue
@@ -62,9 +62,7 @@ const statusList: any = [
     { id: '3', name: '待收货' },
     { id: '4', name: '租赁中' },
     { id: '5', name: '已退租' },
-    { id: '6', name: '已退租' },
     { id: '15', name: '结算待确认' },
-    { id: '7', name: '已完成' },
     { id: '8', name: '已驳回' },
     { id: '10', name: '已检修待结算' },
     { id: '20', name: '已完成' },
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue
index 6448b33..34afbcf 100644
--- a/src/views/user/orderManagementCz/components/order-home.vue
+++ b/src/views/user/orderManagementCz/components/order-home.vue
@@ -64,9 +64,7 @@ const statusList: any = [
     { id: '3', name: '待收货' },
     { id: '4', name: '租赁中' },
     { id: '5', name: '已退租' },
-    { id: '6', name: '已退租' },
     { id: '15', name: '结算待确认' },
-    { id: '7', name: '已完成' },
     { id: '8', name: '已驳回' },
     { id: '10', name: '已检修待结算' },
     { id: '20', name: '已完成' },