diff --git a/src/components/pro-tabs/bns-timeline-tabs.vue b/src/components/pro-tabs/bns-timeline-tabs.vue index 1d9f43c..518844b 100644 --- a/src/components/pro-tabs/bns-timeline-tabs.vue +++ b/src/components/pro-tabs/bns-timeline-tabs.vue @@ -76,6 +76,10 @@ import store from '@/store' export default { props: { + auditReason: { + type: Array, + default: [] + }, showType: Number,// 1 展示审批意见 2 展示填写按钮 isExamine: false,// 是否为审批页面 true 是 展示审核按钮 false 否 btnShow: false,// 是否审核按钮 @@ -204,6 +208,21 @@ export default { }, //驳回 turnDownBtn() { + console.log("333auditType==="+JSON.stringify(this.auditReason)) + console.log("333auditType==="+this.auditReason.toString()) + let reason = '' + if (this.auditReason && this.auditReason.length > 0){ + this.auditReason.forEach(item => { + if (item.reason === '' || item.reason === null || item.reason === undefined){ + }else{ + reason += item.reason + ";" + } + }) + reason = reason.substring(0, reason.length - 1) + }else{ + reason = this.reason + } + this.form.turnDownReason =reason this.dialogVisible = true }, submitForm(){ diff --git a/src/views/pro/approval/subApproval.vue b/src/views/pro/approval/subApproval.vue index a8551ab..13f900c 100644 --- a/src/views/pro/approval/subApproval.vue +++ b/src/views/pro/approval/subApproval.vue @@ -232,6 +232,7 @@