Browse Source

Merge remote-tracking branch 'origin/master'

master
God 11 months ago
parent
commit
b4354b11c1
  1. 8
      anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue
  2. 4
      anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue
  3. 10
      anrui-riskcenter-ui/src/views/overduevehicle/overduevehicleByRisk.vue
  4. 1
      anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue
  5. 8
      anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue
  6. 4
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java
  7. 3
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  8. 5
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
  9. 2
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
  10. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java
  11. 44
      yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue
  12. 5
      yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue
  13. 7
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java
  14. 2
      yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java
  15. 2
      yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java
  16. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java
  17. 2
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java
  18. 19
      yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

8
anrui-riskcenter-ui/src/views/collectionmeasures/collectionmeasuresAdd.vue

@ -57,6 +57,11 @@
</div>
<el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
<el-table-column prop="carNum" label="车牌号" align="center" width="100" />
@ -242,6 +247,9 @@ export default {
this.yckzVisible = false
}
},
handleDelete(index) {
this.formobj.loanBeCollectionVehDetails.splice(index, 1)
},
cautionerEdit(row) {
this.viewState = 8
this.$refs['divCautioner'].showAdd(row.saleVehSid)

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

@ -80,7 +80,7 @@
<el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100"/>
<el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100"/>
<el-table-column prop="beOverdueMoneyAndPeriod" label="换算期数" align="center" width="100"/>
<el-table-column prop="bankCardRemark" label="最近催收日期" align="center" width="110">
<el-table-column label="最近催收日期" align="center" width="120">
<template slot-scope="scope">
<span class="bluezi" @click="lookCollection(scope.row)">{{ scope.row.createTime }}</span>
</template>
@ -91,7 +91,7 @@
</template>
</el-table-column>
<el-table-column prop="riskStaffUserName" label="风控专员" align="center" width="100"/>
<el-table-column prop="lockCarState" label="远程控制状态" align="center" width="110"/>
<el-table-column prop="lockCarState" label="远程控制状态" align="center" width="120"/>
</el-table>
</div>
<!--End 主页面主要部分-->

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

@ -80,7 +80,7 @@
<el-table-column prop="beOverduePeriod" label="逾期期数" align="center" width="100"/>
<el-table-column prop="beOverdueMoney" label="逾期金额" align="center" width="100"/>
<el-table-column prop="beOverdueMoneyAndPeriod" label="换算期数" align="center" width="100"/>
<el-table-column prop="bankCardRemark" label="最近催收日期" align="center" width="110">
<el-table-column label="最近催收日期" align="center" width="120">
<template slot-scope="scope">
<span class="bluezi" @click="lookCollection(scope.row)">{{ scope.row.createTime }}</span>
</template>
@ -91,7 +91,7 @@
</template>
</el-table-column>
<el-table-column prop="riskStaffUserName" label="风控专员" align="center" width="100"/>
<el-table-column prop="lockCarState" label="远程控制状态" align="center" width="110"/>
<el-table-column prop="lockCarState" label="远程控制状态" align="center" width="120"/>
</el-table>
</div>
<!--End 主页面主要部分-->
@ -437,7 +437,7 @@ export default {
this.viewState = 2
this.$refs['divVehicle'].showEdit(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行催收操作' })
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
toCollectionMeasures() {
@ -445,7 +445,7 @@ export default {
this.viewState = 3
this.$refs['divCollection'].showAdd(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行催收操作' })
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
toReturn() {
@ -453,7 +453,7 @@ export default {
this.viewState = 5
this.$refs['divReturn'].showAdd(this.sids[0])
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行催收操作' })
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
}
},
resetState() {

1
anrui-riskcenter-ui/src/views/overduevehicle/vehiclecollectionentry.vue

@ -447,6 +447,7 @@ export default {
useOrgName: '',
useOrgSid: ''
}
this.submitdisabled = false
this.$emit('doback')
}
}

8
anrui-riskcenter-ui/src/views/workFlow/cuishoucuoshiFlow/collectionmeasuresEdit.vue

@ -56,6 +56,11 @@
</div>
<el-table :key="tableKey" :data="formobj.loanBeCollectionVehDetails" :index="index" border style="width: 100%">
<el-table-column fixed width="80" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="loanContractNo" label="贷款合同编号" align="center" width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="120"/>
<el-table-column prop="carNum" label="车牌号" align="center" width="100" />
@ -247,6 +252,9 @@ export default {
this.yckzVisible = false
}
},
handleDelete(index) {
this.formobj.loanBeCollectionVehDetails.splice(index, 1)
},
cautionerEdit(row) {
this.viewState = 8
this.$refs['divCautioner'].showAdd(row.saleVehSid)

4
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanSolutionsDetailsssVo.java

@ -165,4 +165,8 @@ public class LoanSolutionsDetailsssVo {
@ApiModelProperty("实际首付比例")
private String downPayAmountsRatio;
@ApiModelProperty("实际贴息")
private String actualDiscount;
@ApiModelProperty("其他融实际贴息")
private String otherActualDiscount;
}

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

@ -1161,7 +1161,8 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
for (LoanBePadsincereVeh v : records) {
LoanRepaymentPlanDetails planDetails = loanRepaymentPlanDetailsService.selOneByBankNoAndBusVinSid(v.getBankContractNo(), v.getSaleVehSid());
if (null != planDetails) {
String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
// String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
String bankName = planDetails.getBankName();
String orgCode = "";
LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
if (null != schedule) {

5
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java

@ -882,8 +882,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
voucherDetail.setSceneCode("02");
}
}
String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
if (StringUtils.isNotBlank(bankName)) {
// String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
if (StringUtils.isNotBlank(planDetails.getBankName())) {
String bankName = planDetails.getBankName();
voucherDetail.setBankName(bankName);
}
String useOrgSid = planDetails.getUseOrgSid();

2
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java

@ -3262,6 +3262,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
page = "1";
} else if (c == 2) {
page = "2";
} else if (c == 0){
page = "3";
}
if (pdfList.size() > (num - 1) * 3) {
LoanVoucherPdf a = pdfList.get((num - 1) * 3);

6
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@ -875,9 +875,9 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
} else {
voucherDetail.setSceneCode(SceneCodeEnum.TRANSFER_VOUCHER1.getCode());
}
String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
if (StringUtils.isNotBlank(bankName)) {
voucherDetail.setBankName(bankName);
// String bankName = loanRepaymentPlanDetailsService.getBankNameByMainOrOtherPolicy(planDetails);
if (StringUtils.isNotBlank(planDetails.getBankName())) {
voucherDetail.setBankName(planDetails.getBankName());
}
String useOrgSid = planDetails.getUseOrgSid();
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();

44
yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue

@ -52,11 +52,11 @@
</div>
</div>
<el-dialog center :visible.sync="dialogVisible" width="70%">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty">项目名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.aitemName" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>项目名称</div>
<el-form-item prop="aitemName"><el-input class="addinputInfo addinputw" v-model="formobj.aitemName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">拼音缩写</div>
@ -69,18 +69,18 @@
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">排序</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>排序</div>
<el-form-item prop="sortNo"><el-input class="addinputInfo addinputw" @keyup.native="formobj.sortNo = getNumber(formobj.sortNo, 0)" v-model="formobj.sortNo" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty">销售价</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" v-model="formobj.price" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>销售价</div>
<el-form-item prop="price"><el-input class="addinputInfo addinputw" @keyup.native="formobj.price = getNumber(formobj.price, 2)" v-model="formobj.price" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">成本</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
<div class="span-sty"><span class="icon">*</span>成本</div>
<el-form-item prop="cost"><el-input class="addinputInfo addinputw" @keyup.native="formobj.cost = getNumber(formobj.cost, 2)" v-model="formobj.cost" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
</el-form>
@ -121,6 +121,12 @@ export default {
createOrgSid: '',
useOrgSid: ''
},
rules: {
aitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }],
sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }],
},
btndisabled: false,
btnList: [
{
@ -252,6 +258,9 @@ export default {
},
toAdd() {
this.dialogVisible = true
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
@ -285,11 +294,15 @@ export default {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
req.saveOrUpdate(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
this.handleClose()
this.$refs['form_obj'].validate((valid) => {
if (valid) {
req.saveOrUpdate(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.getList()
this.handleClose()
}
})
}
})
}
@ -354,6 +367,9 @@ export default {
.addinputInfo {
margin-left: 75px !important;
}
/deep/ .el-form-item__error {
margin-left: 75px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 75px !important;
width: calc(100% - 70px);

5
yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue

@ -12,7 +12,7 @@
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty"><span class="addinputInfo">*</span>套餐名称</div>
<div class="span-sty"><span class="icon">*</span>套餐名称</div>
<el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.packageName" clearable placeholder="" /></el-form-item>
</el-col>
<el-col :span="16">
@ -211,7 +211,8 @@ export default {
size: 2,
total: 0,
params: {
name: ''
name: '',
orgPath: ''
}
},
commodityData: [],

7
yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageService.java

@ -339,13 +339,6 @@ public class AsServicePackageService extends MybatisBaseService<AsServicePackage
public PagerVo<GoodsListVo> selGoodsInfo(PagerQuery<PackageGoodsQuery> pq) {
PagerQuery<WmsInventoryPackageQuery> query = new PagerQuery<>();
BeanUtil.copyProperties(pq, query);
PackageGoodsQuery params = pq.getParams();
// ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(params.getOrgPath());
// if (orgSidByPath.getSuccess()) {
// String useOrgSid = orgSidByPath.getData();
// WmsGoodsPackageQuery queryParams = query.getParams();
// queryParams.setUseOrgSid(useOrgSid);
// }
ResultBean<PagerVo<WmsInventoryPackageVo>> voResultBean = wmsInventoryFeign.getPackageGoodsVo(query);
PagerVo<GoodsListVo> vo = new PagerVo<>();
if (voResultBean.getSuccess()) {

2
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryFeign.java

@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
)
public interface WmsInventoryFeign {
@ApiOperation("查询分公司下所有的商品信息")
@ApiOperation("查询部门下所有的商品信息")
@PostMapping("/getPackageGoodsVo")
public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> pq);
}

2
yxt-as/src/main/java/com/yxt/anrui/as/feign/wms/wmsInventory/WmsInventoryPackageQuery.java

@ -11,7 +11,7 @@ import lombok.Data;
*/
@Data
public class WmsInventoryPackageQuery implements Query {
private String useOrgSid;
private String orgPath;
@ApiModelProperty("商品名称")
private String goodsName; // 商品名称
@ApiModelProperty("零件号")

2
yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@ -119,7 +119,7 @@ public class WmsInventoryRest {
return rb.success().setData(pv);
}
@ApiOperation("查询分公司下所有的商品信息")
@ApiOperation("查询部门下所有的商品信息")
@PostMapping("/getPackageGoodsVo")
public ResultBean<PagerVo<WmsInventoryPackageVo>> getPackageGoodsVo(@RequestBody PagerQuery<WmsInventoryPackageQuery> pq) {
return wmsInventoryService.getPackageGoodsVo(pq);

2
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryPackageQuery.java

@ -11,7 +11,7 @@ import lombok.Data;
*/
@Data
public class WmsInventoryPackageQuery implements Query {
private String useOrgSid;
private String orgPath;
@ApiModelProperty("商品名称")
private String goodsName; // 商品名称
@ApiModelProperty("零件号")

19
yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@ -14,6 +14,7 @@ import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBill;
import com.yxt.wms.biz.inventory.wmsinventorybill.WmsInventoryBillService;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign;
import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo;
import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign;
import org.springframework.beans.factory.annotation.Autowired;
@ -36,7 +37,8 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
private BaseGoodsSkuFeign baseGoodsSkuFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<WmsInventoryVo> listPage(PagerQuery<WmsInventoryQuery> pq) {
WmsInventoryQuery query = pq.getParams();
QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
@ -316,7 +318,20 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
if (StringUtils.isNotBlank(query.getWarehouseArea())) {
qw.like("v.warehouseArea", query.getWarehouseArea());
}
qw.eq("1", "1");
String orgPath = query.getOrgPath();
String useOrgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
List<String> split = Arrays.asList(orgPath.split("/"));
if (split.size() > 1) {
//获取本级sid获取本级部门信息
SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData();
useOrgSid = sysOrganization1.getSid();
} else {
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData();
useOrgSid = sysOrganization.getSid();
}
qw.eq("v.useOrgSid",useOrgSid);
}
IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
IPage<WmsInventoryPackageVo> pagging = baseMapper.getPackageGoodsVo(page, qw);
List<WmsInventoryPackageVo> records = pagging.getRecords();

Loading…
Cancel
Save