Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 2 years ago
parent
commit
23a7180259
  1. 66
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  2. 32
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinDeliveredFinVo.java
  3. 36
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinSelectInvoiceVo.java
  4. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java
  5. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java
  6. 41
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVinInvoiceVo.java
  7. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java
  8. 19
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml
  9. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java
  10. 72
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java
  11. 118
      anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue
  12. 64
      anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
  13. 2
      anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue
  14. 134
      anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue
  15. 167
      anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue

66
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -913,7 +913,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}*/
//更改申请的状态为待审核2
baseMapper.updateStateBySid(2, bv.getBusinessSid());
}else{
} else {
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
@ -998,14 +998,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appBusHandoverPrepareVehicleDto.setSubscription(busDelivered.getSubscription());
appBusHandoverPrepareVehicleDto.setSubscriptionKey(busDelivered.getSubscriptionKey());*/
BaseVehicleState baseVehicleState = baseMapper.selectByBusVinSid(busSalesOrderVehicle.getSid());
if(baseVehicleState != null){
if(StringUtils.isNotBlank(baseVehicleState.getCarryVehicleState()) && "1".equals(baseVehicleState.getCarryVehicleState())){
if (baseVehicleState != null) {
if (StringUtils.isNotBlank(baseVehicleState.getCarryVehicleState()) && "1".equals(baseVehicleState.getCarryVehicleState())) {
//欠款提车
appBusHandoverPrepareVehicleDto.setSubscription("欠款提车");
appBusHandoverPrepareVehicleDto.setSubscriptionKey("0001");
}else{
if(StringUtils.isNotBlank(baseVehicleState.getFinState()) && "1".equals(baseVehicleState.getFinState())){
} else {
if (StringUtils.isNotBlank(baseVehicleState.getFinState()) && "1".equals(baseVehicleState.getFinState())) {
appBusHandoverPrepareVehicleDto.setSubscription("正常交款");
appBusHandoverPrepareVehicleDto.setSubscriptionKey("0002");
@ -1930,7 +1930,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
busDeliveredApplyDetails.setVinSid(appCarListVo.getVinSid());
busDeliveredApplyDetails.setApplySid(busDeliveredApply.getSid());
//根据合同编号和车架号查询busVinSId
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), appCarListVo.getVinSid());
busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer();
busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin());
@ -2109,7 +2109,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
BusDeliveredUseMessagesVo busDeliveredUseMessagesVo = appCarListVo.getRealBuyer();
busDeliveredApplyDetails.setVinNo(busDeliveredUseMessagesVo.getVin());
//根据合同编号和车架号查询busVinSId
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(),appCarListVo.getVinSid());
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(busDeliveredApply.getContractNo(), appCarListVo.getVinSid());
busDeliveredApplyDetails.setBusVinSid(busSalesOrderVehicle.getSid());
//赠送套餐
BigDecimal discountAll = BigDecimal.ZERO;
@ -2268,13 +2268,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
appCarListVo.setVinSid(busDeliveredApplyDetails.getVinSid());
//查询该车辆是否有挂车
ResultBean<TraliveredVo> trailerList = baseTrailerFeign.trailerList(busDeliveredApplyDetails.getVinSid(), busDeliveredApply.getContractNo());
if(trailerList.getData() != null){
if (trailerList.getData() != null) {
if (trailerList.getData().getList().isEmpty()) {
appCarListVo.setShowHandCarBtn(false);
} else {
appCarListVo.setShowHandCarBtn(true);
}
}else{
} else {
appCarListVo.setShowHandCarBtn(false);
}
@ -2318,14 +2318,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
List<AppCarListVo> carList = dto.getCarList();
if (!carList.isEmpty()) {
List<String> vinNoLists = new ArrayList<>();
List<String> vinSidLists = baseMapper.selectSid(dto.getContractId(),dto.getSid());
List<String> vinSidLists = baseMapper.selectSid(dto.getContractId(), dto.getSid());
//判断合同编号是否一致
for (int a = 0; a < carList.size(); a++) {
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(dto.getContractId(), carList.get(a).getVinSid());
if (busSalesOrderVehicle == null) {
return rb.setMsg("所选车辆与合同编号不匹配");
}
if(vinSidLists.contains(carList.get(a).getVinSid())){
if (vinSidLists.contains(carList.get(a).getVinSid())) {
vinNoLists.add(carList.get(a).getVinSid());
}
}
@ -2335,9 +2335,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (!vinNoList.isEmpty()) {
return rb.setMsg(String.join(",", vinNoList) + "已提交或已出库");
}
if(!vinNoLists.isEmpty()){
vinNoLists = baseMapper.selectBySid(dto.getContractId(),vinNoLists);
if(!vinNoLists.isEmpty()){
if (!vinNoLists.isEmpty()) {
vinNoLists = baseMapper.selectBySid(dto.getContractId(), vinNoLists);
if (!vinNoLists.isEmpty()) {
return rb.setMsg(String.join(",", vinNoLists) + "已发起过出库流程");
}
}
@ -2352,7 +2352,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
//根据discountSid查询已通过或已提交的申请的赠送套餐的数量
int count = busDeliveredDetailsDiscountService.selectGiveNumBySid(busDeliveredDetailsDiscountsVo.getDiscountSid());
int giveNum = count + busDeliveredDetailsDiscountsVo.getDiscountNum();
giveNumBySid = giveNumBySid+busDeliveredDetailsDiscountsVo.getDiscountNum();
giveNumBySid = giveNumBySid + busDeliveredDetailsDiscountsVo.getDiscountNum();
if (busSalesOrderDiscount.getNum() < giveNum) {
return rb.setMsg("车辆赠送的优惠包已超出");
}
@ -2377,7 +2377,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (isTrue) {
//是否存在未赠送的套餐,如果存在则不允许提交
int num = baseMapper.selectNumByContractNo(dto.getContractId());
num = num+giveNumBySid;
num = num + giveNumBySid;
int orderNum = busSalesOrderDiscountService.selectByContractNo(dto.getContractId());
if (orderNum > num) {
return rb.setMsg("本次出库为该订单最后一批出库,还存在未赠送的套餐,不允许提交");
@ -2602,7 +2602,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
//根据合同号和车辆sid查询车辆
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.selectByNoAndVinSid(contractNo, vinSid);
if(busSalesOrderVehicle != null){
if (busSalesOrderVehicle != null) {
deliveredFinVo.setVinNo(busSalesOrderVehicle.getLinkNo());
deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType());
deliveredFinVo.setContractNo(contractNo);
@ -2613,37 +2613,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
if (receiveInvoiceVoResultBean.getData() != null) {
List<ReceiveSeleteVo> receiveSeleteVoList = receiveInvoiceVoResultBean.getData().getReceiveSeleteVoList();
List<FinSelectVo> voList = Optional.ofNullable(receiveSeleteVoList).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FinSelectVo.class)).collect(Collectors.toList());
voList.removeAll(Collections.singleton(null));
List<FinSelectVo> finSelectVos = new ArrayList<>();
if (!voList.isEmpty()) {
for (FinSelectVo finSelectVo : voList) {
String receivablesSid = finSelectVo.getReceivablesSid();
FinSelectedReceivablesDetailed data = finSelectedReceivablesDetailedFeign.fetchByReceivablesSidLimt(receivablesSid).getData();
if (data != null) {
String collSid = data.getCollSid();
if (StringUtils.isNotBlank(data.getSubscriptionDate())) {
finSelectVo.setSubscriptionDate(data.getSubscriptionDate());
}
FinCollectionConfirmationDetailsVo confirmationDetailsVo = finCollectionConfirmationFeign.fetchBySid(collSid).getData();
if (null != confirmationDetailsVo) {
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionBank())) {
finSelectVo.setCollectionBank(confirmationDetailsVo.getCollectionBank());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getReceivingName())) {
finSelectVo.setReceivingName(confirmationDetailsVo.getReceivingName());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getPayerName())) {
finSelectVo.setPayerName(confirmationDetailsVo.getPayerName());
}
if (StringUtils.isNotBlank(confirmationDetailsVo.getCollectionDate())) {
finSelectVo.setCollectionDate(confirmationDetailsVo.getCollectionDate());
}
}
}
finSelectVos.add(finSelectVo);
}
}
deliveredFinVo.setFinSelectVoList(finSelectVos);
deliveredFinVo.setFinSelectVoList(voList);
InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
if (invoiceVo != null) {
VinInvoiceVo vinInvoiceVo = new VinInvoiceVo();

32
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinDeliveredFinVo.java

@ -0,0 +1,32 @@
package com.yxt.anrui.fin.api.finvehicleinvoice;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* @author Administrator
* @description
* @date 2023/8/10 13:34
*/
@Data
public class FinDeliveredFinVo {
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("销售类型")
private String paymentMethod;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("车型")
private String modelName;
@ApiModelProperty("款项情况")
private List<FinSelectInvoiceVo> finSelectVoList = new ArrayList<>();
@ApiModelProperty("发票情况")
private FinVinInvoiceVo vinInvoiceVo = new FinVinInvoiceVo();
}

36
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinSelectInvoiceVo.java

@ -0,0 +1,36 @@
package com.yxt.anrui.fin.api.finvehicleinvoice;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/8/10 13:35
*/
@Data
public class FinSelectInvoiceVo {
@ApiModelProperty("款项名称")
private String receivablesName;
@ApiModelProperty("付款方式")
private String collectionTypeValue;
@ApiModelProperty("已收金额")
private String subscriptionMoneyAll;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("付款时间")
private String subscriptionDate;
@ApiModelProperty("收款账号")
private String collectionBankNum;
@ApiModelProperty("收款账户")
private String receivingName;
@ApiModelProperty("付款人")
private String payerName;
@ApiModelProperty("收款时间")
private String collectionDate;
// @ApiModelProperty("应收金额")
// private String reveivableMoney;
// @ApiModelProperty("未收金额")
// private String notSubscriptionMoney;
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeign.java

@ -118,5 +118,10 @@ public interface FinVehicleInvoiceFeign {
@ResponseBody
ResultBean<FinVehicleInvoice> selectByVinAndContractNo(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo);
@ApiOperation("查看车辆的款票情况")
@GetMapping("/deliveredFinSelect")
@ResponseBody
ResultBean<FinDeliveredFinVo> deliveredFinSelect(@RequestParam("contractNo") String contractNo, @RequestParam("vinSid") String vinSid);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVehicleInvoiceFeignFallback.java

@ -129,4 +129,9 @@ public class FinVehicleInvoiceFeignFallback implements FinVehicleInvoiceFeign {
return null;
}
@Override
public ResultBean<FinDeliveredFinVo> deliveredFinSelect(String contractNo, String vinSid) {
return null;
}
}

41
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finvehicleinvoice/FinVinInvoiceVo.java

@ -0,0 +1,41 @@
package com.yxt.anrui.fin.api.finvehicleinvoice;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/8/10 13:34
*/
@Data
public class FinVinInvoiceVo {
//开票名称
private String invoicingName;
//税号
private String invoiceNo;
//开票单位
private String invoiceTitle;
//开票类型
private String invoiceType;
//开票状态
private String billingState;
//开票金额
private String invoiceAmount;
//开票日期
private String invoiceDate;
//移交状态
private String transferState;
@ApiModelProperty("地址")
private String address;
@ApiModelProperty("联系电话")
private String telPhone;
@ApiModelProperty("开户行")
private String openingBank;
@ApiModelProperty("银行账号")
private String bankNum;
@ApiModelProperty("接收人")
private String recipient;
@ApiModelProperty("移交日期")
private String transferTime;
}

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.java

@ -68,4 +68,6 @@ public interface FinVehicleInvoiceMapper extends BaseMapper<FinVehicleInvoice> {
@Update("update fin_vehicle_invoice set isTakeTicket = '是' where sid = #{sid}")
void updateIsLPBySid(String sid);
List<FinSelectInvoiceVo> getFinSelectInvoiceVoListByBusVinSid(String busVinSid);
}

19
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceMapper.xml

@ -260,4 +260,23 @@
where vehicleSid = #{vinSid}
and contractNo = #{contractNo}
</select>
<select id="getFinSelectInvoiceVoListByBusVinSid"
resultType="com.yxt.anrui.fin.api.finvehicleinvoice.FinSelectInvoiceVo">
select fu.busVinSid,
fu.receivablesName,
co.collectionTypeValue,
fs.subscriptionMoney as subscriptionMoneyAll,
co.remarks,
fs.subscriptionDate,
co.collectionBankNum,
co.receivingName,
co.payerName,
co.confirmDate as collectionDate
FROM fin_uncollected_receivables_detailed as fu
LEFT JOIN fin_selected_receivables_detailed as fs ON fu.sid = fs.receivablesSid
LEFT JOIN fin_collection_confirmation as co ON fs.collSid = co.sid
WHERE fu.busVinSid = #{busVinSid}
and fs.auditState = '3'
ORDER BY co.createTime DESC
</select>
</mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceRest.java

@ -249,4 +249,9 @@ public class FinVehicleInvoiceRest implements FinVehicleInvoiceFeign {
return finVehicleInvoiceService.selectByVinAndContractNo(vinSid, contractNo);
}
@Override
public ResultBean<FinDeliveredFinVo> deliveredFinSelect(String contractNo, String vinSid) {
return finVehicleInvoiceService.deliveredFinSelect(contractNo,vinSid);
}
}

72
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finvehicleinvoice/FinVehicleInvoiceService.java

@ -1,6 +1,7 @@
package com.yxt.anrui.fin.biz.finvehicleinvoice;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basetrailer.BaseTrailerDetailsVo;
@ -11,14 +12,27 @@ import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.common.enums.CertificState;
import com.yxt.anrui.buscenter.api.busdeliveredapply.DeliveredFinVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.FinSelectVo;
import com.yxt.anrui.buscenter.api.busdeliveredapply.VinInvoiceVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordEnum;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsDto;
import com.yxt.anrui.buscenter.api.bustransferrecords.BusTransferRecordsFeign;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDetailsVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveInvoiceVo;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.ReceiveSeleteVo;
import com.yxt.anrui.fin.api.finvehicleinvoice.*;
import com.yxt.anrui.fin.biz.finbillfile.FinBillFileService;
import com.yxt.anrui.fin.biz.fincollectionconfirmation.FinCollectionConfirmationService;
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgByUserVo;
@ -40,6 +54,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-fin(财务管理) <br/>
@ -82,6 +97,15 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserRoleFeign sysUserRoleFeign;
@Autowired
private FinUncollectedReceivablesDetailedService finUncollectedReceivablesDetailedService;
@Autowired
private FinSelectedReceivablesDetailedService finSelectedReceivablesDetailedService;
@Autowired
private FinCollectionConfirmationService finCollectionConfirmationService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
public PagerVo<FinVehicleInvoice> listPage(PagerQuery<FinVehicleInvoiceQuery> pq) {
FinVehicleInvoiceQuery query = pq.getParams();
@ -406,7 +430,7 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
public ResultBean<VehicleInvoiceVo> selectByVinSids(String vinSid) {
ResultBean<VehicleInvoiceVo> rb = ResultBean.fireFail();
VehicleInvoiceVo vehicleInvoiceVo = baseMapper.selectByVinSids(vinSid);
if(StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())){
if (StringUtils.isNotBlank(vehicleInvoiceVo.getFilePath())) {
List<String> filePathList = Arrays.asList(vehicleInvoiceVo.getFilePath().split(","));
vehicleInvoiceVo.setInvoiceImages(filePathList);
}
@ -434,11 +458,11 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.selectByOrgSidPath(orgPath).getData();
for (String sid : sids) {
FinVehicleInvoice finVehicleInvoice = fetchBySid(sid);
if (CertificState.TransferState.TRANSTATE_WJS.getCode().equals(finVehicleInvoice.getTransferStateKey()) && "002".equals(finVehicleInvoice.getBillingStateKey()) && "是".equals(finVehicleInvoice.getIsTakeTicket())){
if (CertificState.TransferState.TRANSTATE_WJS.getCode().equals(finVehicleInvoice.getTransferStateKey()) && "002".equals(finVehicleInvoice.getBillingStateKey()) && "是".equals(finVehicleInvoice.getIsTakeTicket())) {
String vehicleSid = "";
if ("主车".equals(finVehicleInvoice.getVehicleType())){
if ("主车".equals(finVehicleInvoice.getVehicleType())) {
vehicleSid = finVehicleInvoice.getVehicleSid();
}else if ("挂车".equals(finVehicleInvoice.getVehicleType())){
} else if ("挂车".equals(finVehicleInvoice.getVehicleType())) {
String gcSid = finVehicleInvoice.getVehicleSid();
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchBySid(gcSid).getData();
vehicleSid = baseTrailerDetailsVo.getVehSid();
@ -568,4 +592,44 @@ public class FinVehicleInvoiceService extends MybatisBaseService<FinVehicleInvoi
baseMapper.updateIsLPBySid(sid);
return rb.success();
}
/**
* 查看款票详情
*
* @param contractNo
* @param vinSid
* @return
*/
public ResultBean<FinDeliveredFinVo> deliveredFinSelect(String contractNo, String vinSid) {
ResultBean<FinDeliveredFinVo> rb = ResultBean.fireFail();
FinDeliveredFinVo deliveredFinVo = new FinDeliveredFinVo();
//查询销售订单
ResultBean<AppOrderDetailsVo> resultBean = busSalesOrderFeign.getSaleOrderDetailsByContractNo(contractNo);
AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
//根据合同号和车辆sid查询车辆
BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(contractNo, vinSid).getData();
if (busSalesOrderVehicle != null) {
deliveredFinVo.setVinNo(busSalesOrderVehicle.getLinkNo());
deliveredFinVo.setPaymentMethod(appOrderDetailsVo.getPayType());
deliveredFinVo.setContractNo(contractNo);
deliveredFinVo.setCustomerName(appOrderDetailsVo.getName());
deliveredFinVo.setModelName(appOrderDetailsVo.getModelInfo().getModelName());
//根据销售订单车辆查询款项情况
ResultBean<ReceiveInvoiceVo> receiveInvoiceVoResultBean = finUncollectedReceivablesDetailedService.receivedSelect(busSalesOrderVehicle.getSid(), busSalesOrderVehicle.getLinkSid());
if (receiveInvoiceVoResultBean.getData() != null) {
List<FinSelectInvoiceVo> finSelectVoList = baseMapper.getFinSelectInvoiceVoListByBusVinSid(busSalesOrderVehicle.getSid());
finSelectVoList.removeAll(Collections.singleton(null));
if (!finSelectVoList.isEmpty()) {
deliveredFinVo.setFinSelectVoList(finSelectVoList);
}
InvoiceVo invoiceVo = receiveInvoiceVoResultBean.getData().getInvoiceVo();
if (invoiceVo != null) {
FinVinInvoiceVo vinInvoiceVo = new FinVinInvoiceVo();
BeanUtil.copyProperties(invoiceVo, vinInvoiceVo);
deliveredFinVo.setVinInvoiceVo(vinInvoiceVo);
}
}
}
return rb.success().setData(deliveredFinVo);
}
}

118
anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue

@ -26,10 +26,10 @@
<el-form-item prop="mainVehicleAmount">
<div class="addinputInfo">
<span><span class="icon">*</span>主车发票价<el-input v-model="finance.mainVehicleAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.mainVehicleAmount = oninput(finance.mainVehicleAmount, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox v-model="finance.accessoriesAmountCb" style="padding-right: 5px"/>配件<el-input v-model="finance.accessoriesAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.accessoriesAmount = oninput(finance.accessoriesAmount, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox v-model="finance.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input v-model="finance.trailerAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.trailerAmount = oninput(finance.trailerAmount, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox v-model="finance.premiumCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>保险<el-input v-model="finance.premium" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.premium = oninput(finance.premium, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox v-model="finance.purchaseTaxCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>购置税<el-input v-model="finance.purchaseTax" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.purchaseTax = oninput(finance.purchaseTax, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.accessoriesAmountCb" style="padding-right: 5px"/>配件<el-input v-model="finance.accessoriesAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.accessoriesAmount = oninput(finance.accessoriesAmount, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.trailerAmountCb" style="padding-right: 5px"/>挂车<el-input v-model="finance.trailerAmount" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.trailerAmount = oninput(finance.trailerAmount, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.premiumCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>保险<el-input v-model="finance.premium" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.premium = oninput(finance.premium, 0)"/></span>
<span style="padding-left: 5px"><el-checkbox @change="financingProject" v-model="finance.purchaseTaxCb" :disabled="finance.isPack == '0'" style="padding-right: 5px"/>购置税<el-input v-model="finance.purchaseTax" @input="financingProject" clearable style="width: 100px" placeholder="" @keyup.native="finance.purchaseTax = oninput(finance.purchaseTax, 0)"/></span>
</div>
</el-form-item>
</el-col>
@ -86,9 +86,7 @@
<el-col :span="6">
<div class="span-sty">贴息用途</div>
<el-form-item>
<el-select v-model="finance.factoryDiscountUse" placeholder="请选择" @change="changeFactoryDiscountUse" clearable class="addinputInfo">
<el-option v-for="item in factoryDiscountUse_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
</el-select>
<span class="addinputInfo">{{ finance.factoryDiscountUse }}</span>
</el-form-item>
</el-col>
</el-row>
@ -114,7 +112,7 @@
<el-col :span="6">
<div class="span-sty">贴息抵车款</div>
<el-form-item>
<span class="addinputInfo">{{ finance.discountCar }}</span>
<el-input v-model="finance.discountCar" clearable placeholder="" class="addinputInfo addinputw" @keyup.native="finance.discountCar = oninput(finance.discountCar, 0)"/>
</el-form-item>
</el-col>
</el-row>
@ -389,21 +387,8 @@ export default {
dealWay_list: [],
policy_list: [],
other_list: [],
factoryDiscountUse_list: [],
finance: {},
rules: {
// mainVehicleAmount: [{ required: true, message: '', trigger: 'blur' }],
// downPayAmount: [{ required: true, message: '', trigger: 'blur' }],
// loanPeriod: [{ required: true, message: '', trigger: 'blur' }],
// bondAmount: [{ required: true, message: '', trigger: 'blur' }],
// factoryDiscount: [{ required: true, message: '', trigger: 'blur' }],
// loanPayMoney: [{ required: true, message: '', trigger: 'blur' }],
// otherPolicyAmount: [{ required: true, message: '', trigger: 'blur' }],
// otherPolicyPeriod: [{ required: true, message: '', trigger: 'blur' }],
// otherPolicyMonthlyRepay: [{ required: true, message: '', trigger: 'blur' }],
// returnTime: [{ required: true, message: '', trigger: 'blur' }],
// serviceAmount: [{ required: true, message: '', trigger: 'blur' }],
// factoryDiscountUse: [{ required: true, message: '', trigger: 'blur' }]
}
}
},
@ -422,11 +407,6 @@ export default {
this.dealWay_list = resp.data
}
})
typeValues({ type: 'factoryDiscountUse' }).then((resp) => {
if (resp.success) {
this.factoryDiscountUse_list = resp.data
}
})
},
methods: {
//
@ -480,22 +460,54 @@ export default {
},
// --
financingProject() {
if (this.finance.mainVehicleAmount !== '') {
if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// =
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount))
if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb) {
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount))
}
if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb && this.finance.trailerAmountCb) {
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount))
}
if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb) {
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium))
}
if (this.finance.mainVehicleAmount !== '' && this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
}
} else {
this.finance.loanTotal = ''
} else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount))
} else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount))
} else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.premium))
} else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = + + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium))
} else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (!this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount))
} else if (!this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium))
} else if (!this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && !this.finance.purchaseTaxCb) {
// = +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.premium))
} else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (!this.finance.accessoriesAmountCb && !this.finance.trailerAmountCb && !this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (this.finance.accessoriesAmountCb && this.finance.trailerAmountCb && this.finance.premiumCb && this.finance.purchaseTaxCb) {
// = + + + +
this.finance.loanTotal = parseInt(this.arguments(this.finance.mainVehicleAmount)) + parseInt(this.arguments(this.finance.accessoriesAmount)) + parseInt(this.arguments(this.finance.trailerAmount)) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
}
//
if (this.finance.loanTotal !== '') {
@ -552,7 +564,7 @@ export default {
//
this.finance.loanInterest = parseInt(this.arguments(this.finance.loanInterest)) - parseInt(this.arguments(this.finance.factoryDiscount))
//
this.finance.loanPayMoney = (parseInt(this.arguments(this.finance.loanPayMoney)) - parseInt(this.arguments(this.finance.factoryDiscount))) / parseInt(this.arguments(this.finance.loanPeriod))
this.finance.loanPayMoney = ((parseInt(this.arguments(this.finance.loanPayMoney)) - parseInt(this.arguments(this.finance.factoryDiscount))) / parseInt(this.arguments(this.finance.loanPeriod))).toFixed(0)
//
this.finance.policyYearRatio = (parseFloat(this.rate(this.finance.loanPeriod, this.finance.loanPayMoney, this.finance.loanAmount, 0, 0, 0.01)) * 12).toFixed(2)
}
@ -592,18 +604,6 @@ export default {
}
return rate
},
// --
changeFactoryDiscountUse(value) {
const choose = this.factoryDiscountUse_list.filter((item) => item.dictValue === value)
if (choose.length > 0 && choose !== null) {
this.finance.factoryDiscountUseKey = choose[0].dictKey
} else {
this.finance.factoryDiscountUseKey = ''
}
if (this.finance.factoryDiscountUseKey === '02') {
this.factoryDiscountInput()
}
},
// --
changeOtherPolicy(value) {
const choose = this.other_list.filter((item) => item.name === value)
@ -789,12 +789,14 @@ export default {
},
// --
vehTotalPrice() {
this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))))
if (!this.finance.premiumCb && this.finance.premium !== '' && this.finance.premium !== null) {
if (!this.finance.premiumCb && this.finance.purchaseTaxCb) {
this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.premium))
}
if (!this.finance.purchaseTaxCb && this.finance.purchaseTax !== '' && this.finance.purchaseTax !== null) {
} else if (this.finance.premiumCb && !this.finance.purchaseTaxCb) {
this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.purchaseTax))
} else if (!this.finance.premiumCb && !this.finance.purchaseTaxCb) {
this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod)))) + parseInt(this.arguments(this.finance.premium)) + parseInt(this.arguments(this.finance.purchaseTax))
} else {
this.finance.vehTotalPrice = parseInt(this.arguments(this.finance.downPayAmounts)) + parseInt(this.arguments(this.finance.serviceAmount)) + parseInt(this.arguments(this.finance.proxyAccidentPremium)) + parseInt(this.arguments(this.finance.registerAmount)) + parseInt(this.arguments(this.finance.operationAmount)) + parseInt(this.arguments(this.finance.vehOtherPrice)) + parseInt(this.arguments(this.finance.otherAmount)) + parseInt(this.arguments(parseInt(this.arguments(this.finance.loanPayMoney)) * parseInt(this.arguments(this.finance.loanPeriod)))) + parseInt(this.arguments(parseInt(this.arguments(this.finance.otherPolicyMonthlyRepay)) * parseInt(this.arguments(this.finance.otherPolicyPeriod))))
}
return this.finance.vehTotalPrice
},

64
anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue

@ -1,14 +1,8 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<div v-if="formobj.typeKey !== '02'">
<div>
<div>
<el-form ref="dataForm" :model="formobj" class="formaddcopy02">
<div>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6">
<div class="span-sty">是否打包</div>
@ -25,11 +19,10 @@
<el-form-item>
<div class="addinputInfo">
<span>主车发票价{{ formobj.mainVehicleAmount }} </span>
<span>融资票据{{ formobj.accessoriesAmount }} </span>
<span>配件{{ formobj.accessoriesAmount }} </span>
<span>挂车{{ formobj.trailerAmount }} </span>
<span>保险{{ formobj.premium }} </span>
<span>购置税{{ formobj.purchaseTax }} </span>
<span>车损上浮{{ formobj.vehDamageFloat }} </span>
</div>
</el-form-item>
</el-col>
@ -40,7 +33,7 @@
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">首付比例</div>
<div class="span-sty">首付比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
</el-col>
<el-col :span="6">
@ -58,7 +51,7 @@
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">贷款保证金比例</div>
<div class="span-sty">贷款保证金比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.bondRatio }}</span></el-form-item>
</el-col>
<el-col :span="6">
@ -70,11 +63,15 @@
<el-form-item><span class="addinputInfo">{{ formobj.factoryDiscount }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">年利率</div>
<el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
<div class="span-sty">贴息用途</div>
<el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<div class="span-sty">年利率(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.policyYearRatio }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">月还金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.loanPayMoney }}</span></el-form-item>
@ -83,9 +80,9 @@
<div class="span-sty">利息总额</div>
<el-form-item><span class="addinputInfo">{{ formobj.loanInterest }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">厂家贴息用途</div>
<el-form-item><span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span></el-form-item>
<el-col :span="6">
<div class="span-sty">贴息抵车款</div>
<el-form-item><span class="addinputInfo">{{ formobj.discountCar }}</span></el-form-item>
</el-col>
</el-row>
<div v-show="formobj.otherPolicyState">
@ -126,7 +123,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.loanDownPay }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">实际首付比例</div>
<div class="span-sty">实际首付比例(%)</div>
<el-form-item><span class="addinputInfo">{{ formobj.downPayAmountsRatio }}</span></el-form-item>
</el-col>
<el-col :span="6">
@ -259,28 +256,6 @@
</el-col>
</el-row>
</div>
<div v-if="formobj.typeKey == '02'">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="8">
<div class="span-sty">厂家贴息</div>
<el-form-item>
<span class="addinputInfo">{{ formobj.factoryDiscount }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">厂家贴息用途</div>
<el-form-item>
<span class="addinputInfo">{{ formobj.factoryDiscountUse }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>服务费</div>
<el-form-item>
<span class="addinputInfo">{{ formobj.serviceAmount }}</span>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
</div>
@ -303,6 +278,8 @@ export default {
showInfo(value) {
this.viewTitle = '金融方案'
this.formobj = value
console.log(value, 8888)
console.log(this.formobj, 9999)
},
handleReturn() {
this.$emit('doback')
@ -312,6 +289,9 @@ export default {
</script>
<style scoped>
.formaddcopy02 {
padding: 0px;
}
.span-sty {
width: 130px !important;
}

2
anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutions.vue

@ -87,7 +87,7 @@
<!-- 新增或编辑 -->
<customizedfinancialsolutionsAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<!-- 详情 -->
<!-- <customizedfinancialsolutionsInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>-->
<customizedfinancialsolutionsInfo v-show="viewState == 4" ref="divInfo" @doback="resetState"/>
<!-- 流程审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>

134
anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsAdd.vue

@ -451,6 +451,11 @@ export default {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid({ sid: row.sid }).then((res) => {
if (res.success) {
this.formobj = res.data
}
})
},
showTypeChange(value) {
const choose = this.proposal_list.filter((item) => item.dictKey === value)
@ -552,7 +557,11 @@ export default {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
@ -579,7 +588,132 @@ export default {
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
useOrgSid: '',
install: false,
loanTemplateInstall: {
colorValue: '',
installNameValue: '',
moreConfig: '',
plateMaterialValue: '',
plateThicknessBottom: '',
plateThicknessEdge: '',
plateThickness: '',
refitFactory: '',
refitMethodValue: '',
vehInstallPrice: '',
vehInstallRemark: '',
vehInstallModelSid: '',
wkSize: '',
wk_high: '',
wk_long: '',
wk_wide: ''
},
loanTemplateSolutions: {
saleOrderSid: '',
type: '',
isPack: '',
policyName: '',
policySid: '',
mainVehicleAmount: '',
accessoriesAmount: '',
trailerAmount: '',
purchaseTax: '',
premium: '',
loanTotal: '',
accessoriesAmountCb: false,
trailerAmountCb: false,
purchaseTaxCb: false,
premiumCb: false,
downPayRatio: '',
downPayAmount: '',
loanAmount: '',
loanPeriod: '',
bondRatio: '',
bondAmount: '',
factoryDiscount: '',
factoryDiscountUse: '',
policyYearRatio: '',
loanPayMoney: '',
loanInterest: '',
discountCar: '',
otherPolicyState: false,
otherPolicyName: '',
otherPolicySid: '',
otherPolicyAmount: '',
otherPolicyPeriod: '',
otherPolicyMonthlyRepay: '',
otherPolicyInterest: '',
otherPolicyYearRatio: '',
loanDownPay: '',
downPayAmountsRatio: '',
loanAmountTotal: '',
period: '',
monthlyRepay: '',
interest: '',
returnTime: '',
downPayAmounts: '',
bondAmounts: '',
depositPremium: '',
depositSettle: '',
serviceAmount: '',
proxyAccidentPremium: '',
registerAmount: '',
operationAmount: '',
vehOtherPrice: '',
otherAmount: '',
otherAmountRemark: '',
dealWay: '',
dealWayKey: '',
proxyPremium: '',
proxyPurchasetax: '',
proxyTotal: '',
offsetPremium: '',
offsetPurchasetax: '',
offsetTotal: '',
receivableTotal: '',
realTotal: '',
vehTotalPrice: '',
nominalPrice: ''
},
loanTemplateTrailer: {
boxColor: '',
brandName: '',
carModelName: '',
insideSize: '',
insideSizeHigh: '',
insideSizeLong: '',
insideSizeWide: '',
manufacturerName: '',
modelTrailerName: '',
moreConfig: '',
vehTrailerModelSid: '',
vehTrailerCertificateFile: [],
vehTrailerPrice: '',
vehTrailerRemark: ''
},
orgPath: '',
showTypeKey: '',
showTypeValue: '',
sid: '',
taskId: '',
templateName: '',
trailer: false,
instanceId: '',
userSid: '',
vehModel: '',
vehModelConfig: '',
vehModelConfigMore: '',
vehModelConfigSid: '',
vehModelSid: '',
vehNoticeModel: '',
vehNoticeModelSid: '',
vehPrice: ''
}
this.image_list = []
this.submitdisabled = false

167
anrui-riskcenter-ui/src/views/customizedfinancialsolutions/customizedfinancialsolutionsInfo.vue

@ -8,7 +8,7 @@
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty">模板名称</div>
@ -16,7 +16,7 @@
</el-col>
<el-col :span="12">
<div class="span-sty">选择预估报价单</div>
<el-form-item><span class="addinputInfo">{{ formobj.showType }}</span></el-form-item>
<el-form-item><span class="addinputInfo">{{ formobj.showTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
@ -162,6 +162,7 @@
<div class="title">
<div>消贷金融方案</div>
</div>
<financialschemeInfo ref="divInfo"/>
</el-form>
</div>
</div>
@ -170,8 +171,13 @@
<script>
import req from '@/api/customizedfinancialsolutions/customizedfinancialsolutions'
import financialschemeInfo from '@/components/publicPage/financialschemeInfo'
export default {
name: '',
components: {
financialschemeInfo
},
data() {
return {
viewTitle: '',
@ -196,6 +202,79 @@ export default {
wk_long: '',
wk_wide: ''
},
loanTemplateSolutions: {
saleOrderSid: '',
type: '',
isPack: '',
policyName: '',
policySid: '',
mainVehicleAmount: '',
accessoriesAmount: '',
trailerAmount: '',
purchaseTax: '',
premium: '',
loanTotal: '',
accessoriesAmountCb: false,
trailerAmountCb: false,
purchaseTaxCb: false,
premiumCb: false,
downPayRatio: '',
downPayAmount: '',
loanAmount: '',
loanPeriod: '',
bondRatio: '',
bondAmount: '',
factoryDiscount: '',
factoryDiscountUse: '',
policyYearRatio: '',
loanPayMoney: '',
loanInterest: '',
discountCar: '',
otherPolicyState: false,
otherPolicyName: '',
otherPolicySid: '',
otherPolicyAmount: '',
otherPolicyPeriod: '',
otherPolicyMonthlyRepay: '',
otherPolicyInterest: '',
otherPolicyYearRatio: '',
loanDownPay: '',
downPayAmountsRatio: '',
loanAmountTotal: '',
period: '',
monthlyRepay: '',
interest: '',
returnTime: '',
downPayAmounts: '',
bondAmounts: '',
depositPremium: '',
depositSettle: '',
serviceAmount: '',
proxyAccidentPremium: '',
registerAmount: '',
operationAmount: '',
vehOtherPrice: '',
otherAmount: '',
otherAmountRemark: '',
dealWay: '',
dealWayKey: '',
proxyPremium: '',
proxyPurchasetax: '',
proxyTotal: '',
offsetPremium: '',
offsetPurchasetax: '',
offsetTotal: '',
receivableTotal: '',
realTotal: '',
vehTotalPrice: '',
nominalPrice: ''
},
loanTemplateTrailer: {
boxColor: '',
brandName: '',
@ -216,8 +295,10 @@ export default {
showTypeKey: '',
showTypeValue: '',
sid: '',
taskId: '',
templateName: '',
trailer: false,
instanceId: '',
userSid: '',
vehModel: '',
vehModelConfig: '',
@ -233,9 +314,12 @@ export default {
methods: {
showInfo(row) {
this.viewTitle = '公司定制金融方案详情'
req.fetchBySid(row.sid).then((resp) => {
req.fetchBySid({ sid: row.sid }).then((resp) => {
if (resp.success) {
this.formobj = resp.data
this.$nextTick(() => {
this.$refs['divInfo'].showInfo(this.formobj.loanTemplateSolutions)
})
}
})
},
@ -261,6 +345,79 @@ export default {
wk_long: '',
wk_wide: ''
},
loanTemplateSolutions: {
saleOrderSid: '',
type: '',
isPack: '',
policyName: '',
policySid: '',
mainVehicleAmount: '',
accessoriesAmount: '',
trailerAmount: '',
purchaseTax: '',
premium: '',
loanTotal: '',
accessoriesAmountCb: false,
trailerAmountCb: false,
purchaseTaxCb: false,
premiumCb: false,
downPayRatio: '',
downPayAmount: '',
loanAmount: '',
loanPeriod: '',
bondRatio: '',
bondAmount: '',
factoryDiscount: '',
factoryDiscountUse: '',
policyYearRatio: '',
loanPayMoney: '',
loanInterest: '',
discountCar: '',
otherPolicyState: false,
otherPolicyName: '',
otherPolicySid: '',
otherPolicyAmount: '',
otherPolicyPeriod: '',
otherPolicyMonthlyRepay: '',
otherPolicyInterest: '',
otherPolicyYearRatio: '',
loanDownPay: '',
downPayAmountsRatio: '',
loanAmountTotal: '',
period: '',
monthlyRepay: '',
interest: '',
returnTime: '',
downPayAmounts: '',
bondAmounts: '',
depositPremium: '',
depositSettle: '',
serviceAmount: '',
proxyAccidentPremium: '',
registerAmount: '',
operationAmount: '',
vehOtherPrice: '',
otherAmount: '',
otherAmountRemark: '',
dealWay: '',
dealWayKey: '',
proxyPremium: '',
proxyPurchasetax: '',
proxyTotal: '',
offsetPremium: '',
offsetPurchasetax: '',
offsetTotal: '',
receivableTotal: '',
realTotal: '',
vehTotalPrice: '',
nominalPrice: ''
},
loanTemplateTrailer: {
boxColor: '',
brandName: '',
@ -296,8 +453,8 @@ export default {
vehPrice: ''
}
this.$emit('doback')
},
},
}
}
}
</script>

Loading…
Cancel
Save