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 23:36:50 +08:00
commit 3446482c49
10 changed files with 1765 additions and 343 deletions

View File

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

View File

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

View File

@ -0,0 +1,34 @@
import request from '@/utils/request'
// 获取减免申请审核列表
export function getReceiveApplyApi(query) {
return request({
url: '/material/leaseTask/auditList',
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//sysWorkflowNode/listByTaskId',
method: 'get',
params: query
})
}
// 减免申请审核提交接口
export function submitAuditingApi(query) {
return request({
url: '/material/ma_type/getMaTypeTreeSelect',
method: 'get',
params: query
})
}

View File

@ -188,7 +188,7 @@ export const dynamicRoutes = [
path: '/business-details/receive-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true,
permissions: ['system:dict:list'], // 权限字符
permissions: ['receive-apply:list'], // 权限字符
children: [
{
path: 'index',
@ -203,7 +203,7 @@ export const dynamicRoutes = [
path: '/business-details/direct-rotation-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true,
permissions: ['system:dict:list'], // 权限字符
permissions: ['*'], // 权限字符
children: [
{
path: 'index',
@ -218,7 +218,7 @@ export const dynamicRoutes = [
path: '/business-details/reduction-apply',
component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可
hidden: true,
permissions: ['system:dict:list'], // 权限字符
permissions: ['reduction-apply:list'], // 权限字符
children: [
{
path: 'index',

View File

@ -1,189 +1,258 @@
<template>
<div class="business-details-container">
<el-row>
<el-col :span="18">
<div class="left-container">
<div class="pages-title">领用申请详情</div>
<TitleTip :title="`基本信息`" />
<div class="business-details-container">
<el-row>
<el-col :span="18">
<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-form size="small" style="padding: 20px" disabled label-width="120px" :model="detailsInfo">
<el-row>
<el-col :span="8">
<el-form-item label="领用单位">
<el-input v-model="detailsInfo.leaseUnit" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="领用工程">
<el-input v-model="detailsInfo.leaseProject" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="领料人">
<el-input v-model="detailsInfo.leasePerson" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="采购申请编号">
<el-input v-model="detailsInfo.applyCode" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="标准配置">
<el-input v-model="detailsInfo.leaseUnit" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话">
<el-input v-model="detailsInfo.phone" />
</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-row>
<el-col :span="24">
<el-form-item label="类型规格">
<el-input v-model="detailsInfo.maTypeNames" />
</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="`附件信息`" />
<el-table style="margin-top: 20px" :data="detailsList">
<el-table-column label="序号" align="center" width="80" type="index" />
<el-table-column prop="maTypeName" label="类型名称" align="center" show-overflow-tooltip />
<el-table-column prop="typeName" label="规格型号" align="center" show-overflow-tooltip />
<el-table-column prop="unitName" label="计量单位" align="center" show-overflow-tooltip />
<el-table-column prop="preNum" label="预领数量" align="center" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip />
</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 class="right-title">
<div></div>
<div></div>
<div>流程记录</div>
</div>
<div class="file-box">
<div v-for="i in 2" :key="i">附件{{ i }}</div>
</div>
</div>
</el-col>
<el-col :span="6">
<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="process-record">
<el-steps :active="active" :space="120" direction="vertical">
<el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName">
<template slot="description">
<div class="custom-description">
<!-- {{ step.description }} -->
<div class="auditing-container">
<el-input
type="textarea"
v-model="opinion"
placeholder="请输入审核意见"
:autosize="{ minRows: 4, maxRows: 10 }"
/>
<el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag>
<el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag>
<el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag>
</div>
</template>
</el-step>
</el-steps>
</div>
<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>
<div class="auditing-container">
<el-input
type="textarea"
v-model="opinion"
placeholder="请输入审核意见"
:autosize="{ minRows: 2, maxRows: 6 }"
/>
<el-row class="btn-container">
<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>
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 {
components: {
TitleTip
},
data() {
return {
opinion: '',
detailsInfo: {}
}
},
methods: {
//
onSubmitPass() {},
//
onSubmitReject() {}
components: {
TitleTip
},
data() {
return {
opinion: '',
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: {
//
onSubmitPass() {},
//
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>
<style scoped lang="scss">
.business-details-container {
padding: 20px;
padding: 20px;
}
.pages-title {
padding: 10px 0 30px 0;
font-size: 20px;
font-weight: bold;
letter-spacing: 2px;
text-align: center;
color: #19a4a0;
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;
}
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;
}
& div:nth-child(12n) {
margin-right: 0;
}
}
.right-container {
padding: 0 20px;
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%);
}
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;
margin-top: 20px;
// 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>

View File

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

View File

@ -122,6 +122,7 @@
<script>
import { getLeaseTaskList, deleteLeaseTask } from '@/api/business/index'
import { getReceiveApplyApi } from '@/api/receive-apply/index.js'
export default {
data() {
@ -182,9 +183,20 @@ export default {
startTime: this.queryParams.timeRange[0] || '',
endTime: this.queryParams.timeRange[1] || ''
}
const res = await getLeaseTaskList(params)
const res = await getReceiveApplyApi(params)
console.log('🚀 ~ 获取列表 ~ res:', res)
this.tableList = res.data.rows
// this.tableList = [
// {
// createBy: ''
// },
// {
// createBy: ''
// },
// {
// createBy: ''
// }
// ]
this.total = res.data.total || 0
} catch (error) {
console.log('🚀 ~ 获取列表 ~ error:', error)
@ -210,7 +222,13 @@ export default {
// params = { type: 'edit', id: row.id }
// }
// 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) {

View File

@ -2,21 +2,290 @@
<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" :model="detailsInfo">
<el-row>
<el-col :span="12">
<el-form-item label="减免开始日期">
<el-input v-model="detailsInfo.reduceStartTime" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="减免结束日期">
<el-input v-model="detailsInfo.reduceEndTime" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="减免原因">
<el-input
type="textarea"
v-model="detailsInfo.remark"
:autosize="{ minRows: 2, maxRows: 4 }"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<TitleTip :title="`明细信息`" />
<el-table style="margin: 20px 0" :data="detailsList">
<el-table-column prop="num" label="减免数量" align="center" show-overflow-tooltip />
<el-table-column prop="maName" label="机具名称" align="center" show-overflow-tooltip />
<el-table-column prop="maModel" label="规格型号" align="center" show-overflow-tooltip />
<el-table-column prop="reduceNum" label="领料数量" align="center" show-overflow-tooltip />
<el-table-column prop="startTime" label="领料日期" align="center" show-overflow-tooltip />
<el-table-column prop="endTime" label="退料日期" align="center" show-overflow-tooltip />
<el-table-column
prop="reduceStartTime"
label="减免开始时间"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="reduceEndTime"
label="减免结束时间"
align="center"
show-overflow-tooltip
/>
<el-table-column
prop="leasePrice"
label="租赁单价(元/天)"
align="center"
show-overflow-tooltip
/>
<el-table-column prop="reduceDays" label="减免天数" align="center" show-overflow-tooltip />
<el-table-column
prop="reduceLeaseMoney"
label="减免费用(元)"
align="center"
show-overflow-tooltip
/>
</el-table>
<div class="total-amount">
<span>合计:</span>
<span>{{ totalAmount }} / </span>
</div>
<TitleTip :title="`附件信息`" />
<div class="file-box">
<div v-for="img in fileList" :key="img.id">
<el-image style="width: 100%; height: 100%" :src="img.url" fit="cover"></el-image>
</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 :active="active" :space="120" direction="vertical">
<el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName">
<template slot="description">
<div class="custom-description">
<!-- {{ step.description }} -->
<el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag>
<el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag>
<el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag>
</div>
</template>
</el-step>
</el-steps>
</div>
<div class="auditing-container">
<el-input
type="textarea"
v-model="opinion"
placeholder="请输入审核意见"
:autosize="{ minRows: 2, maxRows: 6 }"
/>
<el-row class="btn-container">
<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, getAuditingDetailsApi } from '@/api/reduction-apply/index.js'
import { getDiscountViewList } from '@/api/cost/cost'
export default {
components: {
TitleTip
},
data() {
return {
opinion: '',
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: [],
fileList: [],
totalAmount: 0
}
},
created() {
//
if (this.$route.query) {
const { id, taskId } = this.$route.query
this.getLeaseTaskDetailFun(id, taskId)
}
},
methods: {
//
onSubmitPass() {},
//
onSubmitReject() {},
//
async getLeaseTaskDetailFun(id, taskId) {
const { data: res } = await getDiscountViewList(id)
this.detailsInfo = res
this.detailsList = res.detailList
this.fileList = res.bmFileInfos
this.detailsList.forEach(e => {
this.totalAmount += e.reduceLeaseMoney * 1
})
const { rows: result } = await getAuditingDetailsApi({ taskId })
this.auditingList = result
console.log('result审核记录详情', result)
}
}
}
</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;
// 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;
}
.total-amount {
margin-bottom: 10px;
display: flex;
justify-content: flex-end;
font-size: 14px;
align-items: center;
& span:last-child {
margin: 0 6px;
color: red;
font-weight: bold;
}
}
</style>

View File

@ -0,0 +1,37 @@
<template>
<div class="title-tip">
<div class="is-green"></div>
<div class="title-child">{{ 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-child {
font-weight: bold;
letter-spacing: 1px;
font-size: 18px;
}
</style>

File diff suppressed because it is too large Load Diff