Merge remote-tracking branch 'origin/master'

# Conflicts:
#	anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java

@@ -53,7 +53,7 @@ public class BaseOutsourcingApplicationVehicle extends BaseEntity {
     private String outAppSid; // 外采申请单sid
     
 	@ApiModelProperty("车架号")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 
 	/**
 	 * @return 外采申请单sid
@@ -71,14 +71,14 @@ public class BaseOutsourcingApplicationVehicle extends BaseEntity {
 	/**
 	 * @return 车架号
 	 */
-	public String getVIN(){
-		return VIN;
+	public String getVinNo(){
+		return vinNo;
 	}
 	
 	/**
-	 * @param VIN 车架号 to set
+	 * @param vinNo 车架号 to set
 	 */
-	public void setVIN(String VIN){
-		this.VIN = VIN;
+	public void setVinNo(String vinNo){
+		this.vinNo = vinNo;
 	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java

@@ -52,7 +52,7 @@ public class BaseOutsourcingApplicationVehicleDto implements Dto {
     private String outAppSid; // 外采申请单sid
     
 	@ApiModelProperty("车架号")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 
 	
 	/**
@@ -72,14 +72,14 @@ public class BaseOutsourcingApplicationVehicleDto implements Dto {
 	/**
 	 * @return 车架号
 	 */
-	public String getVIN(){
-		return VIN;
+	public String getVinNo(){
+		return vinNo;
 	}
 	
 	/**
 	 * @param VIN 车架号 to set
 	 */
-	public void setVIN(String VIN){
-		this.VIN = VIN;
+	public void setVinNo(String vinNo){
+		this.vinNo = vinNo;
 	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java

@@ -52,7 +52,7 @@ public class BaseOutsourcingApplicationVehicleVo implements Vo {
     private String outAppSid; // 外采申请单sid
     
 	@ApiModelProperty("车架号")
-    private String VIN; // 车架号
+    private String vinNo; // 车架号
 
 	
 	/**
@@ -72,14 +72,14 @@ public class BaseOutsourcingApplicationVehicleVo implements Vo {
 	/**
 	 * @return 车架号
 	 */
-	public String getVIN(){
-		return VIN;
+	public String getVinNo(){
+		return vinNo;
 	}
 	
 	/**
 	 * @param VIN 车架号 to set
 	 */
-	public void setVIN(String VIN){
-		this.VIN = VIN;
+	public void setVinNo(String vinNo){
+		this.vinNo = vinNo;
 	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BusVehicleOrderCountQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basevehicle;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/16 13:54
+ * @Description
+ */
+@Data
+public class BusVehicleOrderCountQuery implements Query {
+    private static final long serialVersionUID = -6489349086104135416L;
+
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java

@@ -30,4 +30,7 @@ public class PcBaseVehicleOrderQuery implements Query {
 
     @ApiModelProperty(value = "已选择的车辆的sid")
     private List<String> sidList = new ArrayList<>();
+
+    @ApiModelProperty(value = "车架号")
+    private String linkNo;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeign.java

@@ -1,11 +1,13 @@
 package com.yxt.anrui.base.api.busvehicleapplydetail;
 
+import com.yxt.anrui.base.api.basevehicle.BusVehicleOrderCountQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -59,4 +61,8 @@ public interface BusVehicleApplyDetailFeign {
     @ApiOperation("销售订单-采购订单分页列表")
     @PostMapping("/applyPage")
     ResultBean<PagerVo<BusVehicleApplyListVo>> applyPage(@RequestBody PagerQuery<BusVehicleApplyListQuery> pagerQuery);
+
+    @ApiOperation("销售订单-采购订单数量")
+    @GetMapping("/selectOrderCount")
+    ResultBean<Integer> selectOrderCount(@SpringQueryMap BusVehicleOrderCountQuery busVehicleOrderCountQuery);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapplydetail/BusVehicleApplyDetailFeignFallback.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.base.api.busvehicleapplydetail;
 
+import com.yxt.anrui.base.api.basevehicle.BusVehicleOrderCountQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -56,4 +57,9 @@ public class BusVehicleApplyDetailFeignFallback implements BusVehicleApplyDetail
 	public ResultBean<PagerVo<BusVehicleApplyListVo>> applyPage(PagerQuery<BusVehicleApplyListQuery> pagerQuery) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<Integer> selectOrderCount(BusVehicleOrderCountQuery busVehicleOrderCountQuery) {
+		return null;
+	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleorder/OrderListVo.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.busvehicleorder;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/16 14:32
+ * @Description
+ */
+@Data
+public class OrderListVo implements Vo {
+    private static final long serialVersionUID = -2178552075352787095L;
+
+    @ApiModelProperty(value = "台数")
+    private String platformNo;
+
+    @ApiModelProperty(value = "锁定台数")
+    private String lockingNum;
+
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -1166,6 +1166,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             if (query.getSidList().size() > 0) {
                 qw.notIn("bv.sid", query.getSidList());
             }
+            if(StringUtils.isNotBlank(query.getLinkNo())){
+                qw.like("bv.vinNo",query.getLinkNo());
+            }
         }
         return qw;
     }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.java

@@ -9,6 +9,7 @@ import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetail;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyListVo;
+import com.yxt.anrui.base.api.busvehicleorder.OrderListVo;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -57,4 +58,11 @@ public interface BusVehicleApplyDetailMapper extends BaseMapper<BusVehicleApplyD
 	 * @return
 	 */
     IPage<BusVehicleApplyListVo> applyPage(IPage<BusVehicleApply> page, @Param(Constants.WRAPPER)QueryWrapper<BusVehicleApply> qw);
+
+	/**
+	 * 根据车型sid及配置sid查询采购订单的数量
+	 * @param qw 查询条件
+	 * @return
+	 */
+    List<OrderListVo> selectOrderCount(@Param(Constants.WRAPPER) QueryWrapper<BusVehicleApply> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailMapper.xml

@@ -31,4 +31,11 @@
         left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
         ${ew.customSqlSegment}
     </select>
+
+    <select id="selectOrderCount" resultType="com.yxt.anrui.base.api.busvehicleorder.OrderListVo">
+        select bo.platformNo,bo.lockingNum from bus_vehicle_apply_detail bd
+        left join bus_vehicle_apply bv on bd.applySid = bv.sid
+        left join bus_vehicle_order bo on bo.purchaseApplyMediumModelSid = bd.sid
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailRest.java

@@ -1,6 +1,7 @@
 package com.yxt.anrui.base.biz.busvehicleapplydetail;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehicle.BusVehicleOrderCountQuery;
 import com.yxt.anrui.base.api.busvehicleapplydetail.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -86,5 +87,15 @@ public class BusVehicleApplyDetailRest implements BusVehicleApplyDetailFeign {
         return rb.success().setData(pv);
     }
 
+    /**
+     * 根据车型sid及配置sid查询采购订单数量
+     * @param busVehicleOrderCountQuery 查询条件
+     * @return
+     */
+    @Override
+    public ResultBean<Integer> selectOrderCount(BusVehicleOrderCountQuery busVehicleOrderCountQuery) {
+        return busVehicleApplyDetailService.selectOrderCount(busVehicleOrderCountQuery);
+    }
+
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapplydetail/BusVehicleApplyDetailService.java

@@ -3,11 +3,14 @@ package com.yxt.anrui.base.biz.busvehicleapplydetail;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basevehicle.BusVehicleOrderCountQuery;
 import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply;
 import com.yxt.anrui.base.api.busvehicleapplydetail.*;
+import com.yxt.anrui.base.api.busvehicleorder.OrderListVo;
 import com.yxt.common.base.service.MybatisBaseService;
 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 org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -29,134 +32,172 @@ import java.util.List;
  */
 @Service
 public class BusVehicleApplyDetailService extends MybatisBaseService<BusVehicleApplyDetailMapper, BusVehicleApplyDetail> {
-	public PagerVo<BusVehicleApplyDetail> listPage(PagerQuery<BusVehicleApplyDetailQuery> pq) {
-		BusVehicleApplyDetailQuery query = pq.getParams();
-		QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
-		IPage<BusVehicleApplyDetail> page = PagerUtil.queryToPage(pq);
-		IPage<BusVehicleApplyDetail> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<BusVehicleApplyDetail> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	public List<BusVehicleApplyDetail> listAll(BusVehicleApplyDetailQuery query) {
-		QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
-	private QueryWrapper<BusVehicleApplyDetail> createQueryWrapper(BusVehicleApplyDetailQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-		QueryWrapper<BusVehicleApplyDetail> qw = new QueryWrapper<>();
-
-
-		if (StringUtils.isNotBlank(query.getApplySid())) {
-			qw.eq("applySid", query.getApplySid());
-		}
-
-		if (StringUtils.isNotBlank(query.getVehicleSid())) {
-			qw.eq("vehicleSid", query.getVehicleSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getVehicleName())) {
-			qw.eq("vehicleName", query.getVehicleName());
-		}
-
-		if (StringUtils.isNotBlank(query.getConfigName())) {
-			qw.eq("configName", query.getConfigName());
-		}
-
-		if (StringUtils.isNotBlank(query.getMoreConfig())) {
-			qw.eq("moreConfig", query.getMoreConfig());
-		}
-
-		if (StringUtils.isNotBlank(query.getPlannedQuantity())) {
-			qw.eq("plannedQuantity", query.getPlannedQuantity());
-		}
-
-		if (StringUtils.isNotBlank(query.getActualQuantity())) {
-			qw.eq("actualQuantity", query.getActualQuantity());
-		}
-		return qw;
-	}
-
-	public PagerVo<BusVehicleApplyDetailVo> listPageVo(PagerQuery<BusVehicleApplyDetailQuery> pq) {
-		BusVehicleApplyDetailQuery query = pq.getParams();
-		QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
-		IPage<BusVehicleApplyDetail> page = PagerUtil.queryToPage(pq);
-		IPage<BusVehicleApplyDetailVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<BusVehicleApplyDetailVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-
-	public List<BusVehicleApplyDetailVo> listAllVo(BusVehicleApplyDetailQuery query) {
-		QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-
-	public List<BusVehicleApplyDetailVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-
-	public void saveOrUpdateDto(BusVehicleApplyDetailDto dto){
-		BusVehicleApplyDetail entity = new BusVehicleApplyDetail();
-		dto.fillEntity(entity);
-		this.saveOrUpdate(entity);
-	}
-
-	public BusVehicleApplyDetailVo fetchByIdVo(String id){
-		BusVehicleApplyDetail entity = this.fetchById(id);
-		BusVehicleApplyDetailVo vo = new BusVehicleApplyDetailVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
-
-	public void delByApplySid(String sid) {
-		baseMapper.delByApplySid(sid);
-	}
-
-	public List<BusVehicleApplyDetailVo> fetchByApplySid(String sid) {
-		List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = baseMapper.fetchByApplySid(sid);
-		return busVehicleApplyDetailVos;
-	}
-	public BusVehicleApplyDetailVo selModel(String sid) {
-		return baseMapper.selModel(sid);
-	}
-
-	/**
-	 * 销售订单-采购订单分页列表
-	 * @param pagerQuery 查询条件
-	 * @return
-	 */
-	public PagerVo<BusVehicleApplyListVo> applyPage(PagerQuery<BusVehicleApplyListQuery> pagerQuery) {
-		BusVehicleApplyListQuery query = pagerQuery.getParams();
-		QueryWrapper<BusVehicleApply> qw = applyPageWrapper(query);
-		IPage<BusVehicleApply> page = PagerUtil.queryToPage(pagerQuery);
-		IPage<BusVehicleApplyListVo> pagging = baseMapper.applyPage(page, qw);
-		List<BusVehicleApplyListVo> list = pagging.getRecords();
-		for (int i = 0; i <list.size() ; i++) {
-			int platformNo = list.get(i).getPlatformNo();
-			int lockingNum = list.get(i).getLockingNum();
-			int useNum = platformNo-lockingNum;
-			list.get(i).setUseNum(useNum);
-		}
-		PagerVo<BusVehicleApplyListVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-
-	/**
-	 * 销售订单-采购订单分页列表构造条件
-	 * @param query
-	 * @return
-	 */
+    public PagerVo<BusVehicleApplyDetail> listPage(PagerQuery<BusVehicleApplyDetailQuery> pq) {
+        BusVehicleApplyDetailQuery query = pq.getParams();
+        QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
+        IPage<BusVehicleApplyDetail> page = PagerUtil.queryToPage(pq);
+        IPage<BusVehicleApplyDetail> pagging = baseMapper.selectPage(page, qw);
+        PagerVo<BusVehicleApplyDetail> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BusVehicleApplyDetail> listAll(BusVehicleApplyDetailQuery query) {
+        QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
+        return baseMapper.selectList(qw);
+    }
+
+    private QueryWrapper<BusVehicleApplyDetail> createQueryWrapper(BusVehicleApplyDetailQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BusVehicleApplyDetail> qw = new QueryWrapper<>();
+
+
+        if (StringUtils.isNotBlank(query.getApplySid())) {
+            qw.eq("applySid", query.getApplySid());
+        }
+
+        if (StringUtils.isNotBlank(query.getVehicleSid())) {
+            qw.eq("vehicleSid", query.getVehicleSid());
+        }
+
+        if (StringUtils.isNotBlank(query.getVehicleName())) {
+            qw.eq("vehicleName", query.getVehicleName());
+        }
+
+        if (StringUtils.isNotBlank(query.getConfigName())) {
+            qw.eq("configName", query.getConfigName());
+        }
+
+        if (StringUtils.isNotBlank(query.getMoreConfig())) {
+            qw.eq("moreConfig", query.getMoreConfig());
+        }
+
+        if (StringUtils.isNotBlank(query.getPlannedQuantity())) {
+            qw.eq("plannedQuantity", query.getPlannedQuantity());
+        }
+
+        if (StringUtils.isNotBlank(query.getActualQuantity())) {
+            qw.eq("actualQuantity", query.getActualQuantity());
+        }
+        return qw;
+    }
+
+    public PagerVo<BusVehicleApplyDetailVo> listPageVo(PagerQuery<BusVehicleApplyDetailQuery> pq) {
+        BusVehicleApplyDetailQuery query = pq.getParams();
+        QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
+        IPage<BusVehicleApplyDetail> page = PagerUtil.queryToPage(pq);
+        IPage<BusVehicleApplyDetailVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BusVehicleApplyDetailVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public List<BusVehicleApplyDetailVo> listAllVo(BusVehicleApplyDetailQuery query) {
+        QueryWrapper<BusVehicleApplyDetail> qw = createQueryWrapper(query);
+        return baseMapper.selectListAllVo(qw);
+    }
+
+    public List<BusVehicleApplyDetailVo> listVo() {
+        return baseMapper.selectListVo();
+    }
+
+    public void saveOrUpdateDto(BusVehicleApplyDetailDto dto) {
+        BusVehicleApplyDetail entity = new BusVehicleApplyDetail();
+        dto.fillEntity(entity);
+        this.saveOrUpdate(entity);
+    }
+
+    public BusVehicleApplyDetailVo fetchByIdVo(String id) {
+        BusVehicleApplyDetail entity = this.fetchById(id);
+        BusVehicleApplyDetailVo vo = new BusVehicleApplyDetailVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
+
+    public void delByApplySid(String sid) {
+        baseMapper.delByApplySid(sid);
+    }
+
+    public List<BusVehicleApplyDetailVo> fetchByApplySid(String sid) {
+        List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = baseMapper.fetchByApplySid(sid);
+        return busVehicleApplyDetailVos;
+    }
+
+    public BusVehicleApplyDetailVo selModel(String sid) {
+        return baseMapper.selModel(sid);
+    }
+
+    /**
+     * 销售订单-采购订单分页列表
+     *
+     * @param pagerQuery 查询条件
+     * @return
+     */
+    public PagerVo<BusVehicleApplyListVo> applyPage(PagerQuery<BusVehicleApplyListQuery> pagerQuery) {
+        BusVehicleApplyListQuery query = pagerQuery.getParams();
+        QueryWrapper<BusVehicleApply> qw = applyPageWrapper(query);
+        IPage<BusVehicleApply> page = PagerUtil.queryToPage(pagerQuery);
+        IPage<BusVehicleApplyListVo> pagging = baseMapper.applyPage(page, qw);
+        List<BusVehicleApplyListVo> list = pagging.getRecords();
+        for (int i = 0; i < list.size(); i++) {
+            int platformNo = list.get(i).getPlatformNo();
+            int lockingNum = list.get(i).getLockingNum();
+            int useNum = platformNo - lockingNum;
+            list.get(i).setUseNum(useNum);
+        }
+        PagerVo<BusVehicleApplyListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    /**
+     * 销售订单-采购订单分页列表构造条件
+     *
+     * @param query
+     * @return
+     */
     private QueryWrapper<BusVehicleApply> applyPageWrapper(BusVehicleApplyListQuery query) {
         QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
-		if (query != null) {
-			//车型sid
-			qw.eq("bd.vehicleSid", query.getModelSid());
-			//配置sid
-			qw.eq("bd.configSid", query.getConfigSid());
-			if (query.getSidList().size() > 0) {
-				qw.notIn("bo.sid", query.getSidList());
-			}
-		}
+        if (query != null) {
+            //车型sid
+            qw.eq("bd.vehicleSid", query.getModelSid());
+            //配置sid
+            qw.eq("bd.configSid", query.getConfigSid());
+            if (query.getSidList().size() > 0) {
+                qw.notIn("bo.sid", query.getSidList());
+            }
+        }
         return qw;
     }
+
+    /**
+     * 根据车型sid及配置sid查询采购订单的数量
+     *
+     * @param query 查询条件
+     * @return
+     */
+    public ResultBean<Integer> selectOrderCount(BusVehicleOrderCountQuery query) {
+        ResultBean<Integer> rb = ResultBean.fireFail();
+        QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
+        if (query != null) {
+            //车型sid
+            qw.eq("bd.vehicleSid", query.getModelSid());
+            //配置sid
+            qw.eq("bd.configSid", query.getConfigSid());
+        }
+        List<OrderListVo> orderListVoList = baseMapper.selectOrderCount(qw);
+        int count = 0;
+        int plat = 0;
+        int locking = 0;
+        for (int i = 0; i < orderListVoList.size(); i++) {
+            String platformNo = orderListVoList.get(i).getPlatformNo();
+            String lockingNum = orderListVoList.get(i).getLockingNum();
+            if (StringUtils.isNotBlank(platformNo)) {
+                plat = Integer.parseInt(platformNo);
+                if (StringUtils.isNotBlank(lockingNum)) {
+                    locking = Integer.parseInt(lockingNum);
+                }
+            }
+            count = count+(plat-locking);
+        }
+        return rb.success().setData(count);
+    }
 }

anrui-base/anrui-base-ui/src/views/Regist/User.vue

@@ -55,7 +55,7 @@
 	import {
 		registUser,
 		getVerificationCode
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'
@@ -171,7 +171,7 @@
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
 						registUser(qs.stringify(this.userForm)).then((res) => {
-							this.btnDisabled = false 
+							this.btnDisabled = false
 							this.$confirm('注册成功, 是否关闭页面?', '提示', {
 									confirmButtonText: '确定',
 									cancelButtonText: '取消',
@@ -180,7 +180,7 @@
 									window.close();
 								})
 						}).catch(() => {
-							this.btnDisabled = false        
+							this.btnDisabled = false
 						})
 					} else {
 						return false;

anrui-base/anrui-base-ui/src/views/system-admin/check/people.vue

@@ -82,7 +82,7 @@
 </template>
 <script>
   import remarks from './remarks/index.vue'
-  import user from '@/api/system/user/user.js'
+  import user from '@/api/system/user/user1.js'
   export default {
     components:{remarks},
     data() {

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@@ -83,6 +83,7 @@ public class BusMainDeposit extends BaseEntity {
     @ApiModelProperty("环节定义的sid")
     private String nodeSid;
     @ApiModelProperty("流程实例的sid")
+    private String procInstSid;
     private String procInstSid;*/
 
     @ApiModelProperty(value = "节点状态")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrder.java

@@ -104,4 +104,11 @@ public class BusSalesOrder extends BaseEntity {
     private String type;
     @ApiModelProperty("单台开票金额")
     private BigDecimal oneBillMoney; // 单台开票金额
+
+    @ApiModelProperty(value = "客户类型key")
+    private String customerClassKey;
+    @ApiModelProperty(value = "客户类型")
+    private String customerClass;
+    @ApiModelProperty(value = "客户头像")
+    private String customerPhoto;
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -92,6 +92,7 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
         for (int i = 0; i < busDepositFictitiousDtoList.size(); i++) {
             BusDepositFictitious busDepositFictitious = new BusDepositFictitious();
             BeanUtil.copyProperties(busDepositFictitiousDtoList.get(i), busDepositFictitious, "sid");
+            busDepositFictitious.setDepositSid(sid);
             baseMapper.insert(busDepositFictitious);
         }
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -35,8 +35,6 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMapper.java <br/>
@@ -54,12 +52,14 @@ import java.util.List;
 public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     IPage<BusSalesOrderVo> selectPageVo(IPage<BusSalesOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrder> qw);
+
     void modifyFlowState(@Param("businessSid") String businessSid, @Param("procDefId") String procDefId, @Param("nodeState") String nodeState,
                          @Param("procInstSid") String procInstSid, @Param("nodeSid") String nodeSid);
 
 
     @Update("update bus_sales_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}")
-    int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney);
+    int updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid, @Param("oneBillMoney") String oneBillMoney);
+
     /**
      * App销售订单分页列表
      *
@@ -84,4 +84,12 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
      * @return
      */
     AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid);
+
+    /**
+     * 根据销售订单sid更新销售订单的状态
+     *
+     * @param state       状态：审批通过1，不通过2
+     * @param businessSid 销售订单sid
+     */
+    void updateStateByBusinessSid(@Param("state") int state, @Param("businessSid") String businessSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -5,23 +5,23 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo">
         SELECT bo.sid,
-        bo.nodeState,
-        bo.billNo,
-        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
-        bo.customerName,
-        bo.mobile,
-        bm.brandName,
-        bp.singleFinalPrice,
-        bp.quantity,
-        bo.payType,
-        bd.depositAll,
-        case bo.isInsurance
-        when 0 then '否'
-        when 1 then '是' end as isInsurance
+               bo.nodeState,
+               bo.billNo,
+               DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createDate,
+               bo.customerName,
+               bo.mobile,
+               bm.brandName,
+               bp.singleFinalPrice,
+               bp.quantity,
+               bo.payType,
+               bd.depositAll,
+               case bo.isInsurance
+                   when 0 then '否'
+                   when 1 then '是' end                as isInsurance
         FROM bus_sales_order bo
-        left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
-        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+                 left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                 left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -37,24 +37,24 @@
     </update>
     <!--app查询销售订单列表-->
     <select id="getSaleOrders" resultType="com.yxt.anrui.buscenter.api.bussalesorder.AppBusSalesOrderVo">
-        SELECT bo.sid AS saleOrderSid,
-        bo.billNo AS saleOrderId,
-        bo.customerClass AS customerType,
-        bo.customerSid,
-        bo.customerName,
-        bo.customerPhoto AS customerImage,
-        bo.mobile,
-        bo.payType AS carPurchaseType,
-        bo.payTypeKey AS carPurchaseKey,
-        bd.depositAll AS deposit,
-        bo.nodeState AS saleOrderState,
-        DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
-        case bo.isInsurance
-        when 0 then '否'
-        when 1 then '是' end as insuranceInfo
+        SELECT bo.sid                                 AS saleOrderSid,
+               bo.billNo                              AS saleOrderId,
+               bo.customerClass                       AS customerType,
+               bo.customerSid,
+               bo.customerName,
+               bo.customerPhoto                       AS customerImage,
+               bo.mobile,
+               bo.payType                             AS carPurchaseType,
+               bo.payTypeKey                          AS carPurchaseKey,
+               bd.depositAll                          AS deposit,
+               bo.nodeState                           AS saleOrderState,
+               DATE_FORMAT(bo.createDate, '%Y-%m-%d') as createdDate,
+               case bo.isInsurance
+                   when 0 then '否'
+                   when 1 then '是' end                as insuranceInfo
         FROM bus_sales_order bo
-        left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
-        left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+                 left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                 left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -81,4 +81,10 @@
         FROM bus_sales_order bo
         WHERE bo.sid = #{saleOrderSid}
     </select>
+    <!--根据销售订单sid更新销售订单的状态-->
+    <update id="updateStateByBusinessSid">
+        update bus_sales_order
+        set state = #{state}
+        where sid = #{businessSid}
+    </update>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -134,8 +134,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
+    @Autowired
     private FlowableFeign flowableFeign;
+    @Autowired
     private FlowTaskFeign flowTaskFeign;
+    @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
     @Autowired
     private BaseVehmodelConfigFeign baseVehmodelConfigFeign;
@@ -405,9 +408,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //判断补交金额和订金合计-本次结转金额
             String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
-            if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
-                return rb.setMsg("订金信息中需补交订金数值计算错误");
+            if(StringUtils.isNotBlank(makeUpDeposit)){
+                if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
+                    return rb.setMsg("订金信息中需补交订金数值计算错误");
+                }
             }
+
         }
         return rb.success();
     }
@@ -500,32 +506,32 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         baseMapper.insert(busSalesOrder);
         String sid = busSalesOrder.getSid();
         //主车车型信息保存
-        busSalesOrderModelService.saveModel(busSalesOrderModelDto, dto.getSid());
+        busSalesOrderModelService.saveModel(busSalesOrderModelDto, sid);
         if ("1".equals(dto.getType())) {
             //现车车辆信息
-            busSalesOrderVehicleService.saveVehicle(list, dto.getSid());
+            busSalesOrderVehicleService.saveVehicle(list, sid);
         } else if ("2".equals(dto.getType())) {
             //采购订单信息
-            busSalesVehicleOrderService.saveOrder(vehicleList, dto.getSid());
+            busSalesVehicleOrderService.saveOrder(vehicleList, sid);
         }
         //是否含有上装信息
         String isTop = dto.getIsTop();
         if ("1".equals(isTop)) {
-            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, dto.getSid());
+            busSalesOrderMakeupService.saveMake(busSalesOrderMakeupDto, sid);
         }
         //价格信息
-        busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, dto.getSid());
+        busSalesOrderPriceService.saveOrderPrice(busSalesOrderPriceDto, sid);
         //主车优惠明细
-        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, dto.getSid());
+        busSalesOrderDiscountService.saveDiscount(busSalesOrderDiscountDto, sid);
         //是否有保险说明
         String isInsurance = dto.getIsInsurance();
         if ("1".equals(isInsurance)) {
-            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, dto.getSid());
+            busSalesOrderInsuranceService.saveInsurance(busSalesOrderInsuranceDto, sid);
         }
-        busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, dto.getSid());
+        String depositSid = busSalesOrderDepositService.saveOrderDepo(busSalesOrderDepositDto, sid);
         if ("01".equals(busSalesOrderDepositDto.getDepositTypeKey())) {
             //现交订金
-            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, dto.getSid());
+            busDepositFictitiousService.saveFictitious(busDepositFictitiousDtoList, depositSid);
         }
         return sid;
 
@@ -731,6 +737,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 nodeState = ProcessStateEnum.FINISHED.getStateName();
                 taskDefKey = "Event_end";
                 map.put("flowState", SysFormLinkFlowStateEnum.FINISH.getCode());
+                //更新销售订单的状态为已通过的状态:审批通过1
+                //ToDo:
+                updateStateByBusinessSid(1,variables.get("businessSid").toString());
+
+
+
             }
         }
         map.put("nodeState", nodeState);
@@ -739,6 +751,15 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
+    /**
+     * 更新销售订单的状态
+     * @param state 状态，审批通过1，不通过2
+     * @param businessSid
+     */
+    private void updateStateByBusinessSid(int state, String businessSid) {
+        baseMapper.updateStateByBusinessSid(state,businessSid);
+    }
+
     public ResultBean reject(BusSalesOrderFlowDto dto) {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         BeanUtil.copyProperties(dto, flowTaskVo);
@@ -763,6 +784,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
         FlowTaskVo flowTaskVo = new FlowTaskVo();
         BeanUtil.copyProperties(dto, flowTaskVo);
+        //查询是否是最后一步
+        ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(dto.getInstanceId());
+        if (listResultBean.getData().size() == 0) {
+            //更新销售订单的状态为不通过
+            updateStateByBusinessSid(2,dto.getBusinessSid());
+        }
         ResultBean resultBean = flowTaskFeign.breakProcess(flowTaskVo);
         if (!resultBean.getSuccess()) {
             return resultBean;
@@ -1185,10 +1212,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrderInsuranceService.deleteByOrderSid(sid);
             }
             BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
-            busSalesOrderDepositService.deleteByOrderSid(sid);
-            if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
-                busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+            if(busSalesOrderDeposit != null){
+                busSalesOrderDepositService.deleteByOrderSid(sid);
+                if ("02".equals(busSalesOrderDeposit.getDepositTypeKey())) {
+                    busDepositFictitiousService.deleteByDepositSid(busSalesOrderDeposit.getSid());
+                }
             }
+
         }
         return rb.success().setMsg("删除成功");
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -79,10 +79,12 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         return vo;
     }
 
-    public void saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
+    public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
         BeanUtil.copyProperties(busSalesOrderDepositDto, busSalesOrderDeposit, "sid");
+        busSalesOrderDeposit.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderDeposit);
+        return busSalesOrderDeposit.getSid();
     }
 
     public void updateOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -87,6 +87,7 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
         for (int i = 0; i < busSalesOrderDiscountList.size(); i++) {
             BusSalesOrderDiscount busSalesOrderDiscount = new BusSalesOrderDiscount();
             BeanUtil.copyProperties(busSalesOrderDiscountList.get(i), busSalesOrderDiscount, "sid");
+            busSalesOrderDiscount.setSalesOrderSid(sid);
             baseMapper.insert(busSalesOrderDiscount);
         }
     }

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

@@ -87,6 +87,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             BusSalesOrderModel busSalesOrderModel1 = new BusSalesOrderModel();
             if (busSalesOrderModelDto != null) {
                 BeanUtil.copyProperties(busSalesOrderModelDto, busSalesOrderModel1, "sid");
+                busSalesOrderModel1.setSalesOrderSid(sid);
                 save(busSalesOrderModel1);
             }
         } else {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -82,6 +82,7 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
         busSalesOrderPrice.setSingleGuildPrice(guildPriceAll);
         BigDecimal finalPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleFinalPrice());
         busSalesOrderPrice.setSingleFinalPrice(finalPriceAll);
+        busSalesOrderPrice.setSalesOrderSid(sid);
         baseMapper.insert(busSalesOrderPrice);
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -94,6 +94,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
                 BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
+                busSalesOrderVehicle.setSalesOrderSid(sid);
                 save(busSalesOrderVehicle);
             }
         }

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

@@ -93,6 +93,7 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
                 BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
                 BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
+                busSalesVehicleOrder.setSalesOrderSid(sid);
                 save(busSalesVehicleOrder);
             }
         }

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

@@ -47,10 +47,10 @@ export function selectBySid(data) {
   })
 }
 
-// 新增保存
+// 新增保存 已改
 export function save(data) {
   return request({
-    url: '/buscenter/v1/busorderdiscount/save',
+    url: 'base/v1/basediscountpackage/save',
     method: 'post',
     data: data,
     headers: {

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

@@ -94,6 +94,16 @@ export function getCaigouList(params) {
     headers: {'Content-Type': 'application/json'}
   })
 }
+// 现车数量 已改
+export function selectCount(params) {
+  return request({
+    url: '/base/v1/basevehicle/selectCount',
+    method: 'get',
+    params: params,
+    // headers: {'Content-Type': 'application/json'}
+  })
+}
+//
 
 // 销售政策分页列表 已改
 export function selectSalesOrderList(params) {

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue

@@ -858,7 +858,6 @@
       // ----------------------------------方法--------------------
       // 组件返回
       handleReturn() {
-        this.visible = false
         this.activeNames=['1']
         this.$emit('handleReturn')
       },
@@ -973,7 +972,7 @@
                   this.activeNames=['1']
                   this.list1=[]
                   this.$emit('handleReturn')
-                  
+
                 }else if('511'===response.code || '513'===response.code){
                   this.FormLoading = false
                   this.dialogFormVisible = true

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/modellibrary.vue

@@ -396,7 +396,7 @@
         this.handReset()
       },
       handleReturn() {
-        this.$emit('doReturn') // 返回到销售订单新增
+        this.$emit('handleReturn') // 返回到销售订单新增
       }
 
     }

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xiaoshouzhengce.vue

@@ -77,20 +77,10 @@
                   class="pagination" @pagination="getList"/>
         </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"
+          <el-table ref="multipleTable" :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"
                     @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column width="150px" label="操作" align="center">
-              <template slot-scope="scope">
-                <div class="searchbtns"> <!--:disabled=""-->
-                  <el-button size="small" type="primary"
-                             @click="changeNodeState(scope.row)">办理
-                  </el-button>
-                  <el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
-                </div>
-              </template>
-            </el-table-column>
             <el-table-column label="状态" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nodeState }}</span>
@@ -408,9 +398,9 @@ export default {
         bb.push(element.depositBillTypeKey)
       });
       this.sids = aa
-      this.billType = bb
+      // this.billType = bb
       console.log('选择sid', this.sids)
-      console.log('选择订单类型', this.billType)
+      // console.log('选择订单类型', this.billType)
     },
     // 根据本行ID删除数据
     handleDelete() {
@@ -443,13 +433,19 @@ export default {
         // return likeGetCustomerName
       }
     },
+    // 打开主车
+    showZhuche(){
+
+    },
+    // 确认
     handleConfirm() {
       this.$emit('handleYouhui',this.row)
+      this.$refs.multipleTable.clearSelection();
       this.handleReturn()
     },
     // 返回
     handleReturn() {
-      this.$emit('doReturn') // 返回到销售订单新增
+      this.$emit('handleReturn') // 返回到销售订单新增
     },
 
   }

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehu.vue

@@ -247,7 +247,8 @@
       },
       // 返回
       handleReturn() {
-        this.$emit('doReturn') // 返回到销售订单新增
+
+        this.$emit('handleReturn') // 返回到销售订单新增
       },
 
       // 序号

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xuanzekehuAdd.vue

@@ -842,7 +842,7 @@
       handleReturn() {
         this.visible=false
         this.activeNames=['1']
-        this.$emit('doReturn')
+        // this.$emit('doReturn')
         this.$emit('handleReturn')
       },
       // 添加前数据初始化

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanguanli.vue

@@ -14,12 +14,12 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="130px" class="tab-header">
               <el-form-item label="客户(付款人)">
-                <el-input v-model="listQuery.params.customerName" placeholder="请输入" clearable class="filter-item"/>
+                <el-input v-model="listQuery.params.draweeName" placeholder="请输入" clearable class="filter-item"/>
               </el-form-item>
               <el-form-item label="创建日期">
                 <div class="block">
                   <el-date-picker
-                    v-model="listQuery.params.startTime"
+                    v-model="listQuery.params.createDateStart"
                     type="date"
                     placeholder="选择日期"
                     value-format="yyyy-MM-dd"
@@ -29,7 +29,7 @@
                 <label>至</label>
                 <div class="block">
                   <el-date-picker
-                    v-model="listQuery.params.endTime"
+                    v-model="listQuery.params.createDateEnd"
                     type="date"
                     placeholder="选择日期"
                     value-format="yyyy-MM-dd"
@@ -54,17 +54,17 @@
                     @selection-change="handleSelectionChange">
             <el-table-column width="50px" type="selection" align="center"/>
             <el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column width="150px" label="操作" align="center">
-              <template slot-scope="scope">
-                <div class="searchbtns">
-                  <el-button size="small" type="primary"
-                             :disabled="scope.row.nodeState == '' ? false:scope.row.nodeState == '发起订单'?false : true"
-                             @click="changeNodeState(scope.row)">办理
-                  </el-button>
-                  <el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
-                </div>
-              </template>
-            </el-table-column>
+            <!--            <el-table-column width="150px" label="操作" align="center">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <div class="searchbtns">-->
+            <!--                  <el-button size="small" type="primary"-->
+            <!--                             :disabled="scope.row.nodeState == '' ? false:scope.row.nodeState == '发起订单'?false : true"-->
+            <!--                             @click="changeNodeState(scope.row)">办理-->
+            <!--                  </el-button>-->
+            <!--                  <el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>-->
+            <!--                </div>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="状态" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.nodeState }}</span>
@@ -166,13 +166,18 @@ export default {
         current: 1,
         size: 20,
         params: {
+          createDateEnd: '', // 创建日期结束
+          createDateStart: '', // 创建日期开始
+          customerSid: '', // 客户sid
+          draweeName: '', // 付款人
+          staffSid: window.sessionStorage.getItem('staffSid'),
           userSid: window.sessionStorage.getItem('userSid'),
           orgName: '',
           staffName: '',
           customerName: '',
           billType: '',
-          startTime: '',
-          endTime: '',
+          // startTime: '',
+          // endTime: '',
         },
       },
       submitDto: {
@@ -188,7 +193,8 @@ export default {
       temp: {}, // 添加和编辑
       visible: true,
       hetongdanganguanliInfoShow: false,
-      row:[],//所选数据
+      row: [],//所选数据
+      xuniIndex: '',
       // ------------------------------------
     }
   },
@@ -239,14 +245,19 @@ export default {
     handleCreate() {
       this.dialogVisible = true
     },
+    showXuni(customerSid, index) {
+      this.listQuery.params.customerSid = customerSid
+      this.xuniIndex = index
+      this.getList()
+    },
     // 确认
     handleConfirm() {
-      this.$emit('handleXuniList', this.row)
+      this.$emit('handleXuniList', this.row, this.xuniIndex)
       this.handleReturn()
     },
     // 返回
     handleReturn() {
-      this.$emit('doReturn') // 返回到销售订单新增
+      this.$emit('handleReturn') // 返回到销售订单新增
     },
     // 打开编辑
     handleUpdate() {
@@ -312,11 +323,10 @@ export default {
         current: this.listQuery.current,
         size: this.listQuery.size,
         params: {
-          // orgName: this.listQuery.orgName,
-          // staffName: this.listQuery.staffName,
-          customerName: this.listQuery.customerName,
-          startTime: this.listQuery.startTime,
-          endTime: this.listQuery.endTime,
+          createDateEnd: this.listQuery.params.createDateEnd, // 创建日期结束
+          createDateStart: this.listQuery.params.createDateStart, // 创建日期开始
+          customerSid: this.listQuery.params.customerSid, // 客户sid
+          draweeName: this.listQuery.params.draweeName, // 付款人
           userSid: window.sessionStorage.getItem('userSid'),
           staffSid: window.sessionStorage.getItem('staffSid')
         },

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue

@@ -161,7 +161,7 @@ export default {
     },
     // 返回
     handleReturn() {
-      this.$emit('doReturn') // 返回到销售订单新增
+      this.$emit('handleReturn') // 返回到销售订单新增
     },
 
     // 序号

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue

@@ -165,7 +165,7 @@ export default {
     },
     // 返回
     handleReturn() {
-      this.$emit('doReturn') // 返回到销售订单新增
+      this.$emit('handleReturn') // 返回到销售订单新增
     },
 
     // 序号

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

@@ -70,10 +70,7 @@
                     :disabled="scope.row.nodeState == '待提交' ? false : scope.row.nodeState == '' ? false : true"
                     @click="changeNodeState(scope.row)">办理
                   </el-button>
-                  <el-button size="small" type="primary" 
-                    :disabled="scope.row.nodeState == '' ? false : true"
-                    @click="handleCheck(scope.row)">查看
-                  </el-button>
+                  <el-button size="small" type="primary" @click="handleCheck(scope.row)">查看</el-button>
                   <!--                  <el-button size="small" type="primary" @click="printContract(scope.row)">打印合同</el-button>-->
                 </div>
               </template>
@@ -152,10 +149,10 @@
 </template>
 
 <script>
-import { delBySids, dictType, getListOrg, getListPage } from '@/api/salesManagement/orderManagement'
-import { submitSales, updateSales } from '@/api/portal/workFlow'
-import { loginDetails } from '@/api/dictcommons/basemanufacturer'
-import { getStorage } from '@/utils/auth'
+import {delBySids, dictType, getListOrg, getListPage} from '@/api/salesManagement/orderManagement'
+import {submitSales, updateSales} from '@/api/portal/workFlow'
+import {loginDetails} from '@/api/dictcommons/basemanufacturer'
+import {getStorage} from '@/utils/auth'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import divAdd from './xiaoshoudingdanAdd.vue'
@@ -208,12 +205,13 @@ export default {
         current: 1,
         size: 20,
         params: {
-          customerName: '',
-          modelName: '',
-          orgName: '',
-          payType: '',
-          saleType: '',
-          staffName: ''
+          createDateEnd: '', // 单据日期结束时间
+          createDateStart: '', // 单据日期开始时间
+          customerName: '', // 客户名称
+          modelName: '', // 车型名称
+          orgName: '', // 部门名称
+          payTypeKey: '',
+          staffSid: window.sessionStorage.getItem('staffSid'),  //销售专员sid
         }
       },
       temp: {
@@ -245,7 +243,6 @@ export default {
     // ----------功能打开开始--------
     resetState() {
       this.visible = true
-      this.getList()
     },
     xiaoshouhetong(row) {
       console.log('9511', row)
@@ -255,7 +252,7 @@ export default {
     // 打开查看详情
     handleCheck(row) {
       this.visible = false
-      this.$refs['dingdanxinxiinfo'].showInfo(row.billNo)
+      this.$refs['dingdanxinxiinfo'].showInfo(row.sid)
     },
     // 打开添加
     handleCreate(row) {
@@ -412,78 +409,48 @@ export default {
           submitSales(this.submitDto).then((response) => {
             if (response.code === '200') {
               this.updateDto.nodeState = response.data.nodeState
-              this.$notify({
-                title: '提示',
-                message: '添加成功',
-                type: 'success',
-                duration: 2000
-              })
-              // 更新审批 状态
-              this.updateDto.sid = this.sids[0]
-              updateSales(this.updateDto).then((response) => {
-                if (response.code === '200') {
-                  this.$notify({
-                    title: '提示',
-                    message: '更新成功',
-                    type: 'success',
-                    duration: 2000
-                  })
-                  this.getList()
-                } else {
-                  this.$notify({
-                    title: '更新失败',
-                    message: response.msg,
-                    type: 'error'
-                  })
-                }
-              })
             } else {
-              this.$notify({
-                title: '添加失败',
-                message: response.msg,
+              this.$message({
+                showClose: true,
+                message: '提交失败！',
                 type: 'error'
-              })
+              });
             }
           })
         })
       } else if (this.sids.length == 0) {
-        this.$notify({
-          title: '您还未选择，请选择数据！！！',
+        this.$message({
+          showClose: true,
+          message: '您还未选择，请选择数据！',
           type: 'error'
-        })
+        });
       } else if (this.sids.length > 1) {
-        this.$notify({
-          title: '您选择的数据过多，请选择一条数据编辑！！',
+        this.$message({
+          showClose: true,
+          message: '您选择的数据过多，请选择一条数据编辑！',
           type: 'error'
-        })
+        });
       }
     },
     // 根据本行sid删除数据
     handleDelete() {
       if (this.sids.length === 0) {
-        this.$notify({
-          title: '提示',
-          message: '没有选择!!',
-          type: 'warning',
-          duration: 2000
-        })
+        this.$message({
+          showClose: true,
+          message: '请选择数据！',
+          type: 'error'
+        });
         return
       }
-      delBySids(this.sids.join(',')).then((response) => {
+      delBySids(this.sids).then((response) => {
         if (response.code === '200') {
-          this.$notify({
-            title: '提示',
-            message: '删除成功',
-            type: 'success',
-            duration: 2000
-          })
           this.getList()
         } else {
-          this.$notify({
-            title: '删除失败',
-            message: response.msg,
+          this.$message({
+            showClose: true,
+            message: '删除失败！',
             type: 'error'
-          })
+          });
         }
       })
     },

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

@@ -185,7 +185,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item>
-                <el-input v-model="temp.busSalesOrderModel.finalPrice" class="addinputw" clearable
+                <el-input oninput="value = value.replace(/[^\d.]/g,'')" v-model.number="temp.busSalesOrderModel.finalPrice" class="addinputw" clearable
                           maxlength="125" placeholder="请输入单台成交价"/>
               </el-form-item>
             </el-col>
@@ -195,15 +195,15 @@
           <div class="chosseBtn">
             <el-row>
               <el-col :span="4">
-                <el-radio v-model="isXuanzeShow" label="1">现车()</el-radio>
+                <el-radio v-model="isXuanzeShow" label="1">现车({{ xiancheCount }})</el-radio>
                 <span v-show="isXuanzeShow == '1'" class="bluezi" @click="openXianche()">选择</span>
               </el-col>
               <el-col :span="20">
                 <!--放置五个车架号-->
                 <el-form-item>
-                  <div v-for="item in temp.busSalesOrderVehicleList">
+                  <div class="linkNoSty" v-for="(item,index) in temp.busSalesOrderVehicleList">
                     <span>{{ item.linkNo }}</span>
-                    <el-button size="small" type="danger" @click="delXianche()">删除
+                    <el-button size="small" type="danger" @click="delXianche(index)">删除
                     </el-button>
                   </div>
                 </el-form-item>
@@ -211,14 +211,14 @@
             </el-row>
             <el-row>
               <el-col :span="4">
-                <el-radio v-model="isXuanzeShow" label="2">采购订单()</el-radio>
+                <el-radio v-model="isXuanzeShow" label="2">采购订单({{ caigouCount }})</el-radio>
                 <span v-show="isXuanzeShow == '2'" class="bluezi" @click="openCaigou()">选择</span>
               </el-col>
               <el-col :span="20">
                 <el-form-item>
-                  <div v-for="item in temp.busSalesVehicleOrderList">
+                  <div class="linkNoSty" v-for="(item,index) in temp.busSalesVehicleOrderList">
                     <span>{{ item.linkNo }}</span>
-                    <el-button size="small" type="danger" @click="delCaigou()">删除
+                    <el-button size="small" type="danger" @click="delCaigou(index)">删除
                     </el-button>
                   </div>
                 </el-form-item>
@@ -311,7 +311,8 @@
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <el-input v-model="temp.busSalesOrderMakeup.topPrice" class="addinputw" clearable
+                  <el-input oninput="value = value.replace(/[^0-9.]/g, '')" v-model.number="temp.busSalesOrderMakeup.topPrice" class="addinputw"
+                            clearable
                             placeholder="请输入上装价格"/>
                 </el-form-item>
               </el-col>
@@ -380,10 +381,14 @@
               <el-col :span="2">
                 <span>台数</span>
               </el-col>
-              <el-col :span="4">
+              <el-col v-show="isXuanzeShow == '1' || isXuanzeShow == '2'" :span="4">
+                <el-form-item>
+                  <span>{{ NumberMulThree() }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col v-show="isXuanzeShow == '3'" :span="4">
                 <el-form-item>
-                  <span v-show="isXuanzeShow == '1' || isXuanzeShow == '2'">{{ NumberMulThree() }}</span>
-                  <el-input v-show="isXuanzeShow == '3'" v-model="temp.busSalesOrderPrice.quantity" class="addinputw"
+                  <el-input oninput="value = value.replace(/[^0-9.]/g, '')" v-model.number="quantity" class="addinputw"
                             placeholder="请输入台数"
                             clearable/>
                 </el-form-item>
@@ -433,7 +438,10 @@
                 <el-table-column label="序号" type="index" width="80" align="center"/>
                 <el-table-column label="操作" align="center">
                   <template slot-scope="scope">
-                    <el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="danger" size="small"
+                               @click="deleteZhuche(scope.row,scope.$index,temp.busSalesOrderDiscountList[scope.$index])">
+                      删除
+                    </el-button>
                   </template>
                 </el-table-column>
                 <el-table-column label="优惠名称" align="center">
@@ -486,7 +494,8 @@
             </el-col>
             <el-col :span="4" class="baoxianInput">
               <el-form-item>
-                <el-input v-model="temp.busSalesOrderInsurance.insuranceCarMoney" class="addinputw"
+                <el-input oninput="value = value.replace(/[^0-9.]/g, '')" v-model.number="temp.busSalesOrderInsurance.insuranceCarMoney"
+                          class="addinputw"
                           clearable placeholder="请输入单台车保费预估金额"/>
               </el-form-item>
             </el-col>
@@ -530,7 +539,8 @@
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <el-input v-model="temp.busSalesOrderDeposit.deposit" class="addinputw" clearable
+                  <el-input oninput="value = value.replace(/[^0-9.]/g, '')" v-model.number="temp.busSalesOrderDeposit.deposit" class="addinputw"
+                            clearable
                             placeholder="请输入单台订金"/>
                 </el-form-item>
               </el-col>
@@ -553,18 +563,18 @@
                 </el-form-item>
               </el-col>
               <el-col :span="2">
-                <span>需补交定金</span>
+                <span>需补交订金</span>
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <span>{{ temp.busSalesOrderDeposit.makeUpDeposit }}</span>
+                  <span>{{ NumberMakeUpDeposit() }}</span>
                 </el-form-item>
               </el-col>
             </el-row>
           </div>
 
           <!-- ==================== 虚拟订单列表 ======================================== -->
-          <div v-show="temp.busSalesOrderDeposit.depositTypeKey == '2'">
+          <div v-show="temp.busSalesOrderDeposit.depositTypeKey == '02'">
             <div class="titleleft">
               <span>虚拟订单列表</span>
               <el-button class="btntopblueline chooseForm" size="small" type="primary" @click="addXunidingjin()">添加
@@ -575,14 +585,16 @@
               <el-table-column label="序号" type="index" width="80" align="center"/>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="danger" size="small" @click="handleDelete(scope.row)">删除</el-button>
+                  <el-button type="danger" size="small"
+                             @click="deleteXuni(scope.row,scope.$index,temp.busDepositFictitiousList[scope.$index])">删除
+                  </el-button>
                 </template>
               </el-table-column>
               <el-table-column label="虚拟订单编号" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.depositBillNo }}</span>
                   <el-button type="primary" size="small" class="btntopblueline chooseForm"
-                             @click="openXunidingdanList()">选择
+                             @click="openXunidingdanList(scope.$index)">选择
                   </el-button>
                 </template>
               </el-table-column>
@@ -593,7 +605,8 @@
               </el-table-column>
               <el-table-column label="本次结转金额" align="center">
                 <template slot-scope="scope">
-                  <el-input @blur="handleJiezhuan(scope.row,scope.row.price)" v-model="scope.row.price"
+                  <el-input oninput="value = value.replace(/[^0-9.]/g, '')" @blur="handleJiezhuan(scope.row,scope.row.price)"
+                            v-model.number="scope.row.price"
                             placeholder="请输入本次结转金额"
                             class="addinputw"
                             clearable/>
@@ -612,12 +625,13 @@
             <span>补充说明</span>
           </div>
           <el-row>
-            <el-input v-model="temp.remarks" type="textarea" placeholder="补充说明" class="addinputw"/>
+            <el-input v-model="temp.notes" type="textarea" placeholder="补充说明" class="addinputw"/>
           </el-row>
 
         </el-form>
       </div>
     </div>
+
     <!-- 打开新增客户 -->
     <el-dialog :visible.sync="customerVisible" title="客户登记-类型" top="13%" width="28%">
       <el-form :model="customerTypeList">
@@ -663,19 +677,19 @@
                 style="width: 100%;" @selection-change="handleSelectionXianche">
         <el-table-column align="center" type="selection" width="50"/>
         <el-table-column :index="xiancheindexMethod" align="center" label="序号" type="index" width="80"/>
-        <el-table-column align="center" label="订单编号" prop="billNo">
+        <el-table-column align="center" label="车架号" prop="billNo">
           <template slot-scope="scope">
-            <span>{{ scope.row.billNo }}</span>
+            <span>{{ scope.row.linkNo }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="制单日期">
+        <el-table-column align="center" label="存放地点">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate }}</span>
+            <span>{{ scope.row.linkText }}</span>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="客户名称">
+        <el-table-column align="center" label="是否为虚拟订单">
           <template slot-scope="scope">
-            <span>{{ scope.row.customerName }}</span>
+            <span>{{ scope.row.isFictitious }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -714,7 +728,7 @@
         <el-table-column :index="caigouindexMethod" align="center" label="序号" type="index" width="80"/>
         <el-table-column align="center" label="采购订单编号" prop="billNo">
           <template slot-scope="scope">
-            <span>{{ scope.row.billNo }}</span>
+            <span>{{ scope.row.linkNo }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="可使用台数" prop="billNo">
@@ -730,7 +744,7 @@
         </el-table-column>
         <el-table-column align="center" label="采购订单日期">
           <template slot-scope="scope">
-            <span>{{ scope.row.createDate }}</span>
+            <span>{{ scope.row.linkText }}</span>
           </template>
         </el-table-column>
       </el-table>
@@ -743,30 +757,30 @@
     </el-dialog>
 
     <!-- 新增客户 -->
-    <xuanzekehu v-show="relState == '1.1'" ref="xuanzekehu" @doReturn="changeState"
+    <xuanzekehu v-show="relState == '1.1'" ref="xuanzekehu" @handleReturn="changeState"
                 @handleCustomerList="selectCustomer"/>
-    <xuanzekehu-add v-show="relState == '1.2'" ref="xuanzekehuAdd" @doReturn="changeState"
+    <xuanzekehu-add v-show="relState == '1.2'" ref="xuanzekehuAdd" @handleReturn="changeState"
                     @handleCustomerAdd="addCustomer"/>
     <!-- 选择意向车型 -->
-    <yixiangchexingxuanze v-show="relState == '2.1'" ref="yixiangchexing" @doReturn="changeState"
+    <yixiangchexingxuanze v-show="relState == '2.1'" ref="yixiangchexing" @handleReturn="changeState"
                           @handleyixiangList="selectYixiang"/>
     <!-- 选择虚拟订单 -->
-    <xunidingdanxuanze v-show="relState == '2.2'" ref="xunidingdan" @doReturn="changeState"
+    <xunidingdanxuanze v-show="relState == '2.2'" ref="xunidingdan" @handleReturn="changeState"
                        @handlexuniList="selectXuni"/>
     <!-- 车型选择 -->
-    <modellibrary v-show="relState == '2.3'" ref="chexingxuanze" @doReturn="changeState"
+    <modellibrary v-show="relState == '2.3'" ref="chexingxuanze" @handleReturn="changeState"
                   @handleChexing="selectChexing"/>
     <!-- 车型配置选择 -->
-    <vehiclelibraryconfiguration v-show="relState == '6.6'" ref="chexingxuanze" @doReturn="changeState"
+    <vehiclelibraryconfiguration v-show="relState == '6.6'" ref="chexingxuanze" @handleReturn="changeState"
                                  @handleChexing="selectChexing"/>
-    <!-- 销售政策 -->
-    <xiao-shou-zheng-ce v-show="relState == '4.1'" ref="zhucheyouhui" @doReturn="changeState"
+    <!-- 主车优惠、销售政策 -->
+    <xiao-shou-zheng-ce v-show="relState == '4.1'" ref="zhucheyouhui" @handleReturn="changeState"
                         @handleYouhui="selectYouhui"/>
     <!-- 虚拟订单 -->
-    <xunidingdanguanli v-show="relState == '5.1'" ref="xuniList" @doReturn="changeState"
+    <xunidingdanguanli v-show="relState == '5.1'" ref="xuniList" @handleReturn="changeState"
                        @handleXuniList="selectXuniList"/>
     <!-- 提交补充页面-->
-    <xiaoshoudingdan-submit v-show="relState == '3'" ref="divsubmit" @doReturn="changeState"
+    <xiaoshoudingdan-submit v-show="relState == '3'" ref="divsubmit" @handleReturn="changeState"
                             @handleSubmit="submitPage"/>
   </div>
 </template>
@@ -781,8 +795,9 @@ import {
   getPdfByOrderSid,
   getXianList,
   saveOrderForm,
+  selectCount,
+  fetchDetailsBySid
 } from '@/api/salesManagement/orderManagement'
-import {getDelDis} from '@/api/jichuxinxi/busdeposit'
 import {getNamesDown,} from '@/api/dictcommons/basemanufacturer'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -870,14 +885,15 @@ export default {
           depositTypeKey: '', // 订金交纳方式key
           makeUpDeposit: '', // 需补交订金
         },  //订金信息
-        busSalesOrderDiscountList: [{
-          discountExplain: '',  //优惠项目明细
-          name: '',  //优惠名称
-          num: '',  //数量
-          price: '',  //价值
-          salesPolicySid: '',  //销售政策sid
-          totalValue: '',  //总价值
-        }],  //主车优惠明细
+        busSalesOrderDiscountList: [],  //主车优惠明细
+        // {
+        //   discountExplain: '',  //优惠项目明细
+        //     name: '',  //优惠名称
+        //   num: '',  //数量
+        //   price: '',  //价值
+        //   salesPolicySid: '',  //销售政策sid
+        //   totalValue: '',  //总价值
+        // }
         busSalesOrderInsurance: {
           insuranceCarMoney: '',  //单台车保费预估金额
           insuranceName: '',  //保险公司名称
@@ -942,6 +958,7 @@ export default {
         staffSid: window.sessionStorage.getItem('staffSid'),  //销售专员sid
         type: '',  //销售订单车辆类型 1现车、2订单、3排产
       }, // 添加和修改
+      quantity: '', // 台数
       // 客户块信息
       customerList: {},
       // 车型确认块信息
@@ -950,6 +967,7 @@ export default {
       // 现车列表
       xianchetotal: 1,
       xiancheLoading: false,
+      xiancheCount: 0,
       xiancheList: {
         current: 1,
         size: 20,
@@ -965,6 +983,7 @@ export default {
       // 采购订单列表
       caigoutotal: 1,
       caigouLoading: false,
+      caigouCount: 0,
       caigouList: {
         current: 1,
         size: 20,
@@ -1153,8 +1172,8 @@ export default {
         billingTypeKey: '',  //开票类型key
         busDepositFictitiousList: [],  //虚拟订单和订金关联
         busSalesOrderDeposit: {
-          deposit: '111222', // 单台订金
-          depositAll: '111222', // 订金合计
+          deposit: '', // 单台订金
+          depositAll: '', // 订金合计
           depositType: '', // 订金交纳方式
           depositTypeKey: '', // 订金交纳方式key
           makeUpDeposit: '', // 需补交订金
@@ -1184,7 +1203,7 @@ export default {
           guildPrice: '',  //单台指导价
           modelConfig: '',  //车型配置名称
           modelConfigSid: '',  //配置sid
-          modelName: '111122222',  //车型名称
+          modelName: '',  //车型名称
           modelSid: '',  //车型sid
           moreConfig: '',  //更多配置
           specialConfig: '',  //特殊配置说明
@@ -1215,33 +1234,27 @@ export default {
         staffSid: window.sessionStorage.getItem('staffSid'),  //销售专员sid
         type: '',  //销售订单车辆类型 1现车、2订单、3排产
       }
+
     },
     showAdd() {
       this.relState = '1'
       this.dialogStatus = 'add'
     },
-    showEdit(data) {
+    showEdit(sid) {
       this.relState = '1'
       this.dialogStatus = 'edit'
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
         this.resetTemp()
       })
-      //  this.getpayTypeList()
-      // this.getManufacturerList()
-      this.getCustomerInfo()
-      getOneOrder({
-        busOrderSid: data,
+      fetchDetailsBySid({
+        sid: sid,
       }).then((response) => {
-        if (response.code === '200') {
-          //   this.$refs['dataForm'].clearValidate()
-          this.nodeState = response.data.busOrderDto.nodeState
-          this.getBrand(response.data.modelDto.manufacturerSid)
-          this.getCarModel(response.data.modelDto.brandSid)
+        if (response.success) {
           this.temp = response.data
-          this.orderSid = data
         }
       })
+
     },
     // ---------------- 计算属性 ----------------
     // 单台指导价
@@ -1276,64 +1289,69 @@ export default {
       const value = Number(aaa.replace(',', '')) + Number(bbb.replace(',', ''))
       this.temp.busSalesOrderPrice.singleFinalPrice = value.toString()
       return this.temp.busSalesOrderPrice.singleFinalPrice
-
-
-
-      // var finalPrice = 0
-      // var topPrice = 0
-      // finalPrice = parseFloat(this.temp.busSalesOrderModel.finalPrice)
-      // topPrice = parseFloat(this.temp.busSalesOrderMakeup.topPrice)
-      // if (this.temp.busSalesOrderModel.finalPrice !== '') {
-      //   return finalPrice
-      // }
-      // if (this.temp.busSalesOrderMakeup.topPrice !== '') {
-      //   return topPrice
-      // }
-      //
-      // var s1 = finalPrice.toString()
-      // var s2 = topPrice.toString()
-      // const value = Number(s1.replace(',', '')) + Number(s2.replace(',', ''))
-      // this.temp.busSalesOrderPrice.singleFinalPrice = value.toString()
-      // return this.temp.busSalesOrderPrice.singleFinalPrice
     },
     getSum(total, num) {
       return total + num;
     },
     // 台数
     NumberMulThree() {
-      const taishu = []
-      this.temp.busSalesVehicleOrderList.forEach((element) => {
-        taishu.push(element.usingNum)
-      })
-      if (taishu.length > 0) {
-        this.temp.busSalesOrderPrice.quantity = taishu.reduce(this.getSum);
-      } else {
-        return 0
+      // 选择现车时
+      if (this.isXuanzeShow == '1') {
+        if (this.temp.busSalesOrderVehicleList.length > 0) {
+          this.temp.busSalesOrderPrice.quantity = this.temp.busSalesOrderVehicleList.length
+          return this.temp.busSalesOrderPrice.quantity.toString()
+        }
+      }
+      // 选择采购订单时
+      if (this.isXuanzeShow == '2') {
+        if (this.temp.busSalesVehicleOrderList.length > 0) {
+          const taishu = []
+          this.temp.busSalesVehicleOrderList.forEach((element) => {
+            taishu.push(element.usingNum)
+          })
+          if (taishu.length > 0) {
+            this.temp.busSalesOrderPrice.quantity = taishu.reduce(this.getSum);
+          } else {
+            this.temp.busSalesOrderPrice.quantity = 0
+            return this.temp.busSalesOrderPrice.quantity
+          }
+        }
       }
+
     },
     // 车架合计
     NumberMulFour() {
-
+      console.log('tai shu',111111)
       // 单台成交价
       if (this.temp.busSalesOrderPrice.singleFinalPrice == '') {
         return 0
       }
       // 台数
-      if (this.temp.busSalesOrderPrice.quantity == '') {
+      if (this.temp.busSalesOrderPrice.quantity == '' && this.quantity == '') {
         return 0
       }
+      console.log('tai shu',222222)
       var singleFinalPrice = 0
       var quantity = 0
       singleFinalPrice = parseFloat(this.temp.busSalesOrderPrice.singleFinalPrice)
-      quantity = parseFloat(this.temp.busSalesOrderPrice.quantity)
-      console.log('11111',this.temp.busSalesOrderPrice.singleFinalPrice,singleFinalPrice,quantity)
-      console.log('11111.22',this.temp.busSalesOrderPrice.singleFinalPrice,singleFinalPrice,quantity)
+      if (this.isXuanzeShow == '3') {
+        quantity = parseFloat(this.quantity)
+      } else {
+        quantity = parseFloat(this.temp.busSalesOrderPrice.quantity)
+      }
+      console.log('tai shu', quantity)
+      console.log('11111', this.temp.busSalesOrderPrice.singleFinalPrice, singleFinalPrice, quantity)
+      console.log('11111.22', this.temp.busSalesOrderPrice.singleFinalPrice, singleFinalPrice, quantity)
       const chejia1 = singleFinalPrice.toString()
       const chejia2 = quantity.toString()
-      console.log('22222',chejia1,chejia2)
+      console.log('22222', chejia1, chejia2)
       const value = Number(chejia1.replace(',', '')) * Number(chejia2.replace(',', ''))
       this.temp.busSalesOrderPrice.priceSum = value.toString()
-      console.log('33333',value)
+      console.log('33333', value)
+      if (this.temp.busSalesOrderPrice.priceSum == '0') {
+        this.temp.busSalesOrderPrice.priceSum = '0'
+        return this.temp.busSalesOrderPrice.priceSum
+      }
       return this.temp.busSalesOrderPrice.priceSum
     },
     // 订金合计
@@ -1343,18 +1361,39 @@ export default {
         return 0
       }
       // 台数
-      if (this.temp.busSalesOrderPrice.quantity == '') {
+      if (this.temp.busSalesOrderPrice.quantity == '' && this.quantity == '') {
         return 0
       }
-      var deposit = 0
-      var quantity = 0
-      deposit = parseFloat(this.temp.busSalesOrderDeposit.deposit)
-      quantity = parseFloat(this.temp.busSalesOrderPrice.quantity)
-      const s1 = deposit.toString()
-      const s2 = quantity.toString()
-      const value = Number(s1.replace(',', '')) * Number(s2.replace(',', ''))
-      this.temp.busSalesOrderDeposit.depositAll = value.toString()
-      return this.temp.busSalesOrderDeposit.depositAll
+      if (this.quantity !== '') {
+        var deposit = 0
+        var quantity = 0
+        deposit = parseFloat(this.temp.busSalesOrderDeposit.deposit)
+        quantity = parseFloat(this.quantity)
+        const s1 = deposit.toString()
+        const s2 = quantity.toString()
+        const value = Number(s1.replace(',', '')) * Number(s2.replace(',', ''))
+        this.temp.busSalesOrderDeposit.depositAll = value.toString()
+        if (this.temp.busSalesOrderDeposit.depositAl == '') {
+          this.temp.busSalesOrderDeposit.depositAl = 0
+          return this.temp.busSalesOrderDeposit.depositAl
+        }
+        return this.temp.busSalesOrderDeposit.depositAll
+      } else if (this.temp.busSalesOrderPrice.quantity !== '') {
+        var deposit = 0
+        var quantity = 0
+        deposit = parseFloat(this.temp.busSalesOrderDeposit.deposit)
+        quantity = parseFloat(this.temp.busSalesOrderPrice.quantity)
+        const s1 = deposit.toString()
+        const s2 = quantity.toString()
+        const value = Number(s1.replace(',', '')) * Number(s2.replace(',', ''))
+        this.temp.busSalesOrderDeposit.depositAll = value.toString()
+        if (this.temp.busSalesOrderDeposit.depositAl == '') {
+          this.temp.busSalesOrderDeposit.depositAl = 0
+          return this.temp.busSalesOrderDeposit.depositAl
+        }
+        return this.temp.busSalesOrderDeposit.depositAll
+      }
+
     },
     // 主车优惠数量变化
     handleChangeNum(num, row) {
@@ -1387,6 +1426,41 @@ export default {
         return usingNum
       }
     },
+
+    //需补交订金
+    NumberMakeUpDeposit() {
+      var depositAll = 0
+      var jiezhuan = 0
+      if (this.temp.busSalesOrderDeposit.depositAll !== '') {
+        depositAll = parseFloat(this.temp.busSalesOrderDeposit.depositAll)
+      } else {
+        depositAll = 0
+      }
+      console.log('aaaaaaaa', depositAll)
+      if (this.temp.busDepositFictitiousList.length > 0) {
+        const jiezhuanAll = []
+        this.temp.busDepositFictitiousList.forEach((element) => {
+          jiezhuanAll.push(element.price)
+        })
+        console.log('bbbbbbbb020202', jiezhuanAll)
+        if (jiezhuanAll[0] == '') {
+          jiezhuan = 0
+        } else {
+          jiezhuan = parseFloat(jiezhuanAll.reduce(this.getSum))
+        }
+        // jiezhuan = parseFloat(this.temp.busSalesOrderMakeup.topPrice)
+      } else {
+        jiezhuan = 0
+      }
+      console.log('bbbbbbbb', jiezhuan)
+      const s1 = depositAll.toString()
+      const s2 = jiezhuan.toString()
+      console.log('cccccccc', s1, s2)
+      const value = Number(s1.replace(',', '')) - Number(s2.replace(',', ''))
+      this.temp.busSalesOrderDeposit.makeUpDeposit = value.toString()
+      return this.temp.busSalesOrderDeposit.makeUpDeposit
+    },
+
     // ---------------- 主功能实现 ----------------
     // 添加数据
     handleCreate() {
@@ -1395,11 +1469,22 @@ export default {
       } else {
         this.temp.isTop = '0'
       }
+      if (this.checkedBaoxian) {
+        this.temp.isInsurance = '1'
+      } else {
+        this.temp.isInsurance = '0'
+      }
+      // 订金交纳方式
       if (this.temp.busSalesOrderDeposit.depositTypeKey == '01') {
         this.temp.busSalesOrderDeposit.depositType = '现交订金'
       } else {
         this.temp.busSalesOrderDeposit.depositType = '订金结转'
       }
+      if (this.isXuanzeShow == '3') {
+        this.temp.busSalesOrderPrice.quantity = Number(this.quantity)
+      } else {
+        this.temp.busSalesOrderPrice.quantity = Number(this.temp.busSalesOrderPrice.quantity)
+      }
       console.log('type', this.isXuanzeShow)
       this.temp.type = this.isXuanzeShow
       const priceList = []
@@ -1416,39 +1501,26 @@ export default {
               this.FormLoading = false
               if (response.code === '200') {
                 this.orderSid = response.data
-                this.$notify({
-                  title: '提示',
-                  message: '添加成功',
-                  type: 'success',
-                  duration: 2000,
-                })
                 this.handleReturn('true')
               } else {
-                this.$notify({
-                  title: '提示',
-                  message: '添加失败',
-                  type: 'error',
-                  duration: 2000,
-                })
+                this.$message({
+                  showClose: true,
+                  message: '添加失败！',
+                  type: 'error'
+                });
               }
             })
           } else {
             saveOrderForm(this.temp).then((response) => {
               this.FormLoading = false
               if (response.code === '200') {
-                this.$notify({
-                  title: '提示',
-                  message: '修改成功',
-                  type: 'success',
-                  duration: 2000,
-                })
                 this.handleReturn('true')
               } else {
-                this.$notify({
-                  title: '失败',
-                  message: '修改失败',
-                  type: 'error',
-                })
+                this.$message({
+                  showClose: true,
+                  message: '修改失败！',
+                  type: 'error'
+                });
               }
             })
           }
@@ -1599,7 +1671,6 @@ export default {
           message: '请选择一个客户！',
           type: 'error'
         });
-
       }
     },
     // 打开现车
@@ -1618,14 +1689,14 @@ export default {
 
       }
     },
-    // 删除现车数据
-    delXianche() {
 
-    },
     // 打开采购订单
     openCaigou() {
       if (this.temp.busSalesOrderModel.modelSid) {
         this.caigouVisible = true
+        this.$nextTick(() => {
+          this.handleCaigou()
+        })
       } else {
         this.$message({
           showClose: true,
@@ -1635,17 +1706,18 @@ export default {
 
       }
     },
-    // 删除采购订单数据
-    delCaigou() {
 
-    },
     // 主车优惠
     openZhuche() {
       this.relState = '4.1'
+
+      this.$refs['zhucheyouhui'].showZhuche(this.temp.busSalesOrderDiscountList)
     },
     // 虚拟订单列表
-    openXunidingdanList() {
+    openXunidingdanList(index) {
+      console.log('虚拟订单', index)
       this.relState = '5.1'
+      this.$refs['xuniList'].showXuni(this.temp.customerSid, index)
     },
     // 打开提交页面
     handleSubmit() {
@@ -1658,7 +1730,6 @@ export default {
           message: '请选择一个客户！',
           type: 'error'
         });
-
       }
     },
     // ---------------- 弹窗上列表数据加载 ----------------
@@ -1681,7 +1752,11 @@ export default {
       this.xiancheList.params.customerSid = this.temp.customerSid
       this.xiancheList.params.modelConfigSid = this.temp.busSalesOrderModel.modelConfigSid
       this.xiancheList.params.modelSid = this.temp.busSalesOrderModel.modelSid
-      this.xiancheList.params.sidList = this.temp.busSalesOrderVehicleList
+      const aa = []
+      this.temp.busSalesOrderVehicleList.forEach((element) => {
+        aa.push(element.linkSid)
+      })
+      this.xiancheList.params.sidList = aa
       getXianList(this.xiancheList).then((response) => {
         this.xiancheLoading = false
         if (
@@ -1691,6 +1766,11 @@ export default {
         ) {
           this.listXianche = response.data.records
           this.xianchetotal = response.data.total
+          if (this.listXianche.isFictitious == '1') {
+            this.listXianche.isFictitious = '是'
+          } else if (this.listXianche.isFictitious == '0') {
+            this.listXianche.isFictitious = '否'
+          }
         } else {
           this.listXianche = []
           this.xianchetotal = 0
@@ -1712,7 +1792,11 @@ export default {
       this.caigouLoading = true
       this.caigouList.params.configSid = this.temp.busSalesOrderModel.modelConfigSid
       this.caigouList.params.modelSid = this.temp.busSalesOrderModel.modelSid
-      this.caigouList.params.sidList = this.temp.busSalesVehicleOrderList
+      const aa = []
+      this.temp.busSalesVehicleOrderList.forEach((element) => {
+        aa.push(element.linkSid)
+      })
+      this.caigouList.params.sidList = aa
       getXianList(this.caigouList).then((response) => {
         this.caigouLoading = false
         if (
@@ -1741,26 +1825,41 @@ export default {
     // ---------------- 下级页面返回数据 ----------------
     // 确当选择现车
     selectionXianche() {
-      this.temp.busSalesOrderVehicleList = this.xiancheChoice
-      const xincheSids = []
-      this.row.forEach((element) => {
-        xincheSids.push(element.linkSid)
-      })
-      this.xiancheList.params.sidList = xincheSids
-      this.vehicleList = xincheSids
-      this.xiancheLoading = false
-      console.log('确认选择现车:', this.temp.busSalesOrderVehicleList, this.vehicleList)
+      if (this.xiancheChoice.length > 0) {
+        this.temp.busSalesOrderVehicleList = this.xiancheChoice
+        const xincheSids = []
+        this.xiancheChoice.forEach((element) => {
+          xincheSids.push(element.linkSid)
+        })
+        this.xiancheList.params.sidList = xincheSids
+        this.vehicleList = xincheSids
+        this.xiancheVisible = false
+      } else {
+        this.$message({
+          showClose: true,
+          message: '请选择车架号！',
+          type: 'error'
+        });
+      }
     },
     // 确定选择采购
     selectionCaigou() {
-      this.temp.busSalesVehicleOrderList = this.caigouChoice
-      const caigouSids = []
-      this.row.forEach((element) => {
-        caigouSids.push(element.linkSid)
-      })
-      this.caigouList.params.sidList = caigouSids
-      this.caigouLoading = false
-      console.log('确认选择采购', this.temp.busSalesVehicleOrderList, caigouSids)
+      if (this.caigouChoice.length > 0) {
+        this.temp.busSalesVehicleOrderList = this.caigouChoice
+        const caigouSids = []
+        this.caigouChoice.forEach((element) => {
+          caigouSids.push(element.linkSid)
+        })
+        this.caigouList.params.sidList = caigouSids
+        this.caigouVisible = false
+        console.log('确认选择采购', this.temp.busSalesVehicleOrderList, caigouSids)
+      } else {
+        this.$message({
+          showClose: true,
+          message: '请选择车架号！',
+          type: 'error'
+        });
+      }
     },
     // 切换回新增页面
     changeState() {
@@ -1776,6 +1875,7 @@ export default {
       this.temp.customerClassKey = row.customerTypeKey
       this.temp.customerPhoto = row.customerPhoto
       this.customerList = row
+      console.log('选择客户',this.temp)
     },
     // 新增客户
     addCustomer() {
@@ -1796,7 +1896,22 @@ export default {
         modelName: modelData.modelAlias,  //车型名称
         modelSid: modelData.modelSid,  //车型sid
         moreConfig: modelData.otherConfig,  //更多配置
+        specialConfig: '',
+        finalPrice: '',
       }
+      const countList = {
+        customerSid: this.temp.customerSid,  //客户sid
+        modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid,  //配置sid
+        modelSid: this.temp.busSalesOrderModel.modelSid,  //车型sid
+        staffSid: window.sessionStorage.getItem('staffSid'),  //业务员sid
+        type: 1, // 类型
+      }
+      selectCount(countList).then((response) => {
+        if (response.success) {
+          this.xiancheCount = response.data
+          console.log('数量', response.data)
+        }
+      })
     },
     // 选择虚拟订单
     selectXuni(modelData, type) {
@@ -1813,7 +1928,22 @@ export default {
         modelName: modelData.modelAlias,  //车型名称
         modelSid: modelData.modelSid,  //车型sid
         moreConfig: modelData.otherConfig,  //更多配置
+        specialConfig: '',
+        finalPrice: '',
+      }
+      const countList = {
+        customerSid: this.temp.customerSid,  //客户sid
+        modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid,  //配置sid
+        modelSid: this.temp.busSalesOrderModel.modelSid,  //车型sid
+        staffSid: window.sessionStorage.getItem('staffSid'),  //业务员sid
+        type: 2, // 类型
       }
+      selectCount(countList).then((response) => {
+        if (response.success) {
+          this.xiancheCount = response.data
+          console.log('数量', response.data)
+        }
+      })
     },
     // 选择车型
     selectChexing(modelData, type) {
@@ -1830,8 +1960,25 @@ export default {
         modelName: modelData.modelName,  //车型名称
         modelSid: modelData.modelSid,  //车型sid
         moreConfig: modelData.moreConfig,  //更多配置
+        specialConfig: '',
+        finalPrice: '',
+      }
+      const countList = {
+        customerSid: this.temp.customerSid,  //客户sid
+        modelConfigSid: this.temp.busSalesOrderModel.modelConfigSid,  //配置sid
+        modelSid: this.temp.busSalesOrderModel.modelSid,  //车型sid
+        staffSid: window.sessionStorage.getItem('staffSid'),  //业务员sid
+        type: 3, // 类型
       }
+      selectCount(countList).then((response) => {
+        if (response.success) {
+          this.xiancheCount = response.data
+          console.log('数量', response.data)
+        }
+      })
+
     },
+
     selectYouhui(row) {
       console.log('所选优惠包', row)
       row.forEach((element) => {
@@ -1844,14 +1991,17 @@ export default {
       })
     },
     // 虚拟订单订金
-    selectXuniList(row) {
+    selectXuniList(row, index) {
       console.log('所选虚拟顶金', row)
       row.forEach((element) => {
-        this.temp.busDepositFictitiousList.push({
-          depositBillNo: element.billNo,  //虚拟订单编号
-          depositPrice: element.deposit - element.usedDeposit,  //订金剩余金额
-          depositSid: element.sid,  //订金信息sid
-        })
+        this.temp.busDepositFictitiousList[index].depositBillNo = element.billNo
+        this.temp.busDepositFictitiousList[index].depositPrice = element.deposit - element.usedDeposit
+        this.temp.busDepositFictitiousList[index].depositSid = element.sid
+        // this.temp.busDepositFictitiousList.push({
+        //   depositBillNo: element.billNo,  //虚拟订单编号
+        //   depositPrice: element.deposit - element.usedDeposit,  //订金剩余金额
+        //   depositSid: element.sid,  //订金信息sid
+        // })
       })
     },
     // 提交补充页面
@@ -1859,19 +2009,41 @@ export default {
 
     },
     // ----------------------------------方法--------------------
-    //删除
-    handleDelete(row) {
-      getDelDis(row.orderSid).then((response) => {
-        if (response.code === '200') {
-          this.temp.busOrderDiscountDtoList = response.data
-        }
-      })
+    // 删除主车优惠数据
+    deleteZhuche(row, index) {
+      this.temp.busSalesOrderDiscountList.splice(index, 1)
+    },
+    // 删除虚拟订单
+    deleteXuni(row, index) {
+      this.temp.busDepositFictitiousList.splice(index, 1)
+    },
+    // 删除现车数据
+    delXianche(index) {
+      console.log('对应索引', index)
+      this.temp.busSalesOrderVehicleList.splice(index, 1)
+    },
+    // 删除采购订单数据
+    delCaigou(index) {
+      console.log('对应索引', index)
+      this.temp.busSalesOrderVehicleList.splice(index, 1)
     },
+    // handleDelete(row) {
+    //   getDelDis(row.orderSid).then((response) => {
+    //     if (response.code === '200') {
+    //       this.temp.busOrderDiscountDtoList = response.data
+    //     }
+    //   })
+    // },
     addXunidingjin() {
-
+      this.temp.busDepositFictitiousList.push({
+        depositBillNo: '',  //虚拟订单编号
+        depositPrice: '',  //订金剩余金额
+        depositSid: '',  //订金信息sid
+        payPath: '',  //款项支付委托书
+        price: '',  //本次结转金额
+      })
     },
 
-
     // 待使用代码
     // 预览销售合同
     previewHeTong() {
@@ -2045,4 +2217,9 @@ export default {
 .dialogBtn {
   text-align: left;
 }
+
+.linkNoSty {
+  display: inline-block;
+  padding-right: 20px;
+}
 </style>

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

@@ -424,8 +424,15 @@
         }
       },
       methods: {
-        showInfo(billNo) {
+        showInfo(sid) {
           this.relState = '2'
+          fetchDetailsBySid({
+            sid: sid,
+          }).then((response) => {
+            if (response.success) {
+              this.temp = response.data
+            }
+          })
         },
         handleReturn() {
           this.relState = ''

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

@@ -397,7 +397,7 @@ export default {
       this.relState = '3'
     },
     handleReturn() {
-      this.$emit('doback')
+      this.$emit('handleReturn')
     }
   }
 }

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue

@@ -52,7 +52,7 @@
             </el-col>
             <el-col :span="8" class="trightb">
               <el-form-item>
-                <el-input v-model="temp.discountName" class="addinputw" placeholder=""
+                <el-input v-model="temp.projectName" class="addinputw" placeholder=""
                           clearable/>
               </el-form-item>
             </el-col>
@@ -273,7 +273,7 @@
           }
         })
         this.temp.discountType = bb.name
-        this.temp.discountTypeKey = bb.name
+        this.temp.discountTypeKey = bb.key
         console.log('name', this.temp.discountType)
       },
       // ------------ 功能实现 ------------

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileMapper.xml

@@ -38,7 +38,7 @@
 
     <select id="selectBySid" resultType="java.lang.Integer">
         select count(*)
-        from crm_customer_file ccf
+        from crm_file ccf
         where ccf.linkSid = #{sid}
     </select>
 

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java

@@ -224,10 +224,12 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                 }
                 appCustomerArchivesDataVo.setFiles(list);
             }
+            vo.setData(dataVos);
         } else {
             fetchByDataTypeKey(customerSid);
+            dataVos = baseMapper.selectByCustomerSid(customerSid);
+            vo.setData(dataVos);
         }
-        vo.setData(dataVos);
         return rb.success().setData(vo);
     }
 
@@ -254,7 +256,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                             crmFile.setLinkSid(sid);
                             crmFile.setCreateBySid(data.getStaffSid());
                             crmFile.setCreateTime(new Date());
-                            crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+                            crmFile.setAttachType(datum.getKey());
                             crmFile.setName(data.getStaffName());
                             crmFileService.save(crmFile);
                         }
@@ -262,14 +264,14 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                     } else {
                         // 存在 需要判断是否是当天的 如果不是当天的 false
                         String createTime = appCustomerArchivesDataVo.getCreateTime();
-                        Date date = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd");
-                        boolean b = DateUtils.compTime(date, new Date());
-                        if (b) {
+                        Date nowTime = DateUtils.dateStrConvertDate(createTime, "yyyy-MM-dd");
+                        boolean effectiveDate = DateUtils.isEffectiveDate(nowTime);
+                        if (effectiveDate) {
                             //如果是当天的  并新增 提交时间为当前提交时间
                             List<String> files = datum.getFiles();
+                            //删除之前的附件并且删除服务器上的
+                            crmFileService.deleteByLinkSidAndAttachType(sid, datum.getKey());
                             for (String file : files) {
-                                //删除之前的附件并且删除服务器上的
-                                crmFileService.deleteFilesOss(file);
                                 //新增
                                 if (file.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
                                     file = file.replace(fileUploadComponent.getUrlPrefix(), "");
@@ -279,7 +281,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
                                 crmFile.setLinkSid(sid);
                                 crmFile.setCreateBySid(data.getStaffSid());
                                 crmFile.setCreateTime(new Date());
-                                crmFile.setAttachType(CommonAttachTypeEnum.CUSTOMER_FILE.getAttachType());
+                                crmFile.setAttachType(datum.getKey());
                                 crmFile.setName(data.getStaffName());
                                 crmFileService.save(crmFile);
                             }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -235,16 +235,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                     }
                 }
             }
-            if (StringUtils.isNotBlank(dto.getWeixin())) {
-                AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
-                String weiXin = appCrmCustomerTempInfoVo.getWeiXin();
-                if (!weiXin.equals(dto.getWeixin())) {
-                    int count = baseMapper.selBySidAndWeixin(dto.getSid(), dto.getWeixin());
-                    if (count > 0) {
-                        return new ResultBean().fail().setMsg("该微信已绑定其它客户，请重新添加");
-                    }
-                }
-            }
+//            if (StringUtils.isNotBlank(dto.getWeixin())) {
+//                AppCrmCustomerTempInfoVo appCrmCustomerTempInfoVo = baseMapper.selectBySid(dto.getSid());
+//                String weiXin = appCrmCustomerTempInfoVo.getWeiXin();
+//                if (!weiXin.equals(dto.getWeixin())) {
+//                    int count = baseMapper.selBySidAndWeixin(dto.getSid(), dto.getWeixin());
+//                    if (count > 0) {
+//                        return new ResultBean().fail().setMsg("该微信已绑定其它客户，请重新添加");
+//                    }
+//                }
+//            }
 //            if (StringUtils.isNotBlank(dto.getWeixin())) {
 //                map.put("weixin", dto.getWeixin());
 //                CrmCustomerTempVo crmCustomerTempVo = baseMapper.selectByMobileOrWx(map);
@@ -334,11 +334,16 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
             }
             // 客户档案
             List<CrmCustomerFileVo> crmCustomerFileVos = crmCustomerFileService.selectByCustomerSidState(sid);
-            if (crmCustomerFileVos.size() <= 0) {
-                vo.setCustomerArchivesState(0);
-            } else {
-                vo.setCustomerArchivesState(1);
+            for (CrmCustomerFileVo crmCustomerFileVo : crmCustomerFileVos) {
+                String linkSid = crmCustomerFileVo.getSid();
+                List<CrmFileDetailsVo> crmFileDetailsVos = crmFileService.fetchByLinkSid(linkSid);
+                if (crmFileDetailsVos.size() <= 0) {
+                    vo.setCustomerArchivesState(0);
+                } else {
+                    vo.setCustomerArchivesState(1);
+                }
             }
+
             //意向车型
             List<AppCrmVehicledemandVo> appCrmVehicledemandVos = crmVehicledemandService.selectCustomerSid(sid);
             if (appCrmVehicledemandVos.size() > 0) {

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.java

@@ -76,4 +76,6 @@ public interface CrmFileMapper extends BaseMapper<CrmFile> {
 	void deletePath(String path);
 
 	int fetchByFilePath(String str);
+
+	void deleteByLinkSidAndAttachType(@Param("sid") String sid, @Param("key") String key);
 }

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileMapper.xml

@@ -42,6 +42,12 @@
         from crm_file
         where filePath = #{path}
     </delete>
+    <delete id="deleteByLinkSidAndAttachType">
+        delete
+        from crm_file
+        where linkSid = #{sid}
+          and attachType = #{key}
+    </delete>
 
     <select id="fetchByFilePath" resultType="int">
         select count(*)

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmfile/CrmFileService.java

@@ -236,4 +236,8 @@ public class CrmFileService extends MybatisBaseService<CrmFileMapper, CrmFile> {
         }
         return rb.success().setMsg("移除成功");
     }
+
+    public void deleteByLinkSidAndAttachType(String sid, String key) {
+        baseMapper.deleteByLinkSidAndAttachType(sid,key);
+    }
 }

anrui-login-ui/src/views/Regist/User - 副本.vue

@@ -55,7 +55,7 @@
 	import {
 		registUser,
 		getVerificationCode
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'

anrui-login-ui/src/views/Regist/User.vue

@@ -57,7 +57,7 @@
 		registUser,
 		getVerificationCode,
     isRepeatByIDCard
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'

anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js

@@ -22,20 +22,20 @@ export default {
   delBySids: function(params) {
     return request({
       url: '/base/baseoutsourcingapplication/delBySids',
-      method: 'delete',
+      method: 'post',
       data: params
     })
   },
   // 通过sid查询一条记录
   fetchBySid: function(sid) {
     return request({
-      url: '/base/v1/baseoutsourcingapplication/fetchDetailsBySid/' + sid
+      url: '/base/baseoutsourcingapplication/fetchBySid/' + sid
     })
   },
   // 提交
   doSubmit: function(params) {
     return request({
-      url: '/base/v1/baseoutsourcingapplication/doSubmit',
+      url: '/base/baseoutsourcingapplication/submitBaseOutSourcingApplication',
       method: 'post',
       data: params
     })

anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.js

@@ -5,7 +5,7 @@ export default {
   // 查询分页列表
   listPage: function(params) {
     return request({
-      url: '/base/v1/baseoutsourcingapplicationvehicle/listPage',
+      url: '/base/v1/basevehicle/pagerList',
       method: 'post',
       data: params
     })

anrui-scm/anrui-scm-ui/src/api/cheliang/basemodelconfig.js

@@ -4,7 +4,8 @@ import qs from 'qs'
 // 车型与常用配置关联表条件查询 已改
 export function pagerList(data) {
   return request({
-    url: '/base/basevehmodelconfig/listPage', data,
+   // url: '/base/basevehmodelconfig/listPage', data,
+    url: '/base/v1/basemodelconfig/pagerList', data,
     method: 'post',
     headers: { 'Content-Type': 'application/json' }
   })

anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@@ -336,7 +336,28 @@ const codemenu = [
     path: '/chexingchaxun/modelinquire/modellibrary',
     component: () => import('@/views/chexingchaxun/modelinquire/modellibrary'),
     name: 'modellibrary'
+  },
+  // 流程审批
+  // 外采申请表驳回到发起人办理编辑页面
+  {
+    path: '/baseoutsouapplFlow/edit',
+    component: () =>
+      import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd'),
+    name: 'baseoutsouapplFlowEdit'
+  },
+  // 外采申请表详情页面
+  {
+    path: '/baseoutsouapplFlow/info',
+    component: () =>
+      import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo'),
+    name: 'baseoutsouapplFlowInfo'
+  },
+  // 外采申请表审批环节办理页面
+  {
+    path: '/baseoutsouapplFlow/handle',
+    component: () =>
+      import('@/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication'),
+    name: 'baseoutsouapplFlowInfoHandle'
   }
-
 ]
 export default codemenu

anrui-scm/anrui-scm-ui/src/store/getters.js

@@ -1,17 +1,4 @@
 const getters = {
-  sidebar: state => state.app.sidebar,
-  size: state => state.app.size,
-  device: state => state.app.device,
-  visitedViews: state => state.tagsView.visitedViews,
-  cachedViews: state => state.tagsView.cachedViews,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  userInfo: state => state.user.userInfo,
-  menus: state => state.user.menus,
-  introduction: state => state.user.introduction,
-  roles: state => state.user.roles,
-  permission_routes: state => state.permission.routes,
-  errorLogs: state => state.errorLog.logs
+  orgSid: state => state.user.orgSid
 }
 export default getters

anrui-scm/anrui-scm-ui/src/store/index.js

@@ -28,9 +28,6 @@ const store = new Vuex.Store({
     },
     actions: {
 
-    },
-    getters: {
-
     },
   modules,
   getters,

anrui-scm/anrui-scm-ui/src/store/modules/user.js

@@ -1,150 +1,17 @@
-import { login, logout, getInfo } from '@/api/user'
-import { getStorage, setStorage, removeStorage } from '@/utils/auth'
-
-import router, { resetRouter } from '@/router'
-
-const state = {
-  token: getStorage(),
-  userInfo: '',
-  menus: '',
-}
-
-const mutations = {
-  SET_TOKEN: (state, token) => {
-    state.token = token
+const user = {
+  state:{
+    orgSid: ''
   },
-  SET_UESRINFO: (state, userInfo) => {
-    state.userInfo = userInfo
+  mutations: {
+    setOrgSid: (state, orgSid) => {
+      state.orgSid = orgSid
+    }
   },
-  SET_MENUS: (state, menus) => {
-    state.menus = menus
+  actions: {
+     commitOrgSid({commit}, orgSid) {
+      commit('setOrgSid', orgSid)
+    }
   }
 }
 
-const actions = {
-  // user login
-  login({ commit }, userInfo) {
-    return new Promise((resolve, reject) => {
-      login(userInfo).then(response => {
-        const { data } = response
-        commit('SET_TOKEN', data.token)
-        setStorage(data.token)        
-        let user = {
-          roleSid: data.roleSid,
-          name: data.name,
-          userName: data.userName,
-          departmentName: data.departmentName,
-          isAdmin: data.isAdmin,
-          staffSid: data.staffSid,
-          userSid: data.sid,
-          orgSid: data.organizationSid,
-          Orgname: data.organizationName,
-          dwjb: data.dwjb
-        }
-        commit('SET_UESRINFO', user)
-        window.sessionStorage.setItem('userSid', user.userSid);
-        window.sessionStorage.setItem('Orgname', user.Orgname);
-        window.sessionStorage.setItem('departmentName', user.departmentName);
-        window.sessionStorage.setItem('name', user.name);
-        resolve(data)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // get user info
-  getInfo({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      getInfo().then(response => {
-        const { data } = response
-        if (!data) {
-          removeStorage()
-          reject('Verification failed, please Login again.')
-        }
-        let user = {
-          roleSid: data.roleSid,
-          name: data.name,
-          userName: data.userName,
-          orgRoleName: data.orgRoleName,
-          isAdmin: data.isAdmin,
-          staffSid: data.staffSid,
-          userSid: data.sid,
-          orgSid: data.organizationSid,
-          Orgname: data.organizationName,
-          dwjb: data.dwjb
-        }
-        commit('SET_UESRINFO', user)
-        resolve(data)
-      }).catch(error => {
-        removeStorage()
-        router.push({path: '/'})
-        // reject(error)
-      })
-    })
-  },
-
-  getMenus({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      getInfo().then(response => {
-        const { data } = response
-        commit('SET_UESRINFO', user)
-        resolve(data)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // user logout
-  logout({ commit, state, dispatch }) {
-    return new Promise((resolve, reject) => {
-      logout(state.token).then(() => {
-        commit('SET_TOKEN', '')
-        commit('SET_UESRINFO', '')
-        removeStorage()
-        resetRouter()
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // remove token
-  // resetToken({ commit }) {
-  //   return new Promise(resolve => {
-  //     commit('SET_TOKEN', '')
-  //     commit('SET_ROLES', [])
-  //     removeToken()
-  //     resolve()
-  //   })
-  // },
-
-  // dynamically modify permissions
-  // async changeRoles({ commit, dispatch }, role) {
-  //   const token = role + '-token'
-
-  //   commit('SET_TOKEN', token)
-  //   setToken(token)
-
-  //   const { roles } = await dispatch('getInfo')
-
-  //   resetRouter()
-
-  //   // generate accessible routes map based on roles
-  //   const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
-  //   // dynamically add accessible routes
-  //   router.addRoutes(accessRoutes)
-
-  //   // reset visited views and cached views
-  //   dispatch('tagsView/delAllViews', null, { root: true })
-  // }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
+export default user

anrui-scm/anrui-scm-ui/src/store/modules/user1.js

@@ -0,0 +1,150 @@
+import { login, logout, getInfo } from '@/api/user'
+import { getStorage, setStorage, removeStorage } from '@/utils/auth'
+
+import router, { resetRouter } from '@/router'
+
+const state = {
+  token: getStorage(),
+  userInfo: '',
+  menus: '',
+}
+
+const mutations = {
+  SET_TOKEN: (state, token) => {
+    state.token = token
+  },
+  SET_UESRINFO: (state, userInfo) => {
+    state.userInfo = userInfo
+  },
+  SET_MENUS: (state, menus) => {
+    state.menus = menus
+  }
+}
+
+const actions = {
+  // user login
+  login({ commit }, userInfo) {
+    return new Promise((resolve, reject) => {
+      login(userInfo).then(response => {
+        const { data } = response
+        commit('SET_TOKEN', data.token)
+        setStorage(data.token)
+        let user = {
+          roleSid: data.roleSid,
+          name: data.name,
+          userName: data.userName,
+          departmentName: data.departmentName,
+          isAdmin: data.isAdmin,
+          staffSid: data.staffSid,
+          userSid: data.sid,
+          orgSid: data.organizationSid,
+          Orgname: data.organizationName,
+          dwjb: data.dwjb
+        }
+        commit('SET_UESRINFO', user)
+        window.sessionStorage.setItem('userSid', user.userSid);
+        window.sessionStorage.setItem('Orgname', user.Orgname);
+        window.sessionStorage.setItem('departmentName', user.departmentName);
+        window.sessionStorage.setItem('name', user.name);
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // get user info
+  getInfo({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getInfo().then(response => {
+        const { data } = response
+        if (!data) {
+          removeStorage()
+          reject('Verification failed, please Login again.')
+        }
+        let user = {
+          roleSid: data.roleSid,
+          name: data.name,
+          userName: data.userName,
+          orgRoleName: data.orgRoleName,
+          isAdmin: data.isAdmin,
+          staffSid: data.staffSid,
+          userSid: data.sid,
+          orgSid: data.organizationSid,
+          Orgname: data.organizationName,
+          dwjb: data.dwjb
+        }
+        commit('SET_UESRINFO', user)
+        resolve(data)
+      }).catch(error => {
+        removeStorage()
+        router.push({path: '/'})
+        // reject(error)
+      })
+    })
+  },
+
+  getMenus({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getInfo().then(response => {
+        const { data } = response
+        commit('SET_UESRINFO', user)
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // user logout
+  logout({ commit, state, dispatch }) {
+    return new Promise((resolve, reject) => {
+      logout(state.token).then(() => {
+        commit('SET_TOKEN', '')
+        commit('SET_UESRINFO', '')
+        removeStorage()
+        resetRouter()
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // remove token
+  // resetToken({ commit }) {
+  //   return new Promise(resolve => {
+  //     commit('SET_TOKEN', '')
+  //     commit('SET_ROLES', [])
+  //     removeToken()
+  //     resolve()
+  //   })
+  // },
+
+  // dynamically modify permissions
+  // async changeRoles({ commit, dispatch }, role) {
+  //   const token = role + '-token'
+
+  //   commit('SET_TOKEN', token)
+  //   setToken(token)
+
+  //   const { roles } = await dispatch('getInfo')
+
+  //   resetRouter()
+
+  //   // generate accessible routes map based on roles
+  //   const accessRoutes = await dispatch('permission/generateRoutes', roles, { root: true })
+  //   // dynamically add accessible routes
+  //   router.addRoutes(accessRoutes)
+
+  //   // reset visited views and cached views
+  //   dispatch('tagsView/delAllViews', null, { root: true })
+  // }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -261,7 +261,7 @@ export default {
        alert('必须选择一条数据!');
        return ;
      }
-      this.formobj.modelName = obj.model.vehicleAlias
+      this.formobj.modelName = obj.model.modelName
       this.formobj.modelSid = obj.model.sid
       this.formobj.configName = obj.configs[0].configName
       this.formobj.configSid = obj.configs[0].sid

anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/modellibrary.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
     <div v-show="viewState == 1">
-      <div class="tab-header webtop">
-        <div>车型库</div>
-        <div>
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-        </div>
-      </div>
       <div class="webcon">
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
@@ -89,16 +83,12 @@
             </el-form>
           </div>
         </div>
-        <div class="listtop">
-          <div class="tit">车辆列表</div>
-          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-        </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+          <el-table  :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;font-size: 10px;" >
+            <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="车型" align="center">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.vehicleAlias }}</span>
+                <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.modelName }}</span>
               </template>
             </el-table-column>
             <el-table-column label="版本" align="center">
@@ -164,6 +154,8 @@
         </el-table-column>
       </el-table>
     </el-dialog>
+    <!-- 车型配置分页列表 -->
+    <configuration v-show="viewState == 2" ref="divConfiguration" @doback="resetState"/>
   </div>
 </template>
 
@@ -171,14 +163,18 @@
 import { modelPageList, dataDictionary, brandDown, notTheCompanyModelPageList } from '@/api/chexingchaxun/modelinquire.js'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
+import configuration from './vehiclelibraryconfiguration.vue'
 export default {
   name: 'chexingchaxun',
   components: {
     Pagination,
-    pageye
+    pageye,
+    configuration
   },
   data() {
     return {
+      model:{},
+      viewState:1,
       isSearchShow: false,
       dialogVisible: false,
       searchxianshitit: '隐藏查询条件',
@@ -237,6 +233,12 @@ export default {
     // 加载列表
   },
   methods: {
+    getConfigDataList(){
+      return {
+        configs: this.$refs['divConfiguration'].multipleSelection,
+        model: this.model
+      };
+    },
     // 搜索条件效果
     clicksearchShow() {
       this.isSearchShow = !this.isSearchShow
@@ -365,6 +367,7 @@ export default {
     },
     handlink(row) {
       this.viewState = 2
+      this.model=row;
       this.$refs['divConfiguration'].showData(row)
     },
     resetState() {
@@ -373,7 +376,7 @@ export default {
     },
     showData(sid) {
        alert(sid);
-    },
+    }
   }
 }
 </script>
@@ -385,7 +388,9 @@ export default {
   border: 1px solid #dfe4ed;
   height: 40px;
 }
-
+.tableHeaderClass{
+  font-size: 8px;
+}
 .tit {
   margin-bottom: -10px;
 }

anrui-scm/anrui-scm-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue

@@ -2,11 +2,9 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <div class="tab-header webtop">
-        <div>车型库配置列表</div>
+        <div>【{{ modelName }}】车型常用配置列表</div>
         <div>
-
-          <el-button type="primary" size="small" @click="selectAndBack">确定</el-button>
-          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">返回上一级</el-button>
         </div>
       </div>
       <div class="webcon">
@@ -127,14 +125,10 @@
             </el-form>
           </div>
         </div>
-        <div class="listtop">
-          <div class="tit">【{{ modelName }}】车型常用配置列表</div>
-          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
-        </div>
         <div class="">
-          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;font-size: 10px;" @selection-change="handleSelectionChange">
             <el-table-column width="30px" type="selection" align="center" />
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
             <el-table-column label="常用配置" align="center">
               <template slot-scope="scope">
                 <span class="bluezi" @click="handlink(scope.row)">{{ scope.row.configName }}</span>
@@ -413,7 +407,7 @@ export default {
     showData(row) {
       this.listQuery.params.modelSid = row.sid
       this.modelSid = row.sid
-      this.modelName = row.vehicleAlias
+      this.modelName = row.modelName
       this.Dictionary()
       this.getList()
     },

anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuAdd.vue

@@ -148,7 +148,6 @@
         },
         submitdisabled: false, // 保存按钮
         disabled: false // 提交按钮
-
       }
     },
     created() {

anrui-system-ui/src/views/Regist/User.vue

@@ -55,7 +55,7 @@
 	import {
 		registUser,
 		getVerificationCode
-	} from '@/api/user.js'
+	} from '@/api/user1.js'
 	import qs from 'qs'
 	import UploadImg from '@/components/uploadFile/index.vue'
 	import paddwordinput from '@/components/passwordSafe/index.vue'
@@ -171,7 +171,7 @@
 				this.$refs[formName].validate((valid) => {
 					if (valid) {
 						registUser(qs.stringify(this.userForm)).then((res) => {
-							this.btnDisabled = false 
+							this.btnDisabled = false
 							this.$confirm('注册成功, 是否关闭页面?', '提示', {
 									confirmButtonText: '确定',
 									cancelButtonText: '取消',
@@ -180,7 +180,7 @@
 									window.close();
 								})
 						}).catch(() => {
-							this.btnDisabled = false        
+							this.btnDisabled = false
 						})
 					} else {
 						return false;

anrui-system-ui/src/views/flow/todoList.vue

@@ -308,13 +308,11 @@
       // 点击办理
       handleCheck(row) {
         this.centerDialogVisible = true
-        console.log('row', row)
         // this.taskName_now = row.taskName
         // 同意
         this.agreeList.businessSid = row.processVariables.businessSid
         this.agreeList.instanceId = row.procInsId
         this.agreeList.taskId = row.taskId
-        console.log('同意', this.agreeList)
         // 驳回
         this.regectList.businessSid = row.processVariables.businessSid
         this.regectList.instanceId = row.procInsId
@@ -333,12 +331,10 @@
           taskName: row.taskName,
           transactState: '00' // 待办任务状态
         }
-        console.log('123123123', JSON.stringify(parameter_list))
         selectUrl(this.selectUrl_list).then((response) => {
           if (response.code === '200') {
             // this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage()
             this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc'
-            console.log('页面url', this.url)
           } else {
             this.$notify({
               title: '提示',
@@ -350,7 +346,6 @@
         })
         // 审批记录
         this.getFlowRecordList(row.procInsId, row.deployId);
-        // this.$router.push({path: '/todo' + '?token=' + getStorage()})
       },
       closeIt() {
         this.url = ''

anrui-system-ui/src/views/system-admin/check/people.vue

@@ -82,7 +82,7 @@
 </template>
 <script>
   import remarks from './remarks/index.vue'
-  import user from '@/api/system/user/user.js'
+  import user from '@/api/system/user/user1.js'
   export default {
     components:{remarks},
     data() {