diff --git a/anrui-riskcenter-ui/src/api/settle/settle.js b/anrui-riskcenter-ui/src/api/settle/settle.js index 41af0bde26..be8dd3dd85 100644 --- a/anrui-riskcenter-ui/src/api/settle/settle.js +++ b/anrui-riskcenter-ui/src/api/settle/settle.js @@ -26,6 +26,15 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + // 回购申请管理--点击结清申请初始化 + settleRepoInit: function(data) { + return request({ + url: '/riskcenter/v1/loanrepurchaseapply/settleRepoInit', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, fetchBySid: function(data) { return request({ url: '/riskcenter/v1/LoanSettleApply/details', diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js index 2558b5e1fe..69e38b094e 100644 --- a/anrui-riskcenter-ui/src/router/index.js +++ b/anrui-riskcenter-ui/src/router/index.js @@ -1177,6 +1177,27 @@ export const constantRoutes = [ component: () => import('@/views/workFlow/jiaohuichukuFlow/returntothewarehouseYiBan.vue'), name: 'ReturnToTheWarehouseYiBan' + }, + // 车辆结清管理--编辑 + { + path: '/jieqingFlow/settleEdit', + component: () => + import('@/views/workFlow/jieqingFlow/settleEdit.vue'), + name: 'SettleEdit' + }, + // 车辆结清管理--待办 + { + path: '/jieqingFlow/settleDaiBan', + component: () => + import('@/views/workFlow/jieqingFlow/settleDaiBan.vue'), + name: 'SettleDaiBan' + }, + // 车辆结清管理--已办 + { + path: '/jieqingFlow/settleYiBan', + component: () => + import('@/views/workFlow/jieqingFlow/settleYiBan.vue'), + name: 'SettleYiBan' }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } diff --git a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue index 5a0f94ff16..e13553a1d6 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleAdd.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleAdd.vue @@ -11,6 +11,7 @@
+
金额单位:元
申请部门
@@ -82,6 +83,15 @@ {{ formobj.notDuePrice }}
+ + +
回购申请
+
+ +
预结清日期
+ {{ formobj.settingDateBe }} +
+
资方结清费用
@@ -197,6 +207,12 @@ {{ calculateSettleAll }} + + +
截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }} +
+
公司结清费用减免情况
@@ -334,6 +350,7 @@ export default { saleOrderSid: '', settingDate: '', settingDateBe: '', + showHg: false, // 是否展示回购字段 sid: '', trueReduction: false, useOrgName: '', @@ -380,6 +397,18 @@ export default { } }) }, + // 回购申请管理--点击结清申请初始化 + showInit(sid) { + this.viewTitle = '【新增】结清申请' + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + req.settleRepoInit({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), sid: sid, userSid: window.sessionStorage.getItem('userSid') }).then((res) => { + if (res.success) { + this.formobj = res.data + } + }) + }, // 查看催收记录 lookCSJL(sid) { if (sid !== '') { @@ -521,6 +550,7 @@ export default { orgPath: '', overdueMonthPrice: '', saleOrderSid: '', + showHg: false, // 是否展示回购字段 settingDate: '', settingDateBe: '', sid: '', diff --git a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue index 048c49ed17..d78519a95c 100644 --- a/anrui-riskcenter-ui/src/views/settle/settleInfo.vue +++ b/anrui-riskcenter-ui/src/views/settle/settleInfo.vue @@ -9,6 +9,7 @@
+
金额单位:元
申请部门
@@ -80,6 +81,15 @@ {{ formobj.notDuePrice }}
+ + +
回购申请
+
+ +
预结清日期
+ {{ formobj.settingDateBe }} +
+
资方结清费用
@@ -195,6 +205,12 @@ {{ formobj.loanSettleCompanyCostVo.settleAll }} + + +
截止当前资金占用费
+ {{ formobj.loanSettleCompanyCostVo.fundAll }} +
+
公司结清费用减免情况
@@ -305,6 +321,7 @@ export default { orgPath: '', overdueMonthPrice: '', saleOrderSid: '', + showHg: false, // 是否展示回购字段 settingDate: '', settingDateBe: '', sid: '', @@ -416,6 +433,7 @@ export default { orgPath: '', overdueMonthPrice: '', saleOrderSid: '', + showHg: false, // 是否展示回购字段 settingDate: '', settingDateBe: '', sid: '', diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue new file mode 100644 index 0000000000..4692c6ff95 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleDaiBan.vue @@ -0,0 +1,678 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue new file mode 100644 index 0000000000..e85c675893 --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleEdit.vue @@ -0,0 +1,515 @@ + + + + + diff --git a/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue new file mode 100644 index 0000000000..312278246c --- /dev/null +++ b/anrui-riskcenter-ui/src/views/workFlow/jieqingFlow/settleYiBan.vue @@ -0,0 +1,464 @@ + + + + + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java index 35adff0c2d..60f1734c80 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.java @@ -37,4 +37,6 @@ public interface LoanRepurchaseApplyMapper extends BaseMapper map); int selCountByBusVinSid(@Param("busVinSid") String busVinSid); + + String selFundAllByBusVinSid(@Param("busVinSid") String busVinSid); } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml index 62f290221e..ebb254b61e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyMapper.xml @@ -178,4 +178,24 @@ nodeState != '待提交' and nodeState != '终止' + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java index 45dd806412..1481b0f840 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepurchaseapply/LoanRepurchaseApplyService.java @@ -944,6 +944,7 @@ public class LoanRepurchaseApplyService extends MybatisBaseService