diff --git a/src/views/expelled/除名修复管理/二移出审核.vue b/src/views/expelled/除名修复管理/二移出审核.vue index 0e75a18..7da16e7 100644 --- a/src/views/expelled/除名修复管理/二移出审核.vue +++ b/src/views/expelled/除名修复管理/二移出审核.vue @@ -35,16 +35,17 @@ {{ companyInfo.remreasons }} + {{ historyLog }} {{ each.label }} {{ each.opinioncontent }} - {{ each.step }}人: + {{ each.step }}人: {{ each.handler }} {{ each.step }}日期: {{ each.handledate }} @@ -139,22 +140,6 @@ {{ companyInfo.remRemark }} - - - 文书 - - - - 不予信用修复决定书 - 准予信用修复决定书 - - *是否审核通过 @@ -362,8 +347,7 @@ :before-upload="beforeUpload" :on-success="handleSuccess(2)" :on-remove="handleRemove(2)" - > - + /> @@ -383,8 +367,7 @@ :before-upload="beforeUpload" :on-success="handleSuccess(9)" :on-remove="handleRemove(9)" - > - + /> @@ -404,8 +387,7 @@ :before-upload="beforeUpload" :on-success="handleSuccess(3)" :on-remove="handleRemove(3)" - > - + /> @@ -425,8 +407,7 @@ :before-upload="beforeUpload" :on-success="handleSuccess(4)" :on-remove="handleRemove(4)" - > - + /> @@ -448,8 +429,7 @@ :on-success="handleSuccess(99)" :file-list="fileUri.file99" style="width:40%" - > - + /> @@ -462,8 +442,6 @@ import { removeAttachementById, listAttachmentByBizseq, uploadFile } from '@/api import { bizRemoveNext, getBizRemInfo, - removeBizRemListBySplistid, - getBizRemoveRecordList, checknb, getaicepsYbList, geteGtAlterRecoderList } from '@/api/abnormal' @@ -474,6 +452,7 @@ import editor from '@/components/editor.vue' import { getConstant } from '@/api/system' import { isMenHu } from '@/utils/utils' import { checkPyBlacklist } from '@/api/pyBlacklist' +import { expelledRepairNextBiz, expelledRepairGetBiz } from '@/api/除名公告' export default { components: { @@ -598,11 +577,14 @@ export default { } }, async mounted() { - this.bizseq = this.$route.query.bizseq // 获取跳转携带的参数bizseq + this.bizseq = this.$route.query.bizSeq // 获取跳转携带的参数bizseq this.workflowId = this.$route.query.workflowId this.tasklistid = this.$route.query.tasklistid this.type = this.$route.query.type - + expelledRepairGetBiz(this.bizseq).then(res => { + console.log(res) + this.companyInfo = res.data.repairInfo + }) // 加载企业移出原因 getConstant('CD74').then(res => { if (res.code === 0) { @@ -616,7 +598,6 @@ export default { this.reasonOptions = list } }) - // // 加载处办记录 taskOpinion(this.workflowId).then(res => { if (res.code === 0) { @@ -649,36 +630,33 @@ export default { } }) // 加载待移出主体名单及 事实理由 - getBizRemInfo(this.bizseq).then(res => { - if (res.code === 0) { - // 添加分页index - const list = [] - let i = 1 - const pageStart = (this.currentPage - 1) * this.pageSize - res.data.bizList.forEach(each => { - each.index = pageStart + i++ - each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号 - list.push(each) - }) - this.entbase = list - this.tsabnlist = res.data.tsAbnList - const bizInfo = res.data.bizRemListMOdel - this.companyInfo = res.data.bizRemListMOdel - this.isAccept = bizInfo.isAccept - this.isAgreeRepair = bizInfo.isAgreeRepair - this.entname = bizInfo.entname - // this.$set(this, 'reason', bizInfo.remexcpres) - this.specause = bizInfo.specause - this.remRemark = bizInfo.remRemark - this.specauseType = bizInfo.specauseType - // 分页处理 - this.total = this.entbase.length + // getBizRemInfo(this.bizseq).then(res => { + // if (res.code === 0) { + // const list = [] + // let i = 1 + // const pageStart = (this.currentPage - 1) * this.pageSize + // res.data.bizList.forEach(each => { + // each.index = pageStart + i++ + // each.uscc = each.uniscid ? each.uniscid : each.regno // 有统一码显示统一码 没有用注册号 + // list.push(each) + // }) + // this.entbase = list + // this.tsabnlist = res.data.tsAbnList + // const bizInfo = res.data.bizRemListMOdel + // this.companyInfo = res.data.bizRemListMOdel + // this.isAccept = bizInfo.isAccept + // this.isAgreeRepair = bizInfo.isAgreeRepair + // this.entname = bizInfo.entname + // this.specause = bizInfo.specause + // this.remRemark = bizInfo.remRemark + // this.specauseType = bizInfo.specauseType + // this.total = this.entbase.length - this.check_py(this.tsabnlist.uniscid) - } else { - this.$message.error('加载异常名录主体信息失败') - } - }) + // this.check_py(this.tsabnlist.uniscid) + // } else { + // this.$message.error('加载异常名录主体信息失败') + // } + // }) // 加载审核人 this.loadReviewer() @@ -1137,7 +1115,7 @@ export default { this.formData.handlerid = this.user.primaryKey this.formData.opiniontype = '1' this.formData.opinioncontent = this.formData.opinion - bizRemoveNext(this.formData).then(res => { + expelledRepairNextBiz(this.formData).then(res => { this.submitLoading = false if (res.code === 0) { this.$message.success('提交成功') @@ -1164,25 +1142,11 @@ export default { }, // 加载审批人 loadReviewer() { - if (this.type === 'farmer') { - getUsersWithPermission('agricultureRecoverExamine', this.user.orgId).then(res => { - if (res.code === 0) { - this.reviewer = res.data - } - }) - } else if (this.type === 'individual') { - getUsersWithPermission('individualRecoverExamine', this.user.orgId).then(res => { - if (res.code === 0) { - this.reviewer = res.data - } - }) - } else if (this.type === 'company') { - getUsersWithPermission('exptRemoveApprove', this.user.orgId).then(res => { - if (res.code === 0) { - this.reviewer = res.data - } - }) - } + getUsersWithPermission('', this.user.orgId).then(res => { + if (res.code === 0) { + this.reviewer = res.data + } + }) }, // 下载模版 downLoadTemp(type) { diff --git a/src/views/todo/index.vue b/src/views/todo/index.vue index 819c2c9..e927795 100644 --- a/src/views/todo/index.vue +++ b/src/views/todo/index.vue @@ -182,7 +182,7 @@ - 办理 + 办理2