From e00905e53ee5d91d9e488ecf5ece3e25b9889436 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 一月 2026 16:14:44 +0800
Subject: [PATCH] 湟水峡 1.采购模块不要项目名称 2.加一个有待回款登记的提示 3.回款登记、付款登记改成和销售订单价格关联，并且可以多个一起回款或付款 4.合同管理不要下载合同了，跟合同相关的字段可以去掉了 5.重构生产模块 6.测试流程并修改bug
---
src/layout/components/Navbar.vue | 99 ++++++++++++++++++++++---------------------------
1 files changed, 45 insertions(+), 54 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2a0f437..633024f 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,30 +1,11 @@
<template>
<div class="navbar">
<div>
- <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+ <hamburger id="hamburger-container" :is-active="appStore.sidebar.opened" class="hamburger-container"
+ @toggleClick="toggleSideBar" />
<breadcrumb v-if="!settingsStore.topNav" id="breadcrumb-container" class="breadcrumb-container" />
</div>
-<!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
- <div class="center-menu">
- <span class="label">{{userStore.currentFactoryName}}</span>
- <el-dropdown @command="handleFactoryChange" class="right-menu-item hover-effect" trigger="click">
- <div>
- <el-icon size="20"><Switch /></el-icon>
- </div>
- <template #dropdown>
- <el-dropdown-menu >
- <el-dropdown-item
- v-for="item in factoryList"
- :key="item.deptId"
- :command="item"
- >
- {{ item.deptName }}
- </el-dropdown-item>
- </el-dropdown-menu>
- </template>
- </el-dropdown>
- </div>
- <div class="right-menu">
+ <!-- <top-nav v-if="settingsStore.topNav" id="topmenu-container" class="topmenu-container" />-->
<div class="avatar-container">
<el-dropdown @command="handleCommand" class="right-menu-item hover-effect" trigger="click">
<div class="avatar-wrapper">
@@ -47,7 +28,6 @@
</el-dropdown>
</div>
</div>
- </div>
</template>
<script setup>
@@ -63,9 +43,6 @@
import useAppStore from '@/store/modules/app'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
-import { userLoginFacotryList } from "@/api/system/user.js"
-import Cookies from "js-cookie";
-import { decrypt } from "@/utils/jsencrypt"
const appStore = useAppStore()
const userStore = useUserStore()
@@ -113,29 +90,28 @@
settingsStore.toggleTheme()
}
-function getUserLoginFacotryList() {
- if(userStore.id){
- userLoginFacotryList({userId:userStore.id}).then(res => {
- console.log('res', res)
- factoryList.value = res.data
- })
- }else {
- factoryList.value = []
- }
-}
+// function getUserLoginFacotryList() {
+// if (userStore.id) {
+// userLoginFacotryList({ userId: userStore.id }).then(res => {
+// console.log('res', res)
+// factoryList.value = res.data
+// })
+// } else {
+// factoryList.value = []
+// }
+// }
function handleFactoryChange(command) {
console.log('command', command)
handleLogin(command.deptId);
}
-function handleLogin(currentFatoryId){
+function handleLogin(currentFatoryId) {
const loginForm = {
username: Cookies.get("username"),
password: Cookies.get("password") === undefined ? null : decrypt(Cookies.get("password")),
currentFatoryId: currentFatoryId
}
- console.log('loginForm', loginForm)
userStore.loginCheckFactory(loginForm).then(res => {
forceReload();
}).catch((err) => {
@@ -147,8 +123,6 @@
const timestamp = new Date().getTime();
window.location.href = `${currentUrl}?reload=${timestamp}`;
}
-
-getUserLoginFacotryList();
</script>
<style lang='scss' scoped>
@@ -158,20 +132,6 @@
position: relative;
background: var(--navbar-bg);
box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
- .center-menu {
- line-height: 50px;
- position: absolute;
- left: 50%;
- transform: translateX(-50%);
- display: flex;
- align-items: center;
- .label {
- font-weight: bold;
- font-size: 18px;
- color: #333333;
- margin-right: 10px;
- }
- }
.hamburger-container {
line-height: 46px;
@@ -241,6 +201,19 @@
}
}
+ .notification-container {
+ margin-right: 20px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+
+ .notification-badge {
+ :deep(.el-badge__content) {
+ border: none;
+ }
+ }
+ }
+
.avatar-container {
margin-right: 40px;
@@ -266,4 +239,22 @@
}
}
}
+
+</style>
+
+<style lang="scss">
+.notification-popover {
+ padding: 0 !important;
+
+ .el-popover__title {
+ display: none;
+ }
+
+ .el-popover__body {
+ padding: 0 !important;
+ }
+}
+.el-badge__content.is-fixed{
+ top: 12px;
+}
</style>
--
Gitblit v1.9.3