bug修复
This commit is contained in:
parent
b3ff9c11ca
commit
e748c728c9
|
|
@ -47,7 +47,15 @@
|
||||||
v-show="btnShow"
|
v-show="btnShow"
|
||||||
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('违章')">
|
||||||
|
<el-button type="warning" @click="finalInstanceBtn" v-if="finalCheck != '0' && userType != '01'">
|
||||||
|
终审
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<template v-if="!auditTitle.includes('违章')">
|
||||||
<el-button type="warning" @click="finalInstanceBtn" v-if="finalCheck != '0'">终审</el-button>
|
<el-button type="warning" @click="finalInstanceBtn" v-if="finalCheck != '0'">终审</el-button>
|
||||||
|
</template>
|
||||||
<el-button type="primary" @click="passBtn">通过</el-button>
|
<el-button type="primary" @click="passBtn">通过</el-button>
|
||||||
<el-button type="primary" plain @click="turnDownBtn">驳回</el-button>
|
<el-button type="primary" plain @click="turnDownBtn">驳回</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -225,6 +233,10 @@ export default {
|
||||||
type: String,
|
type: String,
|
||||||
default: () => '',
|
default: () => '',
|
||||||
},
|
},
|
||||||
|
auditTitle: {
|
||||||
|
type: String,
|
||||||
|
default: () => '',
|
||||||
|
},
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
store() {
|
store() {
|
||||||
|
|
@ -324,10 +336,13 @@ export default {
|
||||||
// 3.31更改bug新增
|
// 3.31更改bug新增
|
||||||
auditRecordList: [],
|
auditRecordList: [],
|
||||||
endAuditingIndex: -1,
|
endAuditingIndex: -1,
|
||||||
|
userType: '',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.assign()
|
this.assign()
|
||||||
|
|
||||||
|
this.userType = this.$store.state.user.userType
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
assign() {
|
assign() {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
<!-- 违章处罚 -->
|
<!-- 违章处罚 -->
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
|
<el-form v-show="showSearch" :model="queryParams" ref="queryForm" size="small" inline>
|
||||||
<el-form-item label="关键字---" prop="keyWord">
|
<el-form-item label="关键字" prop="keyWord">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="queryParams.keyWord"
|
v-model="queryParams.keyWord"
|
||||||
placeholder="请输入关键字"
|
placeholder="请输入关键字"
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,8 @@
|
||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="dialogForm.punishmentReason"
|
v-model="dialogForm.punishmentReason"
|
||||||
placeholder="请输入处罚原因"
|
placeholder="请输入处罚原因"
|
||||||
clearable v-no-whitespace
|
clearable
|
||||||
|
v-no-whitespace
|
||||||
:autosize="{ minRows: 4, maxRows: 6 }"
|
:autosize="{ minRows: 4, maxRows: 6 }"
|
||||||
maxlength="300"
|
maxlength="300"
|
||||||
show-word-limit
|
show-word-limit
|
||||||
|
|
@ -49,7 +50,8 @@
|
||||||
type="textarea"
|
type="textarea"
|
||||||
v-model="dialogForm.punishmentBasis"
|
v-model="dialogForm.punishmentBasis"
|
||||||
placeholder="请输入处罚依据"
|
placeholder="请输入处罚依据"
|
||||||
clearable v-no-whitespace
|
clearable
|
||||||
|
v-no-whitespace
|
||||||
:autosize="{ minRows: 4, maxRows: 6 }"
|
:autosize="{ minRows: 4, maxRows: 6 }"
|
||||||
maxlength="300"
|
maxlength="300"
|
||||||
show-word-limit
|
show-word-limit
|
||||||
|
|
@ -75,12 +77,7 @@
|
||||||
<!-- 处罚金额大写 -->
|
<!-- 处罚金额大写 -->
|
||||||
<el-col :span="24" :offset="0">
|
<el-col :span="24" :offset="0">
|
||||||
<el-form-item label="大写" prop="moneyUpper">
|
<el-form-item label="大写" prop="moneyUpper">
|
||||||
<el-input
|
<el-input v-model="dialogForm.moneyUpper" placeholder="处罚金额大写" disabled style="width: 400px" />
|
||||||
v-model="dialogForm.moneyUpper"
|
|
||||||
placeholder="处罚金额大写"
|
|
||||||
disabled
|
|
||||||
style="width: 400px"
|
|
||||||
/>
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="24" :offset="0">
|
<el-col :span="24" :offset="0">
|
||||||
|
|
@ -180,7 +177,7 @@
|
||||||
:file-list="dialogForm.improvedPhotoList"
|
:file-list="dialogForm.improvedPhotoList"
|
||||||
:limit="9"
|
:limit="9"
|
||||||
:multiple="true"
|
:multiple="true"
|
||||||
:class="{disabled:true}"
|
:class="{ disabled: true }"
|
||||||
disabled
|
disabled
|
||||||
>
|
>
|
||||||
<i class="el-icon-plus"></i>
|
<i class="el-icon-plus"></i>
|
||||||
|
|
@ -197,7 +194,7 @@
|
||||||
:file-list="dialogForm.receiptOfFinePhotoList"
|
:file-list="dialogForm.receiptOfFinePhotoList"
|
||||||
:limit="9"
|
:limit="9"
|
||||||
:multiple="true"
|
:multiple="true"
|
||||||
:class="{disabled:true}"
|
:class="{ disabled: true }"
|
||||||
disabled
|
disabled
|
||||||
>
|
>
|
||||||
<i class="el-icon-plus"></i>
|
<i class="el-icon-plus"></i>
|
||||||
|
|
@ -228,6 +225,7 @@
|
||||||
v-on:turnDown="approvalTurnDown"
|
v-on:turnDown="approvalTurnDown"
|
||||||
v-on:finalInstance="approvalFinalInstance"
|
v-on:finalInstance="approvalFinalInstance"
|
||||||
v-else
|
v-else
|
||||||
|
:auditTitle="row.title"
|
||||||
></bns-timeline-tabs>
|
></bns-timeline-tabs>
|
||||||
</div>
|
</div>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
|
@ -242,7 +240,7 @@
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import BnsTimelineTabs from '@/components/pro-tabs/bns-timeline-tabs.vue'
|
import BnsTimelineTabs from '@/components/pro-tabs/bns-timeline-tabs.vue'
|
||||||
import {getViolationPunishDetails, PreviewViolation } from '@/api/violation/violation'
|
import { getViolationPunishDetails, PreviewViolation } from '@/api/violation/violation'
|
||||||
import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue'
|
import bnsKkFilePreview from '@/components/pro-tabs/bns-kkFile-preview.vue'
|
||||||
import { approvalHistory } from '@/api/terminalEquipment/deviceInformation'
|
import { approvalHistory } from '@/api/terminalEquipment/deviceInformation'
|
||||||
import { getAuditPerson } from '@/api/pro/approval_cons'
|
import { getAuditPerson } from '@/api/pro/approval_cons'
|
||||||
|
|
@ -252,7 +250,7 @@ import { getMyToDoList, getMyToDoNum, lookFaceFile } from '@/utils/bonus'
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
bnsKkFilePreview,
|
bnsKkFilePreview,
|
||||||
BnsTimelineTabs
|
BnsTimelineTabs,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|
@ -270,10 +268,10 @@ export default {
|
||||||
approvalItems: [],
|
approvalItems: [],
|
||||||
filePreview: {
|
filePreview: {
|
||||||
filePreviewUrl: '',
|
filePreviewUrl: '',
|
||||||
fileName: ''
|
fileName: '',
|
||||||
},
|
},
|
||||||
previewOpen: false,
|
previewOpen: false,
|
||||||
lookFaceFile: ''
|
lookFaceFile: '',
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
@ -303,18 +301,18 @@ export default {
|
||||||
this.dialogForm.receiptOfFinePhotoList = res.data.receiptOfFinePhotoList.map(item => {
|
this.dialogForm.receiptOfFinePhotoList = res.data.receiptOfFinePhotoList.map(item => {
|
||||||
return {
|
return {
|
||||||
name: item.fileName,
|
name: item.fileName,
|
||||||
url: this.lookFaceFile + item.filePath
|
url: this.lookFaceFile + item.filePath,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
this.dialogForm.improvedPhotoList = res.data.improvedPhotoList.map(item => {
|
this.dialogForm.improvedPhotoList = res.data.improvedPhotoList.map(item => {
|
||||||
return {
|
return {
|
||||||
name: item.fileName,
|
name: item.fileName,
|
||||||
url: this.lookFaceFile + item.filePath
|
url: this.lookFaceFile + item.filePath,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
approvalHistory(){
|
approvalHistory() {
|
||||||
approvalHistory({ taskId: this.row.taskId }).then(res => {
|
approvalHistory({ taskId: this.row.taskId }).then(res => {
|
||||||
console.log('🚀 ~ approvalHistory ~ res', res)
|
console.log('🚀 ~ approvalHistory ~ res', res)
|
||||||
this.approvalItems = res.data
|
this.approvalItems = res.data
|
||||||
|
|
@ -351,45 +349,45 @@ export default {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
preview(){
|
preview() {
|
||||||
try {
|
try {
|
||||||
PreviewViolation({violationId: this.row.violationId}).then(res => {
|
PreviewViolation({ violationId: this.row.violationId }).then(res => {
|
||||||
if (res.code === 200){
|
if (res.code === 200) {
|
||||||
console.log('🚀 ~ file: PunishFormDialog.vue ~ line 97 ~ getViolationDetail ~ res', res)
|
console.log('🚀 ~ file: PunishFormDialog.vue ~ line 97 ~ getViolationDetail ~ res', res)
|
||||||
this.filePreview = {
|
this.filePreview = {
|
||||||
filePreviewUrl: "punishSheet/"+ res.msg,
|
filePreviewUrl: 'punishSheet/' + res.msg,
|
||||||
fileName: "违章处罚单"
|
fileName: '违章处罚单',
|
||||||
}
|
}
|
||||||
this.previewOpen = true
|
this.previewOpen = true
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}catch (e) {
|
} catch (e) {
|
||||||
console.log('🚀 ~ file: PunishFormDialog.vue ~ line 99 ~ getViolationDetail ~ e', e)
|
console.log('🚀 ~ file: PunishFormDialog.vue ~ line 99 ~ getViolationDetail ~ e', e)
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/** 审核通过*/
|
/** 审核通过*/
|
||||||
approvalPass(e){
|
approvalPass(e) {
|
||||||
const param = {
|
const param = {
|
||||||
reason:e,
|
reason: e,
|
||||||
agree:"1"
|
agree: '1',
|
||||||
}
|
}
|
||||||
this.approval(param,"审批通过")
|
this.approval(param, '审批通过')
|
||||||
},
|
},
|
||||||
/**审核驳回*/
|
/**审核驳回*/
|
||||||
approvalTurnDown(e){
|
approvalTurnDown(e) {
|
||||||
const param = {
|
const param = {
|
||||||
...e,
|
...e,
|
||||||
agree:"2"
|
agree: '2',
|
||||||
}
|
}
|
||||||
this.approval(param,"退回成功")
|
this.approval(param, '退回成功')
|
||||||
},
|
},
|
||||||
/**终审*/
|
/**终审*/
|
||||||
approvalFinalInstance(e){
|
approvalFinalInstance(e) {
|
||||||
const param = {
|
const param = {
|
||||||
reason:e,
|
reason: e,
|
||||||
agree:"3"
|
agree: '3',
|
||||||
}
|
}
|
||||||
this.approval(param,"终审成功")
|
this.approval(param, '终审成功')
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* 审批方法+
|
* 审批方法+
|
||||||
|
|
@ -397,31 +395,31 @@ export default {
|
||||||
* @param text
|
* @param text
|
||||||
*/
|
*/
|
||||||
getMyToDoNum,
|
getMyToDoNum,
|
||||||
approval(param,text){
|
approval(param, text) {
|
||||||
const params = {
|
const params = {
|
||||||
...param,
|
...param,
|
||||||
taskId: this.row.taskId,
|
taskId: this.row.taskId,
|
||||||
procInstId: this.row.procInsId,
|
procInstId: this.row.procInsId,
|
||||||
taskType: '13',
|
taskType: '13',
|
||||||
uuid: this.row.violationId
|
uuid: this.row.violationId,
|
||||||
}
|
}
|
||||||
submitPersonApproval(params).then(response => {
|
submitPersonApproval(params).then(response => {
|
||||||
this.getMyToDoNum()
|
this.getMyToDoNum()
|
||||||
if (response.code === 200) {
|
if (response.code === 200) {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: text,
|
message: text,
|
||||||
type: 'success'
|
type: 'success',
|
||||||
})
|
})
|
||||||
this.$tab.closePage();
|
this.$tab.closePage()
|
||||||
} else {
|
} else {
|
||||||
this.$message({
|
this.$message({
|
||||||
message: response.msg,
|
message: response.msg,
|
||||||
type: 'error'
|
type: 'error',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
},
|
||||||
}
|
},
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue