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

Merge branch 'material-ui' of http://192.168.0.75:3000/bonus/bonus-ui into material-ui

This commit is contained in:
hongchao 2025-02-20 20:08:20 +08:00
parent dfc0c39218 c0757397d4
commit 7abedf8faf
8 changed files with 470 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/api/receive-apply/index.js Normal file
View File

@ -0,0 +1,34 @@
import request from '@/utils/request'
// 获取领用申请列表
export function getReceiveApplyApi(query) {
return request({
url: '/material/ma_type/getMaTypeTreeSelect',
method: 'get',
params: query
})
}
// 获取领用申请详情
export function getReceiveApplyDetailsApi(query) {
return request({
url: '/material/ma_type/getMaTypeTreeSelect',
method: 'get',
params: query
})
}
// 获取审核记录详情
export function getAuditingDetailsApi(query) {
return request({
url: '/material/ma_type/getMaTypeTreeSelect',
method: 'get',
params: query
})
}
// 审核提交接口
export function submitAuditingApi(query) {
return request({
url: '/material/ma_type/getMaTypeTreeSelect',
method: 'get',
params: query
})
}

60
src/router/index.js
View File

@ -182,22 +182,52 @@ export const dynamicRoutes = [
meta: { title: '流程配置', activeMenu: '/countersign/config' }
}
]
},
// 领料审核 业务详情
{
path: '/business-details/receive-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true,
permissions: ['system:dict:list'], // 权限字符
children: [
{
path: 'index',
name: 'receive-apply-details',
meta: { title: '领料详情', activeMenu: '/business-examine/receive-apply' },
component: () => import('@/views/business-examine/receive-apply/business-details.vue')
}
]
},
// 直转审核 业务详情
{
path: '/business-details/direct-rotation-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true,
permissions: ['system:dict:list'], // 权限字符
children: [
{
path: 'index',
name: 'direct-rotation-apply',
meta: { title: '直转详情', activeMenu: '/business-examine/direct-rotation-apply' },
component: () => import('@/views/business-examine/direct-rotation-apply/business-details.vue')
}
]
},
// 减免审核 业务详情
{
path: '/business-details/reduction-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true,
permissions: ['system:dict:list'], // 权限字符
children: [
{
path: 'index',
name: 'reduction-apply',
meta: { title: '减免详情', activeMenu: '/business-examine/reduction-apply' },
component: () => import('@/views/business-examine/reduction-apply/business-details.vue')
}
]
}
// 业务详情
// {
// path: '/business-details',
// component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
// hidden: true,
// permissions: ['system:dict:list'], // 权限字符
// children: [
// {
// path: 'index',
// name: 'business-details',
// meta: { title: '业务详情', activeMenu: '/business-examine' },
// component: () => import('@/views/business-examine/business-details.vue')
// }
// ]
// }
]
// 防止连续点击多次路由报错

13
src/views/business-examine/direct-rotation-apply/index.vue
View File

@ -41,16 +41,7 @@
/>
<!-- 点击跳转到二级页面配置审核流程 -->
<el-table-column label="流程名称" align="center">
<template slot-scope="{ row }">
<router-link
class="link-type"
:to="`/countersign/config-data/index/${encodeURIComponent(row.typeName)}`"
>
<span>{{ row.typeName }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="流程名称" align="center" prop="typeName" />
<el-table-column label="会签类型" align="center" prop="taskName" show-overflow-tooltip />
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
@ -276,7 +267,7 @@ export default {
},
// 查询
handlePreview() {
this.$router.push({ name: 'business-details' }) // 跳转业务详情页面
this.$router.push({ name: 'receive-apply-details' }) // 跳转业务详情页面
},
// 审核
handleAuditing() {}

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

@ -2,21 +2,188 @@
<div class="business-details-container">
<el-row>
<el-col :span="18">
<div class="left-container">左侧</div>
<div class="left-container">
<div class="pages-title">领用申请详情</div>
<TitleTip :title="`基本信息`" />
<el-form size="small" style="padding: 20px" disabled label-width="120px">
<el-row>
<el-col :span="8">
<el-form-item label="领用单位">
<el-input />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="领用工程">
<el-input />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="领料人">
<el-input />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="采购申请编号">
<el-input />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准配置">
<el-input />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="类型规格">
<el-input />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="联系电话">
<el-input />
</el-form-item>
</el-col>
</el-row>
</el-form>
<TitleTip :title="`明细信息`" />
<el-table style="margin-top: 20px">
<el-table-column label="序号" align="center"></el-table-column>
<el-table-column label="类型名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" align="center" show-overflow-tooltip></el-table-column>
<el-table-column label="计量单位" align="center" show-overflow-tooltip></el-table-column>
<el-table-column label="预领数量" align="center" show-overflow-tooltip></el-table-column>
<el-table-column label="备注" align="center" show-overflow-tooltip></el-table-column>
</el-table>
<TitleTip :title="`附件信息`" />
<div class="file-box">
<div v-for="i in 20" :key="i">附件{{ i }}</div>
</div>
</div>
</el-col>
<el-col :span="6">
<div class="right-container">右侧</div>
<div class="right-container">
<div class="right-title">
<div></div>
<div></div>
<div>流程记录</div>
</div>
<div class="process-record">
<el-steps direction="vertical" :active="1">
<el-step title="步骤 1"></el-step>
<el-step title="步骤 2"></el-step>
<el-step title="步骤 3" description="这是一段很长很长很长的描述性文字"></el-step>
</el-steps>
</div>
<div class="auditing-container">
<el-input
type="textarea"
v-model="opinion"
placeholder="请输入审核意见"
:autosize="{ minRows: 4, maxRows: 10 }"
/>
<el-row>
<el-button type="success" size="mini" @click="onSubmitPass">通过</el-button>
<el-button type="danger" size="mini" @click="onSubmitReject">驳回</el-button>
</el-row>
</div>
</div>
</el-col>
</el-row>
</div>
</template>
<script>
export default {}
import TitleTip from './components/title-tip.vue'
import { submitAuditingApi } from '@/api/receive-apply/index.js'
export default {
components: {
TitleTip
},
data() {
return {
opinion: '',
detailsInfo: {}
}
},
methods: {
// 通过
onSubmitPass() {},
// 驳回
onSubmitReject() {}
}
}
</script>
<style scoped>
<style scoped lang="scss">
.business-details-container {
padding: 20px;
}
.pages-title {
padding: 10px 0 30px 0;
font-size: 20px;
font-weight: bold;
letter-spacing: 2px;
text-align: center;
color: #19a4a0;
}
.file-box {
padding: 10px;
display: flex;
flex-wrap: wrap;
box-sizing: border-box;
div {
width: calc((100% - 110px) / 12);
height: 60px;
margin-right: 10px;
margin-top: 10px;
text-align: center;
line-height: 60px;
background-color: #19a4a0;
}
& div:nth-child(12n) {
margin-right: 0;
}
}
.right-container {
padding: 0 20px;
}
.right-title {
display: flex;
align-items: center;
font-size: 14px;
& div:first-child {
width: 16px;
height: 16px;
border-radius: 50%;
background-color: #19a4a0;
z-index: 9;
}
& div:nth-child(2) {
width: 16px;
height: 16px;
border-radius: 50%;
background-color: #b2e1e0;
transform: translateX(-50%);
}
}
.process-record {
margin-top: 20px;
min-height: 360px;
}
</style>

37
src/views/business-examine/receive-apply/components/title-tip.vue Normal file
View File

@ -0,0 +1,37 @@
<template>
<div class="title-tip">
<div class="is-green"></div>
<div class="title">{{ title }}</div>
</div>
</template>
<script>
export default {
props: {
title: {
type: String,
default: () => '基本信息'
}
}
}
</script>
<style scoped>
.title-tip {
display: flex;
align-items: center;
background-color: #ebeaea;
}
.is-green {
margin: 0 6px;
width: 5px;
height: 20px;
background-color: #19a4a0;
}
.title {
font-weight: bold;
letter-spacing: 1px;
font-size: 18px;
}
</style>

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

@ -1,285 +1,248 @@
<template>
<!-- 业务办理审核 -->
<!-- 业务办理审核 -- 领料审核 -->
<div class="app-container">
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="68px"
>
<el-form-item prop="keyWord">
<el-input
<el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
<el-form-item label="申请日期" prop="timeRange">
<el-date-picker
v-model="queryParams.timeRange"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
clearable
maxlength="20"
placeholder="请输入关键词"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
/>
</el-form-item>
<el-form-item label="关键字" prop="keyWord">
<el-input
v-model="queryParams.keyWord"
placeholder="请输入关键字"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核状态" prop="taskStatus">
<el-select v-model="queryParams.taskStatus" placeholder="请选择审核状态" clearable>
<el-option
v-for="item in statusOptions"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<!-- 表单按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" @click="handleReset">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
</el-col> -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">领料申请</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">
导出数据
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<el-table v-loading="loading" :data="configList" ref="multipleTable">
<el-table :data="tableList" fit highlight-current-row style="width: 100%">
<!-- 多选 -->
<el-table-column type="selection" width="55" align="center" @selection-change="selectionChange" />
<el-table-column
width="80"
label="序号"
type="index"
width="55"
label="序号"
align="center"
:index="indexContinuation(queryParams.pageNum, queryParams.pageSize)"
/>
<!-- 点击跳转到二级页面配置审核流程 -->
<el-table-column label="流程名称" align="center">
<template slot-scope="{ row }">
<router-link
class="link-type"
:to="`/countersign/config-data/index/${encodeURIComponent(row.typeName)}`"
<el-table-column
v-for="(column, index) in tableColumns"
show-overflow-tooltip
:key="column.prop"
:label="column.label"
:prop="column.prop"
align="center"
>
<span>{{ row.typeName }}</span>
</router-link>
<!-- 插槽 -->
<template v-slot="scope" v-if="column.prop == 'taskStatus'">
<el-tag v-if="scope.row.taskStatus == '0'" type="warning" size="mini" style="margin-right: 5px">
待审核
</el-tag>
<el-tag v-else-if="scope.row.taskStatus == '1'" size="mini" style="margin-right: 5px">
审核中
</el-tag>
<el-tag
v-else-if="scope.row.taskStatus == '2'"
type="success"
size="mini"
style="margin-right: 5px"
>
已完成
</el-tag>
</template>
</el-table-column>
<el-table-column label="会签类型" align="center" prop="taskName" show-overflow-tooltip />
<!-- 操作 -->
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
icon="el-icon-zoom-in"
@click="handlePreview(scope.row)"
v-hasPermi="['signConfig:info:edit']"
>
查看
</el-button>
<el-button
size="mini"
type="warning"
icon="el-icon-edit"
@click="handleAuditing(scope.row)"
v-hasPermi="['signConfig:info:remove']"
>
<el-button type="text" size="mini" icon="el-icon-search" @click="handleAuditing(scope.row, 1)">
审核
</el-button>
<el-button
v-if="scope.row.taskStatus == '0'"
type="text"
size="mini"
icon="el-icon-delete"
style="color: #f56c6c"
@click="handleDelete(scope.row)"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
:total="total"
v-show="total > 0"
@pagination="getList"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 新增或修改弹窗 -->
<el-dialog :title="title" :visible.sync="showConfig" width="40%" append-to-body @close="onDialogClose">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row :gutter="24">
<el-col :span="20">
<el-form-item label="流程名称" prop="typeName">
<el-input v-model="form.typeName" placeholder="请输入流程名称" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="20">
<el-form-item label="会签类型" prop="taskType">
<el-select
filterable
clearable
style="width: 100%"
v-model="form.taskType"
placeholder="请选择会签类型"
>
<el-option
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.countersign_type_name"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { getConfigListApi, addConfigApi, editConfigApi, deleteConfigApi } from '@/api/countersign/countersign'
import { getLeaseTaskList, deleteLeaseTask } from '@/api/business/index'
export default {
name: 'signConfig',
dicts: ['countersign_process_name', 'countersign_type_name'],
data() {
return {
// 遮罩层
loading: false,
// 显示搜索条件
showSearch: true,
showConfig: false,
// 总条数
total: 0,
// 会签配置表格数据
configList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
keyWord: undefined
keyWord: '', // 关键字
taskStatus: '', // 审核状态
timeRange: [] // 日期范围
},
// 表单参数
form: {
typeName: '',
taskType: ''
},
// 表单校验
rules: {
typeName: [
{
required: true,
message: '请输入流程名称',
trigger: 'blur'
},
{ max: 30, message: '长度不能超过30个字符', trigger: 'blur' }
// 考勤状态
statusOptions: [
{ label: '待审核', value: '1' },
{ label: '审核中', value: '2' },
{ label: '已完成', value: '3' }
],
taskType: [
{
required: true,
message: '请选择会签类型',
trigger: 'blur'
}
]
}
total: 0, // 总条数
// 表头
tableColumns: [
{ label: '申请时间', prop: 'createTime' },
{ label: '申请人', prop: 'createBy' },
{ label: '领用单位', prop: 'leaseUnit' },
{ label: '领用工程', prop: 'leaseProject' },
{ label: '领料物资类型', prop: 'maTypeNames' },
{ label: '协议号', prop: 'agreementCode' },
{ label: '采购申请单号', prop: 'applyCode' },
{ label: '领料人', prop: 'leasePerson' },
{ label: '领料人电话', prop: 'phone' },
{ label: '状态', prop: 'taskStatus' }
],
// 表格数据
tableList: []
}
},
created() {
this.getList()
},
methods: {
// 取消按钮
cancel() {
this.showConfig = false
},
// 搜索
// 查询
handleQuery() {
this.getList()
},
// 弹框关闭时触发
onDialogClose() {
this.$refs.form.resetFields()
},
// 表单重置
reset() {
this.form = {
typeName: '',
taskType: ''
}
this.resetForm('form')
},
// 新增
handleAdd() {
this.reset()
this.showConfig = true
this.title = '新增'
},
// 重置
resetQuery() {
this.resetForm('queryForm')
this.queryParams.keyWord = null
handleReset() {
this.queryParams.pageNum = 1
this.queryParams.pageSize = 10
this.handleQuery()
this.$refs.queryForm.resetFields()
this.getList()
},
// 编辑
handleUpdate(row) {
const { typeName, taskType, id } = row
this.form.typeName = typeName
this.form.taskType = taskType + ''
this.form.id = id
this.title = '编辑'
this.showConfig = true
},
// 查询列表
// 获取列表
async getList() {
this.loading = true
const res = await getConfigListApi(this.queryParams)
this.configList = res.rows
this.total = res.total
this.loading = false
console.log('列表-查询', this.queryParams)
try {
const params = {
...this.queryParams,
startTime: this.queryParams.timeRange[0] || '',
endTime: this.queryParams.timeRange[1] || ''
}
const res = await getLeaseTaskList(params)
console.log('🚀 ~ 获取列表 ~ res:', res)
this.tableList = res.data.rows
this.total = res.data.total || 0
} catch (error) {
console.log('🚀 ~ 获取列表 ~ error:', error)
this.tableList = []
this.total = 0
}
},
// 多选
selectionChange(val) {
console.log('selectionChange', val)
},
handleAdd() {
console.log('领料申请')
this.$router.push({ path: '/business/businessHandling/index' })
},
// 审核按钮
handleAuditing(row, type) {
// console.log('编辑', row)
// let params = {}
// if (type === 1) {
// params = { type: 'detail', id: row.id }
// } else {
// params = { type: 'edit', id: row.id }
// }
// this.$router.push({ path: '/business/businessHandling/index', query: params })
this.$router.push({ name: 'receive-apply-details' }) // 跳转审核详情页面
},
// 删除
handleDelete(row) {
const id = row.id
this.$modal
.confirm('是否确认删除数据项？')
.then(function () {
return deleteConfigApi({ id })
})
.then(() => {
this.$modal.msgSuccess('删除成功')
console.log('删除', row)
this.$confirm('是否删除该数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(async () => {
const res = await deleteLeaseTask(row.id)
console.log('🚀 ~ 删除 ~ res:', res)
this.getList()
this.$message({
type: 'success',
message: '删除成功!'
})
})
.catch(() => {})
},
// 提交
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.id != undefined) {
editConfigApi(this.form).then(res => {
this.$modal.msgSuccess('修改成功')
this.showConfig = false
this.getList()
})
} else {
addConfigApi(this.form).then(res => {
this.$modal.msgSuccess('新增成功')
this.showConfig = false
this.getList()
})
// 导出数据
handleExport() {
try {
let fileName = `数据_${new Date().getTime()}.xLsx`
let url = ''
const params = { ...this.queryParams }
console.log('🚀 ~ 导出 ~ params:', params)
// this.derive(url, params, fileName)
} catch (error) {
console.log('导出数据失败', error)
}
}
})
},
// 查询
handlePreview() {
this.$router.push({ name: 'business-details' }) // 跳转业务详情页面
},
// 审核
handleAuditing() {}
}
}
</script>
<style lang="scss" scoped></style>

13
src/views/business-examine/reduction-apply/index.vue
View File

@ -41,16 +41,7 @@
/>
<!-- 点击跳转到二级页面配置审核流程 -->
<el-table-column label="流程名称" align="center">
<template slot-scope="{ row }">
<router-link
class="link-type"
:to="`/countersign/config-data/index/${encodeURIComponent(row.typeName)}`"
>
<span>{{ row.typeName }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="流程名称" align="center" prop="typeName" />
<el-table-column label="会签类型" align="center" prop="taskName" show-overflow-tooltip />
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
@ -276,7 +267,7 @@ export default {
},
// 查询
handlePreview() {
this.$router.push({ name: 'business-details' }) // 跳转业务详情页面
this.$router.push({ name: 'receive-apply-details' }) // 跳转业务详情页面
},
// 审核
handleAuditing() {}

4
src/views/material/countersign/config/index.vue
View File

@ -109,7 +109,7 @@
:key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.countersign_type_name"
v-for="dict in dict.type.tm_task_type"
/>
</el-select>
</el-form-item>
@ -128,7 +128,7 @@
import { getConfigListApi, addConfigApi, editConfigApi, deleteConfigApi } from '@/api/countersign/countersign'
export default {
name: 'signConfig',
dicts: ['countersign_process_name', 'countersign_type_name'],
dicts: ['countersign_process_name', 'countersign_type_name', 'tm_task_type'],
data() {
return {
// 遮罩层