Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java

@@ -49,7 +49,8 @@ import java.math.BigDecimal;
 @ApiModel(value = "销售订单-主车车型", description = "销售订单-主车车型")
 public class BusSalesOrderModel extends BaseEntity {
     private static final long serialVersionUID = 1L;
-
+    @ApiModelProperty(value = "类型")
+    private Integer type;
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
     @ApiModelProperty(value = "品牌sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java

@@ -50,6 +50,9 @@ import lombok.Data;
 @ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情")
 public class BusSalesOrderModelDetailsVo implements Vo {
 
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
     @ApiModelProperty("车型sid")
     private String modelSid;
     @ApiModelProperty("配置sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDto.java

@@ -52,6 +52,9 @@ public class BusSalesOrderModelDto implements Dto {
 
     private static final long serialVersionUID = -216156078782065154L;
 
+    @ApiModelProperty(value = "类型")
+    private Integer type;
+
     @ApiModelProperty(value = "品牌")
     @NotBlank(message = "参数错误：品牌")
     private String brandName;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrder.java

@@ -59,4 +59,7 @@ public class BusSalesVehicleOrder extends BaseEntity {
 	@ApiModelProperty("采购订单日期")
     private String linkText;
 
+    @ApiModelProperty(value = "本次使用台数")
+    private Integer usingNum;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDetailsVo.java

@@ -56,5 +56,7 @@ public class BusSalesVehicleOrderDetailsVo implements Vo {
     private String linkNo;
     @ApiModelProperty("采购订单日期")
     private String linkText;
+    @ApiModelProperty(value = "本次使用台数")
+    private Integer usingNum;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -43,7 +43,8 @@
                guildPrice,
                finalPrice,
                brandName,
-               brandSid
+               brandSid,
+        type
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -35,7 +35,8 @@
             resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo">
         select linkSid,
                linkNo,
-               linkText
+               linkText,
+               usingNum
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/salepolicy.js

@@ -2,9 +2,9 @@ import request from '@/utils/request'
 import qs from 'qs'
 
 // 销售政策分页列表
-export function listPage(data) {
+export function selectSalesOrderList(data) {
   return request({
-    url: '/base/v1/basediscountpackage/listPage',
+    url: '/base/v1/basediscountpackage/selectSalesOrderList',
     method: 'post',
     data: data,
     headers: {

anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js

@@ -37,11 +37,19 @@ export function saveOrderForm(data) {
 }
 
 // 编辑、详情初始化 已改
-export function fetchDetailsBySid(data) {
+export function fetchDetailsBySid(params) {
   return request({
-    url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + data.sid,
+    url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid,
+    method: "get",
+    params: params,
+  });
+}
+// 销售订单提交接口
+export function submitOrderForm(params) {
+  return request({
+    url: "/buscenter/v1/bussalesorder/submit",
     method: "post",
-    data: data,
+    data: params,
     headers: {
       "Content-Type": "application/json"
     }
@@ -94,6 +102,7 @@ export function getCaigouList(params) {
     headers: {'Content-Type': 'application/json'}
   })
 }
+
 // 现车数量 已改
 export function selectCount(params) {
   return request({
@@ -103,7 +112,16 @@ export function selectCount(params) {
     // headers: {'Content-Type': 'application/json'}
   })
 }
-//
+
+// 采购订单数量 已改
+export function selectOrderCount(params) {
+  return request({
+    url: '/base/v1/busvehicleapplydetail/selectOrderCount',
+    method: 'get',
+    params: params,
+
+  })
+}
 
 // 销售政策分页列表 已改
 export function selectSalesOrderList(params) {
@@ -125,6 +143,25 @@ export function depositPageList(params) {
   })
 }
 
+// 提交页面中介单位
+export function getBaseDistributorList(params) {
+  return request({
+    url: '/base/v1/basedistributor/getBaseDistributorList',
+    method: 'get',
+    params: params,
+
+  })
+}
+
+// 提交页面内部推荐人下拉框
+export function selectStaffList(params) {
+  return request({
+    url: '/portal/v1/sysstaffinfo/selectStaffList',
+    method: 'get',
+    params: params,
+
+  })
+}
 
 // ==================== 分割 ========================
 // 部门下拉

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanAdd.vue

@@ -1301,8 +1301,6 @@ export default {
           if (this.isXuanzeShow == '3') {
             this.quantity = this.temp.busSalesOrderPrice.quantity
           }
-          console.log('123',this.temp.busSalesOrderPrice.quantity)
-          this.NumberMulThree(this.temp.busSalesOrderPrice.quantity)
           const countList = {
             customerSid: this.temp.customerSid,  //客户sid
             modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid,  //配置sid
@@ -1357,10 +1355,6 @@ export default {
     },
     // 台数
     NumberMulThree(num) {
-      console.log('456',num)
-      if (num) {
-        return this.temp.busSalesOrderPrice.quantity.toString()
-      }
       // 选择现车时
       if (this.isXuanzeShow == '1') {
         if (this.temp.busSalesOrderVehicleList.length > 0) {

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoMapper.java

@@ -103,7 +103,6 @@ public interface SysStaffinfoMapper extends BaseMapper<SysStaffinfo> {
      */
     int updateBySid(@Param("personType") String personType, @Param("personTypeKey") String personTypeKey,
                      @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
-                    @Param("jobNumber") String jobNumber, @Param("sid") String sid, @Param("date") Date date, @Param("reason") String reason);
 
     /**
      * 查询当前分公司下的员工信息