Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseSalesReturnVo.java

@@ -0,0 +1,16 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/31 16:04
+ */
+@Data
+public class BaseSalesReturnVo {
+
+    private String mainSid;
+    private String customerNo;
+    private String materialCode;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -87,6 +87,17 @@ public interface BaseVehicleOutFeign {
     @PostMapping("/ctxsckd")
     @ResponseBody
     ResultBean ctxsckd(@RequestParam("xsckdSid") String xsckdSid);
+
+    @ApiOperation("退车成功后查询出库记录")
+    @PostMapping("/selectByVehReturn")
+    @ResponseBody
+    public ResultBean<BaseSalesReturnVo> selectByVehReturn(@RequestParam("vinSid") String vinSid, @RequestParam("contractNo") String contractNo);
+
+    @ApiOperation("退车成功后删除出库记录")
+    @PostMapping("/deleteByVehReturn")
+    @ResponseBody
+    public ResultBean deleteByVehReturn(@RequestParam("vinSid") String vinSid, @RequestParam("mainSid") String mainSid);
+
 }
 
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -32,9 +32,11 @@ public enum BillTypeEnum {
     XSDDTCSQ("XSDDTCSQ", "销售订单退车申请"),
     QKTCSQ("QKTCSQ", "欠款提车申请"),
     GCCKSQ("GCCKSQ", "挂车出库申请"),
+    XXTHS("XXTHS", "销售退货单"),
     JCZLQRD("JCZLQRD", "交车资料确认单"),
     JCECQRD("JCECQRD", "交车资料二次确认单");
 
+
     private String billType;
     private String billTypeName;
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.java

@@ -26,7 +26,7 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     int selectCountByVinSid(String vinSid);
 
 
-    IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER)QueryWrapper<BaseVehicleOut> qw);
+    IPage<BaseVehicleOutVo> selectPageVo(IPage<BaseVehicleOut> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOut> qw);
 
     BaseVehicleOutDetailsVo details(String sid);
 
@@ -37,7 +37,7 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     @Select("select * from base_vehicle_out where mainSid = #{xsckdSid}")
     List<BaseVehicleOut> fetchByMainSid(String xsckdSid);
 
-    BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid,@Param("vehSid") String vehSid);
+    BaseVehicleOutDetailsVo selByOrgSidAndVehSid(@Param("useOrgSid") String useOrgSid, @Param("vehSid") String vehSid);
 
     List<BaseVehicleOutVoExecl> selByExcel(@Param(Constants.WRAPPER) Wrapper<BaseVehicleOutVoExecl> qw);
 
@@ -47,4 +47,8 @@ public interface BaseVehicleOutMapper extends BaseMapper<BaseVehicleOut> {
     BaseVehicleOutDetailsNewVo detailsNew(String sid);
 
     List<BaseVehicleOutVoExeclNew> listExcelNew(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleOutVoExeclNew> qw);
+
+    BaseSalesReturnVo selectByVehReturn(@Param("vinSid") String vinSid, @Param("contractNo") String contractNo);
+
+    void deleteByVehReturn(@Param("vinSid") String vinSid, @Param("mainSid") String mainSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutMapper.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yxt.anrui.base.biz.basevehicleout.BaseVehicleOutMapper">
+
     <!--库存状态为库存或调入、且问题状态为无问题的、且为相同合同内-->
     <select id="selectCountBySid" resultType="java.lang.String">
         select vinNo
@@ -18,7 +19,7 @@
         select count(*)
         from base_vehicle
         where (vehicleStateValue &lt;&gt; '库存'
-                or vehicleStateValue &lt;&gt; '调入')
+            or vehicleStateValue &lt;&gt; '调入')
           and isProblemVeh &lt;&gt; '0'
           and sid = #{vinSid}
     </select>
@@ -100,7 +101,7 @@
                bo.trailerOrInstallDealPrice,
                bo.totalDealPrice
         from base_vehicle_out bo
-                     left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+                 left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
         where bo.sid = #{sid}
     </select>
 
@@ -116,7 +117,7 @@
         from base_vehicle_out_apply
         where billNo LIKE concat(#{billNo}, '%')
         order by billNo desc
-                limit 1
+            limit 1
     </select>
 
     <select id="selByOrgSidAndVehSid" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
@@ -192,8 +193,8 @@
                bvo.`rebateMoneyTwo`,
                bvo.`remarks`
         FROM base_vehicle_out bvo
-                     LEFT JOIN base_vehicle_out_apply bvoa
+                 LEFT JOIN base_vehicle_out_apply bvoa
-                ON bvo.`mainSid` = bvoa.`sid`
+                           ON bvo.`mainSid` = bvoa.`sid`
         WHERE bvo.sid = #{sid}
     </select>
 
@@ -235,4 +236,20 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selectByVehReturn" resultType="com.yxt.anrui.base.api.basevehicleout.BaseSalesReturnVo">
+        SELECT ba.sid          as mainSid,
+               bv.cwCustomerNo   as customerNo,
+               bv.materialCode as materialCode
+        FROM base_vehicle_out as bv
+                 JOIN base_vehicle_out_apply as ba ON bv.mainSid = ba.sid
+        WHERE bv.vinSid = #{vinSid}
+          AND ba.contractNo = #{contractNo}
+    </select>
+
+    <update id="deleteByVehReturn">
+        UPDATE base_vehicle_out
+        SET isDelete = 1
+        WHERE vinSid = #{vinSid}
+          AND mainSid = #{mainSid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -123,4 +123,16 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean ctxsckd(String xsckdSid) {
         return baseVehicleOutService.ctxsckd(xsckdSid);
     }
+
+    @Override
+    public ResultBean<BaseSalesReturnVo> selectByVehReturn(String vinSid, String contractNo) {
+        return baseVehicleOutService.selectByVehReturn(vinSid,contractNo);
+    }
+
+    @Override
+    public ResultBean deleteByVehReturn(String vinSid, String mainSid) {
+        return baseVehicleOutService.deleteByVehReturn(vinSid,mainSid);
+    }
+
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -65,6 +65,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
@@ -1009,10 +1010,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
         }
         BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(appDto.getContractNo()).getData();
-        if ("2".equals(busSalesOrder.getFinancePlan())){
+        if ("2".equals(busSalesOrder.getFinancePlan())) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(appDto.getContractNo(), baseVehicle.getSid()).getData();
             String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
-            if (StringUtils.isNotBlank(otherReceivableMoney)){
+            if (StringUtils.isNotBlank(otherReceivableMoney)) {
                 note = note + "贴息抵车款" + otherReceivableMoney + "元。";
             }
         }
@@ -1857,10 +1858,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 }
             }
             BusSalesOrder busSalesOrder = busSalesOrderFeign.selectOrderByContractNo(baseVehicleOutApply.getContractNo()).getData();
-            if ("2".equals(busSalesOrder.getFinancePlan())){
+            if ("2".equals(busSalesOrder.getFinancePlan())) {
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), baseVehicle.getSid()).getData();
                 String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
-                if (StringUtils.isNotBlank(otherReceivableMoney)){
+                if (StringUtils.isNotBlank(otherReceivableMoney)) {
                     note = note + "贴息抵车款" + otherReceivableMoney + "元。";
                 }
             }
@@ -1934,10 +1935,10 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         for (BaseVehicleOutVoExeclNew baseVehicleOutVoExeclNew : baseVehicleOutVoExeclNews) {
             baseVehicleOutVoExeclNew.setRankNo(id);
             String createOrgSid = baseVehicleOutVoExeclNew.getCreateOrgSid();
-            if (StringUtils.isNotBlank(createOrgSid)){
+            if (StringUtils.isNotBlank(createOrgSid)) {
                 SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
                 baseVehicleOutVoExeclNew.setCreateOrgName(sysOrganizationVo.getName());
-            }else {
+            } else {
                 baseVehicleOutVoExeclNew.setCreateOrgName("无");
             }
             id = id + 1;
@@ -2056,7 +2057,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         AppDeliveredDetailsVo appDeliveredDetailsVo = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(baseVehicleOutApply.getBusSid()).getData();
         if (appDeliveredDetailsVo != null) {
             List<PCHistTaskListAndCommentList> flowRecordVo = flowableFeignPro.flowRecordAndComment(appDeliveredDetailsVo.getProcInstId(), "1").getData();
-            if (flowRecordVo != null){
+            if (flowRecordVo != null) {
                 for (PCHistTaskListAndCommentList flowTask : flowRecordVo) {
                     if (flowTask.getFlowableRecordVo() != null) {
                         Map<String, Object> flowableRecordVo = flowTask.getFlowableRecordVo();
@@ -2071,7 +2072,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                             dataMap.put("jrsp", assigneeName + finishTime);
                         } else if ("Activity_1xzxtct".equals(taskDefKey) || "Activity_1ohp3br".equals(taskDefKey)) {
                             dataMap.put("confirmName", assigneeName + finishTime);
-                        }else if ("Activity_1461e4e".equals(taskDefKey)){
+                        } else if ("Activity_1461e4e".equals(taskDefKey)) {
                             dataMap.put("cwsp", assigneeName + finishTime);
                         }
                     }
@@ -2168,4 +2169,17 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     public String selectNum(String billNo) {
         return baseMapper.selectNum(billNo);
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean deleteByVehReturn(String vinSid, String mainSid) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.deleteByVehReturn(vinSid, mainSid);
+        return rb.success();
+    }
+
+    public ResultBean<BaseSalesReturnVo> selectByVehReturn(String vinSid, String contractNo) {
+        ResultBean<BaseSalesReturnVo> rb = ResultBean.fireFail();
+        BaseSalesReturnVo vo = baseMapper.selectByVehReturn(vinSid, contractNo);
+        return rb.success().setData(vo);
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesreturnorders/BusSalesReturnOrders.java

@@ -0,0 +1,37 @@
+package com.yxt.anrui.buscenter.api.bussalesreturnorders;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/31 11:52
+ */
+@Data
+@TableName("bus_sales_return_orders")
+public class BusSalesReturnOrders extends BaseEntity {
+
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("客户编码")
+    private String customerNo;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("物料编码")
+    private String materialCode;
+    @ApiModelProperty("应退数量")
+    private String mustQty;
+    @ApiModelProperty("实退数量")
+    private String realQty;
+    @ApiModelProperty("销售组织编码")
+    private String saleOrgId;
+    @ApiModelProperty("是否赠品")
+    private String isFree;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesreturnorders/BusSalesReturnOrdersDto.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.buscenter.api.bussalesreturnorders;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/31 16:28
+ */
+@Data
+public class BusSalesReturnOrdersDto implements Dto {
+    @ApiModelProperty("车架号")
+    private String vinNo;
+    @ApiModelProperty("车辆sid")
+    private String vinSid;
+    @ApiModelProperty("客户编码")
+    private String customerNo;
+    @ApiModelProperty("单据编号")
+    private String billNo;
+    @ApiModelProperty("物料编码")
+    private String materialCode;
+    @ApiModelProperty("应退数量")
+    private String mustQty;
+    @ApiModelProperty("实退数量")
+    private String realQty;
+    @ApiModelProperty("销售组织编码")
+    private String saleOrgId;
+    @ApiModelProperty("是否赠品")
+    private String isFree;
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesreturnorders/BusSalesReturnOrdersFeign.java

@@ -0,0 +1,71 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesreturnorders;
+
+import com.yxt.anrui.buscenter.api.bussealapply.*;
+import com.yxt.anrui.buscenter.api.busvehicleinformationhandover.BusVehicleInformationHandoverDto;
+import com.yxt.anrui.buscenter.api.flow.FlowTaskVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+/**
+ * Project: bus_seal_apply(盖章申请管理) <br/>
+ * File: BusSealApplyFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussealapply.BusSealApplyFeign <br/>
+ * Description: 盖章申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-24 13:45:23 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售退货单表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusSalesReturnOrders",
+        name = "anrui-buscenter",
+        path = "v1/bussalesreturnorders",
+        fallback = BusSealApplyFeignFallback.class)
+public interface BusSalesReturnOrdersFeign {
+
+    @ApiOperation("新增")
+    @PostMapping("/saveReturnOrders")
+    @ResponseBody
+    public ResultBean<String> saveReturnOrders(@RequestBody BusSalesReturnOrdersDto dto);
+
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesreturnorders/BusSalesReturnOrdersFeignFallback.java

@@ -0,0 +1,57 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.bussalesreturnorders;
+
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(业务管理) <br/>
+ * File: BusSalesOrderVehicleFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeignFallback <br/>
+ * Description: 销售订单-车辆信息. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-04-27 13:39:04 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusSalesReturnOrdersFeignFallback implements BusSalesReturnOrdersFeign {
+
+
+    @Override
+    public ResultBean<String> saveReturnOrders(BusSalesReturnOrdersDto dto) {
+        return null;
+    }
+}

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

@@ -2463,9 +2463,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             busSidList.removeAll(applyBusSidList);
             //根据合同编号以及车辆sid查询busVinSid
             List<String> busVinSidList = baseMapper.selectByContractNoToVinSid(dto.getContractId(), vinSid);
-            busSidList.removeAll(busVinSidList);
             busVinSidList.removeAll(Collections.singleton(null));
-            if (busVinSidList.isEmpty()) {
+            busSidList.removeAll(busVinSidList);
+            if (busSidList.isEmpty()) {
                 isTrue = true;
             }
             //是否是最后一批出库车辆

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -37,6 +37,8 @@ import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
 import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateFeign;
 import com.yxt.anrui.base.api.basevehiclecertificate.BaseVehicleCertificateVo;
+import com.yxt.anrui.base.api.basevehicleout.BaseSalesReturnVo;
+import com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutFeign;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateDto;
 import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateEnum;
@@ -60,9 +62,12 @@ import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.GetNodeVo;
 import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.flow.SubmitBusSalesOrderReturnVehApplyDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrders;
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersDto;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderreturnveh.BusSalesOrderReturnVehService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
+import com.yxt.anrui.buscenter.biz.bussalesreturnorders.BusSalesReturnOrdersService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
@@ -71,6 +76,8 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.StateQuery;
 import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
+import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
+import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowFeign;
@@ -101,6 +108,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -159,6 +167,16 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
     @Autowired
     private FinVehicleInvoiceFeign finVehicleInvoiceFeign;
 
+    @Autowired
+    private BaseVehicleOutFeign baseVehicleOutFeign;
+
+    @Autowired
+    private BusSalesReturnOrdersService busSalesReturnOrdersService;
+
+    @Autowired
+    private FinKingDeeFeign finKingDeeFeign;
+
+
     public PagerVo<BusSalesOrderReturnVehApplyVo> listPageVo(PagerQuery<BusSalesOrderReturnVehApplyQuery> pq) {
         BusSalesOrderReturnVehApplyQuery query = pq.getParams();
         QueryWrapper<BusSalesOrderReturnVehApply> qw = new QueryWrapper<>();
@@ -634,10 +652,67 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                 List<BusSalesOrderVehicle> vehicleList = new ArrayList<>();
                 BusSalesOrder finalBusSalesOrderOne = busSalesOrderService.fetchBySid(orderSid);
                 //---------------------修改车辆持久状态-------------------------
+                SalesReturn salesReturn = new SalesReturn();
+                List<SalesReturn.SalesReturnDetailDto> salesReturnDetails = new ArrayList<>();
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                //-----------------生成销售退货单号----------------------------
+                ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(finalBusSalesOrderOne.getOrgSidPath());
+                String billNo = "";
+                if (orgSidByPath.getSuccess()) {
+                    String userOrgSid = orgSidByPath.getData();
+                    //交车资料确认单编号
+                    billNo = busSalesReturnOrdersService.getApplyCode(userOrgSid);
+                }
                 for (BusSalesOrderReturnVehDetailsVo busSalesOrderReturnVehDetailsVo : busSalesOrderReturnVehDetailsVos) {
                     //8.30优化退车申请---如果车辆sid不为空-----
                     if (StringUtils.isNotBlank(busSalesOrderReturnVehDetailsVo.getVehSid())) {
                         String vehSid = busSalesOrderReturnVehDetailsVo.getVehSid();
+                        //------------对已经出库的车推送销售退货单----------------------
+                        BaseVehicleSelectVo vehicleSelectVo = baseVehicleFeign.details(vehSid).getData();
+                        if (null != vehicleSelectVo) {
+                            if (StringUtils.isNotBlank(vehicleSelectVo.getVehicleStateValue())) {
+                                if ("出库".equals(vehicleSelectVo.getVehicleStateValue())) {
+                                    SalesReturn.SalesReturnDetailDto salesReturnDetailDto = new SalesReturn.SalesReturnDetailDto();
+                                    BusSalesReturnOrdersDto busSalesReturnOrdersDto = new BusSalesReturnOrdersDto();
+                                    busSalesReturnOrdersDto.setVinSid(vehSid);
+                                    busSalesReturnOrdersDto.setOrgSidPath(finalBusSalesOrderOne.getOrgSidPath());
+                                    busSalesReturnOrdersDto.setVinNo(busSalesOrderReturnVehDetailsVo.getVinNo());
+                                    if (StringUtils.isNotBlank(vehicleSelectVo.getOrgCode())) {
+                                        salesReturn.setFSaleOrgId(vehicleSelectVo.getOrgCode());
+                                        salesReturn.setFStockOrgId(vehicleSelectVo.getOrgCode());
+                                        busSalesReturnOrdersDto.setSaleOrgId(vehicleSelectVo.getOrgCode());
+                                    }
+                                    BaseSalesReturnVo returnVo = baseVehicleOutFeign.selectByVehReturn(vehSid, busSalesOrderReturnVehApply.getContractNo()).getData();
+                                    if (null != returnVo) {
+                                        if (StringUtils.isNotBlank(returnVo.getMainSid())) {
+                                            baseVehicleOutFeign.deleteByVehReturn(vehSid, returnVo.getMainSid());
+                                        }
+                                        if (StringUtils.isNotBlank(returnVo.getMaterialCode())) {
+                                            String realQty = "1";
+                                            busSalesReturnOrdersDto.setMaterialCode(returnVo.getMaterialCode());
+                                            busSalesReturnOrdersDto.setIsFree("0");
+                                            busSalesReturnOrdersDto.setRealQty(realQty);
+                                            salesReturnDetailDto.setFMaterialId(returnVo.getMaterialCode());
+                                            salesReturnDetailDto.setFIsFree("false");
+                                            salesReturnDetailDto.setFRealQty(realQty);
+                                            salesReturnDetailDto.setFUnitID("liang");
+                                            salesReturnDetailDto.setFDeliveryDate(sdf.format(new Date()));
+                                            salesReturn.setFDate(sdf.format(new Date()));
+                                        }
+                                        if (StringUtils.isNotBlank(returnVo.getCustomerNo())) {
+                                            salesReturn.setCustomerNo(returnVo.getCustomerNo());
+                                            busSalesReturnOrdersDto.setCustomerNo(returnVo.getCustomerNo());
+                                        }
+                                        if (StringUtils.isNotBlank(billNo)) {
+                                            salesReturn.setBillNo(billNo);
+                                            busSalesReturnOrdersDto.setBillNo(billNo);
+                                        }
+                                        busSalesReturnOrdersService.saveReturnOrders(busSalesReturnOrdersDto);
+                                        salesReturnDetails.add(salesReturnDetailDto);
+                                    }
+                                }
+                            }
+                        }
                         baseVehicleFeign.updateLockedState(vehSid);
                         //------修改车辆台账库存状态为库存、销售日期清空、成交价清空、锁定状态未锁定
                         baseVehicleFeign.updateStateForReturnVeh(vehSid);
@@ -648,6 +723,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());
                     vehicleList.add(busSalesOrderVehicle);
                 }
+                //----------------------------推送金蝶销售退货单---------------------------------
+                salesReturnDetails.removeAll(Collections.singleton(null));
+                if (!salesReturnDetails.isEmpty()) {
+                    salesReturn.setSalesReturnDetails(salesReturnDetails);
+                    finKingDeeFeign.draftSalesReturnOrders(salesReturn);
+                }
                 //------------------------修改车辆持久状态--------------------------
                 vehicleList.removeAll(Collections.singleton(null));
                 if (!vehicleList.isEmpty()) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesreturnorders/BusSalesReturnOrdersMapper.java

@@ -0,0 +1,19 @@
+package com.yxt.anrui.buscenter.biz.bussalesreturnorders;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrders;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/16 13:53
+ */
+@Mapper
+public interface BusSalesReturnOrdersMapper extends BaseMapper<BusSalesReturnOrders> {
+
+    int selectNum(String bill);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesreturnorders/BusSalesReturnOrdersMapper.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.buscenter.biz.bussalesreturnorders.BusSalesReturnOrdersMapper">
+
+    <select id="selectNum" resultType="java.lang.Integer">
+        select IFNULL(CAST(REPLACE(MAX(billNo), #{bill}, '') AS SIGNED), 0) as code
+        from bus_sales_return_orders
+        where billNo LIKE concat(#{bill}, '%')
+    </select>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesreturnorders/BusSalesReturnOrdersRest.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.buscenter.biz.bussalesreturnorders;
+
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersDto;
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersFeign;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/16 13:54
+ */
+@Api(tags = "销售退货单")
+@RestController("com.yxt.anrui.buscenter.biz.bussalesreturnorders.BusSalesReturnOrdersRest")
+@RequestMapping("v1/bussalesreturnorders")
+public class BusSalesReturnOrdersRest implements BusSalesReturnOrdersFeign {
+
+    @Autowired
+    private BusSalesReturnOrdersService busSalesReturnOrdersService;
+    @Override
+    public ResultBean<String> saveReturnOrders(BusSalesReturnOrdersDto dto) {
+        return busSalesReturnOrdersService.saveReturnOrders(dto);
+    }
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesreturnorders/BusSalesReturnOrdersService.java

@@ -0,0 +1,61 @@
+package com.yxt.anrui.buscenter.biz.bussalesreturnorders;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.buscenter.api.bushandoverprepare.HandoverInformationIntemVo;
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrders;
+import com.yxt.anrui.buscenter.api.bussalesreturnorders.BusSalesReturnOrdersDto;
+import com.yxt.anrui.buscenter.api.busvehicleinformation.BusVehicleInformation;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/5/16 13:53
+ */
+@Service
+public class BusSalesReturnOrdersService extends MybatisBaseService<BusSalesReturnOrdersMapper, BusSalesReturnOrders> {
+
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
+
+    @Autowired
+    private SysStaffOrgFeign sysStaffOrgFeign;
+
+    public ResultBean<String> saveReturnOrders(BusSalesReturnOrdersDto dto) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        BusSalesReturnOrders busSalesReturnOrders = new BusSalesReturnOrders();
+        BeanUtil.copyProperties(dto, busSalesReturnOrders, "id", "sid");
+        baseMapper.insert(busSalesReturnOrders);
+        return rb.success().setData(busSalesReturnOrders.getSid());
+    }
+
+    /**
+     * 生成交销售退货单单据编号
+     *
+     * @param orgSid
+     * @return
+     */
+    public String getApplyCode(String orgSid) {
+        //获取分公司sid
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(orgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.XXTHS.getBillType());
+        String bill = Rule.getBill(b);
+        int i = baseMapper.selectNum(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
+    }
+}

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialscheme.vue

@@ -329,12 +329,14 @@ export default {
         dealWayKey: '',
         depositPremium: '',
         depositSettle: '',
+        discountCar: '',
         downPayAmount: '',
         downPayAmounts: '',
         downPayAmountsRatio: '',
         downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
         interest: '',
         isPack: '',
         isShowMore: false,
@@ -371,14 +373,17 @@ export default {
         proxyAccidentPremium: '',
         proxyPremium: '',
         proxyPurchasetax: '',
+        proxyTotal: '',
         purchaseTax: '',
         purchaseTaxCb: false,
         realTotal: '',
         receivableTotal: '',
         registerAmount: '',
         returnTime: '',
+        salesOrderSid: '',
         serviceAmount: '',
-        saleOrderSid: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
         trailerAmount: '',
         trailerAmountCb: false,
         vehOtherPrice: '',
@@ -443,12 +448,14 @@ export default {
         dealWayKey: '',
         depositPremium: '',
         depositSettle: '',
+        discountCar: '',
         downPayAmount: '',
         downPayAmounts: '',
         downPayAmountsRatio: '',
         downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
         interest: '',
         isPack: val,
         isShowMore: false,
@@ -485,14 +492,17 @@ export default {
         proxyAccidentPremium: '',
         proxyPremium: '',
         proxyPurchasetax: '',
+        proxyTotal: '',
         purchaseTax: '',
         purchaseTaxCb: false,
         realTotal: '',
         receivableTotal: '',
         registerAmount: '',
         returnTime: '',
+        salesOrderSid: '',
         serviceAmount: '',
-        saleOrderSid: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
         trailerAmount: '',
         trailerAmountCb: false,
         vehOtherPrice: '',
@@ -517,6 +527,14 @@ export default {
         this.finance.loanPeriod = choose[0].period
         // 从金融产品政策中-- 获取贷款保证金比例
         this.finance.bondRatio = choose[0].bondRatio
+        // 从金融产品政策中-- 获取保险保证金
+        this.finance.depositPremium = choose[0].depositPremium
+        // 从金融产品政策中-- 获取落户保证金
+        this.finance.depositSettle = choose[0].depositSettle
+        // 从金融产品政策中-- 获取名义(留购)价
+        this.finance.nominalPrice = choose[0].nominalPrice
+        // 从金融产品政策中-- 获取代收意外险
+        this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
@@ -588,6 +606,17 @@ export default {
         this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
         // 主方案 -- 计算贷款保证金
         this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
+        // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
+        if (this.finance.serviceChargeTypeKey === '01') {
+          // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        } else if (this.finance.serviceChargeTypeKey === '02') {
+          // 等于金融产品政策中服务费
+          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
+        } else if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
       }
       if (this.finance.premiumCb && this.finance.dealWayKey === '02') {
         this.finance.offsetPremium = this.finance.premium
@@ -607,6 +636,10 @@ export default {
         this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toPrecision(2)
         // 重新计算产品贷款金额
         this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
+        if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
         // 主方案 -- 贷款保证金
         this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
       }
@@ -735,78 +768,74 @@ export default {
     },
     handleColse() {
       this.finance = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       this.isShowMore = false
       this.$emit('doback')

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue

@@ -335,12 +335,14 @@ export default {
         dealWayKey: '',
         depositPremium: '',
         depositSettle: '',
+        discountCar: '',
         downPayAmount: '',
         downPayAmounts: '',
         downPayAmountsRatio: '',
         downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
         interest: '',
         isPack: '',
         isShowMore: false,
@@ -377,14 +379,17 @@ export default {
         proxyAccidentPremium: '',
         proxyPremium: '',
         proxyPurchasetax: '',
+        proxyTotal: '',
         purchaseTax: '',
         purchaseTaxCb: false,
         realTotal: '',
         receivableTotal: '',
         registerAmount: '',
         returnTime: '',
+        salesOrderSid: '',
         serviceAmount: '',
-        saleOrderSid: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
         trailerAmount: '',
         trailerAmountCb: false,
         vehOtherPrice: '',
@@ -421,155 +426,149 @@ export default {
     backData(value) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
-      this.formobj.type = value.type
+      this.formobj = value
-      this.formobj.isPack = value.isPack
+      // this.formobj.isPack = value.isPack
-      this.formobj.policyName = value.policyName
+      // this.formobj.policyName = value.policyName
-      this.formobj.policySid = value.policySid
+      // this.formobj.policySid = value.policySid
-      this.formobj.mainVehicleAmount = value.mainVehicleAmount
+      // this.formobj.mainVehicleAmount = value.mainVehicleAmount
-      this.formobj.accessoriesAmount = value.accessoriesAmount
+      // this.formobj.accessoriesAmount = value.accessoriesAmount
-      this.formobj.trailerAmount = value.trailerAmount
+      // this.formobj.trailerAmount = value.trailerAmount
-      this.formobj.purchaseTax = value.purchaseTax
+      // this.formobj.purchaseTax = value.purchaseTax
-      this.formobj.premium = value.premium
+      // this.formobj.premium = value.premium
-      this.formobj.loanTotal = value.loanTotal
+      // this.formobj.loanTotal = value.loanTotal
-
+      //
-      this.formobj.accessoriesAmountCb = value.accessoriesAmountCb
+      // this.formobj.accessoriesAmountCb = value.accessoriesAmountCb
-      this.formobj.trailerAmountCb = value.trailerAmountCb
+      // this.formobj.trailerAmountCb = value.trailerAmountCb
-      this.formobj.purchaseTaxCb = value.purchaseTaxCb
+      // this.formobj.purchaseTaxCb = value.purchaseTaxCb
-      this.formobj.premiumCb = value.premiumCb
+      // this.formobj.premiumCb = value.premiumCb
-
+      //
-      this.formobj.downPayRatio = value.downPayRatio
+      // this.formobj.downPayRatio = value.downPayRatio
-      this.formobj.downPayAmount = value.downPayAmount
+      // this.formobj.downPayAmount = value.downPayAmount
-      this.formobj.loanAmount = value.loanAmount
+      // this.formobj.loanAmount = value.loanAmount
-      this.formobj.loanPeriod = value.loanPeriod
+      // this.formobj.loanPeriod = value.loanPeriod
-      this.formobj.bondRatio = value.bondRatio
+      // this.formobj.bondRatio = value.bondRatio
-      this.formobj.bondAmount = value.bondAmount
+      // this.formobj.bondAmount = value.bondAmount
-      this.formobj.factoryDiscount = value.factoryDiscount
+      // this.formobj.factoryDiscount = value.factoryDiscount
-      this.formobj.factoryDiscountUse = value.factoryDiscountUse
+      // this.formobj.factoryDiscountUse = value.factoryDiscountUse
-      this.formobj.factoryDiscountUseKey = value.factoryDiscountUseKey
+      // this.formobj.factoryDiscountUseKey = value.factoryDiscountUseKey
-      this.formobj.policyYearRatio = value.policyYearRatio
+      // this.formobj.policyYearRatio = value.policyYearRatio
-      this.formobj.loanPayMoney = value.loanPayMoney
+      // this.formobj.loanPayMoney = value.loanPayMoney
-      this.formobj.loanInterest = value.loanInterest
+      // this.formobj.loanInterest = value.loanInterest
-      this.formobj.discountCar = value.discountCar
+      // this.formobj.discountCar = value.discountCar
-      this.formobj.otherPolicyState = value.otherPolicyState
+      // this.formobj.otherPolicyState = value.otherPolicyState
-
+      //
-      this.formobj.otherPolicyName = value.otherPolicyName
+      // this.formobj.otherPolicyName = value.otherPolicyName
-      this.formobj.otherPolicySid = value.otherPolicySid
+      // this.formobj.otherPolicySid = value.otherPolicySid
-      this.formobj.otherPolicyAmount = value.otherPolicyAmount
+      // this.formobj.otherPolicyAmount = value.otherPolicyAmount
-      this.formobj.otherPolicyPeriod = value.otherPolicyPeriod
+      // this.formobj.otherPolicyPeriod = value.otherPolicyPeriod
-
+      //
-      this.formobj.otherPolicyMonthlyRepay = value.otherPolicyMonthlyRepay
+      // this.formobj.otherPolicyMonthlyRepay = value.otherPolicyMonthlyRepay
-      this.formobj.otherPolicyInterest = value.otherPolicyInterest
+      // this.formobj.otherPolicyInterest = value.otherPolicyInterest
-      this.formobj.otherPolicyYearRatio = value.otherPolicyYearRatio
+      // this.formobj.otherPolicyYearRatio = value.otherPolicyYearRatio
-
+      //
-      this.formobj.loanDownPay = value.loanDownPay
+      // this.formobj.loanDownPay = value.loanDownPay
-      this.formobj.downPayAmountsRatio = value.downPayAmountsRatio
+      // this.formobj.downPayAmountsRatio = value.downPayAmountsRatio
-      this.formobj.loanAmountTotal = value.loanAmountTotal
+      // this.formobj.loanAmountTotal = value.loanAmountTotal
-      this.formobj.period = value.period
+      // this.formobj.period = value.period
-      this.formobj.monthlyRepay = value.monthlyRepay
+      // this.formobj.monthlyRepay = value.monthlyRepay
-      this.formobj.interest = value.interest
+      // this.formobj.interest = value.interest
-      this.formobj.returnTime = value.returnTime
+      // this.formobj.returnTime = value.returnTime
-
+      //
-      this.formobj.downPayAmounts = value.downPayAmounts
+      // this.formobj.downPayAmounts = value.downPayAmounts
-      this.formobj.bondAmounts = value.bondAmounts
+      // this.formobj.bondAmounts = value.bondAmounts
-      this.formobj.depositPremium = value.depositPremium
+      // this.formobj.depositPremium = value.depositPremium
-      this.formobj.depositSettle = value.depositSettle
+      // this.formobj.depositSettle = value.depositSettle
-      this.formobj.serviceAmount = value.serviceAmount
+      // this.formobj.serviceAmount = value.serviceAmount
-      this.formobj.proxyAccidentPremium = value.proxyAccidentPremium
+      // this.formobj.proxyAccidentPremium = value.proxyAccidentPremium
-      this.formobj.registerAmount = value.registerAmount
+      // this.formobj.registerAmount = value.registerAmount
-      this.formobj.operationAmount = value.operationAmount
+      // this.formobj.operationAmount = value.operationAmount
-      this.formobj.vehOtherPrice = value.vehOtherPrice
+      // this.formobj.vehOtherPrice = value.vehOtherPrice
-      this.formobj.otherAmount = value.otherAmount
+      // this.formobj.otherAmount = value.otherAmount
-      this.formobj.otherAmountRemark = value.otherAmountRemark
+      // this.formobj.otherAmountRemark = value.otherAmountRemark
-      this.formobj.dealWay = value.dealWay
+      // this.formobj.dealWay = value.dealWay
-      this.formobj.dealWayKey = value.dealWayKey
+      // this.formobj.dealWayKey = value.dealWayKey
-      this.formobj.proxyPremium = value.proxyPremium
+      // this.formobj.proxyPremium = value.proxyPremium
-      this.formobj.proxyPurchasetax = value.proxyPurchasetax
+      // this.formobj.proxyPurchasetax = value.proxyPurchasetax
-      this.formobj.proxyTotal = value.proxyTotal
+      // this.formobj.proxyTotal = value.proxyTotal
-      this.formobj.offsetPremium = value.offsetPremium
+      // this.formobj.offsetPremium = value.offsetPremium
-      this.formobj.offsetPurchasetax = value.offsetPurchasetax
+      // this.formobj.offsetPurchasetax = value.offsetPurchasetax
-      this.formobj.offsetTotal = value.offsetTotal
+      // this.formobj.offsetTotal = value.offsetTotal
-      this.formobj.receivableTotal = value.receivableTotal
+      // this.formobj.receivableTotal = value.receivableTotal
-      this.formobj.realTotal = value.realTotal
+      // this.formobj.realTotal = value.realTotal
-      this.formobj.vehTotalPrice = value.vehTotalPrice
+      // this.formobj.vehTotalPrice = value.vehTotalPrice
-      this.formobj.nominalPrice = value.nominalPrice
+      // this.formobj.nominalPrice = value.nominalPrice
     },
     backParameters() {
       this.$emit('backParameters', this.formobj)
       this.formobj = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: '',
+        registerAmount: '',
-
+        returnTime: '',
-        isShowMore: false
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
     },
     handleSave() {

anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue

@@ -329,12 +329,14 @@ export default {
         dealWayKey: '',
         depositPremium: '',
         depositSettle: '',
+        discountCar: '',
         downPayAmount: '',
         downPayAmounts: '',
         downPayAmountsRatio: '',
         downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
         interest: '',
         isPack: '',
         isShowMore: false,
@@ -371,14 +373,17 @@ export default {
         proxyAccidentPremium: '',
         proxyPremium: '',
         proxyPurchasetax: '',
+        proxyTotal: '',
         purchaseTax: '',
         purchaseTaxCb: false,
         realTotal: '',
         receivableTotal: '',
         registerAmount: '',
         returnTime: '',
+        salesOrderSid: '',
         serviceAmount: '',
-        saleOrderSid: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
         trailerAmount: '',
         trailerAmountCb: false,
         vehOtherPrice: '',
@@ -394,80 +399,74 @@ export default {
     },
     handleReturn() {
       this.formobj = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: '',
+        registerAmount: '',
-
+        returnTime: '',
-        isShowMore: false
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       this.$emit('doback')
     }

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuAdd.vue

@@ -149,12 +149,14 @@ export default {
           dealWayKey: '',
           depositPremium: '',
           depositSettle: '',
+          discountCar: '',
           downPayAmount: '',
           downPayAmounts: '',
           downPayAmountsRatio: '',
           downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
           interest: '',
           isPack: '',
           isShowMore: false,
@@ -191,14 +193,17 @@ export default {
           proxyAccidentPremium: '',
           proxyPremium: '',
           proxyPurchasetax: '',
+          proxyTotal: '',
           purchaseTax: '',
           purchaseTaxCb: false,
           realTotal: '',
           receivableTotal: '',
           registerAmount: '',
           returnTime: '',
+          salesOrderSid: '',
           serviceAmount: '',
-          saleOrderSid: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
           trailerAmount: '',
           trailerAmountCb: false,
           vehOtherPrice: '',
@@ -286,12 +291,14 @@ export default {
         dealWayKey: '',
         depositPremium: '',
         depositSettle: '',
+        discountCar: '',
         downPayAmount: '',
         downPayAmounts: '',
         downPayAmountsRatio: '',
         downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
         interest: '',
         isPack: '',
         isShowMore: false,
@@ -328,14 +335,17 @@ export default {
         proxyAccidentPremium: '',
         proxyPremium: '',
         proxyPurchasetax: '',
+        proxyTotal: '',
         purchaseTax: '',
         purchaseTaxCb: false,
         realTotal: '',
         receivableTotal: '',
         registerAmount: '',
         returnTime: '',
+        salesOrderSid: '',
         serviceAmount: '',
-        saleOrderSid: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
         trailerAmount: '',
         trailerAmountCb: false,
         vehOtherPrice: '',
@@ -441,12 +451,14 @@ export default {
           dealWayKey: '',
           depositPremium: '',
           depositSettle: '',
+          discountCar: '',
           downPayAmount: '',
           downPayAmounts: '',
           downPayAmountsRatio: '',
           downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
           interest: '',
           isPack: '',
           isShowMore: false,
@@ -483,14 +495,17 @@ export default {
           proxyAccidentPremium: '',
           proxyPremium: '',
           proxyPurchasetax: '',
+          proxyTotal: '',
           purchaseTax: '',
           purchaseTaxCb: false,
           realTotal: '',
           receivableTotal: '',
           registerAmount: '',
           returnTime: '',
+          salesOrderSid: '',
           serviceAmount: '',
-          saleOrderSid: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
           trailerAmount: '',
           trailerAmountCb: false,
           vehOtherPrice: '',

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/cheliangxuqiuinfo.vue

@@ -115,12 +115,14 @@ export default {
           dealWayKey: '',
           depositPremium: '',
           depositSettle: '',
+          discountCar: '',
           downPayAmount: '',
           downPayAmounts: '',
           downPayAmountsRatio: '',
           downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
+          factoryDiscountUseKey: '',
           interest: '',
           isPack: '',
           isShowMore: false,
@@ -157,13 +159,17 @@ export default {
           proxyAccidentPremium: '',
           proxyPremium: '',
           proxyPurchasetax: '',
+          proxyTotal: '',
           purchaseTax: '',
           purchaseTaxCb: false,
           realTotal: '',
           receivableTotal: '',
           registerAmount: '',
           returnTime: '',
+          salesOrderSid: '',
           serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
           trailerAmount: '',
           trailerAmountCb: false,
           vehOtherPrice: '',

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialscheme.vue

@@ -318,7 +318,76 @@ export default {
       dealWay_list: [],
       policy_list: [],
       other_list: [],
-      finance: {},
+      finance: {
+        accessoriesAmount: '',
+        accessoriesAmountCb: false,
+        bondAmount: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
+        factoryDiscount: '',
+        factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
+        interest: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
+        loanInterest: '',
+        loanPayMoney: '',
+        loanPeriod: '',
+        loanTotal: '',
+        mainVehicleAmount: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
+        otherPolicyAmount: '',
+        otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
+        otherPolicyYearRatio: '',
+        period: '',
+        policyName: '',
+        policySid: '',
+        policyYearRatio: '',
+        premium: '',
+        premiumCb: false,
+        proxyAccidentPremium: '',
+        proxyPremium: '',
+        proxyPurchasetax: '',
+        proxyTotal: '',
+        purchaseTax: '',
+        purchaseTaxCb: false,
+        realTotal: '',
+        receivableTotal: '',
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
+      },
       orgPath: '',
       rules: {}
     }
@@ -366,75 +435,76 @@ export default {
     },
     // 是否打包
     isPackChange(val) {
-      this.finance.type = ''
+      this.finance = {
-      this.finance.isPack = val
+        accessoriesAmount: '',
-      this.finance.policyName = ''
+        accessoriesAmountCb: false,
-      this.finance.policySid = ''
+        bondAmount: '',
-      this.finance.mainVehicleAmount = ''
+        bondAmounts: '',
-      this.finance.accessoriesAmount = ''
+        bondRatio: '',
-      this.finance.trailerAmount = ''
+        dealWay: '',
-      this.finance.purchaseTax = ''
+        dealWayKey: '',
-      this.finance.premium = ''
+        depositPremium: '',
-      this.finance.loanTotal = ''
+        depositSettle: '',
-
+        discountCar: '',
-      this.finance.accessoriesAmountCb = false
+        downPayAmount: '',
-      this.finance.trailerAmountCb = false
+        downPayAmounts: '',
-      this.finance.purchaseTaxCb = false
+        downPayAmountsRatio: '',
-      this.finance.premiumCb = false
+        downPayRatio: '',
-
+        factoryDiscount: '',
-      this.finance.downPayRatio = ''
+        factoryDiscountUse: '',
-      this.finance.downPayAmount = ''
+        factoryDiscountUseKey: '',
-      this.finance.loanAmount = ''
+        interest: '',
-      this.finance.loanPeriod = ''
+        isPack: val,
-      this.finance.bondRatio = ''
+        isShowMore: false,
-      this.finance.bondAmount = ''
+        loanAmount: '',
-      this.finance.factoryDiscount = ''
+        loanAmountTotal: '',
-      this.finance.policyYearRatio = ''
+        loanDownPay: '',
-      this.finance.loanPayMoney = ''
+        loanInterest: '',
-      this.finance.loanInterest = ''
+        loanPayMoney: '',
-      this.finance.discountCar = ''
+        loanPeriod: '',
-      this.finance.otherPolicyState = false
+        loanTotal: '',
-
+        mainVehicleAmount: '',
-      this.finance.otherPolicyName = ''
+        monthlyRepay: '',
-      this.finance.otherPolicySid = ''
+        nominalPrice: '',
-      this.finance.otherPolicyAmount = ''
+        offsetPremium: '',
-      this.finance.otherPolicyPeriod = ''
+        offsetPurchasetax: '',
-
+        offsetTotal: '',
-      this.finance.otherPolicyMonthlyRepay = ''
+        operationAmount: '',
-      this.finance.otherPolicyInterest = ''
+        otherAmount: '',
-      this.finance.otherPolicyYearRatio = ''
+        otherAmountRemark: '',
-
+        otherPolicyAmount: '',
-      this.finance.loanDownPay = ''
+        otherPolicyInterest: '',
-      this.finance.downPayAmountsRatio = ''
+        otherPolicyMonthlyRepay: '',
-      this.finance.loanAmountTotal = ''
+        otherPolicyName: '',
-      this.finance.period = ''
+        otherPolicyPeriod: '',
-      this.finance.monthlyRepay = ''
+        otherPolicySid: '',
-      this.finance.interest = ''
+        otherPolicyState: false,
-      this.finance.returnTime = ''
+        otherPolicyYearRatio: '',
-
+        period: '',
-      this.finance.downPayAmounts = ''
+        policyName: '',
-      this.finance.bondAmounts = ''
+        policySid: '',
-      this.finance.depositPremium = ''
+        policyYearRatio: '',
-      this.finance.depositSettle = ''
+        premium: '',
-      this.finance.serviceAmount = ''
+        premiumCb: false,
-      this.finance.proxyAccidentPremium = ''
+        proxyAccidentPremium: '',
-      this.finance.registerAmount = ''
+        proxyPremium: '',
-      this.finance.operationAmount = ''
+        proxyPurchasetax: '',
-      this.finance.vehOtherPrice = ''
+        proxyTotal: '',
-      this.finance.otherAmount = ''
+        purchaseTax: '',
-      this.finance.otherAmountRemark = ''
+        purchaseTaxCb: false,
-      this.finance.dealWay = ''
+        realTotal: '',
-      this.finance.dealWayKey = ''
+        receivableTotal: '',
-      this.finance.proxyPremium = ''
+        registerAmount: '',
-      this.finance.proxyPurchasetax = ''
+        returnTime: '',
-      this.finance.proxyTotal = ''
+        salesOrderSid: '',
-      this.finance.offsetPremium = ''
+        serviceAmount: '',
-      this.finance.offsetPurchasetax = ''
+        serviceChargeTypeKey: '',
-      this.finance.offsetTotal = ''
+        serviceChargeTypeValue: '',
-      this.finance.receivableTotal = ''
+        trailerAmount: '',
-      this.finance.realTotal = ''
+        trailerAmountCb: false,
-      this.finance.vehTotalPrice = ''
+        vehOtherPrice: '',
-      this.finance.nominalPrice = ''
+        vehTotalPrice: ''
+      }
       console.log(this.orgPath, window.sessionStorage.getItem('userSid'), this.finance.isPack, 88888)
       selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
         if (resp.success) {
@@ -455,6 +525,14 @@ export default {
         this.finance.loanPeriod = choose[0].period
         // 从金融产品政策中-- 获取贷款保证金比例
         this.finance.bondRatio = choose[0].bondRatio
+        // 从金融产品政策中-- 获取保险保证金
+        this.finance.depositPremium = choose[0].depositPremium
+        // 从金融产品政策中-- 获取落户保证金
+        this.finance.depositSettle = choose[0].depositSettle
+        // 从金融产品政策中-- 获取名义(留购)价
+        this.finance.nominalPrice = choose[0].nominalPrice
+        // 从金融产品政策中-- 获取代收意外险
+        this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
         selectListByOther({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
@@ -523,6 +601,17 @@ export default {
         this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
         // 主方案 -- 计算贷款保证金
         this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
+        // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
+        if (this.finance.serviceChargeTypeKey === '01') {
+          // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        } else if (this.finance.serviceChargeTypeKey === '02') {
+          // 等于金融产品政策中服务费
+          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
+        } else if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
       }
       if (this.finance.premiumCb && this.finance.dealWayKey === '02') {
         this.finance.offsetPremium = this.finance.premium
@@ -542,6 +631,10 @@ export default {
         this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toPrecision(2)
         // 重新计算产品贷款金额
         this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
+        if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
         // 主方案 -- 贷款保证金
         this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
       }
@@ -664,80 +757,74 @@ export default {
     },
     handleColse() {
       this.finance = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: '',
+        registerAmount: '',
-
+        returnTime: '',
-        isShowMore: false
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       this.orgPath = ''
       this.$emit('doback')

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue

@@ -334,12 +334,14 @@ export default {
         dealWayKey: '',
         depositPremium: '',
         depositSettle: '',
+        discountCar: '',
         downPayAmount: '',
         downPayAmounts: '',
         downPayAmountsRatio: '',
         downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
+        factoryDiscountUseKey: '',
         interest: '',
         isPack: '',
         isShowMore: false,
@@ -376,14 +378,17 @@ export default {
         proxyAccidentPremium: '',
         proxyPremium: '',
         proxyPurchasetax: '',
+        proxyTotal: '',
         purchaseTax: '',
         purchaseTaxCb: false,
         realTotal: '',
         receivableTotal: '',
         registerAmount: '',
         returnTime: '',
+        salesOrderSid: '',
         serviceAmount: '',
-        saleOrderSid: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
         trailerAmount: '',
         trailerAmountCb: false,
         vehOtherPrice: '',
@@ -410,77 +415,78 @@ export default {
     backData(value) {
       this.viewState = 1
       value = JSON.parse(JSON.stringify(value))
-      this.formobj.type = value.type
+      this.formobj = value
-      this.formobj.isPack = value.isPack
+      // this.formobj.type = value.type
-      this.formobj.policyName = value.policyName
+      // this.formobj.isPack = value.isPack
-      this.formobj.policySid = value.policySid
+      // this.formobj.policyName = value.policyName
-      this.formobj.mainVehicleAmount = value.mainVehicleAmount
+      // this.formobj.policySid = value.policySid
-      this.formobj.accessoriesAmount = value.accessoriesAmount
+      // this.formobj.mainVehicleAmount = value.mainVehicleAmount
-      this.formobj.trailerAmount = value.trailerAmount
+      // this.formobj.accessoriesAmount = value.accessoriesAmount
-      this.formobj.purchaseTax = value.purchaseTax
+      // this.formobj.trailerAmount = value.trailerAmount
-      this.formobj.premium = value.premium
+      // this.formobj.purchaseTax = value.purchaseTax
-      this.formobj.loanTotal = value.loanTotal
+      // this.formobj.premium = value.premium
-
+      // this.formobj.loanTotal = value.loanTotal
-      this.formobj.accessoriesAmountCb = value.accessoriesAmountCb
+      //
-      this.formobj.trailerAmountCb = value.trailerAmountCb
+      // this.formobj.accessoriesAmountCb = value.accessoriesAmountCb
-      this.formobj.purchaseTaxCb = value.purchaseTaxCb
+      // this.formobj.trailerAmountCb = value.trailerAmountCb
-      this.formobj.premiumCb = value.premiumCb
+      // this.formobj.purchaseTaxCb = value.purchaseTaxCb
-
+      // this.formobj.premiumCb = value.premiumCb
-      this.formobj.downPayRatio = value.downPayRatio
+      //
-      this.formobj.downPayAmount = value.downPayAmount
+      // this.formobj.downPayRatio = value.downPayRatio
-      this.formobj.loanAmount = value.loanAmount
+      // this.formobj.downPayAmount = value.downPayAmount
-      this.formobj.loanPeriod = value.loanPeriod
+      // this.formobj.loanAmount = value.loanAmount
-      this.formobj.bondRatio = value.bondRatio
+      // this.formobj.loanPeriod = value.loanPeriod
-      this.formobj.bondAmount = value.bondAmount
+      // this.formobj.bondRatio = value.bondRatio
-      this.formobj.factoryDiscount = value.factoryDiscount
+      // this.formobj.bondAmount = value.bondAmount
-      this.formobj.factoryDiscountUse = value.factoryDiscountUse
+      // this.formobj.factoryDiscount = value.factoryDiscount
-      this.formobj.factoryDiscountUseKey = value.factoryDiscountUseKey
+      // this.formobj.factoryDiscountUse = value.factoryDiscountUse
-      this.formobj.policyYearRatio = value.policyYearRatio
+      // this.formobj.factoryDiscountUseKey = value.factoryDiscountUseKey
-      this.formobj.loanPayMoney = value.loanPayMoney
+      // this.formobj.policyYearRatio = value.policyYearRatio
-      this.formobj.loanInterest = value.loanInterest
+      // this.formobj.loanPayMoney = value.loanPayMoney
-      this.formobj.discountCar = value.discountCar
+      // this.formobj.loanInterest = value.loanInterest
-      this.formobj.otherPolicyState = value.otherPolicyState
+      // this.formobj.discountCar = value.discountCar
-
+      // this.formobj.otherPolicyState = value.otherPolicyState
-      this.formobj.otherPolicyName = value.otherPolicyName
+      //
-      this.formobj.otherPolicySid = value.otherPolicySid
+      // this.formobj.otherPolicyName = value.otherPolicyName
-      this.formobj.otherPolicyAmount = value.otherPolicyAmount
+      // this.formobj.otherPolicySid = value.otherPolicySid
-      this.formobj.otherPolicyPeriod = value.otherPolicyPeriod
+      // this.formobj.otherPolicyAmount = value.otherPolicyAmount
-
+      // this.formobj.otherPolicyPeriod = value.otherPolicyPeriod
-      this.formobj.otherPolicyMonthlyRepay = value.otherPolicyMonthlyRepay
+      //
-      this.formobj.otherPolicyInterest = value.otherPolicyInterest
+      // this.formobj.otherPolicyMonthlyRepay = value.otherPolicyMonthlyRepay
-      this.formobj.otherPolicyYearRatio = value.otherPolicyYearRatio
+      // this.formobj.otherPolicyInterest = value.otherPolicyInterest
-
+      // this.formobj.otherPolicyYearRatio = value.otherPolicyYearRatio
-      this.formobj.loanDownPay = value.loanDownPay
+      //
-      this.formobj.downPayAmountsRatio = value.downPayAmountsRatio
+      // this.formobj.loanDownPay = value.loanDownPay
-      this.formobj.loanAmountTotal = value.loanAmountTotal
+      // this.formobj.downPayAmountsRatio = value.downPayAmountsRatio
-      this.formobj.period = value.period
+      // this.formobj.loanAmountTotal = value.loanAmountTotal
-      this.formobj.monthlyRepay = value.monthlyRepay
+      // this.formobj.period = value.period
-      this.formobj.interest = value.interest
+      // this.formobj.monthlyRepay = value.monthlyRepay
-      this.formobj.returnTime = value.returnTime
+      // this.formobj.interest = value.interest
-
+      // this.formobj.returnTime = value.returnTime
-      this.formobj.downPayAmounts = value.downPayAmounts
+      //
-      this.formobj.bondAmounts = value.bondAmounts
+      // this.formobj.downPayAmounts = value.downPayAmounts
-      this.formobj.depositPremium = value.depositPremium
+      // this.formobj.bondAmounts = value.bondAmounts
-      this.formobj.depositSettle = value.depositSettle
+      // this.formobj.depositPremium = value.depositPremium
-      this.formobj.serviceAmount = value.serviceAmount
+      // this.formobj.depositSettle = value.depositSettle
-      this.formobj.proxyAccidentPremium = value.proxyAccidentPremium
+      // this.formobj.serviceAmount = value.serviceAmount
-      this.formobj.registerAmount = value.registerAmount
+      // this.formobj.proxyAccidentPremium = value.proxyAccidentPremium
-      this.formobj.operationAmount = value.operationAmount
+      // this.formobj.registerAmount = value.registerAmount
-      this.formobj.vehOtherPrice = value.vehOtherPrice
+      // this.formobj.operationAmount = value.operationAmount
-      this.formobj.otherAmount = value.otherAmount
+      // this.formobj.vehOtherPrice = value.vehOtherPrice
-      this.formobj.otherAmountRemark = value.otherAmountRemark
+      // this.formobj.otherAmount = value.otherAmount
-      this.formobj.dealWay = value.dealWay
+      // this.formobj.otherAmountRemark = value.otherAmountRemark
-      this.formobj.dealWayKey = value.dealWayKey
+      // this.formobj.dealWay = value.dealWay
-      this.formobj.proxyPremium = value.proxyPremium
+      // this.formobj.dealWayKey = value.dealWayKey
-      this.formobj.proxyPurchasetax = value.proxyPurchasetax
+      // this.formobj.proxyPremium = value.proxyPremium
-      this.formobj.proxyTotal = value.proxyTotal
+      // this.formobj.proxyPurchasetax = value.proxyPurchasetax
-      this.formobj.offsetPremium = value.offsetPremium
+      // this.formobj.proxyTotal = value.proxyTotal
-      this.formobj.offsetPurchasetax = value.offsetPurchasetax
+      // this.formobj.offsetPremium = value.offsetPremium
-      this.formobj.offsetTotal = value.offsetTotal
+      // this.formobj.offsetPurchasetax = value.offsetPurchasetax
-      this.formobj.receivableTotal = value.receivableTotal
+      // this.formobj.offsetTotal = value.offsetTotal
-      this.formobj.realTotal = value.realTotal
+      // this.formobj.receivableTotal = value.receivableTotal
-      this.formobj.vehTotalPrice = value.vehTotalPrice
+      // this.formobj.realTotal = value.realTotal
-      this.formobj.nominalPrice = value.nominalPrice
+      // this.formobj.vehTotalPrice = value.vehTotalPrice
+      // this.formobj.nominalPrice = value.nominalPrice
     },
     handleSave() {
       saveJinRong(this.formobj).then((resp) => {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue

@@ -319,80 +319,74 @@ export default {
       tableKey: 0,
       index: 0,
       formobj: {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: '',
+        registerAmount: '',
-
+        returnTime: '',
-        isShowMore: false
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
     }
   },
@@ -403,80 +397,74 @@ export default {
     },
     handleReturn() {
       this.formobj = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: '',
+        registerAmount: '',
-
+        returnTime: '',
-        isShowMore: false
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       this.$emit('doback')
     }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/AppCrmSolutions.java

@@ -162,4 +162,7 @@ public class AppCrmSolutions {
     private String nominalPrice;
 
     private List<CrmSolutionListVo> financeForms = new ArrayList<>();
+
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmSolutions.java

@@ -156,4 +156,7 @@ public class CrmSolutions {
     private String vehTotalPrice;
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
+
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@@ -17,6 +17,7 @@ import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
 import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
+import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
@@ -34,22 +35,25 @@ import java.util.List;
  */
 @Api(tags = "财务模块调用金蝶暂存业务单据的接口")
 @FeignClient(
-    contextId = "anrui-fin-FinKingDeeFeign",
+        contextId = "anrui-fin-FinKingDeeFeign",
-    name = "anrui-fin",
+        name = "anrui-fin",
-    path = "/finKingDee",
+        path = "/finKingDee",
-    fallback =FinKingDeeFeignFallBack.class
+        fallback = FinKingDeeFeignFallBack.class
 )
 public interface FinKingDeeFeign {
     /**
      * 入账暂存应付单的接口
+     *
      * @return
      */
     @ApiOperation("入账暂存应付单的接口")
     @PostMapping("/draftEntryBill")
     @ResponseBody
     ResultBean<String> draftEntryBill(@RequestBody @Valid APPayable APPayable);
+
     /**
      * 生成的应付单的数据，推送到金蝶的平台中
+     *
      * @return
      */
     @ApiOperation("入账暂存应收单的接口")
@@ -70,111 +74,138 @@ public interface FinKingDeeFeign {
     @ApiOperation("暂存付款单的接口")
     @PostMapping("/draftApPayBill")
     @ResponseBody
-    public ResultBean<String> draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) ;
+    public ResultBean<String> draftApPayBill(@RequestBody @Valid ApPayBill apPayBill);
+
     @ApiOperation("暂存采购入库单的接口")
     @PostMapping("/draftStkInStock")
     @ResponseBody
     public ResultBean<String> draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception;
+
     @ApiOperation("根据物料查询入库单的状态 的审核状态 true 审核通过  false 未审核通过")
     @GetMapping("/getStinstockState/{fMaterialId}")
     @ResponseBody
-    public ResultBean<Boolean> getStinstockState(@PathVariable("fMaterialId")String fMaterialId) ;
+    public ResultBean<Boolean> getStinstockState(@PathVariable("fMaterialId") String fMaterialId);
+
     @ApiOperation("暂存采购退料单的接口")
     @PostMapping("/draftPurMrb")
     @ResponseBody
-    public ResultBean<String> draftPurMrb(@RequestBody @Valid PurMrb purMrb) ;
+    public ResultBean<String> draftPurMrb(@RequestBody @Valid PurMrb purMrb);
+
     @ApiOperation("暂存采购出库单的接口")
     @PostMapping("/draftSalOutStock")
     @ResponseBody
-    public ResultBean<String> draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) ;
+    public ResultBean<String> draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock);
+
     @ApiOperation("暂存物料的接口")
     @PostMapping("/draftBdMaterialList")
     @ResponseBody
-    public ResultBean<String> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial) ;
+    public ResultBean<String> draftBdMaterialList(@RequestBody List<BdMaterial> bdMaterial);
+
     @ApiOperation("批量修改物料的接口")
     @PostMapping("/saveBdMaterialList")
     @ResponseBody
-    public ResultBean<String> saveBdMaterialList(@RequestBody  List<BdMaterial> bdMaterial) ;
+    public ResultBean<String> saveBdMaterialList(@RequestBody List<BdMaterial> bdMaterial);
+
     @ApiOperation("暂存直接调拨单的接口")
     @PostMapping("/draftStkTransferDirect")
     @ResponseBody
-    public ResultBean<String> draftStkTransferDirect(@RequestBody @Valid StkTransferDirect stkTransferDirect) ;
+    public ResultBean<String> draftStkTransferDirect(@RequestBody @Valid StkTransferDirect stkTransferDirect);
+
     @ApiOperation("暂存组织机构的接口")
     @PostMapping("/draftOrgOrganizations")
     @ResponseBody
-    public ResultBean<String> draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations) ;
+    public ResultBean<String> draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations);
+
     @ApiOperation("批量修改组织机构的接口")
     @PostMapping("/updateOrgOrganizations")
     @ResponseBody
-    public ResultBean<String> updateOrgOrganizations(@RequestBody @Valid  List<OrgOrganizations> orgOrganizations) ;
+    public ResultBean<String> updateOrgOrganizations(@RequestBody @Valid List<OrgOrganizations> orgOrganizations);
+
     @ApiOperation("暂存供应商的接口")
     @PostMapping("/draftBdSupplier")
     @ResponseBody
     ResultBean<String> draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier);
+
     @ApiOperation("修改供应商的接口")
     @PostMapping("/updateBdSupplier")
     @ResponseBody
     ResultBean<String> updateBdSupplier(@RequestBody @Valid BdSupplier bdSupplier);
+
     @ApiOperation("新增客户信息的接口   适用客户查询的批量推送财务客户数据")
     @PostMapping("/draftBdCustomer")
     @ResponseBody
     ResultBean<String> draftBdCustomer(@RequestBody @Valid BdCustomer bdCustomer);
+
     @ApiOperation("新增客户信息的接口   适用客户查询的批量推送财务客户数据   批量")
     @PostMapping("/draftBdCustomers")
     @ResponseBody
     ResultBean<String> draftBdCustomers(@RequestBody List<BdCustomer> bdCustomers);
+
     @ApiOperation("修改客户信息的接口")
     @PostMapping("/saveBdCustomers")
     @ResponseBody
     ResultBean<String> saveBdCustomers(@RequestBody @Valid List<BdCustomer> bdCustomers);
+
     @ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在")
     @GetMapping("/customerExistState/{number}")
     @ResponseBody
     ResultBean<Boolean> customerExistState(@PathVariable("number") String number);
+
     @ApiOperation("单个 销售出库单 推送客户信息")
     @PostMapping("/updateSingleCustomer")
     @ResponseBody
     public ResultBean<String> updateSingleCustomer(@RequestBody @Valid BdCustomer bdCustomer);
+
     @ApiOperation("使用number查看数据表单")
     @GetMapping("/getKingDataInfoByNumber/{formId}/{number}")
     @ResponseBody
     ResultBean<String> getKingDataInfoByNumber(@PathVariable("formId") String formId, @PathVariable("number") String number);
+
     @ApiOperation("单据查询")
     @GetMapping("/executeBillQuery/{formId}/{number}")
     @ResponseBody
     ResultBean<String> executeBillQuery();
+
     @ApiOperation("下推")
     @PostMapping("/draftStkInStockPushPurMrb")
     @ResponseBody
     public ResultBean<String> draftStkInStockPushPurMrb(@RequestBody @Valid STKInStockPushPurmrb push) throws Exception;
+
     @ApiOperation("暂存仓库信息的接口")
     @PostMapping("/drafBDStock")
     @ResponseBody
     public ResultBean<String> drafBDtStock(@RequestBody @Valid BDStock bDtStock) throws Exception;
+
     @ApiOperation("修改仓库信息的接口")
     @PostMapping("/updateBDtStock")
     @ResponseBody
     public ResultBean<String> updateBDtStock(@RequestBody @Valid BDStock bDtStock);
+
     @ApiOperation("暂存银行的接口")
     @PostMapping("/drafBDBank")
     @ResponseBody
-    public ResultBean<String> drafBDBank(@RequestBody @Valid BDBank bdBank) ;
+    public ResultBean<String> drafBDBank(@RequestBody @Valid BDBank bdBank);
+
     @ApiOperation("修改银行的接口")
     @PostMapping("/updateBDBank")
     @ResponseBody
-    public ResultBean<String> updateBDBank(@RequestBody @Valid BDBank bdBank) ;
+    public ResultBean<String> updateBDBank(@RequestBody @Valid BDBank bdBank);
+
     @ApiOperation("暂存银行账号的接口")
     @PostMapping("/drafCNBankacnt")
     @ResponseBody
     public ResultBean<String> drafCNBankacnt(@RequestBody @Valid CNBankacnt cnBankacnt);
+
     @ApiOperation("修改银行账号的接口")
     @PostMapping("/updateCNBankacnt")
     @ResponseBody
-    public ResultBean<String> updateCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt) ;
+    public ResultBean<String> updateCNBankacnt(@RequestBody @Valid CNBankacnt cNBankacnt);
+
     @ApiOperation("暂存收付款的接口")
     @PostMapping("/draftCNRecpaypurpose")
     @ResponseBody
     public ResultBean<String> draftCNRecpaypurpose(@RequestBody @Valid CNRecpaypurpose cNRecpaypurpose);
+
     @ApiOperation("保存部门的接口")
     @PostMapping("/saveBdDepartment")
     @ResponseBody
@@ -194,4 +225,10 @@ public interface FinKingDeeFeign {
     @PostMapping("/updateBDEmpinfo")
     @ResponseBody
     public ResultBean<String> updateBDEmpinfo(@RequestBody @Valid BDEmpinfo bdEmpinfo);
+
+    @ApiOperation("暂存销售退货单的接口")
+    @PostMapping("/draftSalesReturnOrders")
+    @ResponseBody
+    ResultBean<String> draftSalesReturnOrders(@RequestBody @Valid SalesReturn salesReturn);
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@@ -17,6 +17,7 @@ import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
 import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
+import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
@@ -200,5 +201,10 @@ implements FinKingDeeFeign{
         return null;
     }
 
+    @Override
+    public ResultBean<String> draftSalesReturnOrders(SalesReturn salesReturn) {
+        return null;
+    }
+
 
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeBillId.java

@@ -5,6 +5,7 @@ public enum KingDeeBillId {
     AR_RECEIVABLE("AR_receivable", "应收单"),
     AR_OTHERRECEIVABLE("AR_OtherRecAble", "其他应收单"),
     AP_PAYBILL("AP_PAYBILL", "付款单"),
+    SAL_RETURNSTOCK("SAL_RETURNSTOCK","销售退货单"),
     AR_RECEIVEBILL("AR_RECEIVEBILL", "收款单"),
     STK_INSTOCK("STK_InStock", "采购入库单"),
     PUR_MRB("PUR_MRB", "采购退料单"),
@@ -23,6 +24,9 @@ public enum KingDeeBillId {
     BD_SETTLETYPE("BD_SETTLETYPE", "结算方式"),
     CN_RECPAYPURPOSE("CN_RECPAYPURPOSE", "收付款用途"),
     BD_STOCK("BD_STOCK", "仓库");
+
+
+
     private String ID;
     private String NAME;
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/salesreturn/SalesReturn.java

@@ -0,0 +1,54 @@
+package com.yxt.anrui.fin.api.kingdee.salesreturn;
+
+import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/31 10:48
+ */
+
+/**
+ * 销售退货单
+ */
+@Data
+public class SalesReturn {
+    @ApiModelProperty("单据类型")
+    public String billType = "XSTHD01_SYS";
+    @ApiModelProperty("退货客户编码")
+    public String customerNo;
+    @ApiModelProperty("库存组织编码")
+    public String FStockOrgId;
+    @ApiModelProperty("单据编号")
+    public String billNo;
+    @ApiModelProperty("币别")
+    public String currency = "PRE001";
+    @ApiModelProperty("日期")
+    public String FDate;
+    @ApiModelProperty("销售组织编码")
+    public String FSaleOrgId;
+    @ApiModelProperty("收款明细")
+    public List<SalesReturn.SalesReturnDetailDto> salesReturnDetails;
+
+    @Data
+    public static class SalesReturnDetailDto implements Dto {
+
+        @ApiModelProperty("物料编码")
+        public String FMaterialId;
+        @ApiModelProperty("库存单位")
+        public String FUnitID;
+        @ApiModelProperty("应退数量")
+        public String FMustQty;
+        @ApiModelProperty("实退数量")
+        public String FRealQty;
+        @ApiModelProperty("退货日期")
+        public String FDeliveryDate;
+        @ApiModelProperty("是否赠品")
+        public String FIsFree;
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -21,6 +21,7 @@ import com.yxt.anrui.fin.api.kingdee.orgorganizations.OrgOrganizations;
 import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
 import com.yxt.anrui.fin.api.kingdee.purmrb.PurMrb;
 import com.yxt.anrui.fin.api.kingdee.push.STKInStockPushPurmrb;
+import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
 import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.fin.api.kingdee.stkinstock.StkInStock;
 import com.yxt.anrui.fin.api.kingdee.stktransferdirect.StkTransferDirect;
@@ -41,6 +42,7 @@ import com.yxt.anrui.fin.biz.kingdee.otherreceivablebill.OtherReceivableBillServ
 import com.yxt.anrui.fin.biz.kingdee.purmrb.PurMrbService;
 import com.yxt.anrui.fin.biz.kingdee.push.PushService;
 import com.yxt.anrui.fin.biz.kingdee.receivablebill.ReceivableBillService;
+import com.yxt.anrui.fin.biz.kingdee.salesreturn.SalesReturnOrdersService;
 import com.yxt.anrui.fin.biz.kingdee.saloutstock.SalOutStockService;
 import com.yxt.anrui.fin.biz.kingdee.stkinstock.STKInStockService;
 import com.yxt.anrui.fin.biz.kingdee.stktransferdirect.StkTransferDirectService;
@@ -151,9 +153,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
     @Autowired
     private BDEmpinfoService bDEmpinfoService;
     /**
+     *
      */
     @Autowired
-    private  FinKingDeeService finKingDeeService;
+    private FinKingDeeService finKingDeeService;
     /**
      * 收款单
      */
@@ -164,19 +167,27 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
      */
     @Autowired
     private OtherReceivableBillService otherReceivableBillService;
+
+    /**
+     * 销售退货单
+     */
+    @Autowired
+    private SalesReturnOrdersService salesReturnOrdersService;
+
     @ApiOperation("入账暂存应付单的接口")
     @PostMapping("/draftEntryBill")
     @ResponseBody
     @Override
-    public ResultBean<String> draftEntryBill(@RequestBody @Valid  APPayable APPayable) {
+    public ResultBean<String> draftEntryBill(@RequestBody @Valid APPayable APPayable) {
         log.info("FinKingDeeFeignRest-draftEntryBill:{}", JSONObject.toJSONString(APPayable));
         return apPayableService.draftAPPayable(APPayable);
     }
+
     @ApiOperation("暂存应收单的接口")
     @PostMapping("/draftReceivableBill")
     @ResponseBody
     @Override
-    public ResultBean<String> draftReceivableBill(@RequestBody @Valid  ARReceivable aRReceivable) {
+    public ResultBean<String> draftReceivableBill(@RequestBody @Valid ARReceivable aRReceivable) {
         log.info("FinKingDeeFeignRest-draftReceivableBill:{}", JSONObject.toJSONString(aRReceivable));
         return receivableBillService.draftReceivableBill(aRReceivable);
     }
@@ -187,6 +198,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         return otherReceivableBillService.otherReceivableBillService(otherReceivable);
     }
 
+    @Override
+    public ResultBean<String> draftSalesReturnOrders(SalesReturn salesReturn) {
+        log.info("FinKingDeeFeignRest-draftSalesReturnOrders:{}", JSONObject.toJSONString(salesReturn));
+        return salesReturnOrdersService.salesReturnOrdersService(salesReturn);
+    }
+
     @ApiOperation("暂存收款单的接口")
     @PostMapping("/draftArReceivebill")
     @ResponseBody
@@ -206,7 +223,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
     @PostMapping("/draftApPayBill")
     @ResponseBody
     @Override
-    public ResultBean<String> draftApPayBill(@RequestBody @Valid  ApPayBill apPayBill) {
+    public ResultBean<String> draftApPayBill(@RequestBody @Valid ApPayBill apPayBill) {
         log.info("FinKingDeeFeignRest-draftApPayBill:{}", JSONObject.toJSONString(apPayBill));
         KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
         kingDeeOrgAndDeptCode.setOrgCode(apPayBill.getFPURCHASEORGID());
@@ -223,7 +240,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
     @PostMapping("/draftStkInStock")
     @ResponseBody
     @Override
-    public ResultBean<String> draftStkInStock(@RequestBody @Valid  StkInStock stkInStock) throws Exception {
+    public ResultBean<String> draftStkInStock(@RequestBody @Valid StkInStock stkInStock) throws Exception {
         log.info("FinKingDeeFeignRest-draftStkInStock:{}", JSONObject.toJSONString(stkInStock));
         KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
         kingDeeOrgAndDeptCode.setOrgCode(stkInStock.getFPurchaseOrgId());
@@ -235,11 +252,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         stkInStock.setFSupplierId(kingDeeOrgAndDeptCode.getOtherCode());
         return stkInStockService.draftStkInStock(stkInStock);
     }
+
     @ApiOperation("根据物料查询入库单的状态 的审核状态 true 审核通过  false 未审核通过")
     @GetMapping("/getStinstockState/{fMaterialId}")
     @ResponseBody
     @Override
-    public ResultBean<Boolean> getStinstockState(String fMaterialId)  {
+    public ResultBean<Boolean> getStinstockState(String fMaterialId) {
         log.info("FinKingDeeFeignRest-getStinstockState:{}", JSONObject.toJSONString(fMaterialId));
         return stkInStockService.getStinstockState(fMaterialId);
     }
@@ -248,7 +266,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
     @PostMapping("/draftPurMrb")
     @ResponseBody
     @Override
-    public ResultBean<String> draftPurMrb(@RequestBody @Valid  PurMrb purMrb) {
+    public ResultBean<String> draftPurMrb(@RequestBody @Valid PurMrb purMrb) {
         log.info("FinKingDeeFeignRest-draftPurMrb:{}", JSONObject.toJSONString(purMrb));
         KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
         kingDeeOrgAndDeptCode.setOrgCode(purMrb.getFStockOrgId());
@@ -258,11 +276,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         purMrb.setFSupplierID(kingDeeOrgAndDeptCode.getOtherCode());
         return purMrbService.draftPurMrb(purMrb);
     }
+
     @ApiOperation("暂存采购出库单的接口")
     @PostMapping("/draftSalOutStock")
     @ResponseBody
     @Override
-    public ResultBean<String> draftSalOutStock(@RequestBody @Valid  SalOutStock salOutStock) {
+    public ResultBean<String> draftSalOutStock(@RequestBody @Valid SalOutStock salOutStock) {
         log.info("FinKingDeeFeignRest-draftSalOutStock:{}", JSONObject.toJSONString(salOutStock));
         KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
         kingDeeOrgAndDeptCode.setOrgCode(salOutStock.getFSaleOrgId());
@@ -275,11 +294,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         //salOutStock.setF_PAEZ_Base(kingDeeOrgAndDeptCode.getOrgCode());
         return salOutStockService.draftSalOutStock(salOutStock);
     }
+
     @ApiOperation("批量暂存物料的接口")
     @PostMapping("/draftBdMaterialList")
     @ResponseBody
     @Override
-    public ResultBean<String> draftBdMaterialList(@RequestBody @Valid  List<BdMaterial> bdMaterial) {
+    public ResultBean<String> draftBdMaterialList(@RequestBody @Valid List<BdMaterial> bdMaterial) {
         log.info("FinKingDeeFeignRest-draftBdMaterialList:{}", JSONObject.toJSONString(bdMaterial));
         for (BdMaterial material : bdMaterial) {
             KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
@@ -289,11 +309,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         }
         return bdMaterialService.draftBdMaterialList(bdMaterial);
     }
+
     @ApiOperation("批量修改物料的接口")
     @PostMapping("/saveBdMaterialList")
     @ResponseBody
     @Override
-    public ResultBean<String> saveBdMaterialList(@RequestBody @Valid  List<BdMaterial> bdMaterial) {
+    public ResultBean<String> saveBdMaterialList(@RequestBody @Valid List<BdMaterial> bdMaterial) {
         log.info("FinKingDeeFeignRest-saveBdMaterialList:{}", JSONObject.toJSONString(bdMaterial));
         for (BdMaterial material : bdMaterial) {
             KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
@@ -303,6 +324,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         }
         return bdMaterialService.saveBdMaterialList(bdMaterial);
     }
+
     @ApiOperation("暂存直接调拨单的接口")
     @PostMapping("/draftStkTransferDirect")
     @ResponseBody
@@ -315,27 +337,30 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         stkTransferDirect.setFStockOrgId(kingDeeOrgAndDeptCode.getOrgCode());
         return stkTransferDirectService.draftStkTransferDirect(stkTransferDirect);
     }
+
     @ApiOperation("暂存组织机构的接口")
     @PostMapping("/draftOrgOrganizations")
     @ResponseBody
     @Override
-    public ResultBean<String> draftOrgOrganizations(@RequestBody @Valid  OrgOrganizations orgOrganizations) {
+    public ResultBean<String> draftOrgOrganizations(@RequestBody @Valid OrgOrganizations orgOrganizations) {
         log.info("FinKingDeeFeignRest-draftOrgOrganizations:{}", JSONObject.toJSONString(orgOrganizations));
         return orgOrganizationsService.draftOrgOrganizations(orgOrganizations);
     }
+
     @ApiOperation("批量修改组织机构的接口")
     @PostMapping("/updateOrgOrganizations")
     @ResponseBody
     @Override
-    public ResultBean<String> updateOrgOrganizations(@RequestBody @Valid  List<OrgOrganizations> orgOrganizations) {
+    public ResultBean<String> updateOrgOrganizations(@RequestBody @Valid List<OrgOrganizations> orgOrganizations) {
         log.info("FinKingDeeFeignRest-updateOrgOrganizations:{}", JSONObject.toJSONString(orgOrganizations));
         return orgOrganizationsService.updateOrgOrganizations(orgOrganizations);
     }
+
     @ApiOperation("暂存供应商的接口")
     @PostMapping("/draftBdSupplier")
     @ResponseBody
     @Override
-    public ResultBean<String> draftBdSupplier(@RequestBody @Valid  BdSupplier bdSupplier) {
+    public ResultBean<String> draftBdSupplier(@RequestBody @Valid BdSupplier bdSupplier) {
         log.info("FinKingDeeFeignRest-draftBdSupplier:{}", JSONObject.toJSONString(bdSupplier));
         KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
         kingDeeOrgAndDeptCode.setOrgCode(bdSupplier.getFUseOrgId());
@@ -343,11 +368,12 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         bdSupplier.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
         return bdSupplierService.draftBdSupplier(bdSupplier);
     }
+
     @ApiOperation("修改供应商的接口")
     @PostMapping("/updateBdSupplier")
     @ResponseBody
     @Override
-    public ResultBean<String> updateBdSupplier(@RequestBody @Valid  BdSupplier bdSupplier) {
+    public ResultBean<String> updateBdSupplier(@RequestBody @Valid BdSupplier bdSupplier) {
         log.info("FinKingDeeFeignRest-updateBdSupplier:{}", JSONObject.toJSONString(bdSupplier));
         KingDeeOrgAndDeptCode kingDeeOrgAndDeptCode = new KingDeeOrgAndDeptCode();
         kingDeeOrgAndDeptCode.setOrgCode(bdSupplier.getFUseOrgId());
@@ -355,6 +381,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         bdSupplier.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
         return bdSupplierService.updateBdSupplier(bdSupplier);
     }
+
     @ApiOperation("暂存客户信息的接口")
     @PostMapping("/draftBdCustomer")
     @ResponseBody
@@ -367,6 +394,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
         return bdCustomerService.draftBdCustomer(bdCustomer);
     }
+
     @ApiOperation("暂存客户信息的接口 批量")
     @PostMapping("/draftBdCustomers")
     @ResponseBody
@@ -381,6 +409,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         }
         return bdCustomerService.draftBdCustomers(bdCustomers);
     }
+
     @ApiOperation("修改客户信息的接口")
     @PostMapping("/saveBdCustomers")
     @ResponseBody
@@ -393,24 +422,25 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
             bdCustomer.setTOrgIds(kingDeeOrgAndDeptCode.getOrgCode());
         }
-        return  bdCustomerService.updateCustomers(bdCustomers);
+        return bdCustomerService.updateCustomers(bdCustomers);
     }
+
     @ApiOperation("根据编码查询客户的存在状态 true 存在，false不存在")
     @GetMapping("/customerExistState/{number}")
     @ResponseBody
     @Override
     public ResultBean<Boolean> customerExistState(String number) {
         log.info("FinKingDeeFeignRest-customerExistState:{}", number);
-        return  finKingDeeService.customerExistState(number);
+        return finKingDeeService.customerExistState(number);
     }
 
     @ApiOperation("单个 销售出库单 推送客户信息")
     @PostMapping("/updateSingleCustomer")
     @ResponseBody
     @Override
-    public ResultBean<String> updateSingleCustomer( @RequestBody @Valid BdCustomer bdCustomers) {
+    public ResultBean<String> updateSingleCustomer(@RequestBody @Valid BdCustomer bdCustomers) {
         log.info("FinKingDeeFeignRest-updateSingleCustomer:{}", JSONObject.toJSONString(bdCustomers));
-        return  bdCustomerService.updateSingleCustomer(bdCustomers);
+        return bdCustomerService.updateSingleCustomer(bdCustomers);
     }
 
     @ApiOperation("使用number查看数据表单")
@@ -419,8 +449,8 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
     @Override
     public ResultBean<String> getKingDataInfoByNumber(@PathVariable("formId") String formId,
                                                       @PathVariable("number") String number) {
-        log.info("FinKingDeeFeignRest-getKingDataInfoByNumber:{},{}", formId,number);
+        log.info("FinKingDeeFeignRest-getKingDataInfoByNumber:{},{}", formId, number);
-        return  finKingDeeService.accessKingDeeInterface(formId,number);
+        return finKingDeeService.accessKingDeeInterface(formId, number);
     }
 
     @ApiOperation("单据查询")
@@ -448,14 +478,16 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         log.info("FinKingDeeFeignRest-drafBDtStock:{}", JSONObject.toJSONString(bDtStock));
         return bDStockService.draftBDStock(bDtStock);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
     }
+
     @ApiOperation("修改仓库信息的接口")
     @PostMapping("/updateBDtStock")
     @ResponseBody
     @Override
-    public ResultBean<String> updateBDtStock(@RequestBody @Valid BDStock bDtStock)  {
+    public ResultBean<String> updateBDtStock(@RequestBody @Valid BDStock bDtStock) {
         log.info("FinKingDeeFeignRest-updateBDtStock:{}", JSONObject.toJSONString(bDtStock));
         return bDStockService.updateBDtStock(bDtStock);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
     }
+
     @ApiOperation("暂存银行的接口")
     @PostMapping("/drafBDBank")
     @ResponseBody
@@ -497,7 +529,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         kingDeeOrgAndDeptCode.setOrgCode(cNBankacnt.getFCreateOrgId());
         kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
         cNBankacnt.setFCreateOrgId(kingDeeOrgAndDeptCode.getOrgCode());
-        return  cnBankcntService.updateCNBankacnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
+        return cnBankcntService.updateCNBankacnt(cNBankacnt);//bdCustomerService;//bdCustomerService.getKingBillDataInfoList("","");
     }
 
     @ApiOperation("暂存收付款用途的接口")
@@ -508,6 +540,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         log.info("FinKingDeeFeignRest-draftCNRecpaypurpose:{}", JSONObject.toJSONString(cNRecpaypurpose));
         return cNRecpaypurposeService.draftCNRecpaypurpose(cNRecpaypurpose);
     }
+
     @ApiOperation("保存部门的接口")
     @PostMapping("/saveBdDepartment")
     @ResponseBody
@@ -520,6 +553,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         bdDepartment.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
         return bdDepartmentService.saveBdDepartment(bdDepartment);
     }
+
     @ApiOperation("修改部门的接口")
     @PostMapping("/updateBdDepartment")
     @ResponseBody
@@ -532,6 +566,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         bdDepartment.setFUseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
         return bdDepartmentService.updateBdDepartment(bdDepartment);
     }
+
     @ApiOperation("保存员工的接口")
     @PostMapping("/saveBDEmpinfo")
     @ResponseBody
@@ -540,6 +575,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         log.info("FinKingDeeFeignRest-saveBDEmpinfo:{}", JSONObject.toJSONString(bdEmpinfo));
         return bDEmpinfoService.saveBDEmpinfo(bdEmpinfo);
     }
+
     @ApiOperation("修改员工的接口")
     @PostMapping("/updateBDEmpinfo")
     @ResponseBody
@@ -548,4 +584,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         log.info("FinKingDeeFeignRest-updateBDEmpinfo:{}", JSONObject.toJSONString(bdEmpinfo));
         return bDEmpinfoService.updateBDEmpinfo(bdEmpinfo);
     }
+
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersCastToKingDeeBillFields.java

@@ -0,0 +1,59 @@
+package com.yxt.anrui.fin.biz.kingdee.salesreturn;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.yxt.anrui.fin.biz.kingdee.KingDeeUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 封装转换的类
+ */
+public class SalesReturnOrdersCastToKingDeeBillFields {
+    /**
+     * 构造金蝶需要的数据结构 并对字段赋值
+     *
+     * @param map_fEntityModel_
+     * @param vehicleList
+     * @return
+     */
+    public static String getKingDeeData(Map<String, String> map_fEntityModel_, List<Map<String, String>> vehicleList) {
+        /**
+         * 取模板
+         */
+        String readJsonFile = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/salesreturn/data.json");
+        String fEntityData_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/salesreturn/data_data.json");
+        String fEntityModel_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/salesreturn/data_model.json");
+
+        //模板字符创转json
+        JSONObject jsonObj = JSONObject.parseObject(readJsonFile, Feature.OrderedField);
+        JSONObject jsonFEntityData_ = JSONObject.parseObject(fEntityData_, Feature.OrderedField);
+        fEntityModel_ = KingDeeUtils.replaceTemplateParams(fEntityModel_, map_fEntityModel_);
+        JSONObject jsonFEntityModel_ = JSONObject.parseObject(fEntityModel_, Feature.OrderedField);
+
+        List<JSONObject> list_fEntity_ = new ArrayList<>();
+
+        //对模板字段赋值  根据传递进来的map数据的集合进行赋值
+        for (int i = 0; i < vehicleList.size(); i++) {
+            String fEntity_ = KingDeeUtils.readJsonFile("com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json");
+            Map<String, String> params = vehicleList.get(i);
+            Map<String, String> map_fEntity_ = new HashMap<>();
+            for (Map.Entry<String, String> entry : params.entrySet()) {
+                map_fEntity_.put(entry.getKey(), entry.getValue());
+            }
+            fEntity_ = KingDeeUtils.replaceTemplateParams(fEntity_, map_fEntity_);
+            list_fEntity_.add(JSONObject.parseObject(fEntity_, Feature.OrderedField));
+        }
+
+        jsonFEntityModel_.put("FEntity", JSONArray.parseArray(JSON.toJSONString(list_fEntity_)));
+        jsonFEntityData_.put("Model", JSONObject.parseObject(JSON.toJSONString(jsonFEntityModel_), Feature.OrderedField));
+        jsonObj.put("data", jsonFEntityData_.toJSONString());
+
+        return jsonObj.toJSONString();
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/SalesReturnOrdersService.java

@@ -0,0 +1,97 @@
+package com.yxt.anrui.fin.biz.kingdee.salesreturn;
+
+import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
+import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
+import com.yxt.anrui.fin.api.kingdee.otherarreceivable.OtherReceivable;
+import com.yxt.anrui.fin.api.kingdee.salesreturn.SalesReturn;
+import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SalesReturnOrdersService extends FinKingDeeService {
+
+    /**
+     * 生成的销售退货单的数据，推送到金蝶的平台中
+     *
+     * @param salesReturn
+     * @return
+     */
+    public ResultBean salesReturnOrdersService(SalesReturn salesReturn) {
+        ResultBean rb = ResultBean.fireFail();
+        //业务表的主表数据集合
+        Map<String, String> map_fEntityModel_ = new HashMap<>();
+        //客户
+        if (StringUtils.isBlank(salesReturn.getCustomerNo())) {
+            return rb.setMsg("客户编码不能为空");
+        }
+        map_fEntityModel_.put("FRetcustId", salesReturn.getCustomerNo());
+        //库存组织
+        if (StringUtils.isBlank(salesReturn.getFStockOrgId())) {
+            return rb.setMsg("库存组织不能为空");
+        }
+        map_fEntityModel_.put("FStockOrgId", salesReturn.getFStockOrgId());
+        //单据编号
+        if (StringUtils.isBlank(salesReturn.getBillNo())) {
+            return rb.setMsg("单据编号不能为空");
+        }
+        map_fEntityModel_.put("FBillNo", salesReturn.getBillNo());
+        //业务日期
+        if (StringUtils.isBlank(salesReturn.getFDate())) {
+            return rb.setMsg("业务日期不能为空");
+        }
+        map_fEntityModel_.put("FDate", salesReturn.getFDate());
+        //销售组织
+        if (StringUtils.isBlank(salesReturn.getFSaleOrgId())) {
+            return rb.setMsg("销售组织不能为空");
+        }
+        map_fEntityModel_.put("FSaleOrgId", salesReturn.getFSaleOrgId());
+
+        List<SalesReturn.SalesReturnDetailDto> salesReturnDetailDtos = salesReturn.getSalesReturnDetails() == null ? new ArrayList<>() : salesReturn.getSalesReturnDetails();
+        //准备 物料列表的数据
+        ResultBean<List<Map<String, String>>> vehicleListMap = createVehicleListsForReceivableBill(salesReturnDetailDtos);
+        if (!vehicleListMap.getSuccess()) {
+            return rb.setMsg(vehicleListMap.getMsg());
+        }
+        String kingDeeData = SalesReturnOrdersCastToKingDeeBillFields.getKingDeeData(map_fEntityModel_, vehicleListMap.getData());
+        try {
+            ResultBean<String> resultBean1 = accessKingDeeInterface(KingDeeBillId.SAL_RETURNSTOCK.getID(), kingDeeData, KingDeeBillUrl.DRAFT_URL.getURL());
+            if (!resultBean1.getSuccess()) {
+                log.info("销售退货单保存失败!");
+                return rb.setMsg("销售退货单保存失败!");
+            }
+            log.info("销售退货单保存成功!");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return rb;
+    }
+
+    public ResultBean<List<Map<String, String>>> createVehicleListsForReceivableBill(List<SalesReturn.SalesReturnDetailDto> collectionDetails) {
+        ResultBean<List<Map<String, String>>> rb = ResultBean.fireFail();
+        List<Map<String, String>> collectionDetailMap = new ArrayList<>();
+        for (int i = 0; i < collectionDetails.size(); i++) {
+            SalesReturn.SalesReturnDetailDto c = collectionDetails.get(i);
+            Map<String, String> m = new HashMap<>();
+            if (StringUtils.isBlank(c.getFMaterialId())) {
+                return rb.setMsg("物料编码不能为空");
+            }
+            if (StringUtils.isBlank(c.getFUnitID())) {
+                return rb.setMsg("库存单位不能为空");
+            }
+            m.put("FMaterialId", c.getFMaterialId());
+            m.put("FUnitID", c.getFUnitID());
+            m.put("FRealQty", c.getFRealQty());
+            m.put("FDeliveryDate", c.getFDeliveryDate());
+            m.put("FIsFree", c.getFIsFree());
+            collectionDetailMap.add(m);
+        }
+        return rb.success().setData(collectionDetailMap);
+    }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data.json

@@ -0,0 +1,4 @@
+{
+  "formId": "SAL_RETURNSTOCK",
+  "data": "@KD_data"
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_FEntity.json

@@ -0,0 +1,142 @@
+{
+  "FENTRYID": "0",
+  "FRowType": "",
+  "FMapId": {
+    "FNumber": ""
+  },
+  "FMaterialId": {
+    "FNumber": "@KD_FMaterialId"
+  },
+  "FAuxpropId": {
+    "FAUXPROPID__FF100001": {
+      "FNumber": ""
+    },
+    "FAUXPROPID__FF100005": {
+      "FNumber": ""
+    },
+    "FAUXPROPID__FF100002": {
+      "FNumber": ""
+    },
+    "FAUXPROPID__FF100004": {
+      "FNumber": ""
+    },
+    "FAUXPROPID__FF100006": {
+      "FNumber": ""
+    }
+  },
+  "FUnitID": {
+    "FNumber": "@KD_FUnitID"
+  },
+  "FInventoryQty": "0",
+  "FRealQty": "@KD_FRealQty",
+  "FParentMatId": {
+    "FNUMBER": ""
+  },
+  "FPrice": "0",
+  "FTaxPrice": "0",
+  "FIsFree": "@KD_FIsFree",
+  "FTaxCombination": {
+    "FNumber": ""
+  },
+  "FEntryTaxRate": "0",
+  "FBOMId": {
+    "FNumber": ""
+  },
+  "FReturnType": {
+    "FNumber": "THLX01_SYS"
+  },
+  "FOwnerTypeId": "",
+  "FOwnerId": {
+    "FNumber": ""
+  },
+  "FProduceDate": "",
+  "FExpiryDate": "",
+  "FStockId": {
+    "FNumber": ""
+  },
+  "FStocklocId": {
+    "FSTOCKLOCID__FF100001": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100002": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100003": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100004": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100005": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100006": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100007": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100008": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100009": {
+      "FNumber": ""
+    },
+    "FSTOCKLOCID__FF100010": {
+      "FNumber": ""
+    }
+  },
+  "FStockstatusId": {
+    "FNumber": ""
+  },
+  "FDeliveryDate": "@KD_FDeliveryDate",
+  "FMtoNo": "",
+  "FNote": "",
+  "FDiscountRate": "0",
+  "FPriceDiscount": "0",
+  "FAuxUnitQty": "0",
+  "FExtAuxUnitId": {
+    "FNumber": ""
+  },
+  "FExtAuxUnitQty": "0",
+  "FSalCostPrice": "0",
+  "FISCONSUMESUM": "",
+  "FLot": {
+    "FNumber": ""
+  },
+  "FSalUnitID": {
+    "FNumber": ""
+  },
+  "FSalUnitQty": "0",
+  "FSalBaseQty": "0",
+  "FPriceBaseQty": "0",
+  "FProjectNo": "",
+  "FQualifyType": "",
+  "FEOwnerSupplierId": {
+    "FNUMBER": ""
+  },
+  "FIsOverLegalOrg": "false",
+  "FESettleCustomerId": {
+    "FNUMBER": ""
+  },
+  "FThirdEntryId": "",
+  "FSOEntryId": "0",
+  "FPriceListEntry": {
+    "FNUMBER": ""
+  },
+  "FARNOTJOINQTY": "0",
+  "FIsReturnCheck": "false",
+  "FTaxDetailSubEntity": [
+    {
+      "FDetailID": "0",
+      "FTaxRate": "0"
+    }
+  ],
+  "FSerialSubEntity": [
+    {
+      "FDetailID": "0",
+      "FSerialNo": "",
+      "FSerialNote": ""
+    }
+  ]
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_data.json

@@ -0,0 +1,13 @@
+{
+  "Creator": "",
+  "NeedUpDateFields": [],
+  "NeedReturnFields": [],
+  "IsDeleteEntry": "True",
+  "SubSystemId": "",
+  "IsVerifyBaseDataField": "false",
+  "IsEntryBatchFill": "True",
+  "ValidateFlag": "True",
+  "NumberSearch": "True",
+  "InterationFlags": "",
+  "Model": {}
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/data_model.json

@@ -0,0 +1,112 @@
+{
+  "FID": "0",
+  "FBillTypeID": {
+    "FNUMBER": "XSTHD01_SYS"
+  },
+  "FBillNo": "@KD_FBillNo",
+  "FDate": "@KD_FDate",
+  "FSaleOrgId": {
+    "FNumber": "@KD_FSaleOrgId"
+  },
+  "FRetcustId": {
+    "FNumber": "@KD_FRetcustId"
+  },
+  "FSaledeptid": {
+    "FNumber": ""
+  },
+  "FReturnReason": {
+    "FNumber": ""
+  },
+  "FHeadLocId": {
+    "FNumber": ""
+  },
+  "FCorrespondOrgId": {
+    "FNumber": ""
+  },
+  "FTransferBizType": {
+    "FNumber": ""
+  },
+  "FSaleGroupId": {
+    "FNumber": ""
+  },
+  "FSalesManId": {
+    "FNumber": ""
+  },
+  "FStockOrgId": {
+    "FNumber": "@KD_FStockOrgId"
+  },
+  "FStockDeptId": {
+    "FNumber": ""
+  },
+  "FStockerGroupId": {
+    "FNumber": ""
+  },
+  "FStockerId": {
+    "FNumber": ""
+  },
+  "FHeadNote": "",
+  "FReceiveCustId": {
+    "FNumber": ""
+  },
+  "FReceiveAddress": "",
+  "FSettleCustId": {
+    "FNumber": ""
+  },
+  "FReceiveCusContact": {
+    "FNAME": ""
+  },
+  "FPayCustId": {
+    "FNumber": ""
+  },
+  "FOwnerTypeIdHead": "",
+  "FOwnerIdHead": {
+    "FNumber": ""
+  },
+  "FScanBox": "",
+  "FCDateOffsetUnit": "",
+  "FCDateOffsetValue": "0",
+  "FIsTotalServiceOrCost": "false",
+  "F_PAEZ_Assistant": {
+    "FNumber": ""
+  },
+  "SubHeadEntity": {
+    "FEntryId": "0",
+    "FSettleCurrId": {
+      "FNumber": "PRE001"
+    },
+    "FThirdBillNo": "",
+    "FThirdBillId": "",
+    "FThirdSrcType": "",
+    "FSettleOrgId": {
+      "FNumber": ""
+    },
+    "FSettleTypeId": {
+      "FNumber": ""
+    },
+    "FChageCondition": {
+      "FNumber": ""
+    },
+    "FPriceListId": {
+      "FNumber": ""
+    },
+    "FDiscountListId": {
+      "FNumber": ""
+    },
+    "FLocalCurrId": {
+      "FNumber": ""
+    },
+    "FExchangeTypeId": {
+      "FNumber": ""
+    },
+    "FExchangeRate": "0",
+    "FBuyerNick": "",
+    "FReceiverAddress": "",
+    "FReceiverName": "",
+    "FReceiverMobile": "",
+    "FReceiverCountry": "",
+    "FReceiverState": "",
+    "FReceiverCity": "",
+    "FReceiverDistrict": "",
+    "FReceiverPhone": ""
+  }
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/salesreturn/remarks.txt

@@ -0,0 +1,208 @@
+一、请求参数说明:
+1.formid：业务对象表单Id，字符串类型（必录）
+2.data：Json格式数据（详情参考Json格式数据）（必录）
+     2.1.Creator：创建者内码（非必录）
+     2.2.NeedUpDateFields：需要更新的字段，数组类型，格式：[key1,key2,...]（非必录），注（更新单据体字段得加上单据体key）
+     2.3.NeedReturnFields：需返回结果的字段集合，数组类型，格式：[key,entitykey.key,...]（非必录），注（返回单据体字段格式：entitykey.key）
+     2.4.IsDeleteEntry：是否删除已存在的分录，布尔类型，默认true（非必录）
+     2.5.SubSystemId：表单所在的子系统内码，字符串类型（非必录）
+     2.6.IsVerifyBaseDataField：是否验证所有的基础资料有效性，布尔类，默认false（非必录）
+     2.7.IsEntryBatchFill：是否批量填充分录，默认true（非必录）
+     2.8.ValidateFlag：是否验证标志，布尔类型，默认true（非必录）
+     2.9.NumberSearch：是否用编码搜索基础资料，布尔类型，默认true（非必录）
+     2.10.InterationFlags：交互标志集合，字符串类型，分号分隔，格式："flag1;flag2;..."（非必录），例如（允许负库存标识：STK_InvCheckResult）
+     2.11.Model：表单数据包，Json类型（必录）
+
+字段说明:
+关联应收金额:FARJOINAMOUNT
+累计应收数量（销售基本）:FBASEARQTY
+业务流程:FBFLowId
+累计应收金额:FARAMOUNT
+订单类型:FSOBILLTYPEID
+源单编号:FSrcBillNo
+销售成本价:FSalCostPrice
+关联应收数量（计价基本）:FBaseARJoinQty
+价税合计:FAllAmount
+税额（本位币）:FTaxAmount_LC
+税额:FEntryTaxAmount
+价税合计（本位币）:FAllAmount_LC
+退货日期:FDeliveryDate  (必填项)
+净价:FTaxNetPrice
+是否赠品:FIsFree
+序列号单位:FSNUnitID
+销售数量:FSalUnitQty
+销售单位:FSalUnitID
+计价基本数量:FPriceBaseQty
+销售基本数量:FSalBaseQty
+库存基本分母:FStockBaseDen
+销售基本分子:FSalBaseNum
+质量类型:FQualifyType
+当前库存:FInventoryQty
+项目编号:FProjectNo
+计划跟踪号:FMtoNo
+序列号单位数量:FSNQty
+拒收标志:FRefuseFlag
+实退数量（辅单位）:FExtAuxUnitQty
+辅单位:FExtAuxUnitId
+消耗汇总:FISCONSUMESUM
+金额（本位币）:FAmount_LC
+仓位:FStocklocId
+保质期:FExpPeriod
+保质期单位:FExpUnit
+客户物料编码:FMapId
+退货类型:FReturnType  (必填项)
+批号:FLot
+客户物料名称:FMapName
+源单类型:FSrcBillTypeID
+(作废)关联开票数量(基本单位):FBaseInvoicedQty
+关联应收数量（计价）:FInvoicedQty
+备注:FNote
+累计应收数量（销售）:FSumInvoicedQty
+库存更新标示:FStockFlag
+累计收款金额:FSumRecievedAmt
+累计开票金额:FSumInvoicedAmt
+(作废)累计开票数量(基本单位):FBaseSumInvoicedQty
+折前金额:FBefDisAmt
+最低限价:FLimitDownPrice
+系统定价:FSysPrice
+折前价税合计:FBefDisAllAmt
+金额:FAmount
+折扣额:FDiscount
+折扣率%:FDiscountRate
+价格系数:FPriceCoefficient
+计价数量:FPriceUnitQty
+计价单位:FPriceUnitId
+总成本（本位币）:FCostAmount_LC
+单价:FPrice
+税率%:FEntryTaxRate
+税组合:FTaxCombination
+含税单价:FTaxPrice
+第三方单据编号:FThirdBillNo
+第三方单据内码:FThirdBillId
+第三方系统来源:FThirdSrcType
+会员名称:FBuyerNick
+收货人国家:FReceiverCountry
+收货人地址:FReceiverAddress
+收货人:FReceiverName
+价外税:FIsPriceExcludeTax
+价目表:FPriceListId
+是否含税:FIsIncludedTax
+税额:FBillTaxAmount
+折扣表:FDiscountListId
+跨组织结算生成:FISGENFORIOS
+货主供应商:FOwnerSupplierID
+结算组织客户:FSETTLECustomerID
+收货人城市:FReceiverCity
+卖方代扣代缴:FSellerWithholding
+增值税:FVAT
+计入成本金额:FCostAmount
+买方代扣代缴:FBuyerWithholding
+备注:FSerialNote
+序列号:FSerialId
+序列号:FSerialNo
+计入成本比例%:FCostPercent
+收货人省份:FReceiverState
+收货人地区:FReceiverDistrict
+收货人手机:FReceiverMobile
+收货人电话:FReceiverPhone
+税额:FTaxAmount
+税率%:FTaxRate
+税率名称:FTaxRateId
+金额:FBillAmount
+产品类型:FRowType
+退货检验:FIsReturnCheck
+销售订单EntryId:FSOEntryId
+父项产品:FParentMatId
+第三方单据分录ID:FThirdEntryId
+父项标识:FParentRowId
+行标识:FRowId
+ 未关联应收数量（计价单位）:FARNOTJOINQTY
+明细货主供应商:FEOwnerSupplierId
+携带的主业务单位:FSRCBIZUNITID
+关联应收数量（库存基本）:FStockBaseARJoinQty
+组织间结算跨法人标识:FIsOverLegalOrg
+行价目表:FPriceListEntry
+关联应收数量（销售基本）:FSalBaseARJoinQty
+明细结算组织客户:FESettleCustomerId
+单价折扣:FPriceDiscount
+汇率精度:FPrecision
+总成本（本位币）:FBillCostAmount_LC
+总成本:FBillCostAmount
+价税合计（本位币）:FBillAllAmount_LC
+价税合计:FBillAllAmount
+税额（本位币）:FBillTaxAmount_LC
+金额（本位币）:FBillAmount_LC
+汇率:FExchangeRate
+收款条件:FChageCondition
+结算方式:FSettleTypeId
+车辆类型:F_PAEZ_BaseProperty
+结算组织:FSettleOrgId  (必填项)
+汇率类型:FExchangeTypeId
+本位币:FLocalCurrId
+结算币别:FSettleCurrId  (必填项)
+单据类型:FBillTypeIDFBillTypeID  (必填项)
+收货方:FReceiveCustId
+货主:FOwnerIdHead
+货主类型:FOwnerTypeIdHead
+销售部门:FSaledeptid
+销售组:FSaleGroupId
+库存部门:FStockDeptId
+销售员:FSalesManId
+创建人:FCreatorId
+付款方:FPayCustId
+结算方:FSettleCustId
+仓管员:FStockerId
+销售组织:FSaleOrgId  (必填项)
+单据状态:FDocumentStatus
+单据编号:FBillNo
+日期:FDate  (必填项)
+库存组:FStockerGroupId
+退货客户:FRetcustId  (必填项)
+库存组织:FStockOrgId  (必填项)
+创建日期:FCreateDate
+审核人:FApproverId
+最后修改日期:FModifyDate
+最后修改人:FModifierId
+审核日期:FApproveDate
+作废状态:FCancelStatus
+作废日期:FCancelDate
+作废人:FCancellerId
+物料类别:FMaterialType
+规格型号:FMaterialModel
+物料名称:FMaterialName
+库存单位:FUnitID  (必填项)
+仓库:FStockId
+实退数量:FRealQty
+应退数量:FMustqty
+物料编码:FMaterialId  (必填项)
+创建日期偏移量:FCDateOffsetValue
+创建日期偏移单位:FCDateOffsetUnit
+备注:FHeadNote
+项目类别:F_PAEZ_Assistant
+整单服务标识:FIsTotalServiceOrCost
+库存状态:FStockstatusId
+库存辅单位:FAuxUnitId
+库存基本数量:FBaseunitQty
+基本单位:FBaseunitId
+库存辅单位数量:FAuxUnitQty
+订单单号:FOrderNo
+总成本:FEntryCostAmount
+成本价（本位币）:FCostPrice
+有效期至:FExpiryDate
+保管者类型:FKeeperTypeId
+货主:FOwnerId  (必填项)
+货主类型:FOwnerTypeId
+保管者:FKeeperId
+生产日期:FProduceDate
+辅助属性:FAuxpropId
+BOM版本:FBOMId
+对应组织:FCorrespondOrgId
+跨组织业务类型:FTransferBizType
+收货方地址:FReceiveAddress
+退货原因:FReturnReason
+业务类型:FBussinessType
+交货地点:FHeadLocId
+信用检查结果:FCreditCheckResult
+组织间结算跨法人标识:FIsInterLegalPerson
+收货方联系人:FReceiveCusContact
+序列号上传:FScanBox

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

@@ -281,78 +281,74 @@ export default {
       policy_list: [],
       other_list: [],
       finance: {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       },
       rules: {
       }
@@ -403,80 +399,76 @@ export default {
     // 是否打包
     isPackChange(val) {
       this.finance = {
-        saleOrderSid: '',
-        type: '',
-        isPack: val,
-        policyName: '',
-        policySid: '',
-        mainVehicleAmount: '',
         accessoriesAmount: '',
-        trailerAmount: '',
-        purchaseTax: '',
-        premium: '',
-        loanTotal: '',
-
         accessoriesAmountCb: false,
-        trailerAmountCb: false,
-        purchaseTaxCb: false,
-        premiumCb: false,
-
-        downPayRatio: '',
-        downPayAmount: '',
-        loanAmount: '',
-        loanPeriod: '',
-        bondRatio: '',
         bondAmount: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: val,
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
-      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), isPack: this.finance.isPack }).then((resp) => {
+      selectList({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
         if (resp.success) {
           this.policy_list = resp.data
         }
@@ -495,10 +487,18 @@ export default {
         this.finance.loanPeriod = choose[0].period
         // 从金融产品政策中-- 获取贷款保证金比例
         this.finance.bondRatio = choose[0].bondRatio
+        // 从金融产品政策中-- 获取保险保证金
+        this.finance.depositPremium = choose[0].depositPremium
+        // 从金融产品政策中-- 获取落户保证金
+        this.finance.depositSettle = choose[0].depositSettle
+        // 从金融产品政策中-- 获取名义(留购)价
+        this.finance.nominalPrice = choose[0].nominalPrice
+        // 从金融产品政策中-- 获取代收意外险
+        this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
-        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('defaultOrgPath'), sid: choose[0].sid }).then((res) => {
+        selectListByOther({ orgPath: window.sessionStorage.getItem('defaultOrgPath'), userSid: window.sessionStorage.getItem('userSid'), sid: choose[0].sid }).then((res) => {
           if (res.success) {
             this.other_list = res.data
           }
@@ -561,11 +561,22 @@ export default {
       // 首次计算出或修改融资项目总额
       if (this.finance.loanTotal !== '') {
         // 主方案 -- 计算首付金额
-        this.finance.downPayAmount = (parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100).toFixed(0)
+        this.finance.downPayAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100)
         // 主方案 -- 计算产品贷款金额
-        this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))
+        this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
         // 主方案 -- 计算贷款保证金
-        this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0)
+        this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
+        // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
+        if (this.finance.serviceChargeTypeKey === '01') {
+          // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        } else if (this.finance.serviceChargeTypeKey === '02') {
+          // 等于金融产品政策中服务费
+          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
+        } else if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
       }
       if (this.finance.premiumCb && this.finance.dealWayKey === '02') {
         this.finance.offsetPremium = this.finance.premium
@@ -582,17 +593,21 @@ export default {
     downPayAmountInput() {
       if (this.finance.loanTotal !== '') {
         // 重新计算首付比例
-        this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toFixed(2)
+        this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toPrecision(2)
         // 重新计算产品贷款金额
-        this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))
+        this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
+        if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
         // 主方案 -- 贷款保证金
-        this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0)
+        this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
       }
     },
     // 主方案 -- 修改贷款保证金，重新计算贷款保证金比例
     bondAmountInput() {
       if (this.finance.bondAmount !== '') {
-        this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toFixed(2)
+        this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toPrecision(2)
       }
     },
     // 其它融--名称
@@ -707,78 +722,74 @@ export default {
     },
     handleColse() {
       this.finance = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       this.$emit('doback')
     }

anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue

@@ -22,11 +22,11 @@
               <div class="span-sty">融资项目</div>
               <el-form-item>
                 <div class="addinputInfo">
-                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
+                  <span>主车发票价 {{ formobj.mainVehicleAmount }} 元</span>
-                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
+                  <span>  配件 {{ formobj.accessoriesAmount }} 元</span>
-                  <span>挂车{{ formobj.trailerAmount }} 元</span>
+                  <span>  挂车 {{ formobj.trailerAmount }} 元</span>
-                  <span>保险{{ formobj.premium }} 元</span>
+                  <span>  保险 {{ formobj.premium }} 元</span>
-                  <span>购置税{{ formobj.purchaseTax }} 元</span>
+                  <span>  购置税 {{ formobj.purchaseTax }} 元</span>
                 </div>
               </el-form-item>
             </el-col>
@@ -287,78 +287,74 @@ export default {
       viewTitle: '',
       viewState: 1,
       formobj: {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       },
       rules: {}
     }
@@ -378,78 +374,74 @@ export default {
     backParameters() {
       this.$emit('backParameters', this.formobj)
       this.formobj = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
     },
     resetState() {

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

@@ -18,11 +18,11 @@
               <div class="span-sty">融资项目</div>
               <el-form-item>
                 <div class="addinputInfo">
-                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
+                  <span>主车发票价 {{ formobj.mainVehicleAmount }} 元</span>
-                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
+                  <span>  配件 {{ formobj.accessoriesAmount }} 元</span>
-                  <span>挂车{{ formobj.trailerAmount }} 元</span>
+                  <span>  挂车 {{ formobj.trailerAmount }} 元</span>
-                  <span>保险{{ formobj.premium }} 元</span>
+                  <span>  保险 {{ formobj.premium }} 元</span>
-                  <span>购置税{{ formobj.purchaseTax }} 元</span>
+                  <span>  购置税 {{ formobj.purchaseTax }} 元</span>
                 </div>
               </el-form-item>
             </el-col>

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

@@ -233,78 +233,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
           factoryDiscountUseKey: '',
-          policyYearRatio: '',
+          interest: '',
-          loanPayMoney: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',
@@ -561,77 +557,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
-          policyYearRatio: '',
+          factoryDiscountUseKey: '',
-          loanPayMoney: '',
+          interest: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',

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

@@ -203,77 +203,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
-          policyYearRatio: '',
+          factoryDiscountUseKey: '',
-          loanPayMoney: '',
+          interest: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',
@@ -346,78 +343,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
           factoryDiscountUseKey: '',
-          policyYearRatio: '',
+          interest: '',
-          loanPayMoney: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',

anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue

@@ -11,15 +11,14 @@
       <div class="titwu">金融产品政策</div>
       <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
         <el-row style="border-left: 0px">
-          <el-col :span="6" style="border-right: 0px">
+          <el-col :span="18" style="border-right: 0px">
             <div class="span-sty" style="border-right: 0px"><span>产品政策名称</span></div>
             <el-form-item>
               <div class="addinputInfo">
-                <span>{{ formobj.bankShortName }} {{ formobj.guaranteeTypeValue !== '' ? '( ' + formobj.guaranteeTypeValue + '、' : '' }} {{ formobj.isPack == '1' ? '打包 )' : formobj.isPack == '0' ? '不打包 )' : '' }} {{ formobj.downPayRatio }} {{ formobj.bondRatio !== '' ? '+ ' + formobj.bondRatio : '' }}</span>
+                <span>{{ formobj.bankShortName }} {{ formobj.period !== '' ? formobj.period + '期' : '' }} {{ formobj.guaranteeTypeValue !== '' ? '( ' + formobj.guaranteeTypeValue + '、' : '' }} {{ formobj.isPack == '1' ? '打包 )' : formobj.isPack == '0' ? '不打包 )' : '' }} {{ formobj.downPayRatio }} {{ formobj.bondRatio !== '' ? '+ ' + formobj.bondRatio : '' }}</span>
               </div>
             </el-form-item>
           </el-col>
-          <el-col :span="12" style="border-right: 0px"></el-col>
           <el-col :span="6" style="border-right: 0px">
             <div class="span-sty" style="border-right: 0px"><span>适用销售部门</span></div>
             <el-form-item>
@@ -64,6 +63,14 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="6">
+            <div class="span-sty"><span>担保类型</span></div>
+            <el-form-item>
+              <el-select class="addinputInfo" v-model="formobj.guaranteeTypeKey" @change="guaranteeTypeChange" placeholder="请选择" clearable filterable>
+                <el-option v-for="item in guaranteeType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <div class="span-sty"><span>是否打包</span></div>
             <el-form-item>
@@ -73,14 +80,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <div class="span-sty"><span>担保类型</span></div>
-            <el-form-item>
-              <el-select class="addinputInfo" v-model="formobj.guaranteeTypeKey" @change="guaranteeTypeChange" placeholder="请选择" clearable filterable>
-                <el-option v-for="item in guaranteeType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="6">
             <div class="span-sty"><span>首付比例</span></div>
             <el-form-item>
@@ -140,7 +139,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <div class="span-sty"><span>服务费<span v-show="formobj.serviceAmountTypeValue == '比例'">(%)</span></span></div>
+            <div class="span-sty"><span>服务费<span v-show="formobj.serviceAmountTypeValue !== '固定金额'">(%)</span></span></div>
             <el-form-item>
               <el-input v-model="formobj.serviceAmount" @keyup.native="UpNumber" class="addinputw addinputInfo" clearable placeholder=""/>
             </el-form-item>

anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementInfo.vue

@@ -16,7 +16,7 @@
             <div class="span-sty" style="border-right: 0px"><span>产品政策名称</span></div>
             <el-form-item>
               <div class="addinputInfo">
-                <span>{{ formobj.bankShortName }} {{ formobj.guaranteeTypeValue !== '' ? '( ' + formobj.guaranteeTypeValue + '、' : '' }} {{ formobj.isPack == '1' ? '打包 )' : formobj.isPack == '2' ? '不打包 )' : '' }} {{ formobj.downPayRatio }} {{ formobj.bondRatio !== '' ? '+ ' + formobj.bondRatio : '' }}</span>
+                <span>{{ formobj.bankShortName }} {{ formobj.period !== '' ? formobj.period + '期' : '' }} {{ formobj.guaranteeTypeValue !== '' ? '( ' + formobj.guaranteeTypeValue + '、' : '' }} {{ formobj.isPack == '1' ? '打包 )' : formobj.isPack == '2' ? '不打包 )' : '' }} {{ formobj.downPayRatio }} {{ formobj.bondRatio !== '' ? '+ ' + formobj.bondRatio : '' }}</span>
               </div>
             </el-form-item>
           </el-col>
@@ -41,14 +41,14 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="6">
-            <div class="span-sty"><span>是否打包</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : '否' }}</span></el-form-item>
-          </el-col>
           <el-col :span="6">
             <div class="span-sty"><span>担保类型</span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.guaranteeTypeValue }}</span></el-form-item>
           </el-col>
+          <el-col :span="6">
+            <div class="span-sty"><span>是否打包</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : '否' }}</span></el-form-item>
+          </el-col>
           <el-col :span="6">
             <div class="span-sty"><span>首付比例</span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.downPayRatio }}</span></el-form-item>
@@ -82,7 +82,7 @@
             <el-form-item><span class="addinputInfo">{{ formobj.serviceAmountTypeValue }}</span></el-form-item>
           </el-col>
           <el-col :span="6">
-            <div class="span-sty"><span>服务费<span v-show="formobj.serviceAmountTypeValue == '比例'">(%)</span></span></div>
+            <div class="span-sty"><span>服务费<span v-show="formobj.serviceAmountTypeValue !== '固定金额'">(%)</span></span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.serviceAmount }}</span></el-form-item>
           </el-col>
           <el-col :span="6">

anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementAdd.vue

@@ -20,7 +20,9 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">其他融名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.bankShortName + formobj.productTypeValue + formobj.maxLoanRatio + formobj.period }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">
+              {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.maxLoanRatio + '期' : '' }} {{ formobj.maxLoanRatio }}
+            </span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">适用销售部门</div>
@@ -374,9 +376,9 @@ export default {
 
 <style scoped>
 .span-sty {
-  width: 110px !important;
+  width: 120px !important;
 }
 .addinputInfo {
-  margin-left: 100px !important;
+  margin-left: 110px !important;
 }
 </style>

anrui-riskcenter-ui/src/views/otherfinancialpolicymanagement/otherfinancialpolicymanagementInfo.vue

@@ -15,9 +15,13 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">其他融名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyName }}</span></el-form-item>
+            <el-form-item>
+              <span class="addinputInfo">
+                {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.maxLoanRatio + '期' : '' }} {{ formobj.maxLoanRatio }}
+              </span>
+            </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" class="tlineheightb">
             <div class="span-sty">适用销售部门</div>
             <el-form-item><span class="addinputInfo">{{ formobj.useDeptNames }}</span></el-form-item>
           </el-col>
@@ -130,9 +134,22 @@ export default {
 
 <style scoped>
 .span-sty {
-  width: 110px !important;
+  width: 120px !important;
 }
 .addinputInfo {
-  margin-left: 100px !important;
+  margin-left: 110px !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>

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsDaiBan.vue

@@ -230,77 +230,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
-          policyYearRatio: '',
+          factoryDiscountUseKey: '',
-          loanPayMoney: '',
+          interest: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsEdit.vue

@@ -232,78 +232,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
           factoryDiscountUseKey: '',
-          policyYearRatio: '',
+          interest: '',
-          loanPayMoney: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',

anrui-riskcenter-ui/src/views/workFlow/dingzhijinrongFlow/customizedfinancialsolutionsYiban.vue

@@ -203,77 +203,74 @@ export default {
           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: '',
+          bondAmounts: '',
+          bondRatio: '',
+          dealWay: '',
+          dealWayKey: '',
+          depositPremium: '',
+          depositSettle: '',
+          discountCar: '',
+          downPayAmount: '',
+          downPayAmounts: '',
+          downPayAmountsRatio: '',
+          downPayRatio: '',
           factoryDiscount: '',
           factoryDiscountUse: '',
-          policyYearRatio: '',
+          factoryDiscountUseKey: '',
-          loanPayMoney: '',
+          interest: '',
+          isPack: '',
+          isShowMore: false,
+          loanAmount: '',
+          loanAmountTotal: '',
+          loanDownPay: '',
           loanInterest: '',
-          discountCar: '',
+          loanPayMoney: '',
-          otherPolicyState: false,
+          loanPeriod: '',
-
+          loanTotal: '',
-          otherPolicyName: '',
+          mainVehicleAmount: '',
-          otherPolicySid: '',
+          monthlyRepay: '',
+          nominalPrice: '',
+          offsetPremium: '',
+          offsetPurchasetax: '',
+          offsetTotal: '',
+          operationAmount: '',
+          otherAmount: '',
+          otherAmountRemark: '',
           otherPolicyAmount: '',
-          otherPolicyPeriod: '',
-
-          otherPolicyMonthlyRepay: '',
           otherPolicyInterest: '',
+          otherPolicyMonthlyRepay: '',
+          otherPolicyName: '',
+          otherPolicyPeriod: '',
+          otherPolicySid: '',
+          otherPolicyState: false,
           otherPolicyYearRatio: '',
-
-          loanDownPay: '',
-          downPayAmountsRatio: '',
-          loanAmountTotal: '',
           period: '',
-          monthlyRepay: '',
+          policyName: '',
-          interest: '',
+          policySid: '',
-          returnTime: '',
+          policyYearRatio: '',
-
+          premium: '',
-          downPayAmounts: '',
+          premiumCb: false,
-          bondAmounts: '',
-          depositPremium: '',
-          depositSettle: '',
-          serviceAmount: '',
           proxyAccidentPremium: '',
-          registerAmount: '',
-          operationAmount: '',
-          vehOtherPrice: '',
-          otherAmount: '',
-          otherAmountRemark: '',
-          dealWay: '',
-          dealWayKey: '',
           proxyPremium: '',
           proxyPurchasetax: '',
           proxyTotal: '',
-          offsetPremium: '',
+          purchaseTax: '',
-          offsetPurchasetax: '',
+          purchaseTaxCb: false,
-          offsetTotal: '',
-          receivableTotal: '',
           realTotal: '',
-          vehTotalPrice: '',
+          receivableTotal: '',
-          nominalPrice: ''
+          registerAmount: '',
+          returnTime: '',
+          salesOrderSid: '',
+          serviceAmount: '',
+          serviceChargeTypeKey: '',
+          serviceChargeTypeValue: '',
+          trailerAmount: '',
+          trailerAmountCb: false,
+          vehOtherPrice: '',
+          vehTotalPrice: ''
         },
         loanTemplateTrailer: {
           boxColor: '',

anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/relation/jinrongzhengceInfo.vue

@@ -16,7 +16,7 @@
             <div class="span-sty" style="border-right: 0px"><span>产品政策名称</span></div>
             <el-form-item>
               <div class="addinputInfo">
-                <span>{{ formobj.bankShortName }} {{ formobj.guaranteeTypeValue !== '' ? '( ' + formobj.guaranteeTypeValue + '、' : '' }} {{ formobj.isPack == '1' ? '打包 )' : formobj.isPack == '2' ? '不打包 )' : '' }} {{ formobj.downPayRatio }} {{ formobj.bondRatio !== '' ? '+ ' + formobj.bondRatio : '' }}</span>
+                <span>{{ formobj.bankShortName }} {{ formobj.period !== '' ? formobj.period + '期' : '' }} {{ formobj.guaranteeTypeValue !== '' ? '( ' + formobj.guaranteeTypeValue + '、' : '' }} {{ formobj.isPack == '1' ? '打包 )' : formobj.isPack == '2' ? '不打包 )' : '' }} {{ formobj.downPayRatio }} {{ formobj.bondRatio !== '' ? '+ ' + formobj.bondRatio : '' }}</span>
               </div>
             </el-form-item>
           </el-col>

anrui-riskcenter-ui/src/views/workFlow/jinrongzhengceFlow/relation/otherInfo.vue

@@ -15,7 +15,9 @@
           </el-col>
           <el-col :span="8">
             <div class="span-sty">其他融名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.otherPolicyName }}</span></el-form-item>
+            <el-form-item><span class="addinputInfo">
+              {{ formobj.bankShortName }} {{ formobj.productTypeValue }} {{ formobj.period !=='' ? formobj.maxLoanRatio + '期' : '' }} {{ formobj.maxLoanRatio }}
+            </span></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">适用销售部门</div>

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue

@@ -281,78 +281,74 @@ export default {
       policy_list: [],
       other_list: [],
       finance: {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       },
       orgPath: '',
       rules: {
@@ -405,78 +401,74 @@ export default {
     // 是否打包
     isPackChange(val) {
       this.finance = {
-        saleOrderSid: '',
-        type: '',
-        isPack: val,
-        policyName: '',
-        policySid: '',
-        mainVehicleAmount: '',
         accessoriesAmount: '',
-        trailerAmount: '',
-        purchaseTax: '',
-        premium: '',
-        loanTotal: '',
-
         accessoriesAmountCb: false,
-        trailerAmountCb: false,
-        purchaseTaxCb: false,
-        premiumCb: false,
-
-        downPayRatio: '',
-        downPayAmount: '',
-        loanAmount: '',
-        loanPeriod: '',
-        bondRatio: '',
         bondAmount: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: val,
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       selectList({ orgPath: this.orgPath, userSid: window.sessionStorage.getItem('userSid'), isPack: this.finance.isPack }).then((resp) => {
         if (resp.success) {
@@ -497,6 +489,14 @@ export default {
         this.finance.loanPeriod = choose[0].period
         // 从金融产品政策中-- 获取贷款保证金比例
         this.finance.bondRatio = choose[0].bondRatio
+        // 从金融产品政策中-- 获取保险保证金
+        this.finance.depositPremium = choose[0].depositPremium
+        // 从金融产品政策中-- 获取落户保证金
+        this.finance.depositSettle = choose[0].depositSettle
+        // 从金融产品政策中-- 获取名义(留购)价
+        this.finance.nominalPrice = choose[0].nominalPrice
+        // 从金融产品政策中-- 获取代收意外险
+        this.finance.proxyAccidentPremium = choose[0].vehAccidentAmount
         // 贴息用途赋值
         this.finance.factoryDiscountUse = '抵利息'
         this.finance.factoryDiscountUseKey = '02'
@@ -563,11 +563,22 @@ export default {
       // 首次计算出或修改融资项目总额
       if (this.finance.loanTotal !== '') {
         // 主方案 -- 计算首付金额
-        this.finance.downPayAmount = (parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100).toFixed(0)
+        this.finance.downPayAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.downPayRatio)) / 100)
         // 主方案 -- 计算产品贷款金额
-        this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))
+        this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
         // 主方案 -- 计算贷款保证金
-        this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0)
+        this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
+        // 应收明细 -- 根据金融产品政策获取的服务费类型计算服务费
+        if (this.finance.serviceChargeTypeKey === '01') {
+          // 融资项目总额 * 融资项目总额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        } else if (this.finance.serviceChargeTypeKey === '02') {
+          // 等于金融产品政策中服务费
+          this.finance.serviceAmount = this.finance.serviceChargeTypeValue
+        } else if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
       }
       if (this.finance.premiumCb && this.finance.dealWayKey === '02') {
         this.finance.offsetPremium = this.finance.premium
@@ -584,17 +595,21 @@ export default {
     downPayAmountInput() {
       if (this.finance.loanTotal !== '') {
         // 重新计算首付比例
-        this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toFixed(2)
+        this.finance.downPayRatio = (parseInt(this.arguments(this.finance.downPayAmount)) / parseInt(this.arguments(this.finance.loanTotal)) * 100).toPrecision(2)
         // 重新计算产品贷款金额
-        this.finance.loanAmount = parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount))
+        this.finance.loanAmount = Math.round(parseInt(this.arguments(this.finance.loanTotal)) - parseInt(this.arguments(this.finance.downPayAmount)))
+        if (this.finance.serviceChargeTypeKey === '03') {
+          // 贷款金额 * 贷款金额比例(金融产品政策中服务费)
+          this.finance.serviceAmount = Math.round(parseInt(this.arguments(this.finance.loanAmount)) * parseFloat(this.arguments(this.finance.serviceChargeTypeValue)))
+        }
         // 主方案 -- 贷款保证金
-        this.finance.bondAmount = (parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100).toFixed(0)
+        this.finance.bondAmount = Math.round(parseFloat(this.arguments(this.finance.bondRatio)) * parseInt(this.arguments(this.finance.loanAmount)) / 100)
       }
     },
     // 主方案 -- 修改贷款保证金，重新计算贷款保证金比例
     bondAmountInput() {
       if (this.finance.bondAmount !== '') {
-        this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toFixed(2)
+        this.finance.bondRatio = (parseInt(this.arguments(this.finance.bondAmount)) / parseInt(this.arguments(this.finance.loanAmount)) * 100).toPrecision(2)
       }
     },
     // 其它融--名称
@@ -709,78 +724,74 @@ export default {
     },
     handleColse() {
       this.finance = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
       this.$emit('doback')
     }

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue

@@ -22,11 +22,11 @@
               <div class="span-sty">融资项目</div>
               <el-form-item>
                 <div class="addinputInfo">
-                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
+                  <span>主车发票价 {{ formobj.mainVehicleAmount }} 元</span>
-                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
+                  <span>  配件 {{ formobj.accessoriesAmount }} 元</span>
-                  <span>挂车{{ formobj.trailerAmount }} 元</span>
+                  <span>  挂车 {{ formobj.trailerAmount }} 元</span>
-                  <span>保险{{ formobj.premium }} 元</span>
+                  <span>  保险 { formobj.premium }} 元</span>
-                  <span>购置税{{ formobj.purchaseTax }} 元</span>
+                  <span>  购置税 {{ formobj.purchaseTax }} 元</span>
                 </div>
               </el-form-item>
             </el-col>
@@ -287,78 +287,74 @@ export default {
       viewTitle: '',
       viewState: 1,
       formobj: {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       },
       orgPath: '',
       rules: {}
@@ -380,78 +376,74 @@ export default {
     backParameters() {
       this.$emit('backParameters', this.formobj)
       this.formobj = {
-        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: '',
+        bondAmounts: '',
+        bondRatio: '',
+        dealWay: '',
+        dealWayKey: '',
+        depositPremium: '',
+        depositSettle: '',
+        discountCar: '',
+        downPayAmount: '',
+        downPayAmounts: '',
+        downPayAmountsRatio: '',
+        downPayRatio: '',
         factoryDiscount: '',
         factoryDiscountUse: '',
         factoryDiscountUseKey: '',
-        policyYearRatio: '',
+        interest: '',
-        loanPayMoney: '',
+        isPack: '',
+        isShowMore: false,
+        loanAmount: '',
+        loanAmountTotal: '',
+        loanDownPay: '',
         loanInterest: '',
-        discountCar: '',
+        loanPayMoney: '',
-        otherPolicyState: false,
+        loanPeriod: '',
-
+        loanTotal: '',
-        otherPolicyName: '',
+        mainVehicleAmount: '',
-        otherPolicySid: '',
+        monthlyRepay: '',
+        nominalPrice: '',
+        offsetPremium: '',
+        offsetPurchasetax: '',
+        offsetTotal: '',
+        operationAmount: '',
+        otherAmount: '',
+        otherAmountRemark: '',
         otherPolicyAmount: '',
-        otherPolicyPeriod: '',
-
-        otherPolicyMonthlyRepay: '',
         otherPolicyInterest: '',
+        otherPolicyMonthlyRepay: '',
+        otherPolicyName: '',
+        otherPolicyPeriod: '',
+        otherPolicySid: '',
+        otherPolicyState: false,
         otherPolicyYearRatio: '',
-
-        loanDownPay: '',
-        downPayAmountsRatio: '',
-        loanAmountTotal: '',
         period: '',
-        monthlyRepay: '',
+        policyName: '',
-        interest: '',
+        policySid: '',
-        returnTime: '',
+        policyYearRatio: '',
-
+        premium: '',
-        downPayAmounts: '',
+        premiumCb: false,
-        bondAmounts: '',
-        depositPremium: '',
-        depositSettle: '',
-        serviceAmount: '',
         proxyAccidentPremium: '',
-        registerAmount: '',
-        operationAmount: '',
-        vehOtherPrice: '',
-        otherAmount: '',
-        otherAmountRemark: '',
-        dealWay: '',
-        dealWayKey: '',
         proxyPremium: '',
         proxyPurchasetax: '',
         proxyTotal: '',
-        offsetPremium: '',
+        purchaseTax: '',
-        offsetPurchasetax: '',
+        purchaseTaxCb: false,
-        offsetTotal: '',
-        receivableTotal: '',
         realTotal: '',
-        vehTotalPrice: '',
+        receivableTotal: '',
-        nominalPrice: ''
+        registerAmount: '',
+        returnTime: '',
+        salesOrderSid: '',
+        serviceAmount: '',
+        serviceChargeTypeKey: '',
+        serviceChargeTypeValue: '',
+        trailerAmount: '',
+        trailerAmountCb: false,
+        vehOtherPrice: '',
+        vehTotalPrice: ''
       }
     },
     resetState() {

anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

@@ -18,11 +18,11 @@
               <div class="span-sty">融资项目</div>
               <el-form-item>
                 <div class="addinputInfo">
-                  <span>主车发票价{{ formobj.mainVehicleAmount }} 元</span>
+                  <span>主车发票价 {{ formobj.mainVehicleAmount }} 元</span>
-                  <span>配件{{ formobj.accessoriesAmount }} 元</span>
+                  <span>  配件 {{ formobj.accessoriesAmount }} 元</span>
-                  <span>挂车{{ formobj.trailerAmount }} 元</span>
+                  <span>  挂车 {{ formobj.trailerAmount }} 元</span>
-                  <span>保险{{ formobj.premium }} 元</span>
+                  <span>  保险 {{ formobj.premium }} 元</span>
-                  <span>购置税{{ formobj.purchaseTax }} 元</span>
+                  <span>  购置税 {{ formobj.purchaseTax }} 元</span>
                 </div>
               </el-form-item>
             </el-col>

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinpolicy/PolicyVo.java

@@ -32,5 +32,17 @@ public class PolicyVo implements Vo {
     private String bondRatioKey;
     @ApiModelProperty("标准年利率")
     private String yearRatio;
+    @ApiModelProperty("服务费类型")
+    private String serviceChargeTypeKey;
+    @ApiModelProperty("服务费")
+    private String serviceChargeTypeValue;
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+    @ApiModelProperty("名义/留够价款")
+    private String nominalPrice;
+    @ApiModelProperty("单车意外险")
+    private String vehAccidentAmount;
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/SolutionDetailsDto.java

@@ -94,6 +94,7 @@ public class SolutionDetailsDto implements Dto {
     private String otherPolicyInterest;
     @ApiModelProperty("其它融年利率")
     private String otherPolicyYearRatio;
+    private String otherPolicySid;
 
     @ApiModelProperty("'融资首付")
     private String loanDownPay;

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionsDetailsVo.java

@@ -175,5 +175,10 @@ public class SolutionsDetailsVo implements Vo {
     @ApiModelProperty("实际首付比例")
     private String downPayAmountsRatio;
 
+    @ApiModelProperty("服务费类型")
+    private String serviceChargeTypeKey;
+    @ApiModelProperty("服务费")
+    private String serviceChargeTypeValue;
+
 
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/app/SolutionssVo.java

@@ -165,4 +165,10 @@ public class SolutionssVo implements Vo {
 
     @ApiModelProperty("拼接的List")
     private List<SolutionListVo> financeForms = new ArrayList<>();
+
+
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
+
+
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsDto.java

@@ -134,7 +134,8 @@ public class LoanTemplateSolutionsDto implements Dto {
     private String dealWay;
     @ApiModelProperty("办理方式选择key")
     private String dealWayKey;
-
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
     @ApiModelProperty("代收首年保险费")
     private String proxyPremium;
     @ApiModelProperty("代收购置费")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loantemplate/LoanTemplateSolutionsVo.java

@@ -125,6 +125,8 @@ public class LoanTemplateSolutionsVo implements Vo {
     private String dealWay;
     @ApiModelProperty("办理方式选择key")
     private String dealWayKey;
+    @ApiModelProperty("代收合计")
+    private String proxyTotal;
     @ApiModelProperty("代收首年保险费")
     private String proxyPremium;
     @ApiModelProperty("代收购置费")
@@ -146,4 +148,9 @@ public class LoanTemplateSolutionsVo implements Vo {
 
     @ApiModelProperty("实际首付比例")
     private String downPayAmountsRatio;
+
+    @ApiModelProperty("服务费类型")
+    private String serviceChargeTypeKey;
+    @ApiModelProperty("服务费")
+    private String serviceChargeTypeValue;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyMapper.xml

@@ -36,7 +36,7 @@
     </select>
 
     <select id="selectListOne" resultType="com.yxt.anrui.riskcenter.api.loanfinotherPolicy.OtherPolicyVo">
-        select lfo.sid, lfo.otherPolicyName as name, lfo.period, lfo.periodKey, lfo.yearRatio
+        select lfo.sid, lfo.otherPolicyName as name, lfo.period, lfo.periodKey, lfo.yearRatio,lfo.maxLoanRatio,lfo.maxLoanAmount
         from loan_fin_otherpolicy lfo
         where lfo.mainPolicySid = #{sid}
         <if test="name != null and name != ''">

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicy/LoanFinPolicyMapper.xml

@@ -96,7 +96,12 @@
                lfp.periodKey,
                lfp.bondRatio,
                lfp.bondRatioKey,
-               lfp.yearRatio
+               lfp.yearRatio,
+                lfp.serviceAmountTypeKey as serviceChargeTypeKey,
+                lfp.serviceAmount as serviceChargeTypeValue,
+                lfp.depositPremium,
+                lfp.depositSettle,
+                lfp.nominalPrice
         from loan_fin_policy lfp
         where lfp.filingState = 1
           and isPack = #{isPack}

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -834,7 +834,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             String loanInterest = dto.getLoanInterest();
             loanSolutions.setLoanInterest(StringUtils.isNotBlank(loanInterest) ? new BigDecimal(loanInterest) : BigDecimal.ZERO);
             LoanSolutionsOtherpolicy loanSolutionsOtherpolicy = new LoanSolutionsOtherpolicy();
-            if (dto.isOtherPolicyState()) {
+            if (dto.isOtherPolicyState()) {//包含其他融
                 BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
                 //贷款金额
                 String otherPolicyAmount = dto.getOtherPolicyAmount();
@@ -848,7 +848,41 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 loanSolutions.setOtherPolicyState(1);
                 String loanDownPay = dto.getLoanDownPay();
                 loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+                //验证贷款金额是否不大于最高贷款金额
+                LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(dto.getOtherPolicySid());
+                if (loanFinOtherPolicy != null) {
+                    if (loanFinOtherPolicy.getMaxLoanAmount() != null && loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                        //根据最高融资比例计算最高融资额
+                        BigDecimal maxLoanAmountRat = new BigDecimal(dto.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                        BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
+                        if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
+                            if (maxLoanAmount.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        } else {
+                            if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
+                                if (maxLoanAmount.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
+                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                }
+                            } else {//maxLoanAmountRat与贷款金额作对比
+                                if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
+                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                }
+                            }
+                        }
+                    } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
+                        if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
 
+                    } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                        //根据最高融资比例计算最高融资额
+                        BigDecimal maxLoanAmountRat = new BigDecimal(dto.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                        if (maxLoanAmountRat.compareTo(new BigDecimal(dto.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+                    }
+                }
             } else {
                 BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
                 String loanDownPay = dto.getLoanDownPay();
@@ -941,13 +975,13 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutionsDetail.setSolutionsSid(loanSolutions.getSid());
             loanSolutionsDetailService.insert(loanSolutionsDetail);
         } else {
-            if(StringUtils.isBlank(dto.getFactoryDiscount())){
+            if (StringUtils.isBlank(dto.getFactoryDiscount())) {
                 return rb.setMsg("厂家贴息不能为空");
             }
             if (StringUtils.isBlank(dto.getDiscountCar())) {
                 return rb.setMsg("贴息抵车款不能为空");
             }
-            if(new BigDecimal(dto.getDiscountCar()).compareTo(new BigDecimal(dto.getFactoryDiscount()))>0){
+            if (new BigDecimal(dto.getDiscountCar()).compareTo(new BigDecimal(dto.getFactoryDiscount())) > 0) {
                 return rb.setMsg("贴息抵车款金额不允许超过厂家贴息的金额");
             }
             if (loanSolutions != null) {
@@ -1018,12 +1052,31 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             solutionsDetailsVo.setShowMore(false);
                         } else {
                             solutionsDetailsVo.setShowMore(true);
+                            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionsDetailsVo.getPolicySid());
+                            if(loanFinPolicy != null){
+                                String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                                BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                                solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                                if(serviceChargeTypeValue != null){
+                                    solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                                }
+                            }
                         }
                     } else {
                         solutionsDetailsVo.setShowMore(false);
                     }
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionsDetailsVo.setShowMore(true);
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionsDetailsVo.getPolicySid());
+                    if(loanFinPolicy != null){
+                        String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                        BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                        solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                        if(serviceChargeTypeValue != null){
+                            solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                        }
+                    }
+
                 }
             }
         }
@@ -1119,6 +1172,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         if (loanSolutionsDetail != null) {
             BeanUtil.copyProperties(loanSolutionsDetail, solutionsDetailsVo);
         }
+        LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(loanSolutions.getPolicySid());
+        if(loanFinPolicy != null){
+            String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+            BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+            solutionsDetailsVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+            if(serviceChargeTypeValue != null){
+                solutionsDetailsVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+            }
+        }
         return rb.success().setData(solutionsDetailsVo);
     }
 
@@ -1544,6 +1606,33 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             solutionssVo.setShowMore(false);
                         } else {
                             solutionssVo.setShowMore(true);
+                            solutionssVo.setFactoryDiscountUse("抵利息");
+                            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                            if(loanFinPolicy != null){
+                                String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                                BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                                solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                                if(serviceChargeTypeValue != null){
+                                    solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                                }
+                            }
+                            if (isTrue) {
+                                if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
+                                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                                    if (loanFinOtherPolicy != null) {
+                                        solutionssVo.setOtherPolicyName(loanFinOtherPolicy.getOtherPolicyName());
+                                        solutionssVo.setOtherPolicySid(loanFinOtherPolicy.getSid());
+                                        solutionssVo.setOtherPolicyPeriod(String.valueOf(loanFinOtherPolicy.getPeriod()));
+                                        solutionssVo.setOtherPolicyYearRatio(loanFinOtherPolicy.getYearRatio().toString());
+                                        solutionssVo.setOtherPolicyIsMain(true);
+                                    }
+                                } else {
+                                    LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
+                                    if (loanFinOtherPolicy != null) {
+                                        solutionssVo.setOtherPolicyIsMain(true);
+                                    }
+                                }
+                            }
                         }
                     } else {
                         solutionssVo.setShowMore(false);
@@ -1551,6 +1640,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                 } else if ("2".equals(busSalesOrder.getPayTypeKey())) {//贷款
                     solutionssVo.setShowMore(true);
                     solutionssVo.setFactoryDiscountUse("抵利息");
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                    if(loanFinPolicy != null){
+                        String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                        BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                        solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                        if(serviceChargeTypeValue != null){
+                            solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                        }
+                    }
                     if (isTrue) {
                         if (StringUtils.isNotBlank(loanSolutions.getPolicySid()) && loanSolutions.getOtherPolicyState() == 0) {
                             LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.selectByMainSid(loanSolutions.getPolicySid());
@@ -2121,6 +2219,8 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         SolutionssVo solutionssVo = new SolutionssVo();
         BeanUtil.copyProperties(query, solutionssVo);
         if (query.isShowMore()) {
+
+
             if (query.isPremiumCb()) {
                 //保险
                 String premium = query.getPremium();
@@ -2169,6 +2269,54 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             CalculateVo calculateVo = resultBean.getData();
             BeanUtil.copyProperties(calculateVo, solutionssVo);
+            LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(query.getPolicySid());
+            if(loanFinPolicy != null){
+                String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                if(serviceChargeTypeValue != null){
+                    solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                }
+
+            }
+            if(query.isOtherPolicyState()){
+                //验证贷款金额是否不大于最高贷款金额
+                LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(query.getOtherPolicySid());
+                if (loanFinOtherPolicy != null) {
+                    if (loanFinOtherPolicy.getMaxLoanAmount() != null && loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                        //根据最高融资比例计算最高融资额
+                        BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
+                        BigDecimal maxLoanAmount = loanFinOtherPolicy.getMaxLoanAmount();
+                        if (maxLoanAmount.compareTo(maxLoanAmountRat) == 0) {//任一项与贷款金额作对比
+                            if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                            }
+                        } else {
+                            if (maxLoanAmount.compareTo(maxLoanAmountRat) < 0) {//maxLoanAmount与贷款金额作对比
+                                if (maxLoanAmount.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                }
+                            } else {//maxLoanAmountRat与贷款金额作对比
+                                if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                                    return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                                }
+                            }
+                        }
+                    } else if (loanFinOtherPolicy.getMaxLoanAmount() != null) {
+                        if (loanFinOtherPolicy.getMaxLoanAmount().compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+
+                    } else if (loanFinOtherPolicy.getMaxLoanRatio() != null) {
+                        //根据最高融资比例计算最高融资额
+                        BigDecimal maxLoanAmountRat = new BigDecimal(query.getLoanTotal()).multiply(loanFinOtherPolicy.getMaxLoanRatio()).divide(new BigDecimal("100"), 4, BigDecimal.ROUND_CEILING);
+                        if (maxLoanAmountRat.compareTo(new BigDecimal(query.getOtherPolicyAmount())) < 0) {
+                            return rb.setMsg("其他融贷款金额不能高于选择的其他融的最高贷款金额");
+                        }
+                    }
+                }
+            }
+
         }
         List<SolutionListVo> formList = getFormList(solutionssVo);
         solutionssVo.setFinanceForms(formList);
@@ -2207,7 +2355,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             }
             isTrue = true;
             //全款且为三方金融
-            if(StringUtils.isBlank(loanSolutions.getTypeKey())){
+            if (StringUtils.isBlank(loanSolutions.getTypeKey())) {//贷款且为担保贷款
                 solutionssVo.setShowMore(true);
                 solutionssVo.setFactoryDiscountUse("抵利息");
                 if (isTrue) {
@@ -2226,8 +2374,17 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                             solutionssVo.setOtherPolicyIsMain(true);
                         }
                     }
+                    LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                    if(loanFinPolicy != null){
+                        String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                        BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                        solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                        if(serviceChargeTypeValue != null){
+                            solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                        }
+                    }
                 }
-            }else{
+            } else {
                 if ("02".equals(loanSolutions.getTypeKey())) {
                     solutionssVo.setFactoryDiscountUse("抵车款");
                     if (isTrue) {
@@ -2235,7 +2392,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                     } else {
                         solutionssVo.setShowMore(false);
                     }
-                }else{
+                } else {
                     solutionssVo.setShowMore(true);
                     solutionssVo.setFactoryDiscountUse("抵利息");
                     if (isTrue) {
@@ -2254,6 +2411,15 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
                                 solutionssVo.setOtherPolicyIsMain(true);
                             }
                         }
+                        LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(solutionssVo.getPolicySid());
+                        if(loanFinPolicy != null){
+                            String serviceChargeTypeKey = loanFinPolicy.getServiceAmountTypeKey();
+                            BigDecimal serviceChargeTypeValue = loanFinPolicy.getServiceAmount();
+                            solutionssVo.setServiceChargeTypeKey(serviceChargeTypeKey);
+                            if(serviceChargeTypeValue != null){
+                                solutionssVo.setServiceChargeTypeValue(serviceChargeTypeValue.toString());
+                            }
+                        }
                     }
                 }
             }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionVo.java

@@ -201,5 +201,8 @@ public class AppSolutionVo {
     @ApiModelProperty("拼接的List")
     private List<OrderSolutionListVo> financeForms = new ArrayList<>();
 
+    private String serviceChargeTypeKey;
+    private String serviceChargeTypeValue;
+
 
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/ExtraVo.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.risk.solutions;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,4 +33,16 @@ public class ExtraVo implements Vo {
     private String bondRatioKey;
     @ApiModelProperty("标准年利率")
     private String yearRatio;
+    @ApiModelProperty("服务费类型")
+    private String serviceChargeTypeKey;
+    @ApiModelProperty("服务费")
+    private String serviceChargeTypeValue;
+    @ApiModelProperty("保险保证金")
+    private String depositPremium;
+    @ApiModelProperty("落户保证金")
+    private String depositSettle;
+    @ApiModelProperty("名义/留够价款")
+    private String nominalPrice;
+    @ApiModelProperty("单车意外险")
+    private String vehAccidentAmount;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/OtherPolicyExtraVo.java

@@ -22,4 +22,9 @@ public class OtherPolicyExtraVo implements Vo {
     private String period;
     @ApiModelProperty("期数key")
     private String periodKey;
+
+    @ApiModelProperty("最高融资额比例")
+    private String maxLoanRatio;
+    @ApiModelProperty("最高融资额")
+    private String maxLoanAmount;
 }