更新了多个视图页面及组件,包括审批流程显示方式、oa_Initiate修改、oa_flow_type编辑和索引页面修改。

This commit is contained in:
zmj 2024-05-29 10:24:34 +08:00
parent d53d5109d9
commit 08778a4cdb
6 changed files with 44 additions and 10 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="fold h-full cursor-pointer flex items-center px-2" @click="toggleCollapsed"> <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> </div>
</template> </template>

View File

@ -46,9 +46,9 @@ import UserDropDown from './user-drop-down.vue'
import Setting from '../setting/index.vue' import Setting from '../setting/index.vue'
import MultipleTabs from './multiple-tabs.vue' import MultipleTabs from './multiple-tabs.vue'
import menuLi from './menuLi.vue' import menuLi from './menuLi.vue'
// import msg from './msg.vue' import msg from './msg.vue'
import useSettingStore from '@/stores/modules/setting' import useSettingStore from '@/stores/modules/setting'
const appStore = useAppStore() const appStore = useAppStore()
const isMobile = computed(() => appStore.isMobile) const isMobile = computed(() => appStore.isMobile)
const settingStore = useSettingStore() const settingStore = useSettingStore()

View File

@ -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>

View File

@ -1,6 +1,6 @@
<template> <template>
<div class="refresh cursor-pointer h-full flex items-center px-2" @click="refreshView"> <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> </div>
</template> </template>

View File

@ -88,7 +88,6 @@
<personnelselector ref="personnel" @confirm="submituser" type="1"> <personnelselector ref="personnel" @confirm="submituser" type="1">
</personnelselector> </personnelselector>
</div> </div>
<el-dialog v-model="showBackDialog" title="撤回审批" width="550px"> <el-dialog v-model="showBackDialog" title="撤回审批" width="550px">
<el-form-item label="撤回原因"> <el-form-item label="撤回原因">
<el-input v-model="form.content" type="textarea"> </el-input> <el-input v-model="form.content" type="textarea"> </el-input>

View File

@ -20,11 +20,11 @@
<el-form class="mb-[-16px] mt-5" :model="queryParams" inline> <el-form class="mb-[-16px] mt-5" :model="queryParams" inline>
<el-form-item label="类型" prop="type"> <el-form-item label="类型" prop="type">
<el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1"> <el-select v-model="queryParams.type" clearable placeholder="请选择类型" class="flex-1">
<el-option label="全部" :value="1" /> <el-option label="待审核" :value="0" />
<el-option label="待审核" :value="2" /> <el-option label="审核中" :value="1" />
<!-- <el-option label="审核" :value="2" /> --> <el-option label="审核通过" :value="2" />
<el-option label="审核通过" :value="3" /> <el-option label="审核通过" :value="3" />
<el-option label="审核不通过" :value="4" /> <el-option label="撤销审核" :value="4" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>