diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
index 883c84ef06..074edd717c 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeign.java
@@ -117,4 +117,9 @@ public interface BusVehicleOrderFeign {
     @ApiOperation("查询采购系统（部门）sid、采购系统（部门）名称字段、厂家销售通路sid、厂家销售通路")
     @GetMapping("/getActualAndOrgDept/{vehicleOrderSid}/{modelSid}/{configSid}")
     public  ResultBean<ActualAndOrgDeptVo> getActualAndOrgDept(@PathVariable("vehicleOrderSid") String vehicleOrderSid, @PathVariable("modelSid")String modelSid, @PathVariable("configSid")String configSid);
+
+    @ApiOperation("根据采购订单sid更新采购订单的锁定数量")
+    @PutMapping("/updateState")
+    ResultBean updateLockNum(@RequestParam("sid")String sid,@RequestParam("num")String num);
+
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
index c7302c2636..e4e78c29e2 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/BusVehicleOrderFeignFallback.java
@@ -112,5 +112,10 @@ public class BusVehicleOrderFeignFallback implements BusVehicleOrderFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateLockNum(String sid, String num) {
+        return null;
+    }
+
 
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
index 21c4416079..252d482eb1 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
@@ -1552,7 +1552,7 @@
     <select id="selectByfMaterialID" resultType="java.lang.String">
         SELECT orderingNo
         FROM base_vehicle
-        WHERE vinNo like concat('%', #{fMaterialID}, '%'))
+        WHERE vinNo like concat('%', #{fMaterialID}, '%')
         LIMIT 1
     </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java
index f3e5575ea1..0bb61a8069 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.java
@@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo;
 import com.yxt.anrui.base.api.busvehicleorder.*;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -116,4 +117,6 @@ public interface BusVehicleOrderMapper extends BaseMapper<BusVehicleOrder> {
 
     @Update("update bus_vehicle_order set state = 1 where sid = #{vehicleOrderSid}")
     void updateState(String vehicleOrderSid);
+
+    int updateLockNum(@Param("sid") String sid, @Param("num") String num);
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
index 3c7944cbbd..0c20ab25d5 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml
@@ -211,4 +211,8 @@
                         ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
         WHERE bvad.sid = #{sid}
     </select>
+
+    <update id="updateLockNum">
+        update bus_vehicle_order set lockingNum = #{num} where sid = #{sid}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
index 7b4a4573e3..e5da88ffd9 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderRest.java
@@ -218,4 +218,9 @@ public class BusVehicleOrderRest implements BusVehicleOrderFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean updateLockNum(String sid, String num) {
+        return busVehicleOrderService.updateLockNum(sid,num);
+    }
+
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
index d0536e2345..701dc44c6f 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderService.java
@@ -525,4 +525,10 @@ public class BusVehicleOrderService extends MybatisBaseService<BusVehicleOrderMa
         baseMapper.updateState(vehicleOrderSid);
         return rb.success().setMsg("更新成功");
     }
+
+    public ResultBean updateLockNum(String sid, String num) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateLockNum(sid,num);
+        return rb.success();
+    }
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 43623e90d6..955baf5716 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -76,6 +76,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
@@ -1405,7 +1406,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             ExecutorService pool = new ThreadPoolExecutor(2, 100,
                     0L, TimeUnit.MILLISECONDS,
                     new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
-           /* Future<String> future1 = pool.submit(() -> {
+           Future<String> future1 = pool.submit(() -> {
                 return genCarSaleContract(dto, map, appOrderDetailsVo);
             });
             PrintConfirmVo printConfirmVo = null;
@@ -1433,7 +1434,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get());
                 list.add(printConfirmVo);
                 url = url + "," + future2.get();
-            }*/
+            }
             //生成合同数据
             //根据销售订单sid查询合同表中是否存在
             CommonContractBuscenterVo commonContractBuscenterVo = baseMapper.selectByBusSid(dto.getBusSid());
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java
index 91351d1e7f..2eee814ec7 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java
@@ -54,7 +54,7 @@ public class AppDeliveredApplyInfoVo implements Vo {
     private String createBySid;
 
     @ApiModelProperty("流程实列id")
-    private String procInsId;
+    private String procInstId;
 
     @ApiModelProperty("任务id")
     private String taskId;
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java
index 62a549db7e..a5d5fa57e9 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ public class AppSubmitDeliveredApplyDto extends AppDeliveredApplyDto {
     @ApiModelProperty("意见")
     private String comment;
     @ApiModelProperty("流程实例id")
+    @JsonProperty("procInsId")
     private String instanceId;
     @ApiModelProperty("任务id")
     private String taskId;
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
index dc770d0366..b66046e28e 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
@@ -1,12 +1,10 @@
 package com.yxt.anrui.buscenter.api.busdeposit;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.util.List;
 
 @Data
@@ -34,10 +32,10 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
     private String payDate;
 
     @ApiModelProperty("付款方式")
-    private String payType;
+    private String payTypeKey;
 
     @ApiModelProperty("付款方式")
-    private String payTypeValue;
+    private String payType;
 
     @ApiModelProperty("付款人")
     private String payName;
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitious.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitious.java
index 147eed715e..811de5dc46 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitious.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitious.java
@@ -64,5 +64,9 @@ public class BusDepositFictitious extends BaseEntity {
     private String payPath;
 
     private String depositBillSid;
+    @ApiModelProperty("付款人姓名")
+    private String payName;
+    @ApiModelProperty("付款人联系电话")
+    private String mobile;
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderSubmitInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderSubmitInfoVo.java
index f681c834cc..c2636f68f3 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderSubmitInfoVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderSubmitInfoVo.java
@@ -32,4 +32,16 @@ public class AppBusSalesOrderSubmitInfoVo implements Vo {
     private String recommender;
     @ApiModelProperty(value = "内部引荐人sid")
     private String recommenderSid;
+
+    @ApiModelProperty("中介人1所在单位")
+    private String intermediaryUnit;
+    @ApiModelProperty(value = "中介人2")
+    private String intermediaryName2;
+    @ApiModelProperty(value = "中介人2sid")
+    private String intermediarySid2;
+    @ApiModelProperty("中介电话2")
+    private String intermediaryMobile2;
+    @ApiModelProperty("中介人2所在单位")
+    private String intermediaryUnit2;
+    private String agencyFee2;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java
index cfe8dc9f1e..05fd156754 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/app/AppBusSalesOrderDepositListVo.java
@@ -40,4 +40,7 @@ public class AppBusSalesOrderDepositListVo implements Vo {
 
     @ApiModelProperty("订金使用记录sid")
     private String useDepositRecordSid;
+
+    @ApiModelProperty("付款人联系电话")
+    private String mobile;
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java
index 81b0c87738..e9600bcfb3 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java
@@ -37,5 +37,20 @@ public class BusSalesOrderSubmit extends BaseEntity {
     @ApiModelProperty(value = "内部引荐人sid")
     private String userSid;
 
+    @ApiModelProperty(value = "中介名称")
+    private String distributorNameTwo;
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobileTwo;
+
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSidTwo;
+    @ApiModelProperty(value = "单车中介服务费")
+    private BigDecimal distributorPriceTwo;
+
+    @ApiModelProperty("所在单位1")
+    private String distributorUnit;
+    @ApiModelProperty("所在单位2")
+    private String distributorUnitTwo;
+
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java
index 6b736579c7..61ae202d2f 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.buscenter.api.bussalesordersubmit;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,5 +41,20 @@ public class BusSalesOrderSubmitDto implements Dto {
     @ApiModelProperty("返利备注")
     private String remarks;
 
+    @ApiModelProperty(value = "中介名称")
+    private String distributorNameTwo;
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobileTwo;
+
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSidTwo;
+    @ApiModelProperty(value = "单车中介服务费")
+    private String distributorPriceTwo;
+
+    @ApiModelProperty("所在单位1")
+    private String distributorUnit;
+    @ApiModelProperty("所在单位2")
+    private String distributorUnitTwo;
+
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index 707a8e3974..e59884c8ea 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -47,8 +47,6 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
-import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
-import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@@ -65,14 +63,14 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.messagecenter.api.message.MessageFeign;
+import com.yxt.messagecenter.api.message.MessageFlowVo;
+import com.yxt.messagecenter.api.message.MessageFlowableQuery;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -114,6 +112,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     CommonContractFeign commonContractFeign;
     @Autowired
     BaseVehicleFeign baseVehicleFeign;
+    @Autowired
+    private MessageFeign messageFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -750,12 +750,19 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 String vin = carList.get(0).getVin();
                 baseVehicle = baseVehicleFeign.selectByVinNoAndOrgSid(vin, stringResultBean.getData()).getData();
                 busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
+                //更改车辆状态
+                for (int i = 0; i < carList.size(); i++) {
+                    String vinNo = carList.get(i).getVin();
+                    busDeliveredService.updateState(vinNo, 0);
+                }
             }
+            baseMapper.updateStateBySid(2, dtoSid, DateUtil.date());
             busDeliveredApply.setApplySid(sysUserVo.getSid());
             busDeliveredApply.setApplyName(sysUserVo.getName());
             busDeliveredApply.setModelSid(baseVehicle.getModelSid());
             busDeliveredApply.setConfigSid(baseVehicle.getModelConfigSid());
             save(busDeliveredApply);
+            return rb.success().setData(busDeliveredApply.getSid());
         } else {
             BusDeliveredApply busDeliveredApply = fetchBySid(dtoSid);
             if (busDeliveredApply == null) {
@@ -776,8 +783,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 busDeliveredApplyDetailsService.appSaveList(carList, busDeliveredApply.getSid());
             }
             updateById(busDeliveredApply);
+            return rb.success().setData(busDeliveredApply.getSid());
         }
-        return rb.success().setData(dtoSid);
     }
 
     public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
@@ -869,9 +876,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //创建BusinessVariables实体对象
         BusinessVariables bv = new BusinessVariables();
         //流程中的参数赋值
-        Map<String, Object> variables = BeanUtil.beanToMap(dto);
-        //若有网关，则赋值网关中判断的字段。
-        variables.put("businessSid", businessSid);
+        Map<String, Object> variables = new HashMap<>();
         //用户的部门全路径sid
         bv.setOrgSidPath(orgSidPath);
         //业务sid
@@ -879,12 +884,29 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         //用户sid
         bv.setUserSid(dto.getUserSid());
         bv.setFormVariables(variables);
+        //若app移动端有此功能，则传递appMap参数
+        Map<String, Object> appMap = new HashMap<>();
+        //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
         //流程定义id
         bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            //极光推送
+            busDeliveredApply = fetchBySid(businessSid);
+            MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+            MessageFlowVo messageFlowVo = new MessageFlowVo();
+            BeanUtil.copyProperties(ufVo, messageFlowVo);
+            messageFlowableQuery.setUfVo(messageFlowVo);
+            messageFlowableQuery.setAppMap(appMap);
+            messageFlowableQuery.setBusinessSid(businessSid);
+            messageFlowableQuery.setModuleName("出库申请");
+            messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+            messageFlowableQuery.setMsgTitle("出库申请");
+            ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
             return voResultBean;
         }
         if (r == 2) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
index b0cf20b6a9..97a3610d54 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml
@@ -40,6 +40,7 @@
         select bf.depositBillNo as virtualOrderId,
                bd.sid           as virtualOrderSid,
                bd2.draweeName   as name,
+               bd2.draweeMobile as mobile,
                bf.price         as payMoney,
                bf.payPath,
                bd2.usedDeposit,
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
index 87aba66c89..0d382320ec 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
@@ -3,7 +3,6 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.common.enums.DictCommonEnum;
-import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo;
 import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
 import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
 import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
@@ -222,9 +221,11 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
             vo.setDepositBillType(busMainDeposit.getDepositBillType());
             vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
             BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
-            vo.setCustomerName(vehicleCustomerVo.getCustomerName());
-            vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
-            vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            if(vehicleCustomerVo != null){
+                vo.setCustomerName(vehicleCustomerVo.getCustomerName());
+                vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
+                vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            }
             vo.setStaffName(busMainDeposit.getStaffName());
             vo.setDepartmentName(busMainDeposit.getOrgName());
             vo.setVirtualOrderSid(query.getVirtualOrderSid());
@@ -281,12 +282,14 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
         vo.setDepositBillTypeKey(busMainDeposit.getDepositBillTypeKey());
         //查询客户信息
         BusDepositVehicleCustomerVo vehicleCustomerVo = busDepositVehicleCustomerService.selectByBillSid(virtualOrderSid);
-        vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
-        vo.setCustomerName(vehicleCustomerVo.getCustomerName());
-        vo.setMobile(vehicleCustomerVo.getCustomerMobile());
-        vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto());
-        vo.setCustomerClass(vehicleCustomerVo.getCustomerClass());
-        vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey());
+        if(vehicleCustomerVo != null){
+            vo.setCustomerSid(vehicleCustomerVo.getCustomerSid());
+            vo.setCustomerName(vehicleCustomerVo.getCustomerName());
+            vo.setMobile(vehicleCustomerVo.getCustomerMobile());
+            vo.setHeadImage(vehicleCustomerVo.getCustomerPhoto());
+            vo.setCustomerClass(vehicleCustomerVo.getCustomerClass());
+            vo.setCustomerClassKey(vehicleCustomerVo.getCustomerClassKey());
+        }
         vo.setStaffName(busMainDeposit.getStaffName());
         vo.setDepartmentName(busMainDeposit.getOrgName());
         vo.setUpdateStateUrl("未确定字段");
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 2402ef27fc..c52e2fe5dc 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -658,49 +658,42 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
                 record.setPayName(vo.getPayName());
                 record.setMobile(vo.getMobile());
-                if (StringUtils.isNotBlank(record.getUsedDeposit())) {
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元");
-                } else {
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
-                }
-                /*List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
-                if (depositRecords.size() > 0) {
-                    for (BusDepositRecordsVo depositRecord : depositRecords) {
-                        String usePrice = depositRecord.getUsePrice();
-                        if (StringUtils.isNotBlank(usePrice)) {
-                            BigDecimal priceBig = new BigDecimal(usePrice);
-                            bigDecimalAll = bigDecimalAll.add(priceBig);
-                        }
-                    }
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + bigDecimalAll.toString() + "元");
-                } else {
-                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
-                }*/
-                record.setCarNumber(vo.getCarNumber());
-                //财务确认状态字段
-                if("已办结".equals(record.getVirtualOrderState())){
+                //判断财务是否已审核
+                if ("已办结".equals(record.getVirtualOrderState())) {
                     //查询款项确认的busSid是否存在该申请的sid
                     ResultBean<FinCollectionConfirmation> finCollectionConfirmationResultBean = finCollectionConfirmationFeign.selectByBusSid(record.getVirtualOrderSid());
                     //审核状态（1待审核/2已驳回/3已审核）
                     FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationResultBean.getData();
-                    if(finCollectionConfirmation != null){
-                        if("1".equals(finCollectionConfirmation.getAuditState())){
-                            record.setPaymentState("待确认");
-                        }else if("2".equals(finCollectionConfirmation.getAuditState())){
-                            record.setPaymentState("驳回");
+                    if (finCollectionConfirmation != null) {
+                        if(finCollectionConfirmation.getAuditState() != null){
+                            if(finCollectionConfirmation.getAuditState() ==1){
+                                record.setPaymentState("待确认");
+                            }else if(finCollectionConfirmation.getAuditState() ==2){
+                                record.setPaymentState("驳回");
+                            }else{
+                                record.setPaymentState("已确认");
+                                if (StringUtils.isNotBlank(record.getUsedDeposit())) {
+                                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元");
+                                } else {
+                                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
+                                }
+                            }
+
                         }else{
-                            record.setPaymentState("已确认");
+                            record.setPaymentState("待确认");
                         }
                     }
                 }
-
+                record.setCarNumber(vo.getCarNumber());
             } else if (record.getVirtualOrderType().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
                 int count = baseMapper.selByBillSidCount(virtualOrderSid);
                 record.setCarNumber(String.valueOf(count));
-                record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
-                record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
-                record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
+                if (busDepositVehicleCustomer != null) {
+                    record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
+                    record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
+                    record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
+                }
             }
             // 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止
             if ("待提交".equals(record.getVirtualOrderState())) {
@@ -1909,6 +1902,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
      */
     public ResultBean submitVirtualVehicleOrder(SubmitVirtualOrderVehicleDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(dto.getCustomerSid())) {
+            return rb.setMsg("客户不能为空");
+        }
         //根据用户sid获取staffSid
         ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
         if (!userVoResultBean.getSuccess()) {
@@ -1944,9 +1940,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
 //                return rb.setMsg("您所选车辆已被预定或锁定!");
             }
         }
-        if(isLock){
-            String vinNos = String.join(",",stringList);
-            return rb.setMsg("您所选车辆："+vinNos+"已被预定或锁定");
+        if (isLock) {
+            String vinNos = String.join(",", stringList);
+            return rb.setMsg("您所选车辆：" + vinNos + "已被预定或锁定");
         }
         //新增修改保存
         ResultBean<String> resultBean = reserveCarInfo(dto);
@@ -2134,7 +2130,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                     List<String> orgList = Arrays.asList(bv.getOrgSidPath().split("/"));
                     String deptSid = orgList.get(orgList.size() - 1);
                     ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid);
-                    if(sysOrganizationVoResultBean.getData() != null){
+                    if (sysOrganizationVoResultBean.getData() != null) {
                         finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName());
                     }
                     //申请日期
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
index fa40a4a586..699e4f8904 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml
@@ -161,17 +161,23 @@
 
     <select id="getSubmitInfo"
             resultType="com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderSubmitInfoVo">
-        select bo.customerName        name,
+        select bo.customerName            name,
                bo.mobile,
-               bp.quantity         as number,
+               bp.quantity             as number,
                bs.remarks,
-               bs.userSid          as recommenderSid,
-               bs.name             as recommender,
-               bs.distributorPrice as agencyFee,
-               bs.distributorName     intermediaryName,
-               bs.distributorMobile   intermediaryMobile,
-               bs.distributorSid      intermediarySid,
-               bo.customerPhoto       mobile
+               bs.userSid              as recommenderSid,
+               bs.name                 as recommender,
+               bs.distributorPrice     as agencyFee,
+               bs.distributorName         intermediaryName,
+               bs.distributorMobile       intermediaryMobile,
+               bs.distributorSid          intermediarySid,
+               bo.customerPhoto           mobile,
+               bs.distributorUnit      as intermediaryUnit,
+               bs.distributorNameTwo   as intermediaryName2,
+               bs.distributorSidTwo    as intermediarySid2,
+               bs.distributorMobileTwo as intermediaryMobile2,
+               bs.distributorUnitTwo   as intermediaryUnit2,
+               bs.distributorPriceTwo  as agencyFee2
         from bus_sales_order bo
                  left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
                  left join bus_sales_order_submit bs on bo.sid = bs.salesOrderSid
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 4fa9c037aa..252dce2b66 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -88,10 +88,12 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
@@ -129,7 +131,9 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
 import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
+import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
@@ -241,6 +245,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BaseDiscountpackageFeign baseDiscountpackageFeign;
     @Autowired
     private BaseBrandletpricepowimitFeign baseBrandletpricepowimitFeign;
+    @Autowired
+    private SysUserRoleFeign sysUserRoleFeign;
 
 
     /**
@@ -972,8 +978,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         //计算总指导价-总成交价-总优惠包的价值
         bigDecimalOne = guildPriceAll.subtract(finalPriceAll).subtract(discountPrice);
         List<String> vehicleList = new ArrayList<>();
-        //是否是现车
-        if ("1".equals(busSalesOrder.getType())) {
+        //是否是现车//ToDo:暂去掉
+        /*if ("1".equals(busSalesOrder.getType())) {
             //根据销售订单sid查询现车的sid集合
             vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
             //根据现车去查询销售政策的总促销政策之和
@@ -985,13 +991,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         List<String> stringList = listResultBean.getData();
                         initBigDecimal = initBigDecimal.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
                     }
-                    /*ResultBean<BaseVehiclePriceVo> priceResultBean = baseVehiclePolicyFeign.selectPrice(vehicleList.get(i));
-                    if (priceResultBean.getSuccess() && priceResultBean.getData() != null) {
-                        String price = priceResultBean.getData().getDiscountMoney();
-                        BigDecimal bigDecimal1 = new BigDecimal(price);
-                        initBigDecimal = initBigDecimal.add(bigDecimal1);
-                    }*/
-
+                }
+            }
+        }*/
+        //查询返利金额
+        BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
+        if(busSalesOrderSubmit != null){
+            //台数
+            if(busSalesOrderSubmit.getDistributorPrice() != null){
+                if(quantity != null){
+                    initBigDecimal = initBigDecimal.add(new BigDecimal(quantity).multiply(busSalesOrderSubmit.getDistributorPrice()));
+                }
+            }
+            if(busSalesOrderSubmit.getDistributorPriceTwo() != null){
+                if(quantity != null){
+                    initBigDecimal = initBigDecimal.add(new BigDecimal(quantity).multiply(busSalesOrderSubmit.getDistributorPriceTwo()));
                 }
             }
         }
@@ -1005,14 +1019,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         baseBrandMitQuery.setOrgSid(busSalesOrder.getUseOrgSid());
         baseBrandMitQuery.setBrandSid(busSalesOrderModel.getBrandSid());
         ResultBean<String> resultBean1 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery);
-       /* BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid);
-        String brandSid = busSalesOrderModel.getBrandSid();
-        BaseOrderPostPriceQuery baseOrderPostPriceQuery = new BaseOrderPostPriceQuery();
-        baseOrderPostPriceQuery.setBrandSid(brandSid);
-        baseOrderPostPriceQuery.setRoleSid(roleSid);
-        ResultBean<BaseOrderPostPriceVo> resultBean1 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);*/
         if (resultBean1.getSuccess()) {
-//            String price = resultBean1.getData().getPrice();
             String price = resultBean1.getData();
             //ToDo:计算是否超权限：岗位权限（销售部经理权限、总经理权限）+总促销金额<总指导价-总成交价-优惠包总价值
             //销售支持部经理的岗位权限价格
@@ -1033,17 +1040,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 //        roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
         roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
         //查询总经理审批是否超权限
-       /* baseOrderPostPriceQuery = new BaseOrderPostPriceQuery();
-        baseOrderPostPriceQuery.setBrandSid(brandSid);
-        baseOrderPostPriceQuery.setRoleSid(roleSid);
-        ResultBean<BaseOrderPostPriceVo> resultBean2 = basePostPriceFeign.selectPostPrice(baseOrderPostPriceQuery);*/
         baseBrandMitQuery = new BaseBrandMitQuery();
         baseBrandMitQuery.setRoleSid(roleSid);
         baseBrandMitQuery.setOrgSid(busSalesOrder.getUseOrgSid());
         baseBrandMitQuery.setBrandSid(busSalesOrderModel.getBrandSid());
         ResultBean<String> resultBean2 = baseBrandletpricepowimitFeign.getMoney(baseBrandMitQuery);
         if (resultBean2.getSuccess()) {
-//            String price = resultBean2.getData().getPrice();
             String price = resultBean2.getData();
             //ToDo:计算是否有权限：岗位权限（销售部经理权限、总经理权限）+总促销金额>总指导价-总成交价-优惠包总价值
             //总经理的岗位权限价格
@@ -1176,7 +1178,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId1);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getStaffSid())) {
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder1.getCreateBySid())) {
                     ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
                     AppOrderDetailsVo vo = details.getData();
                     if ("现车".equals(vo.getOrderType())) {
@@ -1188,6 +1190,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
                         baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
                     }
+                    if("采购订单".equals(vo.getOrderType())){
+                        List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
+                        for(BusSalesVehicleOrder b : list){
+                            String linkSid = b.getLinkSid();
+                            int count = b.getUsingNum();
+                            //查询该采购订单的已使用台数
+                            int num = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+//                            int numcount = num-count;
+                            //更新
+                            ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid,String.valueOf(num));
+                        }
+                    }
                 }
                 try {
                     ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
@@ -1210,7 +1224,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(procId);
                         String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
                         List<String> receiveSidList2 = Arrays.asList(nextNodeUserSids2.split(","));
-                        if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getStaffSid())) {
+                        if (receiveSidList2.size() == 1 && receiveSidList2.get(0).equals(busSalesOrder.get().getCreateBySid())) {
                             messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
                         } else {
                             messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
@@ -1306,6 +1320,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
                     baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
                 }
+                if("采购订单".equals(vo.getOrderType())){
+                    List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
+                    for(BusSalesVehicleOrder b : list){
+                        String linkSid = b.getLinkSid();
+                        int count = b.getUsingNum();
+                        //查询该采购订单的已使用台数
+                        int num = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+//                        int numcount = num-count;
+                        //更新
+                        ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid,String.valueOf(num));
+                    }
+                }
+
                 return rb.success().setData(resultBean.getData());
             }
         }
@@ -1334,7 +1361,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
                 String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
                 List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
-                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getStaffSid())) {
+                if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busSalesOrder.getCreateBySid())) {
                     ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
                     AppOrderDetailsVo vo = details.getData();
                     if ("现车".equals(vo.getOrderType())) {
@@ -1346,6 +1373,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
                         baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
                     }
+                    if("采购订单".equals(vo.getOrderType())){
+                        List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
+                        for(BusSalesVehicleOrder b : list){
+                            String linkSid = b.getLinkSid();
+                            int count = b.getUsingNum();
+                            //查询该采购订单的已使用台数
+                            int num = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+//                            int numcount = num-count;
+                            //更新
+                            ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid,String.valueOf(num));
+                        }
+                    }
                 }
                 return rb.success().setData(resultBean.getData());
             }
@@ -2778,6 +2817,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (r == 0) {
             return rb.setMsg("操作失败!提交的数据不一致");
         }
+        BusSalesOrder busSalesOrderOne = fetchBySid(businessSid);
+        if("2".equals(busSalesOrderOne.getType())){
+            List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
+            for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list){
+                String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
+                //查询该采购订单的已使用台数
+                int count = busSalesVehicleOrderService.selectByLinkSid(linkSid);
+                count = count+busSalesVehicleOrderDetailsVo.getUsingNum();
+                //更新该采购订单的锁定台数
+                ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid,String.valueOf(count));
+            }
+
+        }
         //保存提交时补充的内容
         BusSalesOrderSubmitDto busSalesOrderSubmit = dto.getInfo();
         if (busSalesOrderSubmit != null) {
@@ -2806,6 +2858,30 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         bv.setFormVariables(variables);
         //流程定义id
         bv.setModelId(ProcDefEnum.SALESORDER.getProDefId());
+        //根据员工的sid查询员工的角色
+        String userSid = busSalesOrderOne.getCreateBySid();
+        ResultBean<List<String>> userRoleList = sysUserRoleFeign.getUserRoleSidByUserSid(userSid);
+        UserRoleQuery userRoleQuery = new UserRoleQuery();
+        if (userRoleList.getData().size() > 0) {
+            userRoleQuery.setRoleSid(userRoleList.getData().get(0));
+        }
+        userRoleQuery.setOrgSid(staffOrgResultBean.getData().getOrgSid());
+        ResultBean<List<SysUserVo>> listResultBean = sysUserFeign.getUserByOrgRole(userRoleQuery);
+        if (!listResultBean.getSuccess()) {
+            return rb.setMsg(listResultBean.getMsg());
+        }
+        List<SysUserVo> sysUserVos = listResultBean.getData();
+        sysUserVos.removeAll(Collections.singleton(null));
+        if (sysUserVos.isEmpty()) {
+            return rb.setMsg("下一环节没有用户");
+        }
+        StringBuilder nextNodeUserSids = new StringBuilder();
+        for (SysUserVo su : sysUserVos) {
+            nextNodeUserSids.append(su.getSid()).append(",");
+        }
+        //符合条件的用户的sid,拼接的字符串
+        String nextNodeUserSids_ = nextNodeUserSids.toString();
+        bv.setNextNodeUserSids(nextNodeUserSids_);
         if (r == 1) {
             ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
index 73f53caf74..63b43a56e2 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java
@@ -236,6 +236,10 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                 }
 
                 for (AppBusSalesOrderDepositListDto listDto : listVos) {
+                    //查询结转金额是否小于可用金额
+                    if(new BigDecimal(listDto.getPrice()).compareTo(new BigDecimal(listDto.getDepositPrice()))>0){
+                        return rb.setMsg("结转金额不允许大于订金剩余金额");
+                    }
                     //查询付款人是否和客户一样
                     BusDeposit busDeposit = busDepositService.selectByBillSid(listDto.getDepositBillSid());
                     if (!busSalesOrder.getCustomerName().equals(busDeposit.getDraweeName())) {
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
index 7d6beb7c6e..aa1bba4490 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java
@@ -195,13 +195,13 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         String type = "";
         String state = dto.getState();
         int num = 0;
-        if ("0".equals(state)) {
+        if ("0".equals(state)) {//现车
             type = "1";
             List<AppBusSalesOrderVehicleDto> nowCarList = orderInfo.getNowCarList();
             busSalesOrderVehicleService.saveAppVehicle(nowCarList, salesOrderSid);
             num = nowCarList.size();
         }
-        if ("1".equals(state)) {
+        if ("1".equals(state)) {//采购订单
             List<AppBusSalesVehicleOrderDto> readyCarList = orderInfo.getReadyCarList();
             busSalesVehicleOrderService.saveAppOrder(readyCarList, salesOrderSid);
             type = "2";
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java
index c7c5ac23a3..2704666a81 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java
@@ -55,4 +55,8 @@ public class BusSalesOrderSubmitService extends MybatisBaseService<BusSalesOrder
 
         }
     }
+
+    public BusSalesOrderSubmit selectBySaleOrderSid(String sid) {
+        return baseMapper.seletByOrderSid(sid);
+    }
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
index 120a3941d3..b2a10e00a2 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java
@@ -79,4 +79,8 @@ public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOr
      * @return
      */
     List<String> selectListBySid(String sid);
+
+    int selectByLinkSid(String linkSid);
+
+    List<BusSalesVehicleOrder> selectLinkSid(String businessSid);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
index dd87f7011a..51bb4560fb 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml
@@ -47,4 +47,17 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="selectByLinkSid" resultType="int">
+        select ifnull(sum(IFNULL(cast(bs.usingNum as signed),'0')),0)
+        from bus_sales_vehicle_order bs
+        left join bus_sales_order bo on bo.sid = bs.salesOrderSid
+        where bs.linkSid = #{linkSid} and length(bo.nodeState)>0 and bo.nodeState != '销售订单申请'
+    </select>
+
+    <select id="selectLinkSid" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">
+        select *
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{businessSid}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
index 60677188ca..e5838f3eb7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java
@@ -119,4 +119,12 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     public List<String> selectList(String sid) {
         return baseMapper.selectListBySid(sid);
     }
+
+    public int selectByLinkSid(String linkSid) {
+        return baseMapper.selectByLinkSid(linkSid);
+    }
+
+    public List<BusSalesVehicleOrder> selectLinkSid(String businessSid) {
+        return baseMapper.selectLinkSid(businessSid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
index 91e8a31278..235e544729 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
@@ -70,7 +70,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payTypeValue }}</span>
+                <span>{{ temp.payType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
index 5190df42ee..9fca3ce9fd 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
@@ -68,7 +68,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payTypeValue }}</span>
+                <span>{{ temp.payType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
index f2d8f955cd..da1912bb8b 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
@@ -68,7 +68,7 @@
             </el-col>
             <el-col :span="5">
               <el-form-item>
-                <span>{{ temp.payTypeValue }}</span>
+                <span>{{ temp.payType }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java
index dd3b1dfbd5..dd4b382e7a 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDetailedVo.java
@@ -52,5 +52,10 @@ public class AppFinCollectionConfirmationDetailedVo implements Vo {
     @ApiModelProperty("收款方式")
     private String collectionType;
 
+    @ApiModelProperty("收款账户名称")
+    private String receivingName;
+    @ApiModelProperty("付款账号后4位")
+    private String payAccount;
+
 
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
index 2336ef9d2a..a6f0ea29a7 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
@@ -80,7 +80,9 @@
                collectionMoney     AS paymentMoney,
                paymentState        AS collectionBillState,
                paymentVoucherUrl,
-               remarks
+               remarks,
+               payAccount,
+               receivingName
         FROM fin_collection_confirmation
         WHERE sid = #{collectionBillSid}
     </select>
diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
index e24009c88a..2beca34139 100644
--- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
@@ -263,7 +263,7 @@
           <el-col :span="4" class="tleftb">意见</el-col>
           <el-col :span="20">
             <el-form-item>
-              <el-input v-model="formobj.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
+              <el-input v-model="formobj.comment" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" placeholder="审批意见" class="addinputw" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -287,7 +287,7 @@
           <el-col :span="4" class="tleftb">意见</el-col>
           <el-col :span="20">
             <el-form-item>
-              <el-input v-model="formobj.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
+              <el-input v-model="formobj.comment" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" placeholder="审批意见" class="addinputw" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -304,7 +304,7 @@
           <el-col :span="4" class="tleftb">意见</el-col>
           <el-col :span="20">
             <el-form-item>
-              <el-input v-model="formobj.comment" placeholder="审批意见" class="addinputw" clearable></el-input>
+              <el-input v-model="formobj.comment" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" placeholder="审批意见" class="addinputw" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue
index e50285d61b..a4d2926bb8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue
@@ -8,7 +8,7 @@
     </div>
     <div class="listconadd">
       <el-form ref="dataForm" :model="formobj" class="formaddcopy02">
-        <div class="headline">【品牌】车型询价单</div>
+        <div class="title">【品牌】车型询价单</div>
         <el-row>
           <el-col :span="8">
             <div class="span-sty spanOneWidth"><span>销售专员</span></div>
@@ -30,24 +30,24 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <div class="span-sty spanOneWidth"><span>车型配置</span></div>
-            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.vehModelConfig }} {{ formobj.moreConfig }}</span></el-form-item>
+            <el-form-item><span class="addinputwOne">{{ formobj.vehModelConfig }} {{ formobj.moreConfig }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <div class="span-sty spanOneWidth"><span>换、选装说明</span></div>
-            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.repInstr }}</span></el-form-item>
+            <el-form-item><span class="addinputwOne">{{ formobj.repInstr }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <div class="span-sty spanOneWidth"><span>其他特殊配置说明</span></div>
-            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
+            <el-form-item><span class="addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="headline">【品牌】车型报价单</div>
+        <div class="title">【品牌】车型报价单</div>
         <div class="headtitle">{{ formobj.vehicleAlias }}</div>
 <!--        <div class="headtitle"><span>系列：{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动：{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能：{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力：{{ formobj.powerValue }}</span></span></span></span></div>-->
         <el-row>
@@ -84,7 +84,7 @@
             <el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="headline">车型信息</div>
+        <div class="title">车型信息</div>
         <el-row>
           <el-col :span="5">
             <div class="span-sty spanTwoWidth"><span>排放标准</span></div>
@@ -107,102 +107,102 @@
             <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="headline">常用配置</div>
+        <div class="title">常用配置</div>
         <el-row>
           <el-col :span="5">
-            <div class="span-sty"><span>颜色</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>
+            <div class="span-sty"><span>后桥</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.rearAxleValue }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>缓速器</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>
+            <div class="span-sty"><span>速比</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>后视镜</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>
+            <div class="span-sty"><span>轴距</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>轮胎</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>
+            <div class="span-sty"><span>悬架</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>
           </el-col>
           <el-col :span="4">
-            <div class="span-sty"><span>驾驶室</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>
+            <div class="span-sty"><span>鞍座</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
-            <div class="span-sty"><span>后桥速比</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>
+            <div class="span-sty"><span>颜色</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>空调</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>
+            <div class="span-sty"><span>驾驶室</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>轮毂材质</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>
+            <div class="span-sty"><span>保险杠</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>导流罩</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>
+            <div class="span-sty"><span>燃料箱</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>
           </el-col>
           <el-col :span="4">
-            <div class="span-sty"><span>悬架</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>
+            <div class="span-sty"><span>导流罩</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
-            <div class="span-sty"><span>座椅</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>
+            <div class="span-sty"><span>独立热源</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>护轮罩</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>
+            <div class="span-sty"><span>缓速器</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>鞍座</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>
+            <div class="span-sty"><span>护轮罩</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>轴距</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>
+            <div class="span-sty"><span>后视镜</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>
           </el-col>
           <el-col :span="4">
-            <div class="span-sty"><span>保险杠</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>
+            <div class="span-sty"><span>轮胎</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
-            <div class="span-sty"><span>配置包</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
+            <div class="span-sty"><span>轮毂材质</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>独立热源</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>
+            <div class="span-sty"><span>空调</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
-            <div class="span-sty"><span>燃料箱</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>
+            <div class="span-sty"><span>座椅</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>
           </el-col>
           <el-col :span="5">
             <div class="span-sty"><span>多媒体</span></div>
             <el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item>
           </el-col>
           <el-col :span="4">
-            <div class="span-sty"><span>货箱</span></div>
-            <el-form-item><span class="addinputInfo">{{ formobj.packingCase }}</span></el-form-item>
+            <div class="span-sty"><span>配置包</span></div>
+            <el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
           </el-col>
         </el-row>
-        <div class="headline">更多配置</div>
+        <div class="title">更多配置</div>
         <el-row>
           <el-col :span="24">
             <el-form-item>{{ formobj.moreConfig }}</el-form-item>
           </el-col>
         </el-row>
-        <div class="headline">特殊或差异说明</div>
+        <div class="title">特殊或差异说明</div>
         <el-row>
           <el-col :span="24">
             <el-form-item>
@@ -267,15 +267,6 @@ export default {
 }
 </script>
 <style scoped>
-.headline{
-  height: 40px;
-  padding: 10px;
-  font-weight: bold;
-  font-size: 20px;
-  background-color: #0294d7;
-  text-align: left;
-  color: #ffffff;
-}
 .headtitle{
   height: 40px;
   padding: 10px;
@@ -292,9 +283,22 @@ export default {
   width: 100px !important;
 }
 .addinputwOne {
-  margin-left: 150px !important;
+  margin-left: 140px !important;
 }
 .addinputwTwo {
-  margin-left: 110px !important;
+  margin-left: 100px !important;
+}
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
 }
 </style>
diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue
index d69439b6b1..4f7d7c2710 100644
--- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue
@@ -31,21 +31,21 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <div class="span-sty spanOneWidth"><span>车型配置</span></div>
-            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.vehModelConfig }} {{ formobj.moreConfig }}</span></el-form-item>
+            <el-form-item><span class="addinputwOne">{{ formobj.vehModelConfig }} {{ formobj.moreConfig }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <div class="span-sty spanOneWidth"><span>换、选装说明</span></div>
-            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.repInstr }}</span></el-form-item>
+            <el-form-item><span class="addinputwOne">{{ formobj.repInstr }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="24" class="tlineheightb">
             <div class="span-sty spanOneWidth"><span>其他特殊配置说明</span></div>
-            <el-form-item><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
+            <el-form-item><span class="addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
           </el-col>
         </el-row>
         <div class="title">【品牌】车型报价单</div>
@@ -111,81 +111,89 @@
         <div class="title">常用配置</div>
         <el-row>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>颜色</span></div>
+            <div class="span-sty"><span>后桥</span></div>
             <el-form-item>
-              <el-select v-model="formobj.carColor" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeCarColor">
-                <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.rearAxleValue" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeRearAxleValue">
+                <el-option v-for="item in rearAxleValue_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('bodyColor', '颜色')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('rearAxle', '后桥')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>缓速器</span></div>
+            <div class="span-sty"><span>速比</span></div>
             <el-form-item>
-              <el-select v-model="formobj.slowMachine" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSlowMachine">
-                <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.rearAxleRatio" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeRearAxleRatio">
+                <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('slowMachine', '缓速器')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('rearAxleRatio', '速比')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>后视镜</span></div>
+            <div class="span-sty"><span>轴距</span></div>
             <el-form-item>
-              <el-select v-model="formobj.rearViewMirror" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeRearViewMirror">
-                <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.wheelbase" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeWheelbase">
+                <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('rearViewMirror', '后视镜')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('wheelbase', '轴距')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>轮胎</span></div>
+            <div class="span-sty"><span>悬架</span></div>
             <el-form-item>
-              <el-select v-model="formobj.tireSize" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeTireSize">
-                <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.suspension" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSuspension">
+                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('tireSize', '轮胎')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('suspension', '悬架')">+</button>
           </el-col>
           <el-col :span="4" class="colStyle">
-            <div class="span-sty"><span>驾驶室</span></div>
+            <div class="span-sty"><span>鞍座</span></div>
             <el-form-item>
-              <el-select v-model="formobj.specification" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSpecification">
-                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.saddle" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSaddle">
+                <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification', '驾驶室')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('saddle', '鞍座')">+</button>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>后桥速比</span></div>
+            <div class="span-sty"><span>颜色</span></div>
             <el-form-item>
-              <el-select v-model="formobj.rearAxleRatio" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeRearAxleRatio">
-                <el-option v-for="item in rearAxleRatio_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.carColor" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeCarColor">
+                <el-option v-for="item in carColor_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('rearAxleRatio', '后桥速比')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('bodyColor', '颜色')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>空调</span></div>
+            <div class="span-sty"><span>驾驶室</span></div>
             <el-form-item>
-              <el-select v-model="formobj.airConditioner" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeAirConditioner">
-                <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.specification" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSpecification">
+                <el-option v-for="item in specification_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('airConditioner', '空调')">+
-            </button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification', '驾驶室')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>轮毂材质</span></div>
+            <div class="span-sty"><span>保险杠</span></div>
             <el-form-item>
-              <el-select v-model="formobj.hubMaterial" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeHubMaterial">
-                <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.bumper" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeBumper">
+                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('hubMaterial', '轮毂材质')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('bumper', '保险杠')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
+            <div class="span-sty"><span>燃料箱</span></div>
+            <el-form-item>
+              <el-select v-model="formobj.fuelTank" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeFuelTank">
+                <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              </el-select>
+            </el-form-item>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('fuelTank', '燃料箱')">+</button>
+          </el-col>
+          <el-col :span="4" class="colStyle">
             <div class="span-sty"><span>导流罩</span></div>
             <el-form-item>
               <el-select v-model="formobj.baffleModel" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeBaffleModel">
@@ -195,25 +203,26 @@
             <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('baffleModel', '导流罩')">+
             </button>
           </el-col>
-          <el-col :span="4" class="colStyle">
-            <div class="span-sty"><span>悬架</span></div>
+        </el-row>
+        <el-row>
+          <el-col :span="5" class="colStyle">
+            <div class="span-sty"><span>独立热源</span></div>
             <el-form-item>
-              <el-select v-model="formobj.suspension" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSuspension">
-                <el-option v-for="item in suspension_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.independentSources" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeIndependentSources">
+                <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('suspension', '悬架')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('independentSources', '独立热源')">+
+            </button>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>座椅</span></div>
+            <div class="span-sty"><span>缓速器</span></div>
             <el-form-item>
-              <el-select v-model="formobj.seat" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSeat">
-                <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.slowMachine" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSlowMachine">
+                <el-option v-for="item in slowMachine_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('seat', '座椅')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('slowMachine', '缓速器')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
             <div class="span-sty"><span>护轮罩</span></div>
@@ -226,61 +235,52 @@
             </button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>鞍座</span></div>
-            <el-form-item>
-              <el-select v-model="formobj.saddle" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSaddle">
-                <el-option v-for="item in saddle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
-              </el-select>
-            </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('saddle', '鞍座')">+</button>
-          </el-col>
-          <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>轴距</span></div>
+            <div class="span-sty"><span>后视镜</span></div>
             <el-form-item>
-              <el-select v-model="formobj.wheelbase" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeWheelbase">
-                <el-option v-for="item in wheelbase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.rearViewMirror" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeRearViewMirror">
+                <el-option v-for="item in rearViewMirror_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('wheelbase', '轴距')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('rearViewMirror', '后视镜')">+</button>
           </el-col>
           <el-col :span="4" class="colStyle">
-            <div class="span-sty"><span>保险杠</span></div>
+            <div class="span-sty"><span>轮胎</span></div>
             <el-form-item>
-              <el-select v-model="formobj.bumper" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeBumper">
-                <el-option v-for="item in bumper_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.tireSize" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeTireSize">
+                <el-option v-for="item in tireSize_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('bumper', '保险杠')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('tireSize', '轮胎')">+</button>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>配置包</span></div>
+            <div class="span-sty"><span>轮毂材质</span></div>
             <el-form-item>
-              <el-select v-model="formobj.configuringBao" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeConfiguringBao">
-                <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.hubMaterial" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeHubMaterial">
+                <el-option v-for="item in hubMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('configuringBao', '配置包')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('hubMaterial', '轮毂材质')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>独立热源</span></div>
+            <div class="span-sty"><span>空调</span></div>
             <el-form-item>
-              <el-select v-model="formobj.independentSources" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeIndependentSources">
-                <el-option v-for="item in independentSources_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.airConditioner" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeAirConditioner">
+                <el-option v-for="item in airConditioner_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('independentSources', '独立热源')">+
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('airConditioner', '空调')">+
             </button>
           </el-col>
           <el-col :span="5" class="colStyle">
-            <div class="span-sty"><span>燃料箱</span></div>
+            <div class="span-sty"><span>座椅</span></div>
             <el-form-item>
-              <el-select v-model="formobj.fuelTank" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeFuelTank">
-                <el-option v-for="item in fuelTank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.seat" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeSeat">
+                <el-option v-for="item in seat_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('fuelTank', '燃料箱')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('seat', '座椅')">+</button>
           </el-col>
           <el-col :span="5" class="colStyle">
             <div class="span-sty"><span>多媒体</span></div>
@@ -292,14 +292,14 @@
             <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('multimedia', '多媒体')">+
             </button>
           </el-col>
-          <el-col :span="4" class="colStyle">
-            <div class="span-sty"><span>货箱</span></div>
+          <el-col :span="5" class="colStyle">
+            <div class="span-sty"><span>配置包</span></div>
             <el-form-item>
-              <el-select v-model="formobj.packingCase" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changePackingCase">
-                <el-option v-for="item in packingCase_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+              <el-select v-model="formobj.configuringBao" placeholder="请选择" filterable clearable class="addinputwWidth" @change="changeConfiguringBao">
+                <el-option v-for="item in configuringBao_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
               </el-select>
             </el-form-item>
-            <button style="border: 0px;background: #FFFFFF;font-size: 18px;" @click="add('specification', '货箱')">+</button>
+            <button style="border: 0px;background: #FFFFFF;font-size: 20px;margin-left: 2px" @click="add('configuringBao', '配置包')">+</button>
           </el-col>
         </el-row>
         <div class="title">更多配置</div>
@@ -367,7 +367,7 @@
 
 <script>
 import { details, offerSubmit, save } from '@/api/cheliang/chexingbaojia'
-import { typeValues } from '@/api/cheliang/dictcommons'
+import { typeValues, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'xiaoshouzhichibaojia',
@@ -402,11 +402,17 @@ export default {
       independentSources_list: [], // 独立热源
       fuelTank_list: [], // 燃料箱
       multimedia_list: [], // 多媒体
-      packingCase_list: [], // 货箱
+      rearAxleValue_list: [] // 货箱
     }
   },
   methods: {
     init() {
+      getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
+        if (resp.success) {
+          this.formobj.createOrgSid = resp.data
+          this.formobj.useOrgSid = resp.data
+        }
+      })
       typeValues({ type: 'bodyColor' }).then((res) => {
         if (res.success) {
           this.carColor_list = res.data
@@ -524,21 +530,19 @@ export default {
           this.fuelTank_list = res.data
         }
       })
-      typeValues({ type: 'packingCase' }).then((res) => {
+      typeValues({ type: 'rearAxle' }).then((res) => {
         if (res.success) {
-          this.packingCase_list = res.data
+          this.rearAxleValue_list = res.data
         }
       })
     },
 
     UpNumber(e) {
-      e.target.value = e.target.value.replace(/[^0-9.]/g, '') // 清除“数字”和“.”"-"以外的字符
-      e.target.value = e.target.value.replace(/^00/, '0.') // 开头不能有两个0
-      e.target.value = e.target.value.replace(/\.{2,}/g, '.') // 只保留第一个. 清除多余的
-      e.target.value = e.target.value.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/\-{2,}/g, '-') // 只保留第一个-
-      e.target.value = e.target.value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3') // 只能输入两个小数
+      e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
+      e.target.value = e.target.value.replace(/^00/, '0') // 开头不能有两个0
       if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
         // 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+        console.log(e.target.value)
         e.target.value = parseFloat(e.target.value)
       }
     },
@@ -563,7 +567,7 @@ export default {
                 this.tireSize_list = resp.data
               } else if (this.typeName === '驾驶室') {
                 this.specification_list = resp.data
-              } else if (this.typeName === '后桥速比') {
+              } else if (this.typeName === '速比') {
                 this.rearAxleRatio_list = resp.data
               } else if (this.typeName === '空调') {
                 this.airConditioner_list = resp.data
@@ -591,8 +595,8 @@ export default {
                 this.fuelTank_list = resp.data
               } else if (this.typeName === '多媒体') {
                 this.multimedia_list = resp.data
-              } else if (this.typeName === '货箱') {
-                this.packingCase_list = resp.data
+              } else if (this.typeName === '后桥') {
+                this.rearAxleValue_list = resp.data
               }
               this.$nextTick(() => {
                 this.handleColse()
@@ -859,9 +863,9 @@ export default {
       this.formobj.multimedia = bb.value
       this.formobj.multimediaKey = bb.key
     },
-    changePackingCase(value) {
+    changeRearAxleValue(value) {
       let bb = null
-      this.packingCase_list.forEach((e) => {
+      this.rearAxleValue_list.forEach((e) => {
         if (e.dictKey === value) {
           bb = {
             key: e.dictKey,
@@ -875,12 +879,12 @@ export default {
     // ----------------------------------方法--------------------
     // 返回
     handleReturn(isreload) {
+      this.formobj = {}
       if (isreload === 'true') this.$emit('reloadlist')
       this.$emit('doback')
     },
     // 查看
     showInfo(row) {
-
       this.FormLoading = true
       details(row.sid).then((response) => {
         this.FormLoading = false
@@ -939,6 +943,21 @@ export default {
   padding: 5px 0;
   margin-left: 70px;
 }
+
+.tlineheightb {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+/deep/ .tlineheightb .el-form-item .el-form-item__content {
+  line-height: 15px !important;
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+}
+
 .colStyle {
   display: flex;
   flex: 1;
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
index 83485ce95c..977054d748 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue
@@ -19,6 +19,11 @@
       <div class="listconadd">
         <div class="titwu"><span>厂家采购</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb" style="border-bottom: 0px;border-right: 0px">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
           <el-row class="rowStyle">
             <el-col :span="6" class="colOneStyle">
               <div class="span-sty spanOneWidth"><span>分公司:</span></div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
index a475b70a23..c5394c90d8 100644
--- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
@@ -15,6 +15,11 @@
       <div class="listconadd">
         <div class="titwu"><span>厂家采购</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb" style="border-bottom: 0px;border-right: 0px">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
           <el-row class="rowStyle">
             <el-col :span="6" class="colOneStyle">
               <div class="span-sty spanOneWidth"><span>分公司:</span></div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
index 0473e991d8..e52ea2ccb4 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
@@ -17,6 +17,11 @@
       <div class="">
         <div class="titwu"><span>厂家采购</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb" style="border-bottom: 0px;border-right: 0px">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
           <el-row class="rowStyle">
             <el-col :span="6" class="colOneStyle">
               <div class="span-sty spanOneWidth"><span>分公司:</span></div>
@@ -153,7 +158,7 @@
             <span>意见:</span>
           </el-col>
           <el-col :span="20">
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input></el-form-item>
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
index 97cc47e894..8046c82187 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue
@@ -18,6 +18,11 @@
       <div class="">
         <div class="titwu"><span>排产申请</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb" style="border-bottom: 0px;border-right: 0px">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
           <el-row class="rowStyle">
             <el-col :span="6" class="colOneStyle">
               <div class="span-sty spanOneWidth"><span>分公司:</span></div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
index 775b7f5b76..353f562845 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
@@ -15,6 +15,11 @@
       <div class="">
         <div class="titwu"><span>厂家采购</span></div>
         <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row class="rowStyle">
+            <el-col :span="24" class="tleftb" style="border-bottom: 0px;border-right: 0px">
+              <div><span style="font-size: 16px">金额单位：元</span></div>
+            </el-col>
+          </el-row>
           <el-row class="rowStyle">
             <el-col :span="6" class="colOneStyle">
               <div class="span-sty spanOneWidth"><span>分公司:</span></div>
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
index aff49ce9d6..8184593e26 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue
@@ -164,17 +164,21 @@
     <!--End 添加修改部分-->
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
-      <el-form class="formaddcopy02" >
+      <el-form class="formadd" >
         <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
-          <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>意见:</span></div>
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
@@ -444,5 +448,8 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
 </style>
 
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
index 1f71b58607..8c788a6eb7 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
@@ -44,6 +44,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -128,30 +129,30 @@ public interface AppBusDeliveredApplyFeign {
     @ApiOperation("提交流程")
     @PostMapping("/submitRetrievalInfo")
     @ResponseBody
-    ResultBean submitRetrievalInfo(@RequestBody SubmitRetrievalDto dto);
+    ResultBean submitRetrievalInfo(@Valid @RequestBody SubmitRetrievalDto dto);
 
     @ApiOperation("办理")
-    @PutMapping("/agreeAdvanceInvoiceInfo")
+    @PutMapping("/agreeRetrievalInfo")
     @ResponseBody
-    ResultBean agreeRetrievalInfo(@RequestBody CompleteRetrievalDto dto);
+    ResultBean agreeRetrievalInfo(@Valid @RequestBody CompleteRetrievalDto dto);
 
     @ApiOperation("驳回")
     @PutMapping("/rejectRetrievalInfo")
     @ResponseBody
-    ResultBean rejectRetrievalInfo(@RequestBody RetrievalTaskQuery query);
+    ResultBean rejectRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query);
 
     @ApiOperation("撤回")
     @PutMapping("/recallRetrievalInfo")
     @ResponseBody
-    ResultBean recallRetrievalInfo(@RequestBody RetrievalTaskQuery query);
+    ResultBean recallRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query);
 
     @ApiOperation("终止")
     @PutMapping("/stopRetrievalInfo")
     @ResponseBody
-    ResultBean stopRetrievalInfo(@RequestBody RetrievalTaskQuery query);
+    ResultBean stopRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query);
 
     @ApiOperation("获取流程操作标题")
     @GetMapping("/getFlowOperateTitle")
     @ResponseBody
-    ResultBean<String> getFlowOperateTitle(@SpringQueryMap RetrievalQuery query);
+    ResultBean<String> getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query);
 }
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java
index 0f43f20bc7..c0e5d9098c 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java
@@ -51,7 +51,8 @@ public class DeliveredApplyDetailsVo implements Vo {
     private String userSid;
 
     @ApiModelProperty("流程实列id")
-    private String procInsId;
+    @JsonProperty("procInsId")
+    private String procInstId;
 
     @ApiModelProperty("任务id")
     private String taskId;
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java
index 0f9ec209a1..d13a3d567e 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java
@@ -11,23 +11,10 @@ import javax.validation.constraints.NotBlank;
 public class SubmitRetrievalDto extends DeliveredApplyDto {
     private static final long serialVersionUID = -471108222247151552L;
 
-    @ApiModelProperty(value = "任务id")
-    @NotBlank(message = "参数错误：taskId")
-    private String taskId;
-    @ApiModelProperty(value = "流程id")
-    @NotBlank(message = "参数错误：procInsId")
+    @ApiModelProperty("流程实例id")
     @JsonProperty("procInsId")
     private String instanceId;
-    @ApiModelProperty(value = "意见")
-    private String comment;
-    @ApiModelProperty(value = "业务sid")
-    @NotBlank(message = "参数错误：businessSid")
-    private String businessSid;
-    @ApiModelProperty(value = "用户sid")
-    @NotBlank(message = "参数错误：userSid")
-    private String userSid;
-    @ApiModelProperty(value = "节点id")
-    @NotBlank(message = "参数错误：taskDefKey")
-    private String taskDefKey;
+    @ApiModelProperty("任务id")
+    private String taskId;
 
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java
index 1a7fa87125..4833d87fab 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoListVo.java
@@ -1,5 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -30,4 +31,10 @@ public class DepositInfoListVo implements Vo {
     private Boolean showImage;
     @ApiModelProperty("订金使用记录sid")
     private String useDepositRecordSid;
+
+    @ApiModelProperty("付款人")
+    @JsonProperty(value = "payName")
+    private String name;
+    @ApiModelProperty("付款人联系电话")
+    private String mobile;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java
index b45a4996df..6023d404d8 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoVo.java
@@ -29,4 +29,5 @@ public class DepositInfoVo implements Vo {
     private String deposit;
 
     private List<DepositInfoListVo> virtualOrderList = new ArrayList<>();
+
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/OrderSubmitDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/OrderSubmitDto.java
index f84677c215..bf22b2a518 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/OrderSubmitDto.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/flowable/OrderSubmitDto.java
@@ -43,4 +43,25 @@ public class OrderSubmitDto implements Dto {
 
     @ApiModelProperty("中介返利备注")
     private String remarks;
+
+    @ApiModelProperty(value = "中介名称")
+    @JsonProperty("intermediaryName2")
+    private String distributorNameTwo;
+    @JsonProperty("intermediaryMobile2")
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobileTwo;
+
+    @ApiModelProperty(value = "中介单位sid")
+    @JsonProperty("intermediarySid2")
+    private String distributorSidTwo;
+    @ApiModelProperty(value = "单车中介服务费")
+    @JsonProperty("agencyFee2")
+    private String distributorPriceTwo;
+    
+    @ApiModelProperty("所在单位1")
+    @JsonProperty("intermediaryUnit")
+    private String distributorUnit;
+    @ApiModelProperty("所在单位2")
+    @JsonProperty("intermediaryUnit2")
+    private String distributorUnitTwo;
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java
index 0e7d838e7d..30cd6b5f00 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java
@@ -33,4 +33,16 @@ public class OrderSubmitInfoVo implements Vo {
     @ApiModelProperty(value = "内部引荐人sid")
     private String recommenderSid;
 
+    @ApiModelProperty("中介人1所在单位")
+    private String intermediaryUnit;
+    @ApiModelProperty(value = "中介人2")
+    private String intermediaryName2;
+    @ApiModelProperty(value = "中介人2sid")
+    private String intermediarySid2;
+    @ApiModelProperty("中介电话2")
+    private String intermediaryMobile2;
+    @ApiModelProperty("中介人2所在单位")
+    private String intermediaryUnit2;
+    private String agencyFee2;
+
 }
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java
index 6e911878cb..cf35c9fb4e 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java
@@ -1,6 +1,6 @@
 package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit;
 
-import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -27,10 +27,12 @@ public class DepositBuscenterDetailVo implements Vo {
     private String payDate;
 
     @ApiModelProperty("付款方式")
-    private String payType;
+    @JsonProperty("payType")
+    private String payTypeKey;
 
     @ApiModelProperty("付款方式")
-    private String payTypeValue;
+    @JsonProperty("payTypeValue")
+    private String payType;
 
     @ApiModelProperty("付款人")
     private String payName;
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java
index 566cf1c84a..bdc684ba60 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java
@@ -8,6 +8,8 @@ import lombok.Data;
 public class AppManufacturerVo implements Vo {
     private static final long serialVersionUID = 6743866407572366715L;
 
+    @ApiModelProperty("本分公司开户账号sid")
+    private String accountSid;
     @ApiModelProperty("银行账号")
     private String bankAccount;
     @ApiModelProperty("账户名称")
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java
index d7b1e14fa5..fb79ba36b8 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDetailedVo.java
@@ -43,5 +43,10 @@ public class ConfirmationDetailedVo implements Vo {
 
     @ApiModelProperty("收款方式")
     private String collectionType;
+
+    @ApiModelProperty("收款账户名称")
+    private String receivingName;
+    @ApiModelProperty("付款账号后4位")
+    private String payAccount;
 }