Merge branch 'master' of http://47.107.61.133:3000/nm-project/aiccs
This commit is contained in:
commit
4524bee4c0
|
|
@ -463,7 +463,7 @@ export function deleAbnTaskAndillRem(bizseq) {
|
|||
* 退回移动端后撤销业务---严重违法
|
||||
* @param {string} bizseq
|
||||
*/
|
||||
export function illRemCancelBusiness(bizseq) {
|
||||
export function illRemCancelBusiness(bizseq) {
|
||||
const form = new FormData()
|
||||
form.append('bizSeq', bizseq)
|
||||
return request({
|
||||
|
|
@ -663,7 +663,7 @@ export function selectHistorybizRemlist(bizseq) {
|
|||
* 退回移动端后撤销业务---经营异常
|
||||
* @param {string} bizseq
|
||||
*/
|
||||
export function bizRemCancelBusiness(bizseq) {
|
||||
export function bizRemCancelBusiness(bizseq) {
|
||||
const form = new FormData()
|
||||
form.append('bizSeq', bizseq)
|
||||
return request({
|
||||
|
|
@ -692,3 +692,9 @@ export function getOrgunits(orgNumber, orgLevel) {
|
|||
}
|
||||
})
|
||||
}
|
||||
export function getIsUserProp() {
|
||||
return request({
|
||||
url: '/tOrgunits/getIsUserProp',
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,45 +6,44 @@ import request from '@/utils/request'
|
|||
*/
|
||||
export function getRegorgList() {
|
||||
const list = [{
|
||||
value: '440101',
|
||||
label: '广州市市场监督管理局'
|
||||
value: '150100',
|
||||
label: '呼和浩特市市场监督管理局'
|
||||
}, {
|
||||
value: '440102',
|
||||
label: '广州市荔湾区市场监督管理局'
|
||||
value: '150200',
|
||||
label: '包头市市场监督管理局'
|
||||
}, {
|
||||
value: '440104',
|
||||
label: '广州市越秀区市场监督管理局'
|
||||
value: '150300',
|
||||
label: '乌海市市场监督管理局'
|
||||
}, {
|
||||
value: '440105',
|
||||
label: '广州市海珠区市场监督管理局'
|
||||
value: '150400',
|
||||
label: '赤峰市市场监督管理局'
|
||||
}, {
|
||||
value: '440106',
|
||||
label: '广州市天河区市场监督管理局'
|
||||
value: '150500',
|
||||
label: '通辽市市场监督管理局'
|
||||
}, {
|
||||
value: '440110',
|
||||
label: '广州市南沙区市场监督管理局'
|
||||
value: '150600',
|
||||
label: '鄂尔多斯市市场监督管理局'
|
||||
}, {
|
||||
value: '440111',
|
||||
label: '广州市白云区市场监督管理局'
|
||||
value: '150700',
|
||||
label: '呼伦贝尔市市场监督管理局'
|
||||
}, {
|
||||
value: '440112',
|
||||
label: '广州市黄埔区市场监督管理局'
|
||||
value: '150800',
|
||||
label: '巴彦淖尔市市场监督管理局'
|
||||
}, {
|
||||
value: '440121',
|
||||
label: '广州市花都区市场监督管理局'
|
||||
value: '150900',
|
||||
label: '乌兰察布市市场监督管理局'
|
||||
}, {
|
||||
value: '440122',
|
||||
label: '广州市从化区市场监督管理局'
|
||||
value: '152200',
|
||||
label: '兴安盟市场监督管理局'
|
||||
}, {
|
||||
value: '440125',
|
||||
label: '广州市增城区市场监督管理局'
|
||||
value: '152500',
|
||||
label: '锡林郭勒盟市场监督管理局'
|
||||
}, {
|
||||
value: '440126',
|
||||
label: '广州市番禺区市场监督管理局'
|
||||
value: '152900',
|
||||
label: '阿拉善盟市场监督管理局'
|
||||
}]
|
||||
return list
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取惩戒来源清单 临时
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div class="app-banner" style="width:100%;">
|
||||
<img src="@/assets/images/banner.png" class="banner-bg" style="width:100%">
|
||||
<img src="@/assets/images/banner-logo.png" class="banner-logo">
|
||||
<h1>广州市市场综合监管业务系统</h1>
|
||||
<h1>内蒙古自治区市场综合监管业务系统</h1>
|
||||
<!-- <h2>Guangzhou market comprehensive supervision business system</h2> -->
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<navbar />
|
||||
</div>
|
||||
<app-main />
|
||||
<footer>版权所有:广州市市场监督管理局 | 技术支持:广东众望通科技股份有限公司</footer>
|
||||
<footer>版权所有:内蒙古自治区市场监督管理局 | 技术支持:广东众望通科技股份有限公司</footer>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else :class="classObj" class="app-wrapper">
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ import * as utils from './utils/index'
|
|||
import { parseTime } from '@/utils/index.js'
|
||||
|
||||
import hevueImgPreview from 'hevue-img-preview'
|
||||
import '@/plugins/EasyComponent/index'
|
||||
Vue.use(hevueImgPreview)
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
module.exports = {
|
||||
|
||||
title: '广州市市场监督管理局信用惩戒管理系统',
|
||||
title: '内蒙古自治区市场监督管理局信用惩戒管理系统',
|
||||
|
||||
/**
|
||||
* @type {boolean} true | false
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<paper v-for="(item,index) in paperInfo" :key="index" style="width:730px">
|
||||
<div class="printPaper">
|
||||
<div class="paper-header"> <!-- 表头 -->
|
||||
<h3 class="h2">广州市市场监督管理局</h3>
|
||||
<h3 class="h2">内蒙古自治区市场监督管理局</h3>
|
||||
<h3 class="h2">列入经营异常名录异议审批表</h3>
|
||||
</div>
|
||||
<div class="enter" />
|
||||
|
|
|
|||
|
|
@ -939,126 +939,142 @@ export default {
|
|||
if (this.$util.isEmpty(this.form.caseSource)) {
|
||||
return this.$message.warning('请选择案件来源')
|
||||
}
|
||||
console.log(this.form.specause)
|
||||
|
||||
// ===== 仅新增:结束流程单独校验 =====
|
||||
if (this.form.endApply === '5') { // 结束流程
|
||||
// 只校验结束原因,跳过全量表单校验
|
||||
if (this.$util.isEmpty(this.form.endReason)) {
|
||||
return this.$message.warning('请输入结束原因')
|
||||
}
|
||||
// 直接执行提交逻辑
|
||||
this.executeSubmitLogic()
|
||||
return // 终止后续代码,避免走全量校验
|
||||
}
|
||||
|
||||
// 其他操作(提交/回退/作废)保持原有全量校验逻辑
|
||||
this.$refs.form.validate(valid => {
|
||||
if (!valid) return
|
||||
if (this.showRadio) { // 线索列异要再校验一次作提示
|
||||
validateBiz({ ids: this.bizList[0].toIncludeId, validType: 'CLUE', entertype: this.bizType, checkInBiz: 'false' }).then(res => {
|
||||
if (res.code === 0) {
|
||||
let str = ''
|
||||
let type = 'info'
|
||||
if (res.data.length > 0) {
|
||||
for (const item of res.data) {
|
||||
str += item.entname + item.reason + ';'
|
||||
}
|
||||
if (this.form.endApply === '5') {
|
||||
str += '是否结束流程?'
|
||||
}else{
|
||||
str += '是否继续提交?'
|
||||
}
|
||||
type = 'warning'
|
||||
this.executeSubmitLogic()
|
||||
})
|
||||
},
|
||||
// ===== 抽离的公共提交逻辑(完全复制你原有代码,无任何修改)=====
|
||||
executeSubmitLogic() {
|
||||
if (this.showRadio) { // 线索列异要再校验一次作提示
|
||||
validateBiz({ ids: this.bizList[0].toIncludeId, validType: 'CLUE', entertype: this.bizType, checkInBiz: 'false' }).then(res => {
|
||||
if (res.code === 0) {
|
||||
let str = ''
|
||||
let type = 'info'
|
||||
if (res.data.length > 0) {
|
||||
for (const item of res.data) {
|
||||
str += item.entname + item.reason + ';'
|
||||
}
|
||||
if (this.form.endApply === '5') {
|
||||
str += '是否结束流程?'
|
||||
} else {
|
||||
if (this.form.endApply === '5') {
|
||||
str = '是否结束流程?'
|
||||
}else{
|
||||
str = '是否继续提交?'
|
||||
str += '是否继续提交?'
|
||||
}
|
||||
type = 'warning'
|
||||
} else {
|
||||
if (this.form.endApply === '5') {
|
||||
str = '是否结束流程?'
|
||||
} else {
|
||||
str = '是否继续提交?'
|
||||
}
|
||||
}
|
||||
this.$confirm(str, '提示', { type: type }).then(() => {
|
||||
this.submitLoading = true
|
||||
this.form.bizseq = this.bizseq
|
||||
this.form.workflowid = this.workflowId
|
||||
this.form.opiniontype = this.bizType === 'company' ? '1' : '0'
|
||||
this.form.handler = this.user.username
|
||||
this.form.handlerid = this.user.primaryKey
|
||||
this.form.opinioncontent = this.form.opinion
|
||||
this.form.spereasons = this.spereasons
|
||||
this.form.remark = this.remark
|
||||
this.form.decisionContent = this.decisionContent
|
||||
this.form.nextPerformerids = this.form.reviewerId
|
||||
this.form.caseSource = this.caseSource // 关键:绑定选中值到表单
|
||||
for (const i in this.reviewer) {
|
||||
if (this.reviewer[i].primaryKey === this.form.reviewerId) {
|
||||
this.form.nextPerformerNames = this.reviewer[i].name
|
||||
}
|
||||
}
|
||||
this.$confirm(str, '提示', { type: type }).then(() => {
|
||||
this.submitLoading = true
|
||||
this.form.bizseq = this.bizseq
|
||||
this.form.workflowid = this.workflowId
|
||||
this.form.opiniontype = this.bizType === 'company' ? '1' : '0'
|
||||
this.form.handler = this.user.username
|
||||
this.form.handlerid = this.user.primaryKey
|
||||
this.form.opinioncontent = this.form.opinion
|
||||
this.form.spereasons = this.spereasons
|
||||
this.form.remark = this.remark
|
||||
this.form.decisionContent = this.decisionContent
|
||||
this.form.nextPerformerids = this.form.reviewerId
|
||||
this.form.caseSource = this.caseSource // 关键:绑定选中值到表单
|
||||
for (const i in this.reviewer) {
|
||||
if (this.reviewer[i].primaryKey === this.form.reviewerId) {
|
||||
this.form.nextPerformerNames = this.reviewer[i].name
|
||||
}
|
||||
this.form.nextNodeID = 'handleExptlist'
|
||||
if (this.form.endApply === '5') {
|
||||
this.form.nextNodeID = 'overFinish'
|
||||
this.form.opinioncontent = this.form.endReason
|
||||
}
|
||||
nextAbnormaInclusionProcess({
|
||||
tasklistid: this.tasklistid,
|
||||
bizseq: this.bizseq,
|
||||
nextNodeID: this.form.nextNodeID,
|
||||
opinion: {
|
||||
opiniontype: this.form.opiniontype,
|
||||
handler: this.user.username,
|
||||
handlerid: this.user.primaryKey,
|
||||
handledate: this.form.handledate,
|
||||
opinioncontent: this.form.opinioncontent
|
||||
},
|
||||
nextPerformerIds: [this.form.nextPerformerids],
|
||||
nextPerformerNames: [this.form.nextPerformerNames],
|
||||
tsBizSpeListModel: this.form
|
||||
}).then(res => {
|
||||
this.submitLoading = false
|
||||
if (res.code === 0) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.back()
|
||||
}
|
||||
this.form.nextNodeID = 'handleExptlist'
|
||||
if (this.form.endApply === '5') {
|
||||
this.form.nextNodeID = 'overFinish'
|
||||
this.form.opinioncontent = this.form.endReason
|
||||
}
|
||||
nextAbnormaInclusionProcess({
|
||||
tasklistid: this.tasklistid,
|
||||
bizseq: this.bizseq,
|
||||
nextNodeID: this.form.nextNodeID,
|
||||
opinion: {
|
||||
opiniontype: this.form.opiniontype,
|
||||
handler: this.user.username,
|
||||
handlerid: this.user.primaryKey,
|
||||
handledate: this.form.handledate,
|
||||
opinioncontent: this.form.opinioncontent
|
||||
},
|
||||
nextPerformerIds: [this.form.nextPerformerids],
|
||||
nextPerformerNames: [this.form.nextPerformerNames],
|
||||
tsBizSpeListModel: this.form
|
||||
}).then(res => {
|
||||
this.submitLoading = false
|
||||
if (res.code === 0) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.back()
|
||||
}
|
||||
})
|
||||
}).catch(() => {})
|
||||
})
|
||||
}).catch(() => {})
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$confirm('是否确认提交', '提示').then(() => {
|
||||
this.submitLoading = true
|
||||
this.form.bizseq = this.bizseq
|
||||
this.form.workflowid = this.workflowId
|
||||
this.form.opiniontype = this.bizType === 'company' ? '1' : '0'
|
||||
this.form.handler = this.user.username
|
||||
this.form.handlerid = this.user.primaryKey
|
||||
this.form.opinioncontent = this.form.opinion
|
||||
this.form.spereasons = this.spereasons
|
||||
this.form.remark = this.remark
|
||||
this.form.decisionContent = this.decisionContent
|
||||
this.form.nextPerformerids = this.form.reviewerId
|
||||
for (const i in this.reviewer) {
|
||||
if (this.reviewer[i].primaryKey === this.form.reviewerId) {
|
||||
this.form.nextPerformerNames = this.reviewer[i].name
|
||||
}
|
||||
}
|
||||
this.form.nextNodeID = 'handleExptlist'
|
||||
if (this.form.endApply === '5') {
|
||||
this.form.nextNodeID = 'overExptlist'
|
||||
this.form.opinioncontent = this.form.endReason
|
||||
}
|
||||
nextAbnormaInclusionProcess({
|
||||
tasklistid: this.tasklistid,
|
||||
bizseq: this.bizseq,
|
||||
nextNodeID: this.form.nextNodeID,
|
||||
opinion: {
|
||||
opiniontype: this.form.opiniontype,
|
||||
handler: this.user.username,
|
||||
handlerid: this.user.primaryKey,
|
||||
handledate: this.form.handledate,
|
||||
opinioncontent: this.form.opinioncontent
|
||||
},
|
||||
nextPerformerIds: [this.form.nextPerformerids],
|
||||
nextPerformerNames: [this.form.nextPerformerNames],
|
||||
tsBizSpeListModel: this.form
|
||||
}).then(res => {
|
||||
this.submitLoading = false
|
||||
if (res.code === 0) {
|
||||
this.$message.success('提交成功')
|
||||
// this.$router.back()
|
||||
this.$router.push('/todo/list')
|
||||
}
|
||||
})
|
||||
} else {
|
||||
this.$confirm('是否确认提交', '提示').then(() => {
|
||||
this.submitLoading = true
|
||||
this.form.bizseq = this.bizseq
|
||||
this.form.workflowid = this.workflowId
|
||||
this.form.opiniontype = this.bizType === 'company' ? '1' : '0'
|
||||
this.form.handler = this.user.username
|
||||
this.form.handlerid = this.user.primaryKey
|
||||
this.form.opinioncontent = this.form.opinion
|
||||
this.form.spereasons = this.spereasons
|
||||
this.form.remark = this.remark
|
||||
this.form.decisionContent = this.decisionContent
|
||||
this.form.nextPerformerids = this.form.reviewerId
|
||||
for (const i in this.reviewer) {
|
||||
if (this.reviewer[i].primaryKey === this.form.reviewerId) {
|
||||
this.form.nextPerformerNames = this.reviewer[i].name
|
||||
}
|
||||
}
|
||||
this.form.nextNodeID = 'handleExptlist'
|
||||
if (this.form.endApply === '5') {
|
||||
this.form.nextNodeID = 'overExptlist'
|
||||
this.form.opinioncontent = this.form.endReason
|
||||
}
|
||||
nextAbnormaInclusionProcess({
|
||||
tasklistid: this.tasklistid,
|
||||
bizseq: this.bizseq,
|
||||
nextNodeID: this.form.nextNodeID,
|
||||
opinion: {
|
||||
opiniontype: this.form.opiniontype,
|
||||
handler: this.user.username,
|
||||
handlerid: this.user.primaryKey,
|
||||
handledate: this.form.handledate,
|
||||
opinioncontent: this.form.opinioncontent
|
||||
},
|
||||
nextPerformerIds: [this.form.nextPerformerids],
|
||||
nextPerformerNames: [this.form.nextPerformerNames],
|
||||
tsBizSpeListModel: this.form
|
||||
}).then(res => {
|
||||
this.submitLoading = false
|
||||
if (res.code === 0) {
|
||||
this.$message.success('提交成功')
|
||||
// this.$router.back()
|
||||
this.$router.push('/todo/list')
|
||||
}
|
||||
})
|
||||
}).catch(() => {})
|
||||
}
|
||||
})
|
||||
}).catch(() => {})
|
||||
}
|
||||
},
|
||||
uploadCallback(res, file) {
|
||||
if (res.code === 0) {
|
||||
|
|
|
|||
|
|
@ -6789,10 +6789,10 @@ export default {
|
|||
var msg = '提交前请检查是否已上传所需的附件材料,点击确定继续提交'
|
||||
var type = 'info'
|
||||
if (this.bizStatus === '9' && this.nextNodeID === 'decisionEnter') {
|
||||
msg = '审批通过后将自动通过广州市市场监督管理局(知识产权局)网站公示《行政处罚听证告知书》,以公告方式送达当事人。自公告发布之日起经过三十日,视为送达。'
|
||||
msg = '审批通过后将自动通过内蒙古自治区市场监督管理局(知识产权局)网站公示《行政处罚听证告知书》,以公告方式送达当事人。自公告发布之日起经过三十日,视为送达。'
|
||||
type = 'warning'
|
||||
} else if (this.bizStatus === '13' && this.nextNodeID === 'sendEnter') {
|
||||
msg = '审批通过后将自动通过广州市市场监督管理局(知识产权局)网站公示《行政处罚决定书》,以公告方式送达当事人。自公告发布之日起经过三十日,视为送达。'
|
||||
msg = '审批通过后将自动通过内蒙古自治区市场监督管理局(知识产权局)网站公示《行政处罚决定书》,以公告方式送达当事人。自公告发布之日起经过三十日,视为送达。'
|
||||
type = 'warning'
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -46,11 +46,7 @@
|
|||
|
||||
<script>
|
||||
import { listExpelled, saveExpelled, batchImportExpelled } from '@/api/expelled'
|
||||
import EditTable from '@/plugins/EasyComponent/EditTable'
|
||||
export default {
|
||||
components: {
|
||||
EditTable
|
||||
},
|
||||
props: {
|
||||
isComponents: {
|
||||
type: Boolean,
|
||||
|
|
|
|||
|
|
@ -47,11 +47,9 @@
|
|||
|
||||
<script>
|
||||
import { listExpelled, saveExpelled } from '@/api/expelled'
|
||||
import EditTable from '@/plugins/EasyComponent/EditTable'
|
||||
import ExpelledList from '@/views/expelled/list/index.vue'
|
||||
export default {
|
||||
components: {
|
||||
EditTable,
|
||||
ExpelledList
|
||||
},
|
||||
data() {
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@
|
|||
</el-radio-group>
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:entListTable="scope">
|
||||
<template v-slot:entListTable>
|
||||
<easy-table
|
||||
ref="EntListTable"
|
||||
v-model="entListTableData"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
:search-form-prop="searchFormProp"
|
||||
:search-loader="searchLoader"
|
||||
>
|
||||
<template v-slot:table-top="EditTable">
|
||||
<template v-slot:table-top>
|
||||
<div v-if="$route.meta.type === 'todo'" style="margin-bottom: 12px;">
|
||||
<el-button
|
||||
style="background: #32BBD6;"
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@
|
|||
</el-radio-group>
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:entListTable="scope">
|
||||
<template v-slot:entListTable>
|
||||
<easy-table
|
||||
ref="EntListTable"
|
||||
v-model="entListTableData"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
:search-loader="searchLoader"
|
||||
@update:selected="(value)=>{selected = value}"
|
||||
>
|
||||
<template v-slot:table-top="EditTable">
|
||||
<template v-slot:table-top>
|
||||
<div style="margin-bottom: 16px;">
|
||||
<el-button
|
||||
v-if="type === 'todo'"
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
:search-loader="searchLoader"
|
||||
@update:selected="(value)=>{selected = value}"
|
||||
>
|
||||
<template v-slot:table-top="EditTable">
|
||||
<template v-slot:table-top>
|
||||
<div style="margin-bottom: 16px;">
|
||||
<el-button
|
||||
v-if="type === 'todo'"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
:search-form-prop="searchFormProp"
|
||||
:search-loader="searchLoader"
|
||||
>
|
||||
<template v-slot:table-top="EditTable">
|
||||
<template v-slot:table-top>
|
||||
<div v-if="$route.meta.type === 'todo'" style="margin-bottom: 12px;">
|
||||
<el-button
|
||||
style="background: #32BBD6;"
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
:search-form-prop="searchFormProp"
|
||||
:search-loader="searchLoader"
|
||||
>
|
||||
<template v-slot:table-top="EditTable">
|
||||
<template v-slot:table-top>
|
||||
<div v-if="$route.meta.type === 'todo'" style="margin-bottom: 12px;">
|
||||
<el-button
|
||||
style="background: #32BBD6;"
|
||||
|
|
|
|||
|
|
@ -28,13 +28,8 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { getIsUserProp } from '@/api/susnate'
|
||||
import { listBaseinfo } from '@/api/susnate'
|
||||
import EditTable from '@/plugins/EasyComponent/EditTable'
|
||||
export default {
|
||||
components: {
|
||||
EditTable
|
||||
},
|
||||
props: {
|
||||
type: {
|
||||
type: String,
|
||||
|
|
|
|||
|
|
@ -42,12 +42,10 @@
|
|||
<script>
|
||||
import { ESusNateOperRegList, eSusNateVoUpdate, eSusNateVoSave, eSusNateVoRemove } from '@/api/susnate'
|
||||
import EntList from './EntList.vue'
|
||||
import EditTable from '@/plugins/EasyComponent/EditTable'
|
||||
import { getConstant } from '@/api/system'
|
||||
export default {
|
||||
components: {
|
||||
EntList,
|
||||
EditTable
|
||||
EntList
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
|
|
|||
Loading…
Reference in New Issue