bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领用申请代码提交

This commit is contained in:
BianLzhaoMin 2025-02-20 21:50:29 +08:00
parent c0757397d4
commit 79eaa32b11
6 changed files with 334 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.prettierrc
View File

@ -1,17 +1,17 @@
{ {
"printWidth": 120, "printWidth": 120,
"tabWidth": 2, "tabWidth": 2,
"singleQuote": true, "singleQuote": true,
"semi": false, "semi": false,
"bracketSpacing": true, "bracketSpacing": true,
"jsxBracketSameLine": true, "jsxBracketSameLine": true,
"arrowParens": "avoid", "arrowParens": "avoid",
"endOfLine": "lf", "endOfLine": "lf",
"useTabs": false, "useTabs": false,
"trailingComma": "none", "trailingComma": "none",
"bracketSameLine": false, "bracketSameLine": false,
"htmlWhitespaceSensitivity": "ignore", "htmlWhitespaceSensitivity": "ignore",
"vueIndentScriptAndStyle": false, "vueIndentScriptAndStyle": false,
"singleAttributePerLine": false, "singleAttributePerLine": false,
"importStatement": "none" "importStatement": "none"
} }

4
src/api/receive-apply/index.js
View File

@ -3,7 +3,7 @@ import request from '@/utils/request'
// 获取领用申请列表 // 获取领用申请列表
export function getReceiveApplyApi(query) { export function getReceiveApplyApi(query) {
return request({ return request({
url: '/material/ma_type/getMaTypeTreeSelect', url: '/material/leaseTask/auditList',
method: 'get', method: 'get',
params: query params: query
}) })
@ -19,7 +19,7 @@ export function getReceiveApplyDetailsApi(query) {
// 获取审核记录详情 // 获取审核记录详情
export function getAuditingDetailsApi(query) { export function getAuditingDetailsApi(query) {
return request({ return request({
url: '/material/ma_type/getMaTypeTreeSelect', url: '/material//sysWorkflowNode/listByTaskId',
method: 'get', method: 'get',
params: query params: query
}) })

396
src/router/index.js
View File

@ -30,204 +30,204 @@ import Layout from '@/layout'
// 公共路由 // 公共路由
export const constantRoutes = [ export const constantRoutes = [
{ {
path: '/redirect', path: '/redirect',
component: Layout, component: Layout,
hidden: true, hidden: true,
children: [ children: [
{ {
path: '/redirect/:path(.*)', path: '/redirect/:path(.*)',
component: () => import('@/views/redirect') component: () => import('@/views/redirect')
} }
] ]
}, },
{ {
path: '/login', path: '/login',
component: () => import('@/views/login1'), component: () => import('@/views/login1'),
hidden: true hidden: true
}, },
{ {
path: '/register', path: '/register',
component: () => import('@/views/register1'), component: () => import('@/views/register1'),
hidden: true hidden: true
}, },
{ {
path: '/404', path: '/404',
component: () => import('@/views/error/404'), component: () => import('@/views/error/404'),
hidden: true hidden: true
}, },
{ {
path: '/401', path: '/401',
component: () => import('@/views/error/401'), component: () => import('@/views/error/401'),
hidden: true hidden: true
}, },
{ {
path: '', path: '',
component: Layout, component: Layout,
redirect: 'index', redirect: 'index',
children: [ children: [
{ {
path: 'index', path: 'index',
component: () => import('@/views/index'), component: () => import('@/views/index'),
name: 'Index', name: 'Index',
meta: { title: '首页', icon: 'dashboard', affix: true } meta: { title: '首页', icon: 'dashboard', affix: true }
} }
] ]
}, },
{ {
path: '/qrCode/qrCodePage', path: '/qrCode/qrCodePage',
component: () => import('@/views/qrCode/qrCode'), component: () => import('@/views/qrCode/qrCode'),
hidden: true hidden: true
}, },
{ {
path: '/user', path: '/user',
component: Layout, component: Layout,
hidden: true, hidden: true,
redirect: 'noredirect', redirect: 'noredirect',
children: [ children: [
{ {
path: 'profile', path: 'profile',
component: () => import('@/views/system/user/profile/index'), component: () => import('@/views/system/user/profile/index'),
name: 'Profile', name: 'Profile',
meta: { title: '个人中心', icon: 'user' } meta: { title: '个人中心', icon: 'user' }
} }
] ]
} }
] ]
// 动态路由，基于用户权限动态去加载 // 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [ export const dynamicRoutes = [
{ {
path: '/system/user-auth', path: '/system/user-auth',
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:user:edit'], permissions: ['system:user:edit'],
children: [ children: [
{ {
path: 'role/:userId(\\d+)', path: 'role/:userId(\\d+)',
component: () => import('@/views/system/user/authRole'), component: () => import('@/views/system/user/authRole'),
name: 'AuthRole', name: 'AuthRole',
meta: { title: '分配角色', activeMenu: '/system/user' } meta: { title: '分配角色', activeMenu: '/system/user' }
} }
] ]
}, },
{ {
path: '/system/role-auth', path: '/system/role-auth',
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:role:edit'], permissions: ['system:role:edit'],
children: [ children: [
{ {
path: 'user/:roleId(\\d+)', path: 'user/:roleId(\\d+)',
component: () => import('@/views/system/role/authUser'), component: () => import('@/views/system/role/authUser'),
name: 'AuthUser', name: 'AuthUser',
meta: { title: '分配用户', activeMenu: '/system/role' } meta: { title: '分配用户', activeMenu: '/system/role' }
} }
] ]
}, },
{ {
path: '/system/dict-data', path: '/system/dict-data',
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:dict:list'], permissions: ['system:dict:list'],
children: [ children: [
{ {
path: 'index/:dictId(\\d+)', path: 'index/:dictId(\\d+)',
component: () => import('@/views/system/dict/data'), component: () => import('@/views/system/dict/data'),
name: 'Data', name: 'Data',
meta: { title: '字典数据', activeMenu: '/system/dict' } meta: { title: '字典数据', activeMenu: '/system/dict' }
} }
] ]
}, },
{ {
path: '/monitor/job-log', path: '/monitor/job-log',
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['monitor:job:list'], permissions: ['monitor:job:list'],
children: [ children: [
{ {
path: 'index/:jobId(\\d+)', path: 'index/:jobId(\\d+)',
component: () => import('@/views/monitor/job/log'), component: () => import('@/views/monitor/job/log'),
name: 'JobLog', name: 'JobLog',
meta: { title: '调度日志', activeMenu: '/monitor/job' } meta: { title: '调度日志', activeMenu: '/monitor/job' }
} }
] ]
}, },
{ {
path: '/tool/gen-edit', path: '/tool/gen-edit',
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['tool:gen:edit'], permissions: ['tool:gen:edit'],
children: [ children: [
{ {
path: 'index/:tableId(\\d+)', path: 'index/:tableId(\\d+)',
component: () => import('@/views/tool/gen/editTable'), component: () => import('@/views/tool/gen/editTable'),
name: 'GenEdit', name: 'GenEdit',
meta: { title: '修改生成配置', activeMenu: '/tool/gen' } meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
} }
] ]
}, },
// 会签配置 // 会签配置
{ {
path: '/countersign/config-data', path: '/countersign/config-data',
component: Layout, component: Layout,
hidden: true, hidden: true,
permissions: ['system:dict:list'], // 权限字符 permissions: ['system:dict:list'], // 权限字符
children: [ children: [
{ {
path: 'index/:processName(.*)/:id(.*)', path: 'index/:processName(.*)/:id(.*)',
component: () => import('@/views/material/countersign/config/config-data.vue'), component: () => import('@/views/material/countersign/config/config-data.vue'),
name: 'config-data', name: 'config-data',
meta: { title: '流程配置', activeMenu: '/countersign/config' } meta: { title: '流程配置', activeMenu: '/countersign/config' }
} }
] ]
}, },
// 领料审核 业务详情 // 领料审核 业务详情
{ {
path: '/business-details/receive-apply', path: '/business-details/receive-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true, hidden: true,
permissions: ['system:dict:list'], // 权限字符 permissions: ['receive-apply:list'], // 权限字符
children: [ children: [
{ {
path: 'index', path: 'index',
name: 'receive-apply-details', name: 'receive-apply-details',
meta: { title: '领料详情', activeMenu: '/business-examine/receive-apply' }, meta: { title: '领料详情', activeMenu: '/business-examine/receive-apply' },
component: () => import('@/views/business-examine/receive-apply/business-details.vue') component: () => import('@/views/business-examine/receive-apply/business-details.vue')
} }
] ]
}, },
// 直转审核 业务详情 // 直转审核 业务详情
{ {
path: '/business-details/direct-rotation-apply', path: '/business-details/direct-rotation-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true, hidden: true,
permissions: ['system:dict:list'], // 权限字符 permissions: ['*'], // 权限字符
children: [ children: [
{ {
path: 'index', path: 'index',
name: 'direct-rotation-apply', name: 'direct-rotation-apply',
meta: { title: '直转详情', activeMenu: '/business-examine/direct-rotation-apply' }, meta: { title: '直转详情', activeMenu: '/business-examine/direct-rotation-apply' },
component: () => import('@/views/business-examine/direct-rotation-apply/business-details.vue') component: () => import('@/views/business-examine/direct-rotation-apply/business-details.vue')
} }
] ]
}, },
// 减免审核 业务详情 // 减免审核 业务详情
{ {
path: '/business-details/reduction-apply', path: '/business-details/reduction-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true, hidden: true,
permissions: ['system:dict:list'], // 权限字符 permissions: ['system:dict:list'], // 权限字符
children: [ children: [
{ {
path: 'index', path: 'index',
name: 'reduction-apply', name: 'reduction-apply',
meta: { title: '减免详情', activeMenu: '/business-examine/reduction-apply' }, meta: { title: '减免详情', activeMenu: '/business-examine/reduction-apply' },
component: () => import('@/views/business-examine/reduction-apply/business-details.vue') component: () => import('@/views/business-examine/reduction-apply/business-details.vue')
} }
] ]
} }
] ]
// 防止连续点击多次路由报错 // 防止连续点击多次路由报错
@ -235,15 +235,15 @@ let routerPush = Router.prototype.push
let routerReplace = Router.prototype.replace let routerReplace = Router.prototype.replace
// push // push
Router.prototype.push = function push(location) { Router.prototype.push = function push(location) {
return routerPush.call(this, location).catch(err => err) return routerPush.call(this, location).catch(err => err)
} }
// replace // replace
Router.prototype.replace = function push(location) { Router.prototype.replace = function push(location) {
return routerReplace.call(this, location).catch(err => err) return routerReplace.call(this, location).catch(err => err)
} }
export default new Router({ export default new Router({
mode: 'history', // 去掉url中的# mode: 'history', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes routes: constantRoutes
}) })

125
src/views/business-examine/receive-apply/business-details.vue
View File

@ -6,64 +6,64 @@
<div class="pages-title">领用申请详情</div> <div class="pages-title">领用申请详情</div>
<TitleTip :title="`基本信息`" /> <TitleTip :title="`基本信息`" />
<el-form size="small" style="padding: 20px" disabled label-width="120px"> <el-form size="small" style="padding: 20px" disabled label-width="120px" :model="detailsInfo">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领用单位"> <el-form-item label="领用单位">
<el-input /> <el-input v-model="detailsInfo.leaseUnit" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领用工程"> <el-form-item label="领用工程">
<el-input /> <el-input v-model="detailsInfo.leaseProject" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="领料人"> <el-form-item label="领料人">
<el-input /> <el-input v-model="detailsInfo.leasePerson" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="采购申请编号"> <el-form-item label="采购申请编号">
<el-input /> <el-input v-model="detailsInfo.applyCode" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="标准配置"> <el-form-item label="标准配置">
<el-input /> <el-input v-model="detailsInfo.leaseUnit" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="类型规格"> <el-form-item label="联系电话">
<el-input /> <el-input v-model="detailsInfo.phone" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="联系电话"> <el-form-item label="类型规格">
<el-input /> <el-input v-model="detailsInfo.maTypeNames" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<TitleTip :title="`明细信息`" /> <TitleTip :title="`明细信息`" />
<el-table style="margin-top: 20px"> <el-table style="margin-top: 20px" :data="detailsList">
<el-table-column label="序号" align="center"></el-table-column> <el-table-column label="序号" align="center" width="80" type="index" />
<el-table-column label="类型名称" align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="maTypeName" label="类型名称" align="center" show-overflow-tooltip />
<el-table-column label="规格型号" align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="typeName" label="规格型号" align="center" show-overflow-tooltip />
<el-table-column label="计量单位" align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="unitName" label="计量单位" align="center" show-overflow-tooltip />
<el-table-column label="预领数量" align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="preNum" label="预领数量" align="center" show-overflow-tooltip />
<el-table-column label="备注" align="center" show-overflow-tooltip></el-table-column> <el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip />
</el-table> </el-table>
<TitleTip :title="`附件信息`" /> <TitleTip :title="`附件信息`" />
<div class="file-box"> <div class="file-box">
<div v-for="i in 20" :key="i">附件{{ i }}</div> <div v-for="i in 2" :key="i">附件{{ i }}</div>
</div> </div>
</div> </div>
</el-col> </el-col>
@ -76,10 +76,18 @@
</div> </div>
<div class="process-record"> <div class="process-record">
<el-steps direction="vertical" :active="1"> <el-steps :active="active" :space="120" direction="vertical">
<el-step title="步骤 1"></el-step> <el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName">
<el-step title="步骤 2"></el-step> <template slot="description">
<el-step title="步骤 3" description="这是一段很长很长很长的描述性文字"></el-step> <div class="custom-description">
<!-- {{ step.description }} -->
<el-tag size="mini" type="primary" v-if="step.isAccept === null">待审批</el-tag>
<el-tag size="mini" type="success" v-if="step.isAccept === 0">已通过</el-tag>
<el-tag size="mini" type="danger" v-if="step.isAccept === 1">已驳回</el-tag>
</div>
</template>
</el-step>
</el-steps> </el-steps>
</div> </div>
@ -88,10 +96,10 @@
type="textarea" type="textarea"
v-model="opinion" v-model="opinion"
placeholder="请输入审核意见" placeholder="请输入审核意见"
:autosize="{ minRows: 4, maxRows: 10 }" :autosize="{ minRows: 2, maxRows: 6 }"
/> />
<el-row> <el-row class="btn-container">
<el-button type="success" size="mini" @click="onSubmitPass">通过</el-button> <el-button type="success" size="mini" @click="onSubmitPass">通过</el-button>
<el-button type="danger" size="mini" @click="onSubmitReject">驳回</el-button> <el-button type="danger" size="mini" @click="onSubmitReject">驳回</el-button>
</el-row> </el-row>
@ -104,7 +112,8 @@
<script> <script>
import TitleTip from './components/title-tip.vue' import TitleTip from './components/title-tip.vue'
import { submitAuditingApi } from '@/api/receive-apply/index.js' import { submitAuditingApi, getAuditingDetailsApi } from '@/api/receive-apply/index.js'
import { getLeaseTaskDetail } from '@/api/business/index'
export default { export default {
components: { components: {
TitleTip TitleTip
@ -112,14 +121,41 @@ export default {
data() { data() {
return { return {
opinion: '', opinion: '',
detailsInfo: {} detailsInfo: {},
content: `<span style="color:red">测试996</span>`,
steps: [
{ title: '步骤 1', description: '描述信息 1', color: 'red' },
{ title: '步骤 2', description: '描述信息 2', color: 'blue' },
{ title: '步骤 3', description: '描述信息 3', color: 'green' }
],
active: 1,
detailsList: [],
auditingList: []
}
},
created() {
// 判断当前路由页面是否有查询参数
if (this.$route.query) {
const { id, taskId } = this.$route.query
this.getLeaseTaskDetailFun(id, taskId)
} }
}, },
methods: { methods: {
// 通过 // 通过
onSubmitPass() {}, onSubmitPass() {},
// 驳回 // 驳回
onSubmitReject() {} onSubmitReject() {},
// 获取数据详情 和 审核记录详情
async getLeaseTaskDetailFun(id, taskId) {
const { data: res } = await getLeaseTaskDetail(id)
this.detailsInfo = res.leaseApplyInfo
this.detailsList = res.leaseApplyDetailsList
const { rows: result } = await getAuditingDetailsApi({ taskId })
this.auditingList = result
console.log('result审核记录详情', result)
}
} }
} }
</script> </script>
@ -184,6 +220,39 @@ export default {
.process-record { .process-record {
margin-top: 20px; margin-top: 20px;
min-height: 360px; // height: 60vh;
}
.btn-container {
margin-top: 10px;
display: flex;
justify-content: space-around;
}
::v-deep .el-step__icon.is-text {
background-color: #19a4a0;
color: #19a4a0;
border: none;
width: 16px;
height: 16px;
}
::v-deep .el-step.is-vertical .el-step__line {
width: 2px;
top: 26px;
bottom: 8px;
left: 7px;
}
::v-deep .el-step__title.is-finish {
font-weight: bold;
color: #303133;
font-size: 16px;
}
::v-deep .el-step__title.is-wait {
font-weight: bold;
color: #303133;
font-size: 16px;
} }
</style> </style>

4
src/views/business-examine/receive-apply/components/title-tip.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="title-tip"> <div class="title-tip">
<div class="is-green"></div> <div class="is-green"></div>
<div class="title">{{ title }}</div> <div class="title-child">{{ title }}</div>
</div> </div>
</template> </template>
@ -29,7 +29,7 @@ export default {
height: 20px; height: 20px;
background-color: #19a4a0; background-color: #19a4a0;
} }
.title { .title-child {
font-weight: bold; font-weight: bold;
letter-spacing: 1px; letter-spacing: 1px;
font-size: 18px; font-size: 18px;

22
src/views/business-examine/receive-apply/index.vue
View File

@ -122,6 +122,7 @@
<script> <script>
import { getLeaseTaskList, deleteLeaseTask } from '@/api/business/index' import { getLeaseTaskList, deleteLeaseTask } from '@/api/business/index'
import { getReceiveApplyApi } from '@/api/receive-apply/index.js'
export default { export default {
data() { data() {
@ -182,9 +183,20 @@ export default {
startTime: this.queryParams.timeRange[0] || '', startTime: this.queryParams.timeRange[0] || '',
endTime: this.queryParams.timeRange[1] || '' endTime: this.queryParams.timeRange[1] || ''
} }
const res = await getLeaseTaskList(params) const res = await getReceiveApplyApi(params)
console.log('🚀 ~ 获取列表 ~ res:', res) console.log('🚀 ~ 获取列表 ~ res:', res)
this.tableList = res.data.rows this.tableList = res.data.rows
// this.tableList = [
// {
// createBy: '张麻子'
// },
// {
// createBy: '张麻子'
// },
// {
// createBy: '张麻子'
// }
// ]
this.total = res.data.total || 0 this.total = res.data.total || 0
} catch (error) { } catch (error) {
console.log('🚀 ~ 获取列表 ~ error:', error) console.log('🚀 ~ 获取列表 ~ error:', error)
@ -210,7 +222,13 @@ export default {
// params = { type: 'edit', id: row.id } // params = { type: 'edit', id: row.id }
// } // }
// this.$router.push({ path: '/business/businessHandling/index', query: params }) // this.$router.push({ path: '/business/businessHandling/index', query: params })
this.$router.push({ name: 'receive-apply-details' }) // 跳转审核详情页面 this.$router.push({
name: 'receive-apply-details',
query: {
id: row.id,
taskId: row.taskId
}
}) // 跳转审核详情页面
}, },
// 删除 // 删除
handleDelete(row) { handleDelete(row) {