liux
/
nxdt-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

禅道bug修复

This commit is contained in:
BianLzhaoMin 2025-07-16 10:30:53 +08:00
parent 3ef99fc710
commit 6ddf94564b
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/pro-tabs/bns-timeline-tabs.vue
View File

@ -48,7 +48,11 @@
style="position: absolute; top: 94%; left: 80%; z-index: 999 !important; width: 250px" style="position: absolute; top: 94%; left: 80%; z-index: 999 !important; width: 250px"
> >
<template v-if="auditTitle.includes('违章')"> <template v-if="auditTitle.includes('违章')">
<el-button type="warning" @click="finalInstanceBtn" v-if="finalCheck != '0' && userType != '01'"> <el-button
type="warning"
@click="finalInstanceBtn"
v-if="auditPersonArr[currentCheckIndexNew].finalJudgment == 1"
>
终审 终审
</el-button> </el-button>
</template> </template>
@ -342,6 +346,7 @@ export default {
auditRecordList: [], auditRecordList: [],
endAuditingIndex: -1, endAuditingIndex: -1,
userType: '', userType: '',
currentCheckIndexNew: 0,
} }
}, },
mounted() { mounted() {
@ -382,6 +387,7 @@ export default {
this.currentCheckIndex = this.auditPersonArr.length this.currentCheckIndex = this.auditPersonArr.length
} }
this.currentCheckIndexNew = this.auditPersonArr.findIndex(item => item.auditStatus == 4)
this.auditPersonArr.forEach(e => { this.auditPersonArr.forEach(e => {
if (e.isActive == 10) { if (e.isActive == 10) {
e.isResult = true e.isResult = true
@ -389,6 +395,7 @@ export default {
e.isResult = false e.isResult = false
} }
}) })
console.log('this.auditPersonArr.===' + JSON.stringify(this.auditPersonArr)) console.log('this.auditPersonArr.===' + JSON.stringify(this.auditPersonArr))
console.log('this.currentCheckIndex===' + this.currentCheckIndex) console.log('this.currentCheckIndex===' + this.currentCheckIndex)
} }

27
src/views/violationManagenment/violation/violationApprovalList.vue
View File

@ -83,7 +83,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button> <el-button type="text" size="mini" @click="handleRectify(scope.row, 3)">查看</el-button>
<template v-if="userType == '01'"> <!-- <template v-if="userType == '01'">
<template v-if="(scope.row.intoStatus == '1' || scope.row.intoStatus == '2') && scope.row.type != 1"> <template v-if="(scope.row.intoStatus == '1' || scope.row.intoStatus == '2') && scope.row.type != 1">
<el-button type="text" size="mini" style="color: #f56c6c" @click="handleRectify(scope.row, 1)"> <el-button type="text" size="mini" style="color: #f56c6c" @click="handleRectify(scope.row, 1)">
审批 审批
@ -92,16 +92,18 @@
</template> </template>
<template v-else> <template v-else>
<el-button
type="text" </template> -->
size="mini"
style="color: #f56c6c" <el-button
@click="handleRectify(scope.row, 1)" type="text"
v-if="scope.row.intoStatus == '1' || scope.row.intoStatus == '2'" size="mini"
> style="color: #f56c6c"
审批 @click="handleRectify(scope.row, 1)"
</el-button> v-if="scope.row.intoStatus == '1'"
</template> >
审批
</el-button>
<el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)"> <el-button type="text" size="mini" style="color: #e6a23c" @click="handleRectify(scope.row, 2)">
审批记录 审批记录
@ -148,7 +150,7 @@ export default {
keyWord: '', // 关键字 keyWord: '', // 关键字
violationCode: '', // 违章编号 violationCode: '', // 违章编号
signerName: '', // 签发人姓名 signerName: '', // 签发人姓名
status: '', // 审批状态 status: '1', // 审批状态
}, },
// 审批状态-下拉 // 审批状态-下拉
approvalStatusOpts: [ approvalStatusOpts: [
@ -259,6 +261,7 @@ export default {
isApprove, isApprove,
isRecord, isRecord,
active, active,
finalCheck: row.finalCheck,
}, },
}) })
}, },