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

领用申请接口调试完成

This commit is contained in:
BianLzhaoMin 2025-02-21 01:24:12 +08:00
parent c536630a1b
commit 3dfe48ecce
6 changed files with 458 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,16 +19,16 @@ export function getReceiveApplyDetailsApi(query) {
// 获取审核记录详情 // 获取审核记录详情
export function getAuditingDetailsApi(query) { export function getAuditingDetailsApi(query) {
return request({ return request({
url: '/material//sysWorkflowNode/listByTaskId', url: '/material/sysWorkflowNode/listByTaskId',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 审核提交接口 // 审核提交接口
export function submitAuditingApi(query) { export function submitAuditingApi(data) {
return request({ return request({
url: '/material/ma_type/getMaTypeTreeSelect', url: '/material/sysWorkflowRecordHistory/update',
method: 'get', method: 'post',
params: query data
}) })
} }

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

@ -16,10 +16,10 @@ export function getReceiveApplyDetailsApi(query) {
params: query params: query
}) })
} }
// 获取减免申请记录详情 // 获取减免申请审核记录详情
export function getAuditingDetailsApi(query) { export function getAuditingDetailsApi(query) {
return request({ return request({
url: '/material//sysWorkflowNode/listByTaskId', url: '/material/sysWorkflowNode/listByTaskId',
method: 'get', method: 'get',
params: query params: query
}) })

301
src/store/modules/user.js
View File

@ -1,4 +1,4 @@
import { login, logout, getInfo, refreshToken, getPhoneCode, isLogin,isAdmin} from '@/api/login' import { login, logout, getInfo, refreshToken, getPhoneCode, isLogin, isAdmin } from '@/api/login'
import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth' import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
// 更严格的手机号和邮箱正则表达式 // 更严格的手机号和邮箱正则表达式
@ -6,157 +6,168 @@ const phonePattern = /^(\+86)?1[3-9]\d{9}$/ // 支持前缀 +86
const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/ const emailPattern = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
// 构建 payload 函数 // 构建 payload 函数
const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode,phoneUuid }) => { const buildPayload = ({ loginMethod, username, password, uuid, code, mobile, verificationCode, phoneUuid }) => {
let loginType = '' let loginType = ''
if (loginMethod === 'mobile') { if (loginMethod === 'mobile') {
loginType = phonePattern.test(mobile.trim()) ? 'PHONE_OTP' : emailPattern.test(mobile.trim()) ? 'EMAIL_OTP' : 'PHONE_OTP' loginType = phonePattern.test(mobile.trim())
return { ? 'PHONE_OTP'
username: mobile.trim(), : emailPattern.test(mobile.trim())
verificationCode, ? 'EMAIL_OTP'
uuid, : 'PHONE_OTP'
code, return {
loginType, username: mobile.trim(),
phoneUuid verificationCode,
uuid,
code,
loginType,
phoneUuid
}
} else {
loginType = phonePattern.test(username.trim())
? 'PHONE_PASSWORD'
: emailPattern.test(username.trim())
? 'EMAIL_PASSWORD'
: 'USERNAME_PASSWORD'
return {
username: username.trim(),
password,
verificationCode,
uuid,
code,
loginType,
phoneUuid
}
} }
} else {
loginType = phonePattern.test(username.trim()) ? 'PHONE_PASSWORD' : emailPattern.test(username.trim()) ? 'EMAIL_PASSWORD' : 'USERNAME_PASSWORD'
return {
username: username.trim(),
password,
verificationCode,
uuid,
code,
loginType,
phoneUuid
}
}
} }
const user = { const user = {
state: { state: {
token: getToken(), token: getToken(),
id: '', id: '',
name: '', name: '',
avatar: '', avatar: '',
roles: [], roles: [],
permissions: [] permissions: []
}, },
mutations: { mutations: {
SET_TOKEN(state, token) { SET_TOKEN(state, token) {
state.token = token state.token = token
},
SET_EXPIRES_IN(state, time) {
state.expires_in = time
},
SET_ID(state, id) {
state.id = id
},
SET_NAME(state, name) {
state.name = name
},
SET_AVATAR(state, avatar) {
state.avatar = avatar
},
SET_ROLES(state, roles) {
state.roles = roles
},
SET_PERMISSIONS(state, permissions) {
state.permissions = permissions
}
}, },
SET_EXPIRES_IN(state, time) {
state.expires_in = time actions: {
}, IsLogin({ commit }, userInfo) {
SET_ID(state, id) { const payload = buildPayload(userInfo)
state.id = id return isLogin(payload)
}, .then(res => res)
SET_NAME(state, name) { .catch(error => Promise.reject(error))
state.name = name },
}, IsAdmin({ commit }, userInfo) {
SET_AVATAR(state, avatar) { const payload = buildPayload(userInfo)
state.avatar = avatar return isAdmin(payload)
}, .then(res => res)
SET_ROLES(state, roles) { .catch(error => Promise.reject(error))
state.roles = roles },
},
SET_PERMISSIONS(state, permissions) { // 登录
state.permissions = permissions Login({ commit }, userInfo) {
const payload = buildPayload(userInfo)
return login(payload)
.then(res => {
const { access_token, expires_in } = res.data
setToken(access_token)
commit('SET_TOKEN', access_token)
setExpiresIn(expires_in)
commit('SET_EXPIRES_IN', expires_in)
return res
})
.catch(error => Promise.reject(error))
},
// 获取手机验证码
GetPhoneCode({ commit }, userInfo) {
const payload = {
username: userInfo.mobile.trim(),
uuid: userInfo.uuid,
code: userInfo.code,
phoneUuid: userInfo.phoneUuid,
verificationCodeType: userInfo.mobileCodeType
}
return getPhoneCode(payload)
.then(res => res)
.catch(error => Promise.reject(error))
},
// 获取用户信息
GetInfo({ commit }) {
return getInfo()
.then(res => {
const user = res.user
const avatar = user.avatar ? user.avatar : require('@/assets/images/profile.jpg')
commit('SET_ROLES', res.roles && res.roles.length > 0 ? res.roles : ['ROLE_DEFAULT'])
commit('SET_PERMISSIONS', res.permissions)
commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
// 存取用户的userId
sessionStorage.setItem('userId', res.user.userId)
return res
})
.catch(error => Promise.reject(error))
},
// 刷新 token
RefreshToken({ commit, state }) {
return refreshToken(state.token)
.then(res => {
const expiresIn = res.data
setExpiresIn(expiresIn)
commit('SET_EXPIRES_IN', expiresIn)
})
.catch(error => Promise.reject(error))
},
// 退出登录
LogOut({ commit, state }) {
return logout(state.token)
.then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
})
.catch(error => Promise.reject(error))
},
// 前端退出
FedLogOut({ commit }) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
removeToken()
resolve()
})
}
} }
},
actions: {
IsLogin({ commit }, userInfo) {
const payload = buildPayload(userInfo)
return isLogin(payload)
.then(res => res)
.catch(error => Promise.reject(error))
},
IsAdmin({ commit }, userInfo) {
const payload = buildPayload(userInfo)
return isAdmin(payload)
.then(res => res)
.catch(error => Promise.reject(error))
},
// 登录
Login({ commit }, userInfo) {
const payload = buildPayload(userInfo)
return login(payload)
.then(res => {
const { access_token, expires_in } = res.data
setToken(access_token)
commit('SET_TOKEN', access_token)
setExpiresIn(expires_in)
commit('SET_EXPIRES_IN', expires_in)
return res;
})
.catch(error => Promise.reject(error))
},
// 获取手机验证码
GetPhoneCode({ commit }, userInfo) {
const payload = {
username: userInfo.mobile.trim(),
uuid: userInfo.uuid,
code: userInfo.code,
phoneUuid: userInfo.phoneUuid,
verificationCodeType: userInfo.mobileCodeType
}
return getPhoneCode(payload)
.then(res => res)
.catch(error => Promise.reject(error))
},
// 获取用户信息
GetInfo({ commit }) {
return getInfo()
.then(res => {
const user = res.user
const avatar = user.avatar ? user.avatar : require('@/assets/images/profile.jpg')
commit('SET_ROLES', res.roles && res.roles.length > 0 ? res.roles : ['ROLE_DEFAULT'])
commit('SET_PERMISSIONS', res.permissions)
commit('SET_ID', user.userId)
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
return res
})
.catch(error => Promise.reject(error))
},
// 刷新 token
RefreshToken({ commit, state }) {
return refreshToken(state.token)
.then(res => {
const expiresIn = res.data
setExpiresIn(expiresIn)
commit('SET_EXPIRES_IN', expiresIn)
})
.catch(error => Promise.reject(error))
},
// 退出登录
LogOut({ commit, state }) {
return logout(state.token)
.then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
})
.catch(error => Promise.reject(error))
},
// 前端退出
FedLogOut({ commit }) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
removeToken()
resolve()
})
}
}
} }
export default user export default user

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

@ -1,113 +1,125 @@
<template> <template>
<div class="business-details-container"> <div class="business-details-container">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<div class="left-container"> <div class="left-container">
<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" :model="detailsInfo"> <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 v-model="detailsInfo.leaseUnit" /> <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 v-model="detailsInfo.leaseProject" /> <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 v-model="detailsInfo.leasePerson" /> <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 v-model="detailsInfo.applyCode" /> <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 v-model="detailsInfo.leaseUnit" /> <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 v-model="detailsInfo.phone" /> <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 v-model="detailsInfo.maTypeNames" /> <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" :data="detailsList"> <el-table style="margin-top: 20px" :data="detailsList">
<el-table-column label="序号" align="center" width="80" type="index" /> <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="maTypeName" label="类型名称" align="center" show-overflow-tooltip />
<el-table-column prop="typeName" 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="unitName" label="计量单位" align="center" show-overflow-tooltip />
<el-table-column prop="preNum" 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-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 2" :key="i">附件{{ i }}</div> <!-- <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 :active="active" :space="120" direction="vertical"> </div>
<el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName"> </div>
<template slot="description"> </el-col>
<div class="custom-description"> <el-col :span="6">
<!-- {{ step.description }} --> <div class="right-container">
<div class="right-title">
<div></div>
<div></div>
<div>流程记录</div>
</div>
<el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag> <div class="process-record">
<el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag> <el-steps :active="active" :space="120" direction="vertical">
<el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag> <el-step v-for="step in auditingList" :key="step.id" :title="step.nodeName">
</div> <template slot="description">
</template> <div class="custom-description">
</el-step> <!-- {{ step.description }} -->
</el-steps>
</div>
<div class="auditing-container"> <el-tag size="mini" type="primary" v-if="step.isAccept === 0">待审批</el-tag>
<el-input <el-tag size="mini" type="success" v-if="step.isAccept === 1">已通过</el-tag>
type="textarea" <el-tag size="mini" type="danger" v-if="step.isAccept === 2">已驳回</el-tag>
v-model="opinion" </div>
placeholder="请输入审核意见"
:autosize="{ minRows: 2, maxRows: 6 }"
/>
<el-row class="btn-container"> <div class="node-info" v-if="step.createTime">
<el-button type="success" size="mini" @click="onSubmitPass">通过</el-button> 审核时间:
<el-button type="danger" size="mini" @click="onSubmitReject">驳回</el-button> {{ step.createTime }}
</el-row> </div>
</div>
</div> <div class="node-info" v-if="step.remark">
</el-col> 审核意见:
</el-row> {{ step.remark }}
</div> </div>
</template>
</el-step>
</el-steps>
</div>
<div class="auditing-container" v-if="pagesType === 1">
<el-input
type="textarea"
v-model="auditingParams.remark"
placeholder="请输入审核意见"
:autosize="{ minRows: 2, maxRows: 6 }"
/>
<el-row class="btn-container">
<el-button type="success" size="mini" @click="onHandleAuditing(1)">通过</el-button>
<el-button type="danger" size="mini" @click="onHandleAuditing(2)">驳回</el-button>
</el-row>
</div>
</div>
</el-col>
</el-row>
</div>
</template> </template>
<script> <script>
@ -115,144 +127,196 @@ import TitleTip from './components/title-tip.vue'
import { submitAuditingApi, getAuditingDetailsApi } from '@/api/receive-apply/index.js' import { submitAuditingApi, getAuditingDetailsApi } from '@/api/receive-apply/index.js'
import { getLeaseTaskDetail } from '@/api/business/index' import { getLeaseTaskDetail } from '@/api/business/index'
export default { export default {
components: { components: {
TitleTip TitleTip
}, },
data() { data() {
return { return {
opinion: '', opinion: '',
detailsInfo: {}, detailsInfo: {},
content: `<span style="color:red">测试996</span>`, content: `<span style="color:red">测试996</span>`,
steps: [ steps: [
{ title: '步骤 1', description: '描述信息 1', color: 'red' }, { title: '步骤 1', description: '描述信息 1', color: 'red' },
{ title: '步骤 2', description: '描述信息 2', color: 'blue' }, { title: '步骤 2', description: '描述信息 2', color: 'blue' },
{ title: '步骤 3', description: '描述信息 3', color: 'green' } { title: '步骤 3', description: '描述信息 3', color: 'green' }
], ],
active: 1, active: 1,
detailsList: [], detailsList: [],
auditingList: [] auditingList: [],
} userId: '',
}, auditingParams: {
created() { recordId: '',
// 判断当前路由页面是否有查询参数 nodeId: '', // 当前审核记录的id
if (this.$route.query) { nextNodeId: '', // 下个流程节点ID
const { id, taskId } = this.$route.query isAccept: '', // 审批结果 1. 通过 2. 驳回
this.getLeaseTaskDetailFun(id, taskId) remark: '', // 审核意见
} typeId: '', // 当前审核记录中的 typeId
}, taskId: '' // 外层列表的taskId
methods: { },
// 通过 pagesType: 1
onSubmitPass() {}, }
// 驳回 },
onSubmitReject() {}, created() {
// 获取数据详情 和 审核记录详情 // 判断当前路由页面是否有查询参数
async getLeaseTaskDetailFun(id, taskId) { if (this.$route.query) {
const { data: res } = await getLeaseTaskDetail(id) const { id, taskId, type } = this.$route.query
this.auditingParams.taskId = taskId
this.pagesType = type
this.getLeaseTaskDetailFun(id, taskId)
}
this.detailsInfo = res.leaseApplyInfo this.userId = sessionStorage.getItem('userId')
this.detailsList = res.leaseApplyDetailsList },
methods: {
// 通过 或 驳回
async onHandleAuditing(type) {
// 组装参数
const currentAuditing = this.auditingList.filter(e => e.configValues.includes(this.userId)) // 获取当前审核的节点
const currentIndex = this.auditingList.findIndex(e => e.configValues.includes(this.userId)) // 获取当前的索引
const { rows: result } = await getAuditingDetailsApi({ taskId }) const { recordId, id, typeId, isAccept } = currentAuditing[0]
this.auditingList = result
console.log('result审核记录详情', result) if (isAccept !== 0) {
this.$modal.msgError('当前已审核，不可重复审核')
return
}
Object.assign(this.auditingParams, {
typeId,
recordId,
nodeId: id
})
this.auditingParams.isAccept = type
if (currentIndex !== this.auditingList.length - 1) {
this.auditingParams.nextNodeId = this.auditingList[currentIndex + 1].id
}
const res = await submitAuditingApi(this.auditingParams)
console.log(res, '提交结果')
if (res.code === 200) {
this.$modal.msgSuccess('审核成功')
setTimeout(() => {
const obj = { path: '/business-examine/receive-apply' }
this.$tab.closeOpenPage(obj)
}, 500)
}
console.log(this.auditingParams, ' this.auditingParams组装好的参数')
},
// 获取数据详情 和 审核记录详情
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>
<style scoped lang="scss"> <style scoped lang="scss">
.business-details-container { .business-details-container {
padding: 20px; padding: 20px;
} }
.pages-title { .pages-title {
padding: 10px 0 30px 0; padding: 10px 0 30px 0;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
letter-spacing: 2px; letter-spacing: 2px;
text-align: center; text-align: center;
color: #19a4a0; color: #19a4a0;
} }
.file-box { .file-box {
padding: 10px; padding: 10px;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
box-sizing: border-box; box-sizing: border-box;
div { div {
width: calc((100% - 110px) / 12); width: calc((100% - 110px) / 12);
height: 60px; height: 60px;
margin-right: 10px; margin-right: 10px;
margin-top: 10px; margin-top: 10px;
text-align: center; text-align: center;
line-height: 60px; line-height: 60px;
background-color: #19a4a0; background-color: #19a4a0;
} }
& div:nth-child(12n) { & div:nth-child(12n) {
margin-right: 0; margin-right: 0;
} }
} }
.right-container { .right-container {
padding: 0 20px; padding: 0 20px;
} }
.right-title { .right-title {
display: flex; display: flex;
align-items: center; align-items: center;
font-size: 14px; font-size: 14px;
& div:first-child { & div:first-child {
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 50%; border-radius: 50%;
background-color: #19a4a0; background-color: #19a4a0;
z-index: 9; z-index: 9;
} }
& div:nth-child(2) { & div:nth-child(2) {
width: 16px; width: 16px;
height: 16px; height: 16px;
border-radius: 50%; border-radius: 50%;
background-color: #b2e1e0; background-color: #b2e1e0;
transform: translateX(-50%); transform: translateX(-50%);
} }
} }
.process-record { .process-record {
margin-top: 20px; margin-top: 20px;
// height: 60vh; // height: 60vh;
} }
.btn-container { .btn-container {
margin-top: 10px; margin-top: 10px;
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
} }
::v-deep .el-step__icon.is-text { ::v-deep .el-step__icon.is-text {
background-color: #19a4a0; background-color: #19a4a0;
color: #19a4a0; color: #19a4a0;
border: none; border: none;
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
::v-deep .el-step.is-vertical .el-step__line { ::v-deep .el-step.is-vertical .el-step__line {
width: 2px; width: 2px;
top: 26px; top: 26px;
bottom: 8px; bottom: 8px;
left: 7px; left: 7px;
} }
::v-deep .el-step__title.is-finish { ::v-deep .el-step__title.is-finish {
font-weight: bold; font-weight: bold;
color: #303133; color: #303133;
font-size: 16px; font-size: 16px;
} }
::v-deep .el-step__title.is-wait { ::v-deep .el-step__title.is-wait {
font-weight: bold; font-weight: bold;
color: #303133; color: #303133;
font-size: 16px; font-size: 16px;
}
.node-info {
padding: 6px 0;
color: #ccc;
} }
</style> </style>

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

@ -91,19 +91,23 @@
<!-- 操作 --> <!-- 操作 -->
<el-table-column label="操作" align="center" width="180"> <el-table-column label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" icon="el-icon-search" @click="handleAuditing(scope.row, 1)">
审核
</el-button>
<el-button <el-button
v-if="scope.row.taskStatus == '0'" v-if="scope.row.taskStatus != 2"
type="text" type="text"
size="mini" size="mini"
icon="el-icon-delete" icon="el-icon-edit"
style="color: #f56c6c" @click="handleAuditing(scope.row, 1)"
@click="handleDelete(scope.row)"
> >
删除 审核
</el-button>
<el-button
v-if="scope.row.taskStatus == 2"
type="text"
size="mini"
icon="el-icon-search"
@click="handleAuditing(scope.row, 2)"
>
查看
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -226,7 +230,8 @@ export default {
name: 'receive-apply-details', name: 'receive-apply-details',
query: { query: {
id: row.id, id: row.id,
taskId: row.taskId taskId: row.taskId,
type
} }
}) // 跳转审核详情页面 }) // 跳转审核详情页面
}, },

20
src/views/business-examine/reduction-apply/business-details.vue
View File

@ -68,7 +68,7 @@
</el-table> </el-table>
<div class="total-amount"> <div class="total-amount">
<span>合计:</span> <span>合计:</span>
<span>{{ totalAmount }} / 元</span> <span>{{ totalAmount.toFixed(2) }} / 元</span>
</div> </div>
<TitleTip :title="`附件信息`" /> <TitleTip :title="`附件信息`" />
@ -106,7 +106,7 @@
<div class="auditing-container"> <div class="auditing-container">
<el-input <el-input
type="textarea" type="textarea"
v-model="opinion" v-model="auditingParams.remark"
placeholder="请输入审核意见" placeholder="请输入审核意见"
:autosize="{ minRows: 2, maxRows: 6 }" :autosize="{ minRows: 2, maxRows: 6 }"
/> />
@ -132,7 +132,6 @@ export default {
}, },
data() { data() {
return { return {
opinion: '',
detailsInfo: {}, detailsInfo: {},
content: `<span style="color:red">测试996</span>`, content: `<span style="color:red">测试996</span>`,
steps: [ steps: [
@ -144,7 +143,15 @@ export default {
detailsList: [], detailsList: [],
auditingList: [], auditingList: [],
fileList: [], fileList: [],
totalAmount: 0 totalAmount: 0,
auditingParams: {
nodeId: '', // 当前审核记录的id
nextNodeId: '', // 下个流程节点ID
isAccept: '', // 审批结果 1. 通过 2. 驳回
remark: '', // 审核意见
typeId: '', // 当前审核记录中的 typeId
taskId: '' // 外层列表的taskId
}
} }
}, },
created() { created() {
@ -156,7 +163,10 @@ export default {
}, },
methods: { methods: {
// 通过 // 通过
onSubmitPass() {}, onSubmitPass() {
// 组装参数
const auditingParams = {}
},
// 驳回 // 驳回
onSubmitReject() {}, onSubmitReject() {},
// 获取数据详情 和 审核记录详情 // 获取数据详情 和 审核记录详情