FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Change the menu bar and merge pages

Browse Source
This commit is contained in:
assina045
2023-05-31 01:45:01 +08:00
parent 670052627c
commit 9c53b6bc60
18 changed files with 365 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
ui/src/components/ApplicantsAddAffairs.vue → ui/src/components/affairs/ApplicantsAddAffairs.vue
View File

@@ -1,12 +1,12 @@
<template>
<el-form :model="form" label-width="120px">
<el-form-item label="事务名称:">
<el-form-item label="事务标题:">
<el-col :span="4">
<el-input v-model="form.title" placeholder="请输入事务名称" class="longInput" />
<el-input v-model="form.title" placeholder="请输入事务标题" class="longInput" />
</el-col>
</el-form-item>
<el-form-item label="申请者:">
<el-form-item label="申请者:" v-if="grant">
<el-col :span="4">
<el-input
v-model="form.applicantId"
@@ -17,6 +17,25 @@
</el-col>
</el-form-item>
<el-form-item label="申请者:" v-if="!grant">
<el-col :span="4">
<el-select
v-model="form.applicantId"
:placeholder="currentUser.username"
filterable
ref="fieldSelect"
popper-class="roleSelect"
>
<el-option
v-for="sameDepartmentUser in sameDepartmentUsers"
:label="sameDepartmentUser.username"
:value="sameDepartmentUser.id"
:key="sameDepartmentUser.id"
/>
</el-select>
</el-col>
</el-form-item>
<el-form-item label="审批者:">
<el-col :span="4">
<el-select
@@ -27,7 +46,7 @@
popper-class="roleSelect"
>
<el-option
v-for="user in users"
v-for="user in grantUsers"
:label="user.username"
:value="user.id"
:key="user.id"
@@ -70,11 +89,12 @@
</el-form>
</template>
<script>
<script lang="ts">
import 'element-plus/theme-chalk/index.css'
import request from '@/services'
import request from '@/services/index.js'
import _ from 'lodash'
import { ElMessage } from 'element-plus'
export default {
data() {
return {
@@ -95,18 +115,14 @@ export default {
deleted: '',
version: ''
},
users: [
{
id: '',
username: ''
}
],
currentUser: [
{
id: '',
username: ''
}
]
grantUsers: [],
currentUser: {
id: '',
username: '',
department_id: ''
},
sameDepartmentUsers: [],
grant: true
}
},
methods: {
@@ -124,14 +140,15 @@ export default {
.post('/affair/add', form)
.then((response) => {
console.log(response.data)
this.getPersonalAffair()
this.resetForm()
})
.catch((reportError) => {
this.resetForm()
console.log(reportError)
})
this.resetForm()
// this.$router.go()
this.getPersonalAffair()
this.$router.go()
} else {
if (_.isEmpty(form.title)) {
ElMessage({
@@ -163,12 +180,6 @@ export default {
type: 'error'
})
}
// if (_.isEmpty(form.createTime)) {
// ElMessage({
// message: '错误！发送时间不能为空！',
// type: 'error'
// })
// }
}
}, // 表单提交及验证
resetForm() {
@@ -181,31 +192,60 @@ export default {
this.form.createTime = new Date()
}, 500)
}, // 动态时钟
getUser() {
getGrantUser() {
request
.get('/affair/add/get_user')
.get('/user/affair')
.then((response) => {
this.users = response.data.data
this.grantUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
}) // 数据库中获取用户
}) // 获取有权限用户
},
getCurrentUser() {
request
.get('/affair/add/get_current_user')
.get('/user/info')
.then((response) => {
this.currentUser = response.data.data
})
.catch((reportError) => {
console.log(reportError)
}) // 获取当前用户
},
selectGrant() {
for (let i = 0; i < this.grantUsers.length; i++) {
if (this.currentUser.id === this.grantUsers[i].id) {
this.grant = false
}
}
},
getSameDepartmentUser() {
request
.get('/user/department')
.then((response) => {
this.sameDepartmentUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
})
},
getPersonalAffair() {
request
.get('/affair/personal_affairs')
.then((response) => {
this.grantUsers = response.data.data
})
.catch((reportError) => {
console.log(reportError)
})
}
},
created() {
this.alarm()
this.getUser()
this.getGrantUser()
this.getCurrentUser()
this.selectGrant()
this.getSameDepartmentUser()
},
mounted() {
this.$nextTick(function () {
@@ -220,10 +260,6 @@ export default {
width: 99%;
}
/*.shortInput {*/
/* width: 200px;*/
/*}*/
.textarea {
height: 70%;
width: 70%;

113
ui/src/components/ApproverApproved.vue → ui/src/components/affairs/ApproverApproved.vue
View File

@@ -1,28 +1,4 @@
<template>
<el-row :span="24">
<el-col :span="18">
<div class="mt-4">
<el-input placeholder="查询事务" class="input-with-select">
<template #prepend>
<el-select placeholder="查询方式">
<el-option label="事务编号" value="1" />
<el-option label="事务名称" value="2" />
<el-option label="日期" value="3" />
</el-select>
</template>
<template #append>
<el-button>查询</el-button>
</template>
</el-input>
</div>
</el-col>
<el-col :span="4">
<el-button type="warning" round>待审批</el-button>
<el-button type="success" round>已审批</el-button>
</el-col>
</el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column label="事务编号" prop="id" />
@@ -99,7 +75,7 @@
</el-row>
</el-dialog>
<el-divider :data="labelData">
<el-divider>
<div class="block">
<el-pagination
style="color: #888888"
@@ -114,73 +90,32 @@
</el-divider>
</template>
<script>
import request from '@/services'
<script lang="ts">
import request from '@/services/index.js'
import 'element-plus/theme-chalk/index.css'
export default {
data() {
return {
tableData: [
{
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
],
// }],
labelData: [
{
currentPage1: 5,
currentPage2: 5,
currentPage3: 5,
currentPage4: 4
}
],
tableData: [],
dialogVisible: false,
dialogData: [
{
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
],
users: [
{
id: '',
username: ''
}
],
currentUser: [
{
id: '',
username: ''
}
]
dialogData: {
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
},
users: []
}
},
methods: {
@@ -222,7 +157,7 @@ export default {
},
getUser() {
request
.get('/affair/add/get_user')
.get('/user/affair')
.then((response) => {
this.users = response.data.data
})
@@ -259,10 +194,10 @@ export default {
}
},
created() {
console.log('approved created')
this.getApproved()
this.dialogFalse()
this.getUser()
console.log(this.tableData)
}
}
</script>

112
ui/src/components/ApproverNotApproved.vue → ui/src/components/affairs/ApproverNotApproved.vue
View File

@@ -1,28 +1,4 @@
<template>
<el-row :span="24">
<el-col :span="18">
<div class="mt-4">
<el-input placeholder="查询事务" class="input-with-select">
<template #prepend>
<el-select placeholder="查询方式">
<el-option label="事务编号" value="1" />
<el-option label="事务名称" value="2" />
<el-option label="日期" value="3" />
</el-select>
</template>
<template #append>
<el-button>查询</el-button>
</template>
</el-input>
</div>
</el-col>
<el-col :span="6">
<el-button type="warning" round>待审批</el-button>
<el-button type="success" round>已审批</el-button>
</el-col>
</el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column label="事务编号" prop="id" />
@@ -105,7 +81,7 @@
</el-row>
</el-dialog>
<el-divider :data="labelData">
<el-divider>
<div class="block">
<el-pagination
style="color: #888888"
@@ -120,62 +96,32 @@
</el-divider>
</template>
<script>
import request from '@/services'
<script lang="ts">
import request from '@/services/index.js'
import 'element-plus/theme-chalk/index.css'
export default {
data() {
return {
tableData: [
{
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
],
// }],
labelData: [
{
currentPage1: 5,
currentPage2: 5,
currentPage3: 5,
currentPage4: 4
}
],
tableData: [],
dialogVisible: false,
dialogData: [
{
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: '',
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
]
dialogData: {
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: '',
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
}
},
methods: {
@@ -225,20 +171,6 @@ export default {
format(time) {
return new Date(time).toLocaleString()
}, // 时间格式转换
/*
getDate() {
let newTime = ''
const date = new Date()
const yy = date.getUTCFullYear()
const mm = _.padStart((date.getUTCMonth() + 1).toString(), 2, '0')
const dd = _.padStart(date.getUTCDate().toString(), 2, '0')
const hh = _.padStart(date.getUTCHours().toString(), 2, '0')
const mf = _.padStart(date.getUTCMinutes().toString(), 2, '0')
const ss = _.padStart(date.getUTCSeconds().toString(), 2, '0')
newTime = yy + '-' + mm + '-' + dd + ' ' + hh + ':' + mf + ':' + ss
return newTime
}, // 获取当前时间与格式转换
*/
dialogTure(data) {
this.dialogVisible = true
this.dialogData = data
@@ -248,9 +180,9 @@ export default {
} // 关闭弹出框
},
created() {
console.log('not approved created')
this.getApproved()
this.dialogFalse()
console.log(this.tableData)
} // 获取事务信息
}
</script>

102
ui/src/components/personalAffairs.vue → ui/src/components/affairs/personalAffairs.vue
View File

@@ -1,28 +1,4 @@
<template>
<el-row :span="24">
<el-col :span="18">
<div class="mt-4">
<el-input placeholder="查询事务" class="input-with-select">
<template #prepend>
<el-select placeholder="查询方式">
<el-option label="事务编号" value="1" />
<el-option label="事务名称" value="2" />
<el-option label="日期" value="3" />
</el-select>
</template>
<template #append>
<el-button>查询</el-button>
</template>
</el-input>
</div>
</el-col>
<el-col :span="4">
<el-button type="warning" round>待审批</el-button>
<el-button type="success" round>已审批</el-button>
</el-col>
</el-row>
<el-table :data="tableData" style="width: 100%">
<el-table-column label="事务编号" prop="id" />
@@ -111,7 +87,7 @@
</el-row>
</el-dialog>
<el-divider :data="labelData">
<el-divider>
<div class="block">
<el-pagination
style="color: #888888"
@@ -126,61 +102,31 @@
</el-divider>
</template>
<script>
import request from '@/services'
<script lang="ts">
import request from '@/services/index.js'
import 'element-plus/theme-chalk/index.css'
export default {
data() {
return {
tableData: [
{
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
],
// }],
labelData: [
{
currentPage1: 5,
currentPage2: 5,
currentPage3: 5,
currentPage4: 4
}
],
tableData: [],
dialogVisible: false,
dialogData: [
{
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
]
dialogData: {
id: '',
title: '',
content: '',
typeId: '',
status: '',
applicantId: '',
inspectorId: '',
createTime: new Date(),
inspectTime: new Date(),
priority: '',
modifyTime: '',
originId: '',
old: '',
deleted: '',
version: ''
}
}
},
methods: {
@@ -190,7 +136,7 @@ export default {
.delete('/affair/' + row.id)
.then((response) => {
console.log(response.data)
this.getApproed()
this.getApproved()
})
.catch((reportError) => {
console.log(reportError)
@@ -203,7 +149,7 @@ export default {
handleCurrentChange(val) {
console.log(`当前页: ${val}`)
},
getApproed() {
getApproved() {
request
.get('/affair/personal_affairs')
.then((response) => {
@@ -226,7 +172,7 @@ export default {
}
},
created() {
this.getApproed()
this.getApproved()
this.dialogFalse()
console.log(this.tableData)
}

2
ui/src/constants/Common.constants.ts
View File

@@ -1,7 +1,7 @@
const PRODUCTION_NAME = 'Pinnacle OA'
const TOKEN_NAME = 'JWT_TOKEN'
const COLOR_PRODUCTION = '#00D4FF'
const COLOR_BACKGROUND = '#D8D8D8'
const COLOR_BACKGROUND = '#F5F5F5'
const COLOR_TOP = 'rgba(234,46,13,0.85)'
const COLOR_FONT_MAIN = '#4D4D4D'
const COLOR_FONT_SECONDARY = '#9E9E9E'

2
ui/src/pages/affair/AffairAdd.vue
View File

@@ -2,7 +2,7 @@
<applicants-add-affairs></applicants-add-affairs>
</template>
<script>
<script lang="ts">
export default {
name: 'AffairAdd'
}

2
ui/src/pages/affair/AffairApproved.vue
View File

@@ -1,6 +1,6 @@
<template><approver-approved></approver-approved></template>
<script>
<script lang="ts">
export default {
name: 'AffairApproved'
}

58
ui/src/pages/affair/AffairManage.vue Normal file
View File

@@ -0,0 +1,58 @@
<template>
<el-row :span="24">
<el-col :span="18">
<div class="mt-4">
<el-input placeholder="查询事务" class="input-with-select">
<template #prepend>
<el-select placeholder="查询方式">
<el-option label="事务编号" value="1" />
<el-option label="事务名称" value="2" />
<el-option label="日期" value="3" />
</el-select>
</template>
<template #append>
<el-button>查询</el-button>
</template>
</el-input>
</div>
</el-col>
<el-col :span="6">
<el-menu
:default-active="$route.path"
class="el-menu-demo"
mode="horizontal"
router
background-color="white"
>
<el-menu-item index="/affair/manage/toApprove">
<el-button type="warning" round>待审批</el-button>
</el-menu-item>
<el-menu-item index="/affair/manage/Approved">
<el-button type="success" round>已审批</el-button>
</el-menu-item>
</el-menu>
</el-col>
<router-view></router-view>
</el-row>
</template>
<script lang="ts">
import { COLOR_BACKGROUND } from '@/constants/Common.constants'
export default {
name: 'AffairManage',
methods: {
COLOR_BACKGROUND() {
return COLOR_BACKGROUND
}
}
}
</script>
<style scoped>
.el-menu--horizontal > .el-menu-item {
border-bottom: none;
text-decoration: none;
}
</style>

4
ui/src/pages/affair/Affair.vue → ui/src/pages/affair/AffairNotApproved.vue
View File

@@ -1,8 +1,8 @@
<template><approver-not-approved></approver-not-approved></template>
<script>
<script lang="ts">
export default {
name: 'AffairPage'
name: 'AffairNotApproved'
}
</script>

11
ui/src/pages/affair/PersonAffair.vue Normal file
View File

@@ -0,0 +1,11 @@
<template>
<personal-affairs></personal-affairs>
</template>
<script lang="ts">
export default {
name: 'PersonAffair'
}
</script>
<style scoped></style>

43
ui/src/pages/affair/PersonalAffairsView.vue
View File

@@ -1,8 +1,45 @@
<template><personal-affairs></personal-affairs></template>
<template>
<el-row :span="24">
<el-col :span="16">
<div class="mt-4">
<el-input placeholder="查询事务" class="input-with-select">
<template #prepend>
<el-select placeholder="查询方式">
<el-option label="事务编号" value="1" />
<el-option label="事务名称" value="2" />
<el-option label="日期" value="3" />
</el-select>
</template>
<template #append>
<el-button>查询</el-button>
</template>
</el-input>
</div>
</el-col>
<script>
<el-col :span="8">
<el-menu
:default-active="$route.path"
class="el-menu-demo"
mode="horizontal"
router
background-color="white"
>
<el-menu-item index="/affair/personal/person">
<el-button type="success" round>我的事务</el-button>
</el-menu-item>
<el-menu-item index="/affair/personal/add">
<el-button type="success" round>添加事务</el-button>
</el-menu-item>
</el-menu>
</el-col>
</el-row>
<router-view></router-view>
</template>
<script lang="ts">
export default {
name: 'PersonalAffairsView'
name: 'personalAffairsView'
}
</script>

86
ui/src/router/affair.ts
View File

@@ -1,53 +1,74 @@
const affairRouter = {
path: '/affair',
name: 'affair',
redirect: 'manage',
children: [
{
path: 'add',
component: async () => await import('@/pages/affair/AffairAdd.vue'),
name: 'affairAdd',
meta: {
title: '事务添加',
requiresMenu: true,
requiresScrollbar: true,
requiresPadding: true
}
},
{
path: 'personalAffairs',
path: 'personal',
component: async () => await import('@/pages/affair/PersonalAffairsView.vue'),
name: 'PersonalAffairs',
redirect: '/affair/personal/person',
meta: {
title: '我的事务',
requiresMenu: true,
requiresScrollbar: true,
requiresPadding: true,
requiresAuth: true
}
requiresPadding: true
},
children: [
{
path: 'add',
component: async () => await import('@/pages/affair/AffairAdd.vue'),
name: 'affairAdd',
meta: {
title: '事务添加',
requiresScrollbar: true,
requiresPadding: true
}
},
{
path: 'person',
component: async () => await import('@/pages/affair/PersonAffair.vue'),
name: 'person',
meta: {
title: '事务',
requiresScrollbar: true,
requiresPadding: true
}
}
]
},
{
path: 'manage',
component: async () => await import('@/pages/affair/AffairManage.vue'),
name: 'affairManage',
component: async () => await import('@/pages/affair/Affair.vue'),
redirect: '/affair/manage/toApprove',
meta: {
title: '事务审批',
requiresMenu: true,
requiresScrollbar: true,
requiresPadding: true,
requiresAuth: true
}
},
{
path: 'approved',
component: async () => await import('@/pages/affair/AffairApproved.vue'),
name: 'affairApproved',
meta: {
title: '审批记录',
title: '事务管理',
requiresMenu: true,
requiresScrollbar: true,
requiresPadding: true
}
},
children: [
{
path: 'toApprove',
name: 'toApprove',
component: async () => await import('@/pages/affair/AffairNotApproved.vue'),
meta: {
title: '事务审批',
requiresScrollbar: true,
requiresPadding: true
}
},
{
path: 'approved',
component: async () => await import('@/pages/affair/AffairApproved.vue'),
name: 'approved',
meta: {
title: '审批记录',
requiresScrollbar: true,
requiresPadding: true
}
}
]
}
],
meta: {
@@ -55,7 +76,8 @@ const affairRouter = {
icon: shallowRef(IconPinnacleAffairs),
requiresMenu: true,
requiresScrollbar: false,
requiresPadding: true
requiresPadding: true,
requiresAuth: true
}
}