From 08778a4cdbefc8117d1553c0ca3d4f069ec3ac9a Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 29 May 2024 10:24:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=A4=9A=E4=B8=AA?=
=?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=A1=B5=E9=9D=A2=E5=8F=8A=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F=E3=80=81oa=5FInitiate?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81oa=5Fflow=5Ftype=E7=BC=96=E8=BE=91?=
=?UTF-8?q?=E5=92=8C=E7=B4=A2=E5=BC=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/layout/default/components/header/fold.vue | 2 +-
.../default/components/header/index.vue | 4 +--
src/layout/default/components/header/msg.vue | 35 +++++++++++++++++++
.../default/components/header/refresh.vue | 2 +-
src/views/oa_Initiate/detail.vue | 1 -
src/views/oa_Initiate/index.vue | 10 +++---
6 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/layout/default/components/header/fold.vue b/src/layout/default/components/header/fold.vue
index 7ce9360..15eb7a3 100644
--- a/src/layout/default/components/header/fold.vue
+++ b/src/layout/default/components/header/fold.vue
@@ -1,6 +1,6 @@
<template>
<div class="fold h-full cursor-pointer flex items-center px-2" @click="toggleCollapsed">
- <icon :name="`local-icon-${isCollapsed ? 'close' : 'open'}`" :size="20" />
+ <icon :name="`local-icon-${isCollapsed ? 'close' : 'open'}`" :size="30" />
</div>
</template>
diff --git a/src/layout/default/components/header/index.vue b/src/layout/default/components/header/index.vue
index 13dde5b..12f03b1 100644
--- a/src/layout/default/components/header/index.vue
+++ b/src/layout/default/components/header/index.vue
@@ -46,9 +46,9 @@ import UserDropDown from './user-drop-down.vue'
import Setting from '../setting/index.vue'
import MultipleTabs from './multiple-tabs.vue'
import menuLi from './menuLi.vue'
-// import msg from './msg.vue'
-
+import msg from './msg.vue'
import useSettingStore from '@/stores/modules/setting'
+
const appStore = useAppStore()
const isMobile = computed(() => appStore.isMobile)
const settingStore = useSettingStore()
diff --git a/src/layout/default/components/header/msg.vue b/src/layout/default/components/header/msg.vue
index e69de29..26be545 100644
--- a/src/layout/default/components/header/msg.vue
+++ b/src/layout/default/components/header/msg.vue
@@ -0,0 +1,35 @@
+<template>
+ <div style="position:relative;" class="cursor-pointer" @click="handleClick">
+ <div class="num">10</div>
+ <el-icon :size="30">
+ <Bell />
+ </el-icon>
+ </div>
+</template>
+<script setup>
+import { Bell } from '@element-plus/icons-vue'
+import Notifce from './../../../../utils/Notifce.js'
+
+const handleClick = () => {
+ Notifce.info("你有新的消息")
+}
+
+</script>
+
+
+<style lang="scss" scoped>
+.num {
+ position: absolute;
+ top: -5px;
+ right: -5px;
+ width: 20px;
+ height: 20px;
+ background: red;
+ border-radius: 50%;
+ color: #fff;
+ text-align: center;
+ line-height: 20px;
+ font-size: 12px;
+ z-index: 100;
+}
+</style>
\ No newline at end of file
diff --git a/src/layout/default/components/header/refresh.vue b/src/layout/default/components/header/refresh.vue
index a55ccba..4850a8f 100644
--- a/src/layout/default/components/header/refresh.vue
+++ b/src/layout/default/components/header/refresh.vue
@@ -1,6 +1,6 @@
<template>
<div class="refresh cursor-pointer h-full flex items-center px-2" @click="refreshView">
- <icon name="el-icon-RefreshRight" :size="18" />
+ <icon name="el-icon-RefreshRight" :size="30" />
</div>
</template>
diff --git a/src/views/oa_Initiate/detail.vue b/src/views/oa_Initiate/detail.vue
index 39ace72..bd0aa16 100644
--- a/src/views/oa_Initiate/detail.vue
+++ b/src/views/oa_Initiate/detail.vue
@@ -88,7 +88,6 @@
<personnelselector ref="personnel" @confirm="submituser" type="1">
</personnelselector>
</div>
-
<el-dialog v-model="showBackDialog" title="撤回审批" width="550px">
<el-form-item label="撤回原因">
<el-input v-model="form.content" type="textarea"> </el-input>
diff --git a/src/views/oa_Initiate/index.vue b/src/views/oa_Initiate/index.vue
index a6be919..0943667 100644
--- a/src/views/oa_Initiate/index.vue
+++ b/src/views/oa_Initiate/index.vue
@@ -20,11 +20,11 @@
<el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
<el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1">
- <el-option label="全部" :value="1" />
- <el-option label="待审核" :value="2" />
- <!-- <el-option label="审核中" :value="2" /> -->
- <el-option label="审核通过" :value="3" />
- <el-option label="审核不通过" :value="4" />
+ <el-option label="待审核" :value="0" />
+ <el-option label="审核中" :value="1" />
+ <el-option label="审核通过" :value="2" />
+ <el-option label="审核不通过" :value="3" />
+ <el-option label="撤销审核" :value="4" />
</el-select>
</el-form-item>
<el-form-item>