diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java index c8cce63c18..e85e047955 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/PaymentVoucher.java @@ -60,5 +60,7 @@ public class PaymentVoucher { public String type; @ApiModelProperty("核算维度银行") public String bank; + + private Integer riskState; } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 6db28f7808..5735527369 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -5362,7 +5362,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService import('@/views/transferToLitigation/transferToLitigation.vue'), + name: 'TransferToLitigation', + meta: { + title: '转诉讼科目管理', + noCache: true + } + }] + }, { path: '/provisionoffunds', component: Layout, @@ -1599,6 +1616,27 @@ export const constantRoutes = [{ import('@/views/workFlow/buzhuichangFlow/secondarysalesnotrecoveryYiBan.vue'), name: 'SecondarySalesNotRecoveryYiBan' }, + // 二次销售车辆不追偿--编辑 + { + path: '/zhuansusongFlow/transferToLitigationEdit', + component: () => + import('@/views/workFlow/zhuansusongFlow/transferToLitigationEdit.vue'), + name: 'TransferToLitigationEdit' + }, + // 二次销售车辆不追偿--待办 + { + path: '/zhuansusongFlow/transferToLitigationDaiBan', + component: () => + import('@/views/workFlow/zhuansusongFlow/transferToLitigationDaiBan.vue'), + name: 'TransferToLitigationDaiBan' + }, + // 二次销售车辆不追偿--已办 + { + path: '/zhuansusongFlow/transferToLitigationYiBan', + component: () => + import('@/views/workFlow/zhuansusongFlow/transferToLitigationYiBan.vue'), + name: 'TransferToLitigationYiBan' + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecase.vue b/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecase.vue index ddd8bde965..8d9096c163 100644 --- a/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecase.vue +++ b/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecase.vue @@ -56,6 +56,11 @@ + + + + +
查询 @@ -94,6 +99,11 @@ + + + @@ -121,6 +131,8 @@ + +
@@ -136,6 +148,7 @@ import casedelegationAdd from '../casedelegation/casedelegationAdd' import caseappealAdd from '../caseappeal/caseappealAdd' import caseexecutionAdd from '../caseexecution/caseexecutionAdd' import caseclosedAdd from '../caseclosed/caseclosedAdd' +import transferToLitigationAdd from '../transferToLitigation/transferToLitigationAdd' export default { name: 'CourseOfTheCase', @@ -148,7 +161,8 @@ export default { casedelegationAdd, caseappealAdd, caseexecutionAdd, - caseclosedAdd + caseclosedAdd, + transferToLitigationAdd }, data() { return { @@ -175,6 +189,13 @@ export default { btnKey: 'toEntrust', btnLabel: '委托律师申请' }, + { + type: 'primary', + size: 'small', + icon: '', + btnKey: 'toLitigation', + btnLabel: '转诉讼科目申请' + }, { type: 'primary', size: 'small', @@ -210,6 +231,16 @@ export default { tableKey: 0, list: [], sids: [], // 用于导出的时候保存已选择的SIDs + state_list: [ + { + dictKey: '1', + dictValue: '是' + }, + { + dictKey: '0', + dictValue: '否' + } + ], multipleSelection: [], FormLoading: false, listLoading: false, @@ -237,6 +268,7 @@ export default { lawFirms: '', lawer: '', full: '', + isZfull: '', orgPath: '', menuUrl: '' } @@ -283,6 +315,9 @@ export default { case 'toEntrust': this.toEntrust() break + case 'toLitigation': + this.toLitigation() + break case 'toAppeal': this.toAppeal() break @@ -361,6 +396,7 @@ export default { lawFirms: '', lawer: '', full: '', + isZfull: '', orgPath: '', menuUrl: '' } @@ -419,6 +455,15 @@ export default { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } }, + // 转诉讼科目申请 + toLitigation() { + if (this.sids.length === 1) { + this.viewState = 9 + this.$refs['divLitigation'].showAdd(this.sids[0]) + } else { + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) + } + }, // 上/应诉申请 toAppeal() { if (this.sids.length === 1) { @@ -435,8 +480,12 @@ export default { // 执行立案申请 toExecute() { if (this.sids.length === 1) { - this.viewState = 7 - this.$refs['divCasEexecution'].showAdd(this.sids[0]) + if (this.multipleSelection[0].isZfull === '1') { + this.viewState = 7 + this.$refs['divCasEexecution'].showAdd(this.sids[0]) + } else { + this.$message({ showClose: true, type: 'error', message: '请先转诉讼科目后,再发起申请!' }) + } } else { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } @@ -444,8 +493,12 @@ export default { // 结案申请 toClosing() { if (this.sids.length === 1) { - this.viewState = 8 - this.$refs['divCaseClosed'].showAdd(this.sids[0]) + if (this.multipleSelection[0].isZfull === '1') { + this.viewState = 8 + this.$refs['divCaseClosed'].showAdd(this.sids[0]) + } else { + this.$message({ showClose: true, type: 'error', message: '请先转诉讼科目后,再发起申请!' }) + } } else { this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' }) } diff --git a/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecaseInfo.vue b/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecaseInfo.vue index a7df54b3d0..457c747306 100644 --- a/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecaseInfo.vue +++ b/anrui-riskcenter-ui/src/views/courseofthecase/courseofthecaseInfo.vue @@ -332,7 +332,7 @@ export default { this.isFourSelect = false this.isFiveSelect = false this.activeName = 1 - this.$refs['divFirst'].showEdit(this.formobj.sid) + this.$refs['divFirst'].showInfo(this.formobj.sid) }, // 二审模块 toTwo() { @@ -342,7 +342,7 @@ export default { this.isFourSelect = false this.isFiveSelect = false this.activeName = 2 - this.$refs['divSecond'].showEdit(this.formobj.sid) + this.$refs['divSecond'].showInfo(this.formobj.sid) }, // 再审模块 toThree() { @@ -352,7 +352,7 @@ export default { this.isFourSelect = false this.isFiveSelect = false this.activeName = 3 - this.$refs['divExamineagain'].showEdit(this.formobj.sid) + this.$refs['divExamineagain'].showInfo(this.formobj.sid) }, toFour() { this.isFirstSelect = false @@ -361,7 +361,7 @@ export default { this.isFourSelect = true this.isFiveSelect = false this.activeName = 4 - this.$refs['divExecute'].showEdit(this.formobj.sid) + this.$refs['divExecute'].showInfo(this.formobj.sid) }, toFive() { this.isFirstSelect = false @@ -370,7 +370,7 @@ export default { this.isFourSelect = false this.isFiveSelect = true this.activeName = 5 - this.$refs['divSettlealawsuit'].showEdit(this.formobj.sid) + this.$refs['divSettlealawsuit'].showInfo(this.formobj.sid) }, lookSuSong() { if (this.formobj.suSongSid !== '') { diff --git a/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigation.vue b/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigation.vue new file mode 100644 index 0000000000..e3bcdb78fa --- /dev/null +++ b/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigation.vue @@ -0,0 +1,356 @@ + + + + diff --git a/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigationAdd.vue b/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigationAdd.vue new file mode 100644 index 0000000000..7744e8257d --- /dev/null +++ b/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigationAdd.vue @@ -0,0 +1,264 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigationInfo.vue b/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigationInfo.vue new file mode 100644 index 0000000000..242d9b9c0b --- /dev/null +++ b/anrui-riskcenter-ui/src/views/transferToLitigation/transferToLitigationInfo.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationDaiBan.vue new file mode 100644 index 0000000000..ebedb3c4c7 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationDaiBan.vue @@ -0,0 +1,458 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationEdit.vue new file mode 100644 index 0000000000..924f881c24 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationEdit.vue @@ -0,0 +1,244 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationYiBan.vue new file mode 100644 index 0000000000..d27120ff0c --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/zhuansusongFlow/transferToLitigationYiBan.vue @@ -0,0 +1,244 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangDaiBan.vue index ede65ce258..08a373933c 100644 --- a/anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangDaiBan.vue +++ b/anrui-riskcenter-ui/src/views/workFlow/zifangduizhangFlow/zifangduizhangDaiBan.vue @@ -105,7 +105,7 @@