Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/ModelConfigListQuery.java

@@ -58,8 +58,8 @@ public class ModelConfigListQuery implements Query {
     private String userSid;
     @ApiModelProperty("分公司：后端内部使用")
     private String useOrg;
-//    @ApiModelProperty("分公司：机构sid")
+    @ApiModelProperty("分公司：机构sid")
-//    private String orgPath;
+    private String orgPath;
 
     @ApiModelProperty(value = "标签")
     private String label;

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

@@ -78,4 +78,9 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String billNo; // 单据编号
     @ApiModelProperty("财务中客户编码")
     private String cwCustomerNo;
+
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName;
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid;
 }

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

@@ -101,4 +101,9 @@ public class BaseVehicleOutDto implements Dto {
     private String isUpdateOrInsertCrm; // 是否要修改客户
     @ApiModelProperty("财务中客户编码")
     private String cwCustomerNo;
+
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName;
+    @ApiModelProperty("内部引荐人用户sid")
+    private String innerUserSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -79,7 +79,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
-        //后桥
+        /*//后桥
         if (StringUtils.isNotBlank(dto.getRearAxleValue()) && !"-".equals(dto.getRearAxleValue())) {
             configName += dto.getRearAxleValue() + "/";
         }
@@ -158,7 +158,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         //配置包
         if (StringUtils.isNotBlank(dto.getConfiguringBao()) && !"-".equals(dto.getConfiguringBao())) {
             configName += dto.getConfiguringBao() + "/";
-        }
+        }*/
+        configName = baseModelConfigService.configNameSpell(entity);
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
         List<String> stringList = baseModelConfigService.checkByConfigName(sid);
@@ -189,7 +190,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         BaseModelConfig entity = new BaseModelConfig();
         dto.fillEntity(entity);
         String configName = "";
-        //后桥
+        /*//后桥
         if (StringUtils.isNotBlank(dto.getRearAxleValue()) && !"-".equals(dto.getRearAxleValue())) {
             configName += dto.getRearAxleValue() + "/";
         }
@@ -268,7 +269,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         //配置包
         if (StringUtils.isNotBlank(dto.getConfiguringBao()) && !"-".equals(dto.getConfiguringBao())) {
             configName += dto.getConfiguringBao() + "/";
-        }
+        }*/
+        configName = baseModelConfigService.configNameSpell(entity);
         entity.setConfigName(configName);
         configName += dto.getOtherConfig();
         List<String> stringList = baseModelConfigService.checkByConfigName(sid);
@@ -309,7 +311,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         }
         dto.setCreateOrgSId(sid1);
         String configName = "";
-        //后桥
+        /*//后桥
         if (StringUtils.isNotBlank(dto.getRearAxleValue()) && !"-".equals(dto.getRearAxleValue())) {
             configName += dto.getRearAxleValue() + "/";
         }
@@ -388,9 +390,11 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         //配置包
         if (StringUtils.isNotBlank(dto.getConfiguringBao()) && !"-".equals(dto.getConfiguringBao())) {
             configName += dto.getConfiguringBao() + "/";
-        }
+        }*/
-        dto.setConfigName(configName);
+        BeanUtil.copyProperties(dto,baseModelConfig);
-        String otherConfig = dto.getOtherConfig();
+        configName = baseModelConfigService.configNameSpell(baseModelConfig);
+        baseModelConfig.setConfigName(configName);
+        String otherConfig = baseModelConfig.getOtherConfig();
         configName += otherConfig;
         List<String> stringList = baseModelConfigService.checkConfigNameBySid(sid,sid1);
         for (String s : stringList) {
@@ -398,8 +402,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
                 return rb.setMsg("该常用配置已存在");
             }
         }
-        int i = baseModelConfigService.updateBySid(dto.toMap(), sid);
+        boolean i = baseModelConfigService.updateById(baseModelConfig);
-        if (i == 0) {
+        if (!i) {
             return rb.setMsg("修改失败");
         }
         return rb.success().setMsg("修改成功");
@@ -408,10 +412,6 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean deleteBySids(String sids, String userSid) {
         List<String> sidList = Arrays.asList(sids.split(","));
-//        int count = baseModelConfigService.deleteBySids(sidList);
-//        if (count != sidList.size()) {
-//            return ResultBean.fireFail().setMsg("删除失败");
-//        }
         for (String sid : sidList) {
             int i = baseVehmodelConfigService.checkByConfigSid(sid);
             if (i > 0) {
@@ -452,17 +452,10 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
     @Override
     public ResultBean<PagerVo<AppChooseBaseModelConfigVo>> getAppChooseListByModelSid(PagerQuery<BaseModelConfigQuery> pagerQuery) {
         ResultBean<PagerVo<AppChooseBaseModelConfigVo>> rb = ResultBean.fireFail();
-       /* if (StringUtils.isBlank(pagerQuery.getParams().getVehicleSid())) {
-            return rb.setMsg("车型sid不能为空");
-        }*/
         IPage<AppChooseBaseModelConfigVo> page = baseModelConfigService.getAppChooseListByModelSid(pagerQuery);
         PagerVo<AppChooseBaseModelConfigVo> pv = new PagerVo<>();
         PagerVo<AppChooseBaseModelConfigVo> pv1 = PagerUtil.pageToVo(page, pv);
         pv1.setMsg("查询到以下" + page.getTotal() + "种配置");
-        /*BaseVehicleModel vehicleModel = baseVehicleModelService.fetchBySid(pagerQuery.getParams().getVehicleSid());
-        Map<String, Object> map = new HashMap<>();
-        map.put("modelName", vehicleModel.getModelName());
-        pv1.setMap(map);*/
         return rb.success().setData(pv1);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java

@@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.*;
 import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
+import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
 import com.yxt.anrui.base.api.basevehicle.ModelLabel;
 import com.yxt.anrui.base.api.basevehicle.MoreConfigVo;
-import com.yxt.anrui.base.api.basevehicle.ConfigInfo;
-import com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo;
-import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService;
 import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo;
@@ -321,7 +319,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         return iPage;
     }*/
-    public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
+    /*public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) {
         for (BaseModelConfigListVo record : records) {
 //            String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) && "有".equals(record.getSlowMachine()) ? ("缓速器" + "/") : "";
             String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) ? (record.getSlowMachine() + "/") : "";
@@ -373,7 +371,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         return records;
 
-    }
+    }*/
 
     /**
      * 更多配置分页列表(非本公司的)
@@ -513,15 +511,15 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
 
     public ModelConfigVo getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) {
         String userSid = pagerQuery.getParams().getUserSid();
-//        String orgPath = pagerQuery.getParams().getOrgPath();
+        String orgPath = pagerQuery.getParams().getOrgPath();
-//        String orgSid = "";
+        String orgSid = "";
-//        if (StringUtils.isBlank(orgPath)) {
+        if (StringUtils.isBlank(orgPath)) {
-//            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+            orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-//        } else {
+        } else {
-//            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-//        }
+        }
         // 1、根据业务员部门sid查询分公司sid
-        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
+//        String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
         if (StringUtils.isNotBlank(orgSid)) {
             pagerQuery.getParams().setUseOrg(orgSid);
         }
@@ -559,7 +557,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         //配置列表
         IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery);
         QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams());
-//        List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
         List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
         long pages = page.getPages();
         vo.setPages((int) pages);
@@ -581,7 +578,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             }
             appModelConfigListVo.setMoreList(moreConfigVos);
         }
-        addDonfigName(appModelConfigListVos);
+        addDonfigName1(appModelConfigListVos);
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
@@ -640,11 +637,22 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             }
             appModelConfigListVo.setMoreList(moreConfigVos);
         }*/
-        addDonfigName(appModelConfigListVos);
+        addDonfigName1(appModelConfigListVos);
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
 
+    public List<AppModelConfigListVo> addDonfigName1(List<AppModelConfigListVo> appModelConfigListVos) {
+        for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
+            BaseModelConfig baseModelConfig = fetchBySid(appModelConfigListVo.getConfigSid());
+            String configName = configNameSpell(baseModelConfig);
+            appModelConfigListVo.setConfigName(configName);
+        }
+        return appModelConfigListVos;
+
+    }
+
+
     /**
      * 拼接常用车型字段（configName）
      *
@@ -870,7 +878,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             }
             appModelConfigListVo.setMoreList(moreConfigVos);
         }
-        addDonfigName(appModelConfigListVos1);
+        addDonfigName1(appModelConfigListVos1);
         return appModelConfigListVos;
     }
 
@@ -897,14 +905,14 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         ModelConfigVo vo = baseMapper.getStockModelConfigList(modelSid, orgSid);
         List<ModelLabel> modelLabels = new ArrayList<>();
         StringBuilder labelValue = new StringBuilder();
-        if (StringUtils.isNotBlank(vo.getLabelName())){
+        if (StringUtils.isNotBlank(vo.getLabelName())) {
             String[] labelNames = vo.getLabelName().split(",");
             for (String labelName : labelNames) {
                 labelValue.append(labelName).append("/");
             }
         }
-        if (StringUtils.isNotBlank(labelValue.toString())){
+        if (StringUtils.isNotBlank(labelValue.toString())) {
-            vo.setLabelValue(labelValue.substring(0,labelValue.lastIndexOf("/")));
+            vo.setLabelValue(labelValue.substring(0, labelValue.lastIndexOf("/")));
         }
         List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid);
         List<String> modelImagesList = new ArrayList<>();
@@ -1006,7 +1014,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
         }
         List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigLableList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid, params.getLabel());
         for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) {
-            if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())){
+            if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())) {
                 String labelName = appModelConfigListVo.getLabelName();
                 String[] mains = labelName.split(",");
                 List<ModelLabel> modelLabelss = new ArrayList<>();
@@ -1049,12 +1057,97 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa
             }
             appModelConfigListVo.setMoreList(moreConfigVos);
         }
-        addDonfigName(appModelConfigListVos);
+        addDonfigName1(appModelConfigListVos);
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
 
     public BaseModelConfigVo selectByConfigName(String sid, String configName) {
-        return baseMapper.selectByConfigName(sid,configName);
+        return baseMapper.selectByConfigName(sid, configName);
+    }
+
+    public String configNameSpell(BaseModelConfig baseModelConfig) {
+        String configName = "";
+        //后桥
+        if (StringUtils.isNotBlank(baseModelConfig.getRearAxleValue()) && !"-".equals(baseModelConfig.getRearAxleValue())) {
+            configName += baseModelConfig.getRearAxleValue() + "/";
+        }
+        //速比
+        if (StringUtils.isNotBlank(baseModelConfig.getRearAxleRatio()) && !"-".equals(baseModelConfig.getRearAxleRatio())) {
+            configName += baseModelConfig.getRearAxleRatio() + "/";
+        }
+        //轴距
+        if (StringUtils.isNotBlank(baseModelConfig.getWheelbase()) && !"-".equals(baseModelConfig.getWheelbase())) {
+            configName += baseModelConfig.getWheelbase() + "/";
+        }
+        //悬架
+        if (StringUtils.isNotBlank(baseModelConfig.getSuspension()) && !"-".equals(baseModelConfig.getSuspension())) {
+            configName += baseModelConfig.getSuspension() + "/";
+        }
+        //鞍座
+        if (StringUtils.isNotBlank(baseModelConfig.getSaddle()) && !"-".equals(baseModelConfig.getSaddle())) {
+            configName += baseModelConfig.getSaddle() + "/";
+        }
+        //颜色
+        if (StringUtils.isNotBlank(baseModelConfig.getCarColor()) && !"-".equals(baseModelConfig.getCarColor())) {
+            configName += baseModelConfig.getCarColor() + "/";
+        }
+        //驾驶室
+        if (StringUtils.isNotBlank(baseModelConfig.getSpecification()) && !"-".equals(baseModelConfig.getSpecification())) {
+            configName += baseModelConfig.getSpecification() + "/";
+        }
+        //保险杠
+        if (StringUtils.isNotBlank(baseModelConfig.getBumper()) && !"-".equals(baseModelConfig.getBumper())) {
+            configName += baseModelConfig.getBumper() + "/";
+        }
+        //燃料箱
+        if (StringUtils.isNotBlank(baseModelConfig.getFuelTank()) && !"-".equals(baseModelConfig.getFuelTank())) {
+            configName += baseModelConfig.getFuelTank() + "/";
+        }
+        //导流罩
+        if (StringUtils.isNotBlank(baseModelConfig.getBaffleModel()) && !"-".equals(baseModelConfig.getBaffleModel())) {
+            configName += baseModelConfig.getBaffleModel() + "/";
+        }
+        //独立热源
+        if (StringUtils.isNotBlank(baseModelConfig.getIndependentSources()) && !"-".equals(baseModelConfig.getIndependentSources())) {
+            configName += baseModelConfig.getIndependentSources() + "/";
+        }
+        //缓速器
+        if (StringUtils.isNotBlank(baseModelConfig.getSlowMachine()) && !"-".equals(baseModelConfig.getSlowMachine())) {
+            configName += baseModelConfig.getSlowMachine() + "/";
+        }
+        //护轮罩
+        if (StringUtils.isNotBlank(baseModelConfig.getTireCover()) && !"-".equals(baseModelConfig.getTireCover())) {
+            configName += baseModelConfig.getTireCover() + "/";
+        }
+        //后视镜
+        if (StringUtils.isNotBlank(baseModelConfig.getRearViewMirror()) && !"-".equals(baseModelConfig.getRearViewMirror())) {
+            configName += baseModelConfig.getRearViewMirror() + "/";
+        }
+        //轮胎
+        if (StringUtils.isNotBlank(baseModelConfig.getTireSize()) && !"-".equals(baseModelConfig.getTireSize())) {
+            configName += baseModelConfig.getTireSize() + "/";
+        }
+        //轮毂材质
+        if (StringUtils.isNotBlank(baseModelConfig.getHubMaterial()) && !"-".equals(baseModelConfig.getHubMaterial())) {
+            configName += baseModelConfig.getHubMaterial() + "/";
+        }
+        //空调
+        if (StringUtils.isNotBlank(baseModelConfig.getAirConditioner()) && !"-".equals(baseModelConfig.getAirConditioner())) {
+            configName += baseModelConfig.getAirConditioner() + "/";
+        }
+        //座椅
+        if (StringUtils.isNotBlank(baseModelConfig.getSeat()) && !"-".equals(baseModelConfig.getSeat())) {
+            configName += baseModelConfig.getSeat() + "/";
+        }
+        //多媒体
+        if (StringUtils.isNotBlank(baseModelConfig.getMultimedia()) && !"-".equals(baseModelConfig.getMultimedia())) {
+            configName += baseModelConfig.getMultimedia() + "/";
+        }
+        //配置包
+        if (StringUtils.isNotBlank(baseModelConfig.getConfiguringBao()) && !"-".equals(baseModelConfig.getConfiguringBao())) {
+            configName += baseModelConfig.getConfiguringBao() + "/";
+        }
+        return configName;
     }
 }

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basemodelconfig.AppCarConfigSummaryVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigDetailsVo;
 import com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo;
 import com.yxt.anrui.base.api.basevehicle.*;
@@ -710,7 +711,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         vo.setPrice(guidedPriceMin + "-" + guidedPriceMax + "万元");
         //拼接常用车型
         List<AppModelConfigListVo> appModelConfigListVos = baseModelConfigService.selectAppConfigListByModelSid(modelSid);
-        addDonfigName(appModelConfigListVos);
+        baseModelConfigService.addDonfigName1(appModelConfigListVos);
         vo.setModelConfigList(appModelConfigListVos);
         return vo;
     }
@@ -899,7 +900,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
             configDetailVo.setMoreConfig(otherConfig);
         }
         //拼接常用配置字段
-        String modelInfoName = modelInfoName(configVo);
+//        String modelInfoName = modelInfoName(configVo);
+        BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(configSid);
+        String modelInfoName = baseModelConfigService.configNameSpell(baseModelConfig);
         configDetailVo.setModelInfoName(modelInfoName);
         return configDetailVo;
     }
@@ -907,23 +910,6 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
 
     //    拼接常用配置字段
     public String modelInfoName(AppModelConfigDetailsVo configVo) {
-
-      /*  String brandName = StringUtils.isNotBlank(currentCarVo.getBrandName()) ? (currentCarVo.getBrandName() + "/") : "";
-        String vehicleType = StringUtils.isNotBlank(currentCarVo.getVehicleTypeValue()) ? (currentCarVo.getVehicleTypeValue() + "/") : "";
-        String productLine = StringUtils.isNotBlank(currentCarVo.getProductLineValue()) ? (currentCarVo.getProductLineValue() + "/") : "";
-        String driveForm = StringUtils.isNotBlank(currentCarVo.getDriveFormValue()) ? (currentCarVo.getDriveFormValue() + "/") : "";
-        String power = StringUtils.isNotBlank(currentCarVo.getPowerValue()) ? (currentCarVo.getPowerValue() + "/") : "";
-        String vehicleVersion = StringUtils.isNotBlank(currentCarVo.getVehicleVersionValue()) ? (currentCarVo.getVehicleVersionValue() + "/") : "";
-        String fuelType = StringUtils.isNotBlank(currentCarVo.getFuelTypeValue()) ? (currentCarVo.getFuelTypeValue() + "/") : "";
-        String gearboxType = StringUtils.isNotBlank(currentCarVo.getGearboxTypeValue()) ? (currentCarVo.getGearboxTypeValue() + "/") : "";
-        String emissionStandard = StringUtils.isNotBlank(currentCarVo.getEmissionStandardValue()) ? (currentCarVo.getEmissionStandardValue() + "/") : "";
-        String engineType = StringUtils.isNotBlank(currentCarVo.getEngineTypeValue()) ? (currentCarVo.getEngineTypeValue() + "/") : "";
-        String marketSegments = StringUtils.isNotBlank(currentCarVo.getMarketSegments()) ? (currentCarVo.getMarketSegments() + "/") : "";
-        String specifications = StringUtils.isNotBlank(currentCarVo.getSpecifications()) ? (currentCarVo.getSpecifications() + "/") : "";
-        String department = StringUtils.isNotBlank(currentCarVo.getDepartment()) ? (currentCarVo.getDepartment() + "/") : "";
-        String modelInfoName = brandName + vehicleType + productLine + driveForm + power + vehicleVersion + fuelType +
-                gearboxType + emissionStandard + engineType + marketSegments + specifications + department;
-        return modelInfoName.substring(0, modelInfoName.length() - 1);*/
         String color = StringUtils.isNotBlank(configVo.getCarColor())
                 ? (configVo.getCarColor() + "/") : "";
         String slowMachine = StringUtils.isNotBlank(configVo.getSlowMachine())
@@ -1439,7 +1425,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      */
     public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
         AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
-        String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
+        /*String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine()) ? (appModelConfigListVo.getSlowMachine() + "/") : "";
 
         String rearViewMirror = StringUtils.isNotBlank(appModelConfigListVo.getRearViewMirror()) ? (appModelConfigListVo.getRearViewMirror() + "/") : "";
 
@@ -1478,7 +1464,9 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia()) && StringUtils.equals(appModelConfigListVo.getMultimedia(), "有") ? ("多媒体") : "";
 
         String configName = slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
-                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
+                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;*/
+        BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appModelConfigListVo.getConfigSid());
+        String configName = baseModelConfigService.configNameSpell(baseModelConfig);
         vo.setConfig(configName);
         vo.setModel(appModelConfigListVo.getModel());
         vo.setMoreConfig(appModelConfigListVo.getOtherConfig());
@@ -3218,7 +3206,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
                 //配置sid
                 String configSid = appOrderDetailsVo.getModelInfo().getConfigSid();
                 qw.eq("bv.modelSid",modelSid);
-                qw.eq("bv.configSid",configSid);
+                qw.eq("bv.modelConfigSid",configSid);
             }
             //非删除
             qw.eq("bv.isDelete",0);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -497,14 +497,14 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     public ResultBean saveOrUpdateAll(BaseVehicleModelDto dto) {
         ResultBean rb = ResultBean.fireFail();
         String sid = dto.getSid();
-        String modelName = appendModelName(dto);
+        String modelName = "";
+//        String modelName = appendModelName(dto);
         if (StringUtils.isBlank(sid)) {
             BaseVehicleModel entity = new BaseVehicleModel();
             String userSid = dto.getUserSid();
             String sid2 = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
-            String sid1 = entity.getSid();
+            BeanUtil.copyProperties(dto, entity,"sid");
-            BeanUtil.copyProperties(dto, entity);
+            modelName = appendModelName(entity);
-            entity.setSid(sid1);
             entity.setModelName(modelName);
             entity.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
             int i = baseMapper.checkSaveByModelName(modelName);
@@ -538,6 +538,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
+        BeanUtil.copyProperties(dto,baseVehicleModel,"sid");
+        modelName = appendModelName(baseVehicleModel);
         dto.setModelName(modelName);
         dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         int i = baseMapper.checkUpdateByModelName(modelName, sid);
@@ -565,39 +567,39 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
     }
 
     //拼接车型全名称
-    private String appendModelName(BaseVehicleModelDto dto){
+    public String appendModelName(BaseVehicleModel dto){
         StringBuilder modelName = new StringBuilder();
         //功能
         if (StringUtils.isNotBlank(dto.getVehicleTypeValue()) && !"-".equals(dto.getVehicleTypeValue())){
-            modelName.append(dto.getVehicleTypeValue()).append("/");
+            modelName.append(dto.getVehicleTypeValue());
         }
         //系列
         if (StringUtils.isNotBlank(dto.getProductLineValue()) && !"-".equals(dto.getProductLineValue())){
-            modelName.append(dto.getProductLineValue()).append("/");
+            modelName.append("/").append(dto.getProductLineValue());
         }
         //驱动
         if (StringUtils.isNotBlank(dto.getDriveFormValue()) && !"-".equals(dto.getDriveFormValue())){
-            modelName.append(dto.getDriveFormValue()).append("/");
+            modelName.append("/").append(dto.getDriveFormValue());
         }
         //马力
         if (StringUtils.isNotBlank(dto.getPowerValue()) && !"-".equals(dto.getPowerValue())){
-            modelName.append(dto.getPowerValue()).append("/");
+            modelName.append("/").append(dto.getPowerValue());
         }
         //版本
         if (StringUtils.isNotBlank(dto.getVehicleVersionValue()) && !"-".equals(dto.getVehicleVersionValue())){
-            modelName.append(dto.getVehicleVersionValue()).append("/");
+            modelName.append("/").append(dto.getVehicleVersionValue());
         }
         //燃料
         if (StringUtils.isNotBlank(dto.getFuelTypeValue()) && !"-".equals(dto.getFuelTypeValue())){
-            modelName.append(dto.getFuelTypeValue()).append("/");
+            modelName.append("/").append(dto.getFuelTypeValue());
         }
         //排放标准
         if (StringUtils.isNotBlank(dto.getEmissionStandardValue()) && !"-".equals(dto.getEmissionStandardValue())){
-            modelName.append(dto.getEmissionStandardValue()).append("/");
+            modelName.append("/").append(dto.getEmissionStandardValue());
         }
         //发动机型号
         if (StringUtils.isNotBlank(dto.getEngineTypeValue()) && !"-".equals(dto.getEngineTypeValue())){
-            modelName.append(dto.getEngineTypeValue()).append("/");
+            modelName.append("/").append(dto.getEngineTypeValue());
         }
         //变速箱类型
         if (StringUtils.isNotBlank(dto.getTranCaseTypeValue()) && !"-".equals(dto.getTranCaseTypeValue())){
@@ -605,19 +607,19 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         }
         //变速箱
         if (StringUtils.isNotBlank(dto.getGearboxTypeValue()) && !"-".equals(dto.getGearboxTypeValue())){
-            modelName.append(dto.getGearboxTypeValue()).append("/");
+            modelName.append("/").append(dto.getGearboxTypeValue());
         }
         //细分市场
         if (StringUtils.isNotBlank(dto.getMarketSegmentsValue()) && !"-".equals(dto.getMarketSegmentsValue())){
-            modelName.append(dto.getMarketSegmentsValue()).append("/");
+            modelName.append("/").append(dto.getMarketSegmentsValue());
         }
         //规格型号
         if (StringUtils.isNotBlank(dto.getSpecifications()) && !"-".equals(dto.getSpecifications())){
-            modelName.append(dto.getSpecifications()).append("/");
+            modelName.append("/").append(dto.getSpecifications());
         }
         //系别
         if (StringUtils.isNotBlank(dto.getDepartmentValue()) && !"-".equals(dto.getDepartmentValue())){
-            modelName.append(dto.getDepartmentValue());
+            modelName.append("/").append(dto.getDepartmentValue());
         }
         return modelName.toString();
     }

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

@@ -64,31 +64,34 @@
     </select>
 
     <select id="details" resultType="com.yxt.anrui.base.api.basevehicleout.BaseVehicleOutDetailsVo">
-        select vinSid,
+        select bo.vinSid,
-               vinNo,
+                bo.vinNo,
-               type,
+                bo.type,
-               typeKey,
+                bo.typeKey,
-               orgSid,
+                bo.orgSid,
-               orgName,
+                bo.orgName,
-               staffName,
+                bo.staffName,
-               staffSid,
+                bo.staffSid,
-               concatNo,
+                bo.concatNo,
-               price,
+                bo.price,
-               case isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
+                case bo.isTerminal when 1 then '是' when 0 then '否' end as isTerminal,
-               customerName,
+                bo.customerName,
-               customerSid,
+                bo.customerSid,
-               mobile,
+                bo.mobile,
-               giftsDescription,
+                bo.giftsDescription,
-               salesAllowance,
+                bo.salesAllowance,
-               middleOne,
+                bo.middleOne,
-               middleTwo,
+                bo.middleTwo,
-               rebateMoneyOne,
+                bo.rebateMoneyOne,
-               rebateMoneyTwo,
+                bo.rebateMoneyTwo,
-               remarks,
+                bo.remarks,
-               saleDate,
+                bo.saleDate,
-               createOrgSid
+                bo.createOrgSid,
-        from base_vehicle_out
+                ba.innerName,
-        where sid = #{sid}
+                ba.innerUserSid
+        from base_vehicle_out bo
+        left join base_vehicle_out_apply ba on ba.sid = bo.mainSid
+        where bo.sid = #{sid}
     </select>
 
     <select id="selectCountBySidVin" resultType="int">

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

@@ -145,7 +145,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 ResultBean<CommonContract> commonContract = commonContractService.selectByNo(dto.getConcatNo());
                 if(commonContract.getSuccess()){
                     //查询合同编号和车辆sid客户的临时编码
-                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getCustomerNo(),dto.getVinSid());
+                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid());
                     if(!stringResultBean.getSuccess()){
                         return rb.setMsg("请检查合同是否审核");
                     }
@@ -306,6 +306,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOutApply.setSaleTypeValue(dto.getType());
         baseVehicleOutApply.setCreateOrgSid(dto.getCreateOrgSid());
         baseVehicleOutApply.setCreateBySid(dto.getCreateBySid());
+        //内部引荐人、内部引荐人sid
+        baseVehicleOutApply.setInnerName(dto.getInnerName());
+        baseVehicleOutApply.setInnerUserSid(dto.getInnerUserSid());
         //保存车辆出库单主表
         baseVehicleOutApplyService.save(baseVehicleOutApply);
         //出库单子表关联主表sid

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -536,7 +536,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
      */
     public AppCarConfigSummaryVo addConfigName(AppModelConfigListVo appModelConfigListVo) {
         AppCarConfigSummaryVo vo = new AppCarConfigSummaryVo();
-        String carColor = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) ? (appModelConfigListVo.getCarColor() + "/") : "";
+        /*String carColor = StringUtils.isNotBlank(appModelConfigListVo.getCarColor()) ? (appModelConfigListVo.getCarColor() + "/") : "";
         //缓速器
         String slowMachine = StringUtils.isNotBlank(appModelConfigListVo.getSlowMachine())
                 ? (appModelConfigListVo.getSlowMachine() + "/") : "";
@@ -589,7 +589,9 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         String multimedia = StringUtils.isNotBlank(appModelConfigListVo.getMultimedia())
                 ? (appModelConfigListVo.getMultimedia() + "/") : "";
         String configName = carColor + slowMachine + rearViewMirror + tireSize + specification + rearAxleValue + rearAxleRatio + airConditioner + hubMaterial +
-                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;
+                baffleModel + suspension + seat + tireCover + saddle + wheelbase + bumper + configuringBao + independentSources + fuelTank + multimedia;*/
+        BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appModelConfigListVo.getConfigSid());
+        String configName = baseModelConfigService.configNameSpell(baseModelConfig);
         vo.setConfig(configName);
         vo.setModel(appModelConfigListVo.getModel());
         vo.setMoreConfig(appModelConfigListVo.getOtherConfig());

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basemodelconfig.BaseModelConfig;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -14,6 +15,7 @@ import com.yxt.anrui.base.api.commoncontract.flowable.AppSubmitContractInfoDto;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
+import com.yxt.anrui.base.biz.basemodelconfig.BaseModelConfigService;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
 import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
@@ -166,6 +168,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
     @Autowired
     private BasePurchaseSystemService basePurchaseSystemService;
+    @Autowired
+    private BaseModelConfigService baseModelConfigService;
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1015,13 +1019,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
      */
     private String getInvoicMessage(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
         String url = "";
-        //根据分公司sid查询分公司开票申请
-        /*String invoicName = "";
-        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(appOrderDetailsVo.getUseOrgSid(),appOrderDetailsVo.getPurchaseSystemSid());
-        if (invoicingDetailsVoResultBean.getData() != null) {
-            map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
-            invoicName = invoicingDetailsVoResultBean.getData().getName();
-        }*/
         //查询销售订单的现车
         AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
         AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
@@ -1038,6 +1035,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
                 vo.setType(appOrderDetailsVo.getInvoiceType());
                 invoicMessageContractVos.add(vo);
             }
+        }else{
+            for (int i = 0; i < Integer.parseInt(orderModelInfoVo.getTotal()); i++) {
+                InvoicMessageContractVo vo = new InvoicMessageContractVo();
+//                vo.setType(appOrderDetailsVo.getInvoiceType());
+                invoicMessageContractVos.add(vo);
+            }
         }
         map.put("invoicList", invoicMessageContractVos);
         String ftl = "invoicApply";
@@ -1686,11 +1689,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
         //根据车型sid查询车型的全称
         BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
-        //车型
+        BaseModelConfig baseModelConfig = baseModelConfigService.fetchBySid(appOrderModelInfoVo.getConfigSid());
-        String modelName1 = baseVehicleModel.getVehicleTypeValue() + baseVehicleModel.getProductLineValue() + baseVehicleModel.getDriveFormValue() + baseVehicleModel.getGearboxTypeValue() + baseVehicleModel.getVehicleVersionValue() + baseVehicleModel.getPowerValue() + baseVehicleModel.getFuelTypeValue() + baseVehicleModel.getEngineTypeValue() + baseVehicleModel.getEmissionStandardValue();
+        String modelName1 = baseVehicleModelService.appendModelName(baseVehicleModel);
         String modelName = "车型：" + baseVehicleModel.getVehicleAlias()+"。";
-        //配置
+        //配置：后桥/速比/轴距/悬架/鞍座/颜色/驾驶室/保险杠/燃料箱/导流罩/独立热源/缓速器/护轮罩/后视镜/轮胎/轮毂材质/空调/坐骑/多媒体/配置包
-        String modelConfig = "配置：" + modelName1+"/"+appOrderModelInfoVo.getConfig() + "。";
+        String configName = baseModelConfigService.configNameSpell(baseModelConfig);
+        String modelConfig = "配置：" + modelName1+"/"+configName + "。";
         //上装
         if (appOrderDetailsVo.getTopInfo() != null) {
             AppOrderTopInfoVo topInfo = appOrderDetailsVo.getTopInfo();

anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl

@@ -779,7 +779,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t>   ${money!}</w:t>
+                    <w:t>             ${money!}      </w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>
@@ -805,7 +805,7 @@
                         <w:sz-cs w:val="28"/>
                         <w:u w:val="single"/>
                     </w:rPr>
-                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>     ${moneyDx!}     </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
+                    <w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>                    ${moneyDx!}     </w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:hint="fareast"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
                 </w:r>
                 <w:r>
                     <w:rPr>

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.buscenter.api.bussalesorder;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2023/2/6 16:57
+ * @Description
+ */
+@Data
+public class BusSalesOrdeVo implements Vo {
+    private static final long serialVersionUID = -5062473459801930693L;
+    @ApiModelProperty("临时号")
+    private String temporaryNo;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+}

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

@@ -277,7 +277,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation(value = "查询客户的临时编码")
     @GetMapping("/selectTemporaryNo")
     @ResponseBody
-    ResultBean<String> selectTemporaryNo(@RequestParam("contractNo")String contractNo,@RequestParam("vehSid")String vehSid);
+    ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid);
 
     @ApiOperation(value = "根据车辆sid查询销售订单是否存在，若存在返回相关数据")
     @GetMapping("/selectOrderOne")

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

@@ -251,7 +251,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid) {
         return null;
     }
 

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

@@ -30,10 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSaleOrderVehicleOutVo;
+import com.yxt.anrui.buscenter.api.bussalesorder.*;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.contract.AppRovalContractPageVo;
@@ -195,7 +192,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     OrderRemarksVo getOrderRemarksInfo(String saleOrderSid);
 
-    String selectTemporaryNo(@Param("contractNo") String contractNo, @Param("vehSid") String vehSid);
+    BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid);
 
     /**
      * 根据车辆sid查询销售订单的数据

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

@@ -327,12 +327,12 @@
         where sid = #{saleOrderSid}
     </select>
 
-    <select id="selectTemporaryNo" resultType="java.lang.String">
+    <select id="selectTemporaryNo" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrdeVo">
-        select bv.temporaryNo
+        select bv.temporaryNo,bo.contractNo
         from bus_sales_order bo
                  left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
-        where bo.contractNo = #{contractNo}
+        where bo.nodeState = '已办结'
-          and bv.linkSid = #{vehSid}
+          and bv.linkSid = #{vehSid} limit 1
     </select>
 
     <select id="selectOrderOne" resultType="com.yxt.anrui.buscenter.api.bussalesorder.BusSaleOrderVehicleOutVo">

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

@@ -330,8 +330,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid) {
-        return busSalesOrderService.selectTemporaryNo(contractNo,vehSid);
+        return busSalesOrderService.selectTemporaryNo(vehSid);
     }
 
     @Override

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

@@ -3357,7 +3357,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(bv.getBusinessSid());
                 AppOrderDetailsVo vo = details.getData();
                 if ("现车".equals(vo.getOrderType())) {
-                    //更新已选择的车架号的状态为审批中
+                    //更新已选择的车架号的状态为销售订单锁定
                     List<String> list = busSalesOrderVehicleService.selectVehicleSid(bv.getBusinessSid());
                     BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
                     busMainDepositUpdateQuery.setVinSidList(list);
@@ -3486,18 +3486,21 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 VinListVo vinListVo = new VinListVo();
                 vinListVo.setLinkNo(vv.getVin());
                 vinListVo.setLinkSid(vv.getCarSid());
-                //根据车架号查询是否已出库
+                if(StringUtils.isNotBlank(vv.getCarSid())){
-                ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid());
+                    //根据车架号查询是否已出库
-                if (baseVehicleResultBean.getSuccess()) {
+                    ResultBean<BaseVehicleSelectVo> baseVehicleResultBean = baseVehicleFeign.details(vv.getCarSid());
-                    BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
+                    if (baseVehicleResultBean.getSuccess()) {
-                    if (vo != null) {
+                        BaseVehicleSelectVo vo = baseVehicleResultBean.getData();
-                        if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
+                        if (vo != null) {
-                            vinListVo.setState(true);
+                            if (VehicleState.StockEnum.OUT_STOCK.getCode().equals(vo.getVehicleState())) {
-                        } else {
+                                vinListVo.setState(true);
-                            vinListVo.setState(false);
+                            } else {
+                                vinListVo.setState(false);
+                            }
                         }
                     }
                 }
+
                 vinListVos.add(vinListVo);
             }
         } else {
@@ -3535,13 +3538,31 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busSalesOrderVehicle.setSalesOrderSid(dto.getSaleOrderSid());
             busSalesOrderVehicleService.insert(busSalesOrderVehicle);
         }*/
+        busSalesOrderVehicleDetailsVos.removeAll(Collections.singleton(null));
         if (busSalesOrderVehicleDetailsVos.size() > 0) {
+            //查询已选择的车辆
+            //将销售订单原本已选择的车辆的锁定状态修改为未锁定
+            List<String> stringList = busSalesOrderVehicleDetailsVos.stream().filter(v -> StringUtils.isNotBlank(v.getLinkSid())).map(v -> v.getLinkSid()).collect(Collectors.toList());
+            //将车辆状态修改为未锁定
+            BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            busMainDepositUpdateQuery.setVinSidList(stringList);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
             for (int i = 0; i < busSalesOrderVehicleDetailsVos.size(); i++) {
                 BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderVehicleDetailsVos.get(i).getSid());
                 busSalesOrderVehicle.setLinkNo(list.get(i).getLinkNo());
                 busSalesOrderVehicle.setLinkSid(list.get(i).getLinkSid());
                 busSalesOrderVehicleService.updateById(busSalesOrderVehicle);
             }
+            //将选择的车辆的锁定状态修改为已锁定
+            busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+            List<String> vinStringList = list.stream().map(v->v.getLinkSid()).collect(Collectors.toList());
+            busMainDepositUpdateQuery.setVinSidList(vinStringList);
+            busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.ORDER_LOCK.getCode());
+            busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.ORDER_LOCK.getRemarks());
+            baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+
         }
         return rb.success();
 
@@ -3878,13 +3899,19 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
-    public ResultBean<String> selectTemporaryNo(String contractNo, String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid) {
         ResultBean<String> rb = ResultBean.fireFail();
-        String temporaryNo = baseMapper.selectTemporaryNo(contractNo,vehSid);
+        BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid);
-        if(StringUtils.isBlank(temporaryNo)){
+        if(busSalesOrdeVo != null){
+            String contractNo = busSalesOrdeVo.getContractNo();
+            if(StringUtils.isBlank(contractNo)){
+                return rb;
+            }
+            return rb.success().setData(busSalesOrdeVo.getTemporaryNo());
+
+        }else{
             return rb;
         }
-        return rb.success().setData(temporaryNo);
     }
 
     public ResultBean<BusSaleOrderVehicleOutVo> selectOrderOne(String vinSid) {
@@ -3912,7 +3939,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();
                 discountList.removeAll(Collections.singleton(null));
                 if(discountList.size()>0){
-                    List<String> discountLists = discountList.stream().filter(v-> null != v.getDiscountExplain()).filter(v->!v.getDiscountExplain().isEmpty()).map(v->v.getDiscountExplain()).collect(Collectors.toList());
+                    List<String> discountLists = discountList.stream().filter(v->StringUtils.isNotBlank(v.getDiscountExplain())).map(v->v.getDiscountExplain()).collect(Collectors.toList());
                     busSaleOrderVehicleOutVo.setDiscountExplain(String.join(",",discountLists));
                 }
             }

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue

@@ -371,7 +371,7 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '付款方式请选择是或否' })
         return
       }
-      if (this.isTerminal === '') {
+      if (this.isPayment === '0' && this.isTerminal === '') {
         this.$message({ showClose: true, type: 'error', message: '是否确定车架号请选择是或否' })
         return
       }

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -785,6 +785,7 @@ export default {
       this.balance = ''
       this.balanceCopy = ''
       this.dialogStatus = ''
+      this.submitdisabled = false
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -1655,7 +1655,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
                 //登记日期
                 freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
-                freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                if(vvvv.getVIN().length() >= 8){
+                    freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                }
                 //收款用途
                 freceivebillentry.setFPURPOSEIDKey("001");
                 freceivebillentry.setFPURPOSEIDType("cw_skyt");
@@ -1713,7 +1715,9 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                 freceivebillentry.setFRECTOTALAMOUNTFOR(vvvv.getSubscriptionMoney());
                 //登记日期
                 freceivebillentry.setFPOSTDATE(confirmation.getCollectionDate());
-                freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                if(vvvv.getVIN().length() >= 8){
+                    freceivebillentry.setF_PAEZ_Base1(vvvv.getVIN().substring(vvvv.getVIN().length() - 8));
+                }
                 //收款用途
                 freceivebillentry.setFPURPOSEIDKey("002");
                 freceivebillentry.setFPURPOSEIDType("cw_skyt");

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeign.java

@@ -9,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -82,7 +83,11 @@ public interface SysFunctionFeign {
     @ApiOperation("获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<SysFunctionVo> fetchBySid(@PathVariable("sid") String sid);
+    @ApiOperation("角色授权时查询功能列表")
+    @GetMapping("/getFunctionAuthorization/{roleSid}")
+    public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(@PathVariable("roleSid") String roleSid);
     @ApiOperation("查询按钮的权限")
     @PostMapping("/getButtonPermissions")
     public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(@RequestBody ButtonPermissionQuery query);
+
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionFeignFallback.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -90,6 +91,11 @@ public class SysFunctionFeignFallback implements SysFunctionFeign {
 		return rb.setMsg("接口anrui_portal/sysfunction/fetchBySid无法访问");
 	}
 
+	@Override
+	public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(String roleSid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
 		return null;

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java

@@ -12,6 +12,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -57,4 +58,12 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
     int selectBySourceSid(@Param("isEnable") int isEnable, @Param("sourceSid") String sourceSid);
 
      List<ButtonPermissionVo>  getButtonPermissions(@Param("query")ButtonPermissionQuery query);
+     @Select("SELECT ss.sourceName,ss.sid FROM sys_source ss  LEFT JOIN sys_source_role ssr ON ss.sid=ssr.sorceSid where ssr.rolesid=#{roleSid}")
+    List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
+    @Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm  LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
+    List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
+    @Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,0,1) state  FROM sys_function sf  " +
+            " LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid  " +
+            " WHERE sf.actionUrl= #{pageUrl} ")
+    List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionRest.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -193,9 +194,18 @@ public class SysFunctionRest implements SysFunctionFeign {
         return rb.success().setData(vo);
     }
 
+    @Override
+    public ResultBean<List<Map<String,Object>>> getFunctionAuthorization(String roleSid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<Map<String,Object>> list=sysFunctionService.getFunctionAuthorization(roleSid);
+        return rb.success().setData(list);
+    }
+
     @Override
     public ResultBean<List<ButtonPermissionVo>> getButtonPermissions(ButtonPermissionQuery query) {
         ResultBean<List<ButtonPermissionVo>> rb = ResultBean.fireFail();
         return rb.success().setData(sysFunctionService.getButtonPermissions(query));
     }
+    //getFunctionAuthorization(){
+    // }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@@ -17,7 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -240,4 +242,38 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
 		List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
 		return buttonPermissions ;
     }
+
+    public List<Map<String, Object>> getFunctionAuthorization(String roleSid) {
+		List<Map<String,Object>> list=new ArrayList<>();
+		List<Map<String, Object>> lsources=baseMapper.getSourceAuthorization(roleSid);
+		lsources.forEach(f->{
+			Map<String,Object> map=new HashMap<>();
+			map.put("name",f.get("sourceName").toString());
+			map.put("sid",f.get("sid").toString());
+			map.put("state","1");
+			list.add(map);
+		});
+
+		list.forEach(f->{
+			List<Map<String,Object>> list2=new ArrayList<>();
+			String sid = f.get("sid").toString();
+			List<Map<String, Object>> lmenus=baseMapper.getMenuAuthorization(sid);
+			lmenus.forEach(ff->{
+				Map<String,Object> map=new HashMap<>();
+				map.put("name",ff.get("name"));
+				String sids = ff.get("sid").toString();
+				map.put("sid",sids);
+				map.put("state","1");
+
+				if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){
+					String pageUrl =ff.get("pageUrl").toString();
+					List<Map<String, Object>> lfuncs=baseMapper.getFunctionAuthorization(pageUrl);
+					map.put("children",lfuncs);
+				}
+				list2.add(map);
+			});
+			f.put("children",list2);
+		});
+		return list;
+    }
 }

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

@@ -238,3 +238,12 @@ export function selectSupplier(data) {
   })
 }
 
+// 根据车辆sid获取销售订单数据
+export function selectOrderOne(data) {
+  return request({
+    url: '/buscenter/v1/bussalesorder/selectOrderOne',
+    method: 'get',
+    params: data
+  })
+}
+

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

@@ -1,5 +1,6 @@
 import request from '@/utils/request'
 
+// 获取数据字典
 export function typeValues(data) {
     return request({
         url: '/portal/v1/dictcommons/typeValues',
@@ -8,6 +9,15 @@ export function typeValues(data) {
     })
 }
 
+// 获取数据字典（根据分组）
+export function getTypeValueList(data) {
+  return request({
+    url: '/portal/v1/dictcommons/getTypeValueList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 品牌下拉
 export function brandDown(data) {
   return request({

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@@ -133,7 +133,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <el-select v-model="temp.middleOneName" class="addinputw" clearable placeholder="" @change="changeDistributorOne">
+              <el-select v-model="temp.middleOne" class="addinputw" clearable placeholder="" @change="changeDistributorOne">
                 <el-option v-for="item in distributor_list" :key="item.middleSid" :label="item.middleNameAndCompany" :value="item.middleNameAndCompany"/>
               </el-select>
             </el-form-item>
@@ -153,7 +153,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item>
-              <el-select v-model="temp.middleTwoName" class="addinputw" clearable placeholder="" @change="changeDistributorTwo">
+              <el-select v-model="temp.middleTwo" class="addinputw" clearable placeholder="" @change="changeDistributorTwo">
                 <el-option v-for="item in distributor_list" :key="item.middleSid" :label="item.middleNameAndCompany" :value="item.middleNameAndCompany"/>
               </el-select>
             </el-form-item>
@@ -171,11 +171,21 @@
           <el-col :span="4" class="tleftb">
             <span>备注</span>
           </el-col>
-          <el-col :span="20">
+          <el-col :span="8">
             <el-form-item>
               <el-input v-model="temp.remarks" placeholder="请写明赠品情况" clearable class="addinputw"/>
             </el-form-item>
           </el-col>
+          <el-col :span="4" class="tleftb">
+            <span>内部引荐人</span>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item>
+              <el-select v-model="temp.innerName" class="addinputw" filterable placeholder="" @change="changeInner">
+                <el-option v-for="item in inner_list" :key="item.userSid" :label="item.userName" :value="item.userName"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row v-show="temp.trailerOrInstallName !== ''">
           <el-col :span="4" class="tleftb">
@@ -243,11 +253,11 @@
 </template>
 
 <script>
-import { vehicleOutLibrary, isUpdateOrInsertCrm } from '@/api/cheliang/basevehicle'
+import { vehicleOutLibrary, isUpdateOrInsertCrm, selectOrderOne } from '@/api/cheliang/basevehicle'
-import { selectOrgList, selectCustomerList, selectMiddleList, typeValues } from '@/api/cheliang/dictcommons'
+import { selectOrgList, selectCustomerList, selectMiddleList, getTypeValueList, getGressionUserList } from '@/api/cheliang/dictcommons'
 
 export default {
-  name: 'cheliangtaizhangChu',
+  name: 'CheLiangTaiZhangChu',
   data() {
     // var checkSubmit = (rule, value, callback) => {
     //   const Submit =
@@ -307,13 +317,16 @@ export default {
         totalDealPrice: '',
         szOrGCSid: '',
         createBySid: '',
-        createByName: ''
+        createByName: '',
+        innerName: '',
+        innerUserSid: ''
       },
       payType_list: [], // 出库类型
       org_list: [], // 销售部门
       staff_list: [], // 销售专员
       customer_list: [], // 客户名称
       distributor_list: [], // 中介人员
+      inner_list: [],
       rules: {
         type: [{ required: true, message: '销售类型不能为空', trigger: 'change' }],
         orgName: [{ required: true, message: '销售部门不能为空', trigger: 'change' }],
@@ -344,11 +357,16 @@ export default {
       return val
     },
     getType() {
-      typeValues({ type: 'payType' }).then((res) => {
+      getTypeValueList({ type: 'payType', groupNum: 'xsck' }).then((res) => {
         if (res.success) {
           this.payType_list = res.data
         }
       })
+      getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.inner_list = res.data
+        }
+      })
       selectOrgList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
         if (resp.success) {
           this.org_list = resp.data
@@ -400,6 +418,10 @@ export default {
       this.temp.middleTwoSid = choosetItem[0].middleSid
       this.temp.middleCodeTwo = choosetItem[0].middleCode
     },
+    changeInner(value) {
+      const choose = this.inner_list.filter((item) => item.userName === value)
+      this.temp.innerUserSid = choose[0].userSid
+    },
     showChu(multipleSelection, createOrgSid) {
       this.$nextTick(() => {
         this.$refs['dataForm'].clearValidate()
@@ -417,7 +439,59 @@ export default {
       this.temp.rebateMoneyOne = '0'
       this.temp.rebateMoneyTwo = '0'
       this.temp.salesAllowance = '0'
-      this.getType()
+      selectOrderOne({ vinSid: multipleSelection[0].sid }).then((resp) => {
+        if (resp.success) {
+          this.temp.type = resp.data.payType
+          this.temp.typeKey = resp.data.payTypeKey
+          this.temp.orgName = resp.data.deptName
+          this.temp.orgSid = resp.data.deptSid
+          this.temp.staffName = resp.data.staffName
+          this.temp.staffSid = resp.data.staffSid
+          this.temp.price = resp.data.singleFinalPrice
+          this.temp.concatNo = resp.data.contractNo
+          this.temp.customerName = resp.data.customerName
+          this.temp.customerSid = resp.data.customerSid
+          this.temp.mobile = resp.data.mobile
+          this.temp.giftsDescription = resp.data.totaldiscount
+          this.temp.salesAllowance = resp.data.carDiscountPrice
+          this.temp.middleOne = resp.data.intermediaryName
+          this.temp.rebateMoneyOne = resp.data.distributorPrice
+          this.temp.middleTwo = resp.data.intermediaryName2
+          this.temp.rebateMoneyTwo = resp.data.distributorPrice2
+          this.temp.remarks = resp.data.discountExplain
+          this.temp.innerName = resp.data.name
+          this.temp.innerUserSid = resp.data.userSid
+          selectOrgList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+            if (resp.success) {
+              this.org_list = resp.data
+              const choosetItem = this.org_list.filter((item) => item.orgDeptName === this.temp.orgName)
+              this.staff_list = choosetItem[0].staffinfoVoList
+            }
+          })
+          selectCustomerList({ staffSid: this.temp.staffSid, userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
+            if (resp.success) {
+              this.customer_list = resp.data
+            }
+          })
+          selectMiddleList({ staffSid: this.temp.staffSid, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+            if (res.success) {
+              this.distributor_list = res.data
+            }
+          })
+          getTypeValueList({ type: 'payType', groupNum: 'xsck' }).then((res) => {
+            if (res.success) {
+              this.payType_list = res.data
+            }
+          })
+          getGressionUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+            if (res.success) {
+              this.inner_list = res.data
+            }
+          })
+        } else {
+          this.getType()
+        }
+      })
     },
     totalDealPrice() {
       if (this.temp.trailerOrInstallDealPrice !== '' && this.temp.price !== '') {
@@ -524,7 +598,9 @@ export default {
         totalDealPrice: '',
         szOrGCSid: '',
         createBySid: '',
-        createByName: ''
+        createByName: '',
+        innerName: '',
+        innerUserSid: ''
       }
       this.disabledBtn = false
       this.$refs['dataForm'].resetFields()

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue

@@ -204,8 +204,8 @@
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="handleConfirm">确定</el-button>
+        <el-button size="small" :disabled="visibleDisabled" type="primary" @click="handleConfirm">确定</el-button>
-        <el-button size="small" @click="dialogVisible = false">取消</el-button>
+        <el-button size="small" :disabled="visibleDisabled" @click="dialogVisible = false">取消</el-button>
       </span>
     </el-dialog>
     <chelaingxiaoshouInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
@@ -237,6 +237,7 @@ export default {
       btndisabled: false,
       viewState: 1,
       dialogVisible: false,
+      visibleDisabled: false,
       printSid: '',
       print: '',
       btnList: [
@@ -390,6 +391,7 @@ export default {
       this.dialogVisible = true
     },
     handleConfirm() {
+      this.visibleDisabled = true
       createPdf({ xsckdSid: this.printSid, printerType: this.print }).then((resp) => {
         if (resp.success && resp.data.pdfPath !== '') {
           var xhr = new XMLHttpRequest()
@@ -414,7 +416,12 @@ export default {
           xhr.send()
           this.dialogVisible = false
           this.printSid = ''
+          this.visibleDisabled = false
+        } else {
+          this.visibleDisabled = false
         }
+      }).catch(() => {
+        this.visibleDisabled = false
       })
     },
     toInfo(row) {

anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue

@@ -193,7 +193,8 @@ export default {
           manSid: '',
           orgDeptSid: '',
           orgPriceEndDate: '',
-          orgPriceStartDate: ''
+          orgPriceStartDate: '',
+          orgSidPath: ''
         },
         current: 1,
         size: 10,
@@ -269,6 +270,7 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -295,7 +297,8 @@ export default {
           manSid: '',
           orgDeptSid: '',
           orgPriceEndDate: '',
-          orgPriceStartDate: ''
+          orgPriceStartDate: '',
+          orgSidPath: ''
         },
         current: 1,
         size: 10,