nm-project
/
aiccs
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhouxy 2026-01-13 15:35:44 +08:00
parent 47cc1ceb1c f5c610b57f
commit bb130b2e27
7 changed files with 416 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/router/index.js
View File

@ -3083,6 +3083,13 @@ export const constantRoutes = [{
component: () => import('@/views/expelled/撤销除名公告管理/index.vue'),
name: 'revokeAnnouncement',
meta: { title: '撤销除名公告管理' }
},
{
path: 'revokeAnnouncementDetail',
component: () => import('@/views/expelled/撤销除名公告管理/撤销除名公告详情.vue'),
name: 'revokeAnnouncementDetail',
hidden: true,
meta: { title: '撤销除名公告详情' }
}
]
},

13
src/views/expelled/撤销除名公告管理/index.vue
View File

@ -53,11 +53,11 @@
<el-table-column prop="removeReason" :show-overflow-tooltip="true" label="除名原因" align="left" min-width="30%" />
<el-table-column prop="removeOrgName" label="除名机关" align="left" min-width="15%" />
<el-table-column prop="approveDate" label="撤销除名日期" align="left" min-width="10%" />
<!-- <el-table-column label="操作" min-width="10%" align="center" fixed="right">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button type="primary" size="mini" @click="check(scope.row)">办理</el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" min-width="10%" align="center" fixed="right">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="detail(scope.row)">查看详情</el-button>
</template>
</el-table-column>
</el-table>
<div class="page-box">
<el-row class="bl0">
@ -159,6 +159,9 @@ export default {
this.searchForm.uscc = ''
this.searchForm.entName = ''
this.loadPage()
},
detail(item) {
this.$router.push({ path: '/entManage/expelled/revokeAnnouncementDetail', query: { bizId: item.bizId }})
}
}
}

395
src/views/expelled/撤销除名公告管理/撤销除名公告详情.vue Normal file
View File

@ -0,0 +1,395 @@
<template>
<div class="main-content abnormal" v-loading.fullscreen.lock="loading">
<div class="content-body">
<el-tabs v-model="activeName" type="border-card" class="tabs" style="font-size:unset">
<el-tab-pane label="除名撤销申请信息" name="除名撤销申请信息">
<div class="table-title">
<img src="../../../assets/images/icon01.png" alt="" style="width:24px;margin-right:10px">
除名撤销申请信息
</div>
<el-form ref="form" label-width="190px" label-position="right">
<div class="form">
<div class="form-body">
<table
width="100%"
class="apply-table"
style="border-collapse: collapse;"
border="1"
cellpadding="0"
cellspacing="0"
>
<tr>
<th>企业名称</th>
<td>
{{ detailInfo?.revokeInfo?.entName || '-' }}
</td>
</tr>
<tr>
<th width="20%">统一社会信用代码/注册号</th>
<td>
{{ detailInfo.revokeInfo?.uscc || '-' }}
</td>
</tr>
<tr>
<th>法定代表人（负责人、经营者）</th>
<td colspan="2">{{ detailInfo?.revokeInfo?.lerepName || '-' }}</td>
</tr>
<tr>
<th>住所（经营场所）</th>
<td colspan="2">{{ detailInfo?.revokeInfo?.address || '-' }}</td>
</tr>
<tr>
<th>申请时间</th>
<td colspan="2">{{ detailInfo?.revokeInfo?.applyDate || '-' }}</td>
</tr>
<tr>
<th>申请人</th>
<td colspan="2">{{ detailInfo?.revokeInfo?.contactName || '-' }}</td>
</tr>
<tr>
<th>联系电话</th>
<td colspan="2">{{ detailInfo?.revokeInfo?.contactPhone || '-' }}</td>
</tr>
<tr>
<th>决定除名时间</th>
<td>
{{ detailInfo?.revokeInfo?.removeDate || '' }}
</td>
</tr>
<tr>
<th>决定除名机关</th>
<td>
{{ detailInfo?.revokeInfo?.removeOrgName || '-' }}
</td>
</tr>
<tr>
<th>决定除名原因</th>
<td>
{{ detailInfo?.revokeInfo?.removeReason || '' }}
</td>
</tr>
<tr>
<th>申请原因</th>
<td>
{{ detailInfo?.revokeInfo?.applyReason || '' }}
</td>
</tr>
<tr>
<th>批准撤销除名时间</th>
<td>
{{ detailInfo?.revokeInfo?.approveDate || '' }}
</td>
</tr>
<tr>
<th>作出决定的事实、理由、依据及主要内容</th>
<td>
{{ detailInfo?.revokeInfo?.situation || '' }}
</td>
</tr>
<tr>
<th>撤销类型</th>
<td>
{{
detailInfo?.revokeInfo?.state === '92' ? '通过行政复议批准撤销' :
detailInfo?.revokeInfo?.state === '93' ? '直接申请撤销' :
detailInfo?.revokeInfo?.state || ''
}}
</td>
</tr>
<tr>
<th>备注</th>
<td>
{{ detailInfo?.revokeInfo?.remark || '' }}
</td>
</tr>
</table>
</div>
</div>
</el-form>
</el-tab-pane>
<el-tab-pane label="除名撤销审批信息" name="除名撤销审批信息">
<div class="table-title">
<img src="../../../assets/images/icon01.png" alt="" style="width:24px;margin-right:10px">
除名撤销审批信息
</div>
<div v-if="detailInfo.historyOpinions.length > 0" class="form">
<div class="form-body">
<template v-if="detailInfo.historyOpinions && detailInfo.historyOpinions.length > 0">
<table
width="100%"
class="apply-table"
style="border-collapse: collapse;"
border="1"
cellpadding="0"
cellspacing="0"
>
<tr v-for="(each,index) in detailInfo.historyOpinions" :key="'historyLog'+index">
<th style="width: 20%;">{{ each.step }}意见</th>
<td colspan="3">
<span style="display: block;text-indent: 1em;min-height:80px">{{ each.opinioncontent }}</span>
<el-col :span="8" :offset="16">
<label>{{ each.step }}人：</label>
<span>{{ each.handler }}</span>
<label
style="margin-left: 25px"
>{{ each.step }}日期：</label>
<span style="display: inline-block">{{ each.handledate }}</span>
</el-col>
</td>
</tr>
</table>
</template>
</div>
</div>
</el-tab-pane>
</el-tabs>
<div class="submit-btn-box">
<el-button type="primary" @click="$router.go(-1)">返回</el-button>
</div>
</div>
</div>
</template>
<script>
import { expelledRevokeGetBiz } from '@/api/除名公告'
export default {
data() {
return {
loading: false,
bizId: '',
activeName: '除名撤销申请信息',
detailInfo: {
revokeInfo: {},
historyOpinions: []
}
}
},
mounted() {
this.bizId = this.$route.query.bizId
this.loadRevokeInfo()
},
methods: {
loadRevokeInfo() {
this.loading = true
expelledRevokeGetBiz(this.bizId).then(res => {
this.loading = false
if (res.code === 0) {
// 处理处办记录
res.data.historyOpinions.forEach(each => {
switch (each.opiniontype) {
case '0':
each.step = '经办'
each.label = '经办人意见'
break
case '1':
each.step = '审核'
each.label = '部门负责人意见'
break
case '2':
each.step = '审批'
each.label = '经办机构负责人意见'
break
case '9':
each.step = '经办'
each.label = '经办人意见'
break
}
})
this.detailInfo = res.data
}
}).catch(() => {
this.loading = false
})
}
}
}
</script>
<style lang="scss">
.tabs {
.el-tabs__item {
font-size: initial;
}
}
.reasonOptions {
.el-scrollbar .el-select-dropdown__wrap {
max-height: 300px;
}
}
</style>
<style lang="scss" scoped>
/deep/.el-table .warning-row {
background: #eaf4fe!important;
}
.el-upload{
/deep/ .el-icon-close-tip{
display: none!important;
}
}
.table-title{
width: 100%;
margin-top: 10px;
padding: 15px;
display: flex;
align-items: center;
font-weight: 600;
background: #fff;
font-size: $table-title-font-size;
color:#333;
border-bottom: 1px solid #E5E5E5;
}
.main-content{
padding: 10pt;
font-size: $table-content-font-size;
.back-btn{
margin-top: 6px;
position:absolute;
right:40pt;
}
.content-body{
background: white;
border:1PX solid #eee;
}
.content-header{
background: white;
height:50PX;
border:1PX solid #eee;
display: flex;
align-items: center;
.title{
font-weight: 600;
font-size: 1rem;
}
}
.content-body{
.tab{
.tab-title{
label{
background: $color-primary;
display:inline-block;
color:$color-title-color;
padding:5px;
}
}
}
.form{
margin-bottom: 20pt;
}
}
.apply-table{
padding:15px;
margin-bottom: 30px;
border-color: $color-border;
tr{
width:100%
}
th,td{
font-size:$table-title-font-size;
padding:15px
}
th{
color: #666;
font-weight: normal;
background: $color-form-label;
text-align: $text-algin-right;
font-size:$table-title-font-size;
}
td{
text-align: $text-algin-left;
}
.radio{
.el-radio__label {
font-size: unset;
}
}
}
}
.el-row {
border-left: 1px solid $color-border;
}
.bt0 {
/deep/.el-form-item__label{
border-top: 0!important;
}
/deep/.el-form-item__content{
border-top: 0!important;
}
}
.submit-btn-box {
text-align: center;
margin-top: 15px;
margin-bottom: 15px;
}
</style>
<style lang="scss">
.main-content.abnormal{
.el-form-item{
margin-bottom:0;
background: $color-form-label;
.el-form-item__label{
padding-left: 10px;
border-top: 1px solid $color-border;
font-size: $table-content-font-size;
}
.el-form-item__content{
background: white;
padding: 10px;
font-size: $table-content-font-size;
border-top: 1px solid $color-border;
border-right: 1px solid $color-border;
border-left: 1px solid $color-border;
}
}
.el-form-item:last-child{
border-bottom: 1px solid $color-border;
}
.form-body.history{
padding:15px;
border:1px solid $color-border;
}
.el-form-item.is-error .custom .el-input__inner{
border-color:$color-border;
}
.el-table-column--selection .cell {
padding-right: 0px;
}
.no {
padding-left: 0px;
}
.el-table_9_column_61.is-left.is-leaf{
.cell{
padding-left: 0px;
padding-right: 0px;
}
}
.el-pagination{
text-align: right;
}
.dialog-box{
text-align: right;
}
.el-textarea.is-disabled .el-textarea__inner{
color: #1c1e23;
}
.el-input__inner{
margin-bottom: 5px;
}
.uploadFileList{
.el-upload-list__item{
display: inline-block;
width: auto;
}
}
.radio{
.el-radio__label {
font-size: unset;
}
.el-radio__input.is-disabled+span.el-radio__label {
color: unset;
}
.el-radio__input.is-disabled.is-checked .el-radio__inner {
background-color: #409EFF;
border-color: #409EFF;
}
}
}
</style>

2
src/views/expelled/撤销除名管理/index.vue
View File

@ -219,7 +219,7 @@ export default {
return expelledRevokeStartBiz(row).then(({ code, data }) => {
if (code === 0) {
this.$message.success('除名撤销业务启动成功')
this.$router.push({ path: '/expelled/removeRevokeAccept', query: { bizId: data.bizId }})
this.$router.push({ path: '/entManage/expelled/removeRevokeAccept', query: { bizId: data.bizId }})
} else {
this.$message.error('除名撤销业务启动失败')
}

2
src/views/expelled/除名修复管理/index.vue
View File

@ -219,7 +219,7 @@ export default {
return expelledRepairStartBiz(row).then(({ code, data }) => {
if (code === 0) {
this.$message.success('除名修复业务启动成功')
this.$router.push({ path: '/expelled/removeAccept', query: { bizId: data.bizId }})
this.$router.push({ path: '/entManage/expelled/removeAccept', query: { bizId: data.bizId }})
} else {
this.$message.error('除名修复业务启动失败')
}

2
src/views/expelled/除名行政复议管理/index.vue
View File

@ -218,7 +218,7 @@ export default {
return expelledReviewStartBiz(row).then(({ code, data }) => {
if (code === 0) {
this.$message.success('除名复议业务启动成功')
this.$router.push({ path: '/expelled/removeReviewAccept', query: { bizId: data.bizId }})
this.$router.push({ path: '/entManage/expelled/removeReviewAccept', query: { bizId: data.bizId }})
} else {
this.$message.error('除名复议业务启动失败')
}

6
src/views/todo/index.vue
View File

@ -3632,7 +3632,7 @@ export default {
path = 'removeExamine'
}
this.$router.push({
path: '/expelled/' + path,
path: '/entManage/expelled/' + path,
query: {
taskId: row.tasklistid,
bizSeq: row.bizseqid,
@ -3652,7 +3652,7 @@ export default {
path = 'removeReviewExamine'
}
this.$router.push({
path: '/expelled/' + path,
path: '/entManage/expelled/' + path,
query: {
taskId: row.tasklistid,
bizSeq: row.bizseqid,
@ -3672,7 +3672,7 @@ export default {
path = 'removeRevokeExamine'
}
this.$router.push({
path: '/expelled/' + path,
path: '/entManage/expelled/' + path,
query: {
taskId: row.tasklistid,
bizSeq: row.bizseqid,