Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
commit
031534b719
  1. 12
      anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessAdd.vue
  2. 25
      anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue
  3. 7
      anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue
  4. 20
      anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue
  5. 22
      anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue
  6. 29
      anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue
  7. 25
      anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessDaiBan.vue
  8. 12
      anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessEdit.vue
  9. 25
      anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessYiBan.vue
  10. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
  11. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java
  12. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  13. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java
  14. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java
  15. 3
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

12
anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessAdd.vue

@ -35,16 +35,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">其他说明</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">打款时需备注内容</div>
<el-form-item><el-input v-model="formobj.payRemarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他说明</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">

25
anrui-riskcenter-ui/src/views/agentbusiness/agentbusinessInfo.vue

@ -28,16 +28,14 @@
<div class="span-sty">财务付款形式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payForm }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">其他说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">打款时需备注内容</div>
<el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">其他说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -149,4 +147,17 @@ export default {
.addinputInfo {
margin-left: 130px !important;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
</style>

7
anrui-riskcenter-ui/src/views/monthlypayment/adjust.vue

@ -121,8 +121,11 @@ export default {
})
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^0-9]/g, '') // .
e.target.value = e.target.value.replace(/^00/, '0') // 0
e.target.value = e.target.value.replace(/[^0-9.]/g, '') // .
e.target.value = e.target.value.replace(/^00/, '0.') // 0
e.target.value = e.target.value.replace(/\.{2,}/g, '.') // .
e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.')
e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') //
if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
// 0102
e.target.value = parseFloat(e.target.value)

20
anrui-riskcenter-ui/src/views/monthlypayment/monthlypayment.vue

@ -107,7 +107,7 @@
<!-- 导入 -->
<el-dialog :visible.sync="dialogVisible" width="60%" :show-close="false">
<div>
<el-button size="small" type="text" style="font-weight: bold" @click="downLoad">下载当月还款记录模板</el-button>
<el-button size="small" type="text" style="font-weight: bold" @click="downLoad">下载还款记录模板</el-button>
</div>
<el-card class="box-card">
<div>
@ -195,15 +195,15 @@ export default {
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toDeduct',
btnLabel: '划扣'
btnKey: 'toUpdate',
btnLabel: '更新'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toUpdate',
btnLabel: '更新'
btnKey: 'toDeduct',
btnLabel: '划扣'
},
{
type: 'danger',
@ -226,6 +226,7 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
multipleSelection: [],
returnWay_list: [],
buckle_list: [
{
@ -327,6 +328,7 @@ export default {
// sid
handleSelectionChange(row) {
const aa = []
this.multipleSelection = row
row.forEach(element => {
aa.push(element.sid)
})
@ -408,7 +410,7 @@ export default {
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '当月还款记录模板' + '.xls'
const fileName = '还款记录模板' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
@ -436,7 +438,7 @@ export default {
},
handleConfirm() {
if (this.upload_list.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请先上传当月还款记录' })
this.$message({ showClose: true, type: 'error', message: '请先上传还款记录' })
return
}
req.saveRecords(this.upload_list).then((res) => {
@ -501,8 +503,12 @@ export default {
//
toEdit(row) {
if (this.sids.length === 1) {
if (this.multipleSelection[0].updateTime === '') {
this.viewState = 2
this.$refs['divAdd'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '该记录已生成更新日期,无需进行调整操作' })
}
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑操作' })
}

22
anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue

@ -47,6 +47,12 @@
<el-form-item label="风控专员">
<el-input v-model="listQuery.params.riskStaffName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="远程控制状态">
<el-select v-model="istQuery.params.lockCarState" clearable placeholder="请选择" filterable>
<el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -166,6 +172,16 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
lockCarState_list: [
{
dictKey: '1',
dictValue: '控制成功'
},
{
dictKey: '2',
dictValue: '控制失败'
}
],
user_list: [],
FormLoading: false,
listLoading: false,
@ -192,7 +208,8 @@ export default {
vinNo: '',
collectionStartDate: '',
collectionEndDate: '',
isFP: false
isFP: false,
lockCarState: ''
}
},
//
@ -309,7 +326,8 @@ export default {
vinNo: '',
collectionStartDate: '',
collectionEndDate: '',
isFP: false
isFP: false,
lockCarState: ''
}
}
this.getList()

29
anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue

@ -47,6 +47,12 @@
<el-form-item label="风控专员">
<el-input v-model="listQuery.params.riskStaffName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="远程控制状态">
<el-select v-model="istQuery.params.lockCarState" clearable placeholder="请选择" filterable>
<el-option v-for="item in lockCarState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
@ -202,13 +208,6 @@ export default {
btnKey: 'toCollectionMeasures',
btnLabel: '催收措施申请'
},
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toUnlock',
btnLabel: '解锁申请'
},
{
type: 'primary',
size: 'small',
@ -237,6 +236,16 @@ export default {
tableKey: 0,
list: [],
sids: [], // SIDs
lockCarState_list: [
{
dictKey: '1',
dictValue: '控制成功'
},
{
dictKey: '2',
dictValue: '控制失败'
}
],
FormLoading: false,
listLoading: false,
//
@ -258,7 +267,8 @@ export default {
vinNo: '',
collectionStartDate: '',
collectionEndDate: '',
riskStaffName: ''
riskStaffName: '',
lockCarState: ''
}
},
formobj: {
@ -362,7 +372,8 @@ export default {
vinNo: '',
collectionStartDate: '',
collectionEndDate: '',
riskStaffName: ''
riskStaffName: '',
lockCarState: ''
}
}
this.getList()

25
anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessDaiBan.vue

@ -31,16 +31,14 @@
<div class="span-sty">财务付款形式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payForm }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">其他说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">打款时需备注内容</div>
<el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">其他说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -406,6 +404,19 @@ export default {
.addinputInfo {
margin-left: 130px !important;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}

12
anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessEdit.vue

@ -34,16 +34,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">其他说明</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
<div class="span-sty">打款时需备注内容</div>
<el-form-item><el-input v-model="formobj.payRemarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其他说明</div>
<el-form-item><el-input v-model="formobj.remarks" clearable placeholder="" class="addinputInfo addinputw" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">

25
anrui-riskcenter-ui/src/views/workFlow/daishoudaifuFlow/agentbusinessYiBan.vue

@ -28,16 +28,14 @@
<div class="span-sty">财务付款形式</div>
<el-form-item><span class="addinputInfo">{{ formobj.payForm }}</span></el-form-item>
</el-col>
<el-col :span="16">
<div class="span-sty">其他说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8" class="tlineheightb">
<div class="span-sty">打款时需备注内容</div>
<el-form-item><span class="addinputInfo">{{ formobj.payRemarks }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<div class="span-sty">其他说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
@ -201,4 +199,17 @@ export default {
.addinputInfo {
margin-left: 130px !important;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
</style>

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java

@ -211,7 +211,7 @@ public class LoanBeCollectionApplyService extends MybatisBaseService<LoanBeColle
DateTime modifyTime = DateUtil.parse(record.getModifyTime());
record.setModifyTime(DateUtil.formatDate(modifyTime));
} else {
record.setModifyTime("未办结");
record.setModifyTime("");
}
}
PagerVo<LoanBeCollectionApplyVo> p = PagerUtil.pageToVo(pagging, null);

3
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java

@ -159,6 +159,9 @@ public class LoanBeOverdueVehService {
if (StringUtils.isNotBlank(query.getVinNo())) {
qw.like("a1.vinNo", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getNames())) {
qw.and(wrapper -> wrapper.like("a1.loanContractNo", query.getNames()).or().like("a1.borrowerName", query.getNames()).or().like("a1.vinNo", query.getNames()));
}
String collectionStartDate = query.getCollectionStartDate();
String collectionEndDate = query.getCollectionEndDate();
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@ -208,7 +208,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
DateTime modifyTime = DateUtil.parse(record.getModifyTime());
record.setModifyTime(DateUtil.formatDate(modifyTime));
} else {
record.setModifyTime("未办结");
record.setModifyTime("");
}
}
PagerVo<LoanBePadsincereApplyVo> p = PagerUtil.pageToVo(pagging, null);

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/AppBeOverdueVehVo.java

@ -13,10 +13,8 @@ public class AppBeOverdueVehVo implements Vo {
@ApiModelProperty("销售订单车辆sid")
private String saleVehSid;
@ApiModelProperty("分公司")
private String useOrgName;
@ApiModelProperty("发起部门")
private String dept;
@ApiModelProperty("分公司-发起部门")
private String publishInfo;
@ApiModelProperty("贷款合同编号")
private String loanContractNo;
@ApiModelProperty("车架号")

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/becollection/BeCollectionFeign.java

@ -38,7 +38,7 @@ public interface BeCollectionFeign {
public ResultBean<AppBePadsincereApplyDetailsVo> padsincereDetail(@PathVariable("sid") String sid);
@ApiOperation("初始化实际还款人")
@PostMapping("/initReaRepayment")
@GetMapping("/initReaRepayment")
public ResultBean<AppReaRepaymentVo> initReaRepayment(@RequestParam("saleVehSid") String saleVehSid);
@ApiOperation("维护实际还款人")

3
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/becollection/BeCollectionService.java

@ -423,8 +423,7 @@ public class BeCollectionService {
for (LoanBeOverdueVehVo record : records) {
AppBeOverdueVehVo appBeOverdueVehVo = new AppBeOverdueVehVo();
appBeOverdueVehVo.setSaleVehSid(record.getSaleVehSid());
appBeOverdueVehVo.setUseOrgName(record.getUseOrgName());
appBeOverdueVehVo.setDept(record.getDept());
appBeOverdueVehVo.setPublishInfo(record.getUseOrgName() + "-" + record.getDept());
appBeOverdueVehVo.setLoanContractNo(record.getLoanContractNo());
appBeOverdueVehVo.setVinNo(record.getVinNo());
appBeOverdueVehVo.setCarNum(record.getCarNum());

Loading…
Cancel
Save