领用申请代码提交
This commit is contained in:
parent
c0757397d4
commit
79eaa32b11
|
|
@ -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
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -6,64 +6,64 @@
|
|||
<div class="pages-title">领用申请详情</div>
|
||||
<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-col :span="8">
|
||||
<el-form-item label="领用单位">
|
||||
<el-input />
|
||||
<el-input v-model="detailsInfo.leaseUnit" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="领用工程">
|
||||
<el-input />
|
||||
<el-input v-model="detailsInfo.leaseProject" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="领料人">
|
||||
<el-input />
|
||||
<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 />
|
||||
<el-input v-model="detailsInfo.applyCode" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="标准配置">
|
||||
<el-input />
|
||||
<el-input v-model="detailsInfo.leaseUnit" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="类型规格">
|
||||
<el-input />
|
||||
<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 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 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 v-for="i in 2" :key="i">附件{{ i }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
|
|
@ -76,10 +76,18 @@
|
|||
</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 :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 === 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>
|
||||
</div>
|
||||
|
||||
|
|
@ -88,10 +96,10 @@
|
|||
type="textarea"
|
||||
v-model="opinion"
|
||||
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="danger" size="mini" @click="onSubmitReject">驳回</el-button>
|
||||
</el-row>
|
||||
|
|
@ -104,7 +112,8 @@
|
|||
|
||||
<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
|
||||
|
|
@ -112,14 +121,41 @@ export default {
|
|||
data() {
|
||||
return {
|
||||
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: {
|
||||
// 通过
|
||||
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>
|
||||
|
|
@ -184,6 +220,39 @@ export default {
|
|||
|
||||
.process-record {
|
||||
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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue