diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue index 115a3f8e30..23903748ee 100644 --- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue @@ -553,17 +553,41 @@ export default { saveOrUpdate() { this.$refs['form_obj'].validate((valid) => { if (valid) { + if (this.formobj.isOtherProduct) { + if (this.formobj.loanFinOtherPolicy.productTypeKey === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中产品类别不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.maxLoanRatio === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中最高融资比例不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.maxLoanAmount === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中最高融资额不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.periodKey === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中期数不能为空' }) + return + } + if (this.formobj.loanFinOtherPolicy.yearRatio === '') { + this.$message({ showClose: true, type: 'error', message: '其它融中年利率不能为空' }) + return + } + } if (this.useDept_list.length > 0) { + const aa = [] for (var i = 0; i < this.orgList.length; i++) { for (var k = 0; k < this.useDept_list.length; k++) { if (this.orgList[i].orgDeptSid === this.useDept_list[k]) { - this.formobj.useDeptList.push({ + aa.push({ deptName: this.orgList[i].orgDeptName, deptSid: this.orgList[i].orgDeptSid }) } } } + this.formobj.useDeptList = aa } else { this.$message({ showClose: true, type: 'error', message: '适用销售部门不能为空' }) return @@ -583,27 +607,6 @@ export default { this.formobj.vehTypeValueList = [] return } - if (this.formobj.isOtherProduct) { - if (this.formobj.loanFinOtherPolicy.productTypeKey === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中产品类别不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.maxLoanRatio === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中最高融资比例不能为空' }) - return - }if (this.formobj.loanFinOtherPolicy.maxLoanAmount === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中最高融资额不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.periodKey === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中期数不能为空' }) - return - } - if (this.formobj.loanFinOtherPolicy.yearRatio === '') { - this.$message({ showClose: true, type: 'error', message: '其它融中年利率不能为空' }) - return - } - } this.submitdisabled = true // 保存 req.saveOrUpdate(this.formobj).then((res) => { diff --git a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue index 9e1bb9ca21..af3d6c6eab 100644 --- a/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue +++ b/anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue @@ -302,16 +302,18 @@ export default { this.$refs['form_obj'].validate((valid) => { if (valid) { if (this.useDept_list.length > 0) { + const aa = [] for (var i = 0; i < this.orgList.length; i++) { for (var k = 0; k < this.useDept_list.length; k++) { if (this.orgList[i].orgDeptSid === this.useDept_list[k]) { - this.formobj.useDeptList.push({ + aa.push({ deptName: this.orgList[i].orgDeptName, deptSid: this.orgList[i].orgDeptSid }) } } } + this.formobj.useDeptList = aa } if (this.formobj.vehTypeKeyList.length > 0) { const aa = [] diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java index 5c581f8ca7..94a881d1c6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyFeign.java @@ -49,7 +49,7 @@ public interface LoanFinOtherPolicyFeign { @GetMapping("selectList") @ApiOperation("获取产品政策下其他融,或分公司下其他融") - ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name); + ResultBean> selectList(@RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid, @RequestParam(value = "sid", required = false) String sid, @RequestParam(value = "name", required = false) String name,@RequestParam(value = "modelSid", required = false) String modelSid); @ApiOperation("使用状态停用、开启:useState为1时走停用,为0时走开启") @PostMapping("setState") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java index 0f14c35cb0..e4f0e84a3a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.java @@ -30,7 +30,7 @@ public interface LoanFinOtherPolicyMapper extends BaseMapper List selectListOne(@Param("sid") String sid,@Param("name") String name); - List selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name); + List selectListTwo(@Param("useOrgSid") String useOrgSid,@Param("name") String name,@Param("type") String type,@Param("deptSid") String deptSid); IPage selectPageVo(IPage page,@Param(Constants.WRAPPER)QueryWrapper qw); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml index ad6da1fc69..e971a0485d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml @@ -36,23 +36,56 @@