diff --git a/src/views/abnormal/company/inclusion/Accept.vue b/src/views/abnormal/company/inclusion/Accept.vue
index 8f1eee1..a25ab56 100644
--- a/src/views/abnormal/company/inclusion/Accept.vue
+++ b/src/views/abnormal/company/inclusion/Accept.vue
@@ -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) {
diff --git a/src/views/bBulkDeactivation/batchDeactivation.vue b/src/views/bBulkDeactivation/batchDeactivation.vue
index be7b5dc..f4346cd 100644
--- a/src/views/bBulkDeactivation/batchDeactivation.vue
+++ b/src/views/bBulkDeactivation/batchDeactivation.vue
@@ -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'
}
diff --git a/src/views/expelled/list/index.vue b/src/views/expelled/list/index.vue
index 59932fe..7567d4d 100644
--- a/src/views/expelled/list/index.vue
+++ b/src/views/expelled/list/index.vue
@@ -46,11 +46,7 @@
-