Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
yunuo970428 3 years ago
parent
commit
0894a949c7
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml
  2. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareMapper.xml
  3. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
  4. 6
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  5. 3
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java
  6. 3
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  7. 3
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
  8. 12
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  9. 25
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java
  10. 18
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
  11. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml
  12. 10
      anrui-scm/anrui-scm-ui/src/api/cheliang/chexingbaojia.js
  13. 14
      anrui-scm/anrui-scm-ui/src/api/vehicleModel/vehicleconfiguration.js
  14. 390
      anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
  15. 20
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  16. 41
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  17. 28
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue
  18. 420
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration.vue
  19. 13
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue
  20. 4
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml

@ -44,7 +44,7 @@
</update> </update>
<select id="selectNum" resultType="int"> <select id="selectNum" resultType="int">
select count(*) SELECT CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED) CODE
from base_internal_purchase from base_internal_purchase
where applyNo LIKE concat(#{bill}, '%') where applyNo LIKE concat(#{bill}, '%')
</select> </select>

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerretware/BaseManufacturerRetwareMapper.xml

@ -12,7 +12,7 @@
</select> </select>
<select id="selectNum" resultType="int"> <select id="selectNum" resultType="int">
select count(*) SELECT CAST(REPLACE(MAX(applyNo), #{bill}, '')AS SIGNED) CODE
from base_manufacturer_retware from base_manufacturer_retware
where applyNo LIKE concat(#{bill}, '%') where applyNo LIKE concat(#{bill}, '%')
</select> </select>

6
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml

@ -36,9 +36,9 @@
</update> </update>
<select id="selectNum" resultType="int"> <select id="selectNum" resultType="int">
select count(*) SELECT CAST(REPLACE(MAX(applicationCode), #{bill}, '')AS SIGNED) CODE
from base_outsourcing_application FROM base_outsourcing_application
where applicationCode LIKE concat(#{bill}, '%') WHERE applicationCode LIKE CONCAT(#{bill}, '%')
</select> </select>
</mapper> </mapper>

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

@ -21,7 +21,6 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils; import com.yxt.common.base.utils.DateUtils;
@ -1195,7 +1194,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
//库存状态:库存 //库存状态:库存
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
//调车状态:未调车 //调车状态:未调车
qw.eq("bv.witPinState","100"); qw.eq("bv.witPinState", "100");
} }
return qw; return qw;
} }
@ -1223,7 +1222,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (params != null) { if (params != null) {
if (StringUtils.isNotBlank(params.getUserSid())) { if (StringUtils.isNotBlank(params.getUserSid())) {
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData(); String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
qw.eq("bv.useOrgSid", orgSid); qw.eq("bv.createOrgSid", orgSid);
} }
//品牌 //品牌
@ -1277,6 +1276,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode()); qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
//车辆状态:现车 //车辆状态:现车
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()); qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
qw.eq("bv.isDelete", 0);
} }
return qw; return qw;
} }

3
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
@ -55,5 +56,5 @@ public class BusinessVariables {
/** /**
* 业务参数按需传递 * 业务参数按需传递
*/ */
private Map<String, Object> formVariables; private Map<String, Object> formVariables =new HashMap<>();
} }

3
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java

@ -226,6 +226,9 @@ public class FlowableRest implements FlowableFeign {
if (StringUtils.isBlank(dto.getBusinessSid())) { if (StringUtils.isBlank(dto.getBusinessSid())) {
return rb.setMsg("businessSid 不能为空!"); return rb.setMsg("businessSid 不能为空!");
} }
if(formVariables==null){
return rb.setMsg("业务参数集合 不能为空!");
}
formVariables.put("businessSid",dto.getBusinessSid()); formVariables.put("businessSid",dto.getBusinessSid());
String nextUserSid = dto.getNextNodeUserSids(); String nextUserSid = dto.getNextNodeUserSids();
if(StringUtils.isBlank(nextUserSid)){ if(StringUtils.isBlank(nextUserSid)){

3
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java

@ -49,6 +49,9 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
if (StringUtils.isBlank(bv.getBusinessSid())) { if (StringUtils.isBlank(bv.getBusinessSid())) {
return ResultBean.fireFail().setMsg("businessSid 不能为空!"); return ResultBean.fireFail().setMsg("businessSid 不能为空!");
} }
if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空!");
}
bv.getFormVariables().put("businessSid",bv.getBusinessSid()); bv.getFormVariables().put("businessSid",bv.getBusinessSid());
ResultBean<FlowTask> rb = flowDefinitionService.businessStart(bv); ResultBean<FlowTask> rb = flowDefinitionService.businessStart(bv);
if (!rb.getSuccess()) { if (!rb.getSuccess()) {

12
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -116,6 +116,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (bv.getModelId() != null) { if (bv.getModelId() != null) {
procId = bv.getModelId(); procId = bv.getModelId();
} }
if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空!");
}
List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables()); List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables());
List<FlowElement> collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList()); List<FlowElement> collect = flowElements.stream().filter(item -> item.getId().length() > 0).collect(Collectors.toList());
for (int i = 0; i < collect.size(); i++) { for (int i = 0; i < collect.size(); i++) {
@ -741,6 +744,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
ResultBean<FlowTask> rb = ResultBean.fireFail(); ResultBean<FlowTask> rb = ResultBean.fireFail();
Map<String, Object> formVariables = dto.getFormVariables(); Map<String, Object> formVariables = dto.getFormVariables();
if(dto.getFormVariables()==null){
return rb.setMsg("业务参数集合 不能为空!");
}
// formVariables.put("handleUrl", dto.getHandleUrl()); // formVariables.put("handleUrl", dto.getHandleUrl());
// formVariables.put("detailUrl", dto.getDetailUrl()); // formVariables.put("detailUrl", dto.getDetailUrl());
String taskId = (String) formVariables.get("taskId"); String taskId = (String) formVariables.get("taskId");
@ -1538,6 +1544,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (bv.getModelId() != null) { if (bv.getModelId() != null) {
procId = bv.getModelId(); procId = bv.getModelId();
} }
if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空!");
}
List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables()); List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables());
ResultBean<List<Map<String, Object>>> rb = new ResultBean<List<Map<String, Object>>>(); ResultBean<List<Map<String, Object>>> rb = new ResultBean<List<Map<String, Object>>>();
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();
@ -1574,6 +1583,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if (bv.getModelId() != null) { if (bv.getModelId() != null) {
procId = bv.getModelId(); procId = bv.getModelId();
} }
if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空!");
}
List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables()); List<FlowElement> flowElements = processService.calApprovePath(procId, modelId, bv.getFormVariables());
ResultBean<List<Map<String, Object>>> rb = new ResultBean<List<Map<String, Object>>>(); ResultBean<List<Map<String, Object>>> rb = new ResultBean<List<Map<String, Object>>>();
List<Map<String, Object>> list = new ArrayList<>(); List<Map<String, Object>> list = new ArrayList<>();

25
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskDoVo.java

@ -1,7 +1,6 @@
package com.yxt.anrui.portal.api.flow.app; package com.yxt.anrui.portal.api.flow.app;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -12,29 +11,39 @@ import java.util.Map;
/** /**
* @Author dimengzhe * @Author dimengzhe
* @Date 2022/7/20 9:45 * @Date 2022/7/20 9:45
* @Description * @Description 移动待办返回参数
*/ */
@Data @Data
public class FlowTaskDoVo implements Vo { public class FlowTaskDoVo implements Vo {
private static final long serialVersionUID = 8771689666940266426L; private static final long serialVersionUID = 8771689666940266426L;
@ApiModelProperty(value = "环节名称")
private String taskName; private String taskName;
@ApiModelProperty(value = "发起部门")
private String startDeptName; private String startDeptName;
@ApiModelProperty(value = "发起人")
private String startUserName; private String startUserName;
@ApiModelProperty(value = "工作名称")
private String procDefName; private String procDefName;
@ApiModelProperty(value = "提交日期")
private String processCreateTime; private String processCreateTime;
@ApiModelProperty(value = "发起日期")
private String createTime; private String createTime;
@JsonProperty("deployId") // @JsonProperty("deployId")
private String procDefId; // private String procDefId;
@ApiModelProperty(value = "流程id")
private String deployId;
@ApiModelProperty(value = "流程实例id")
private String procInsId; private String procInsId;
@ApiModelProperty(value = "任务id")
private String taskId; private String taskId;
@JsonIgnore
@ApiModelProperty("节点id") @ApiModelProperty("节点id")
@JsonIgnore
private String taskDefKey; private String taskDefKey;
@ApiModelProperty(value = "app集合")
private AppVo appVariables; private AppVo appVariables;
@JsonIgnore @JsonIgnore
private Map<String,Object> processVariables; private Map<String, Object> processVariables;
@ApiModelProperty("办理的url") @ApiModelProperty("办理的url")
@JsonIgnore @JsonIgnore
private SysProUrlVo sysProUrlVo ; private SysProUrlVo sysProUrlVo;
} }

18
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@ -60,6 +60,7 @@ import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -492,7 +493,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
} }
taskQuery.setFields(taskParamList); taskQuery.setFields(taskParamList);
taskQueryPagerQuery.setParams(taskQuery); taskQueryPagerQuery.setParams(taskQuery);
// ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoList(userSid, taskQueryPagerQuery);
ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery); ResultBean<Page<FlowTaskDto>> resultBean = flowTaskFeign.businessTodoListForApp(userSid, taskQueryPagerQuery);
if (!resultBean.getSuccess()) { if (!resultBean.getSuccess()) {
return rb.setMsg("流程错误"); return rb.setMsg("流程错误");
@ -500,30 +500,24 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
PagerVo<FlowTaskDoVo> page = new PagerVo<>(); PagerVo<FlowTaskDoVo> page = new PagerVo<>();
List<FlowTaskDoVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDoVo.class)).collect(Collectors.toList()); List<FlowTaskDoVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), FlowTaskDoVo.class)).collect(Collectors.toList());
voList.removeAll(Collections.singleton(null)); voList.removeAll(Collections.singleton(null));
//定义的app的sid的index集合
Map<String, List<Integer>> appVer = new HashMap<>(); Map<String, List<Integer>> appVer = new HashMap<>();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
for (int i = 0; i < voList.size(); i++) { for (int i = 0; i < voList.size(); i++) {
FlowTaskDoVo f = voList.get(i); FlowTaskDoVo f = voList.get(i);
f.setCreateTime(sdf.format(new Date(Long.parseLong(f.getCreateTime()))));
f.setProcessCreateTime(sdf.format(new Date(Long.parseLong(f.getProcessCreateTime()))));
Map<String, Object> flowMap = f.getProcessVariables(); Map<String, Object> flowMap = f.getProcessVariables();
Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app"); Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
String json = JSONObject.toJSONString(appMap); String json = JSONObject.toJSONString(appMap);
System.out.println(json); System.out.println(json);
//根据节点id和流程定义id以及类型查询地址以及版本号等:待定,需要流程返回。
//========================================================================
// String procDefId = f.getProcDefId();
// String taskDefKey = f.getTaskDefKey();
// ResultBean<SysProUrlVo> resultBean1 = sysProUrlFeign.selectUrlByKey(procDefId, taskDefKey, "1","2");
//========================================================================
AppVo appVo = new AppVo(); AppVo appVo = new AppVo();
appVo.setJson(json); appVo.setJson(json);
//app版本的sid //app版本的sid
String appSid = ""; String appSid = "";
//app版本的类型 //app版本的类型
String type = ""; String type = "";
/* if (resultBean1.getData() != null) { if (f.getSysProUrlVo() != null) {
appVo.setModuleAction(resultBean1.getData().getUrl());
appSid = resultBean1.getData().getModulePluginName();
}*/
if(f.getSysProUrlVo() != null){
appVo.setModuleAction(f.getSysProUrlVo().getUrl()); appVo.setModuleAction(f.getSysProUrlVo().getUrl());
appSid = f.getSysProUrlVo().getModulePluginName(); appSid = f.getSysProUrlVo().getModulePluginName();
} }

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundMapper.xml

@ -32,7 +32,7 @@
</update> </update>
<select id="selectNum" resultType="int"> <select id="selectNum" resultType="int">
select count(*) SELECT CAST(REPLACE(MAX(applicationCode), #{bill}, '')AS SIGNED) CODE
from scm_apply_inbound from scm_apply_inbound
where applicationCode LIKE concat(#{bill}, '%') where applicationCode LIKE concat(#{bill}, '%')
</select> </select>

10
anrui-scm/anrui-scm-ui/src/api/cheliang/chexingbaojia.js

@ -57,8 +57,14 @@ export function fetchAllBySid(data) {
// 车型配置详细信息 // 车型配置详细信息
export function selectExiCarConfig(data) { export function selectExiCarConfig(data) {
return request({ return request({
url: '/base/v1/basevehicle/selectExiCarConfig/' + data.modelSid + '/' + data.configSid + '/' + data.userSid, url: '/base/v1/basevehicle/selectExiCarConfig',
method: 'get' method: 'post',
params: {
modelSid:data.modelSid,
configSid:data.configSid,
vehModelConfigSid:data.vehModelConfigSid,
userSid:data.userSid
},
}) })
} }

14
anrui-scm/anrui-scm-ui/src/api/vehicleModel/vehicleconfiguration.js

@ -0,0 +1,14 @@
import request from '@/utils/request'
// 车型配置详细信息
export function selectExiCarConfig(data) {
return request({
url: '/base/v1/basevehicle/selectExiCarConfig',
method: 'post',
params: {
modelSid:data.modelSid,
configSid:data.configSid,
vehModelConfigSid:data.vehModelConfigSid,
},
})
}

390
anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue

@ -0,0 +1,390 @@
<template>
<div class="app-container">
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" class="formaddcopy02">
<!-- <div class="headtitle">{{ formobj.vehicleAlias }}</div>-->
<!-- <div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>-->
<div class="headtitle_con">
<div class="headtitle">
{{ formobj.vehicleAlias }}
<div class="headtitle_jia">销售指导价:<span>{{guidedPrice}} 万元</span></div>
<div class="icon_sty" @click="changeDown(false)" v-show="isDown">
<i class="el-icon-arrow-down"/>
<span>展开</span>
</div>
<div class="icon_sty" @click="changeUp(true)" v-show="!isDown">
<i class="el-icon-arrow-up"/>
<span>收起</span>
</div>
</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>品牌</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>功能</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>系列</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.productLineValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>驱动</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.driveFormValue }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>马力</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.powerValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>版本</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleVersionValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>燃料</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="14">
<div class="span-sty"><span>变速箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div class="more_content" v-show="!isDown">
<div class="headline">车型信息</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>排放标准</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.emissionStandardValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>发动机型号</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>细分市场</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.marketSegmentsValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>规格型号</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>系别</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">常用配置</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>颜色</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>缓速器</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>后视镜</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轮胎</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>驾驶室</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>后桥速比</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>空调</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轮毂材质</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>导流罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>悬架</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>座椅</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>护轮罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>鞍座</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轴距</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>保险杠</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>配置包</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>独立热源</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>燃料箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>多媒体</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item>
</el-col>
<el-col :span="4">
<!-- <div class="span-sty"><span>货箱</span></div>-->
<!-- <el-form-item><span class="addinputInfo">{{ formobj.packingCase }}</span></el-form-item>-->
</el-col>
</el-row>
<div class="headline">
更多配置
<div class="icon_sty" @click="changeDownOtherConfig(false)" v-show="isDownOther">
<i class="el-icon-arrow-down"/>
<span>展开</span>
</div>
<div class="icon_sty" @click="changeUpOtherConfig(true)" v-show="!isDownOther">
<i class="el-icon-arrow-up"/>
<span>收起</span>
</div>
</div>
<el-row v-show="!isDownOther">
<el-col :span="24">
<el-form-item>{{ formobj.otherConfig }}</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
</div>
</template>
<script>
import { selectExiCarConfig } from '@/api/vehicleModel/vehicleconfiguration.js'
export default {
name: 'chexingpeizhibiaozhun',
props:{
params: {
type: Object,
}
},
data() {
return {
FormLoading: false,
priceValidity: '',
guidedPrice:'',
formobj: {},
isDown: true,
isDownOther: true,
sid_list: {
modelSid: '',
configSid: '',
vehModelConfigSid:'',
userSid: window.sessionStorage.getItem('userSid')
}
}
},
watch:{
params: {
deep: true,
immediate: false,
handler(newVal, oldVal) {
console.log('子组件接受的props数据if判断外', newVal)
if (newVal.configSid !== '' && newVal.modelSid !== ''){
console.log('子组件接受的props数据', newVal)
if (newVal.guidedPrice !== '' || newVal.guidedPrice !== null){
const guidedPrice_two = parseFloat(Number(newVal.guidedPrice) / 10000).toFixed(2)
this.guidedPrice = guidedPrice_two
}
selectExiCarConfig({
modelSid:newVal.modelSid,
configSid:newVal.configSid,
vehModelConfigSid:newVal.vehModelConfigSid
}).then((response) => {
this.FormLoading = false
if (response.success) {
this.formobj = response.data
} else {
this.$message({
showClose: true,
message: '查看失败!',
type: 'error'
});
}
})
}else {
this.formobj = {}
this.guidedPrice = ''
}
// this.files = newVal
// console.log('aaaa2', this.files)
}
}
},
methods: {
init() {
this.tempDate.sid = this.$route.query.sid
},
//
changeDown(val) {
this.isDown = val
},
changeUp(val) {
this.isDown = val
},
//
changeDownOtherConfig(val) {
this.isDownOther = val
},
changeUpOtherConfig(val) {
this.isDownOther = val
},
// ------------------------------------------------------
//
showInfo(row) {
this.FormLoading = true
this.sid_list.modelSid = row.modelSid
this.sid_list.configSid = row.modelConfigSid
this.sid_list.vehModelConfigSid = row.vehModelConfigSid
if (row.guidedPrice !== '' || row.guidedPrice !== null){
const guidedPrice_two = parseFloat(Number(row.guidedPrice) / 10000).toFixed(2)
this.guidedPrice = guidedPrice_two
}
selectExiCarConfig(this.sid_list).then((response) => {
this.FormLoading = false
if (response.success) {
this.formobj = response.data
} else {
this.$notify({
title: '失败',
message: '查询失败',
type: 'error'
})
}
})
}
}
}
</script>
<style scoped>
/* 标题头部的样式 */
.headtitle {
padding: 9px;
font-weight: bold;
font-size: 20px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
position: relative;
}
/* 内容头部的样式 */
.headline {
padding: 9px;
/*font-weight: bold;*/
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
position: relative;
}
/* 标题中内容的样式 */
.formaddcopy02 .headtitle_con .span-sty {
font-size: 16px;
width: 88px;
}
.formaddcopy02 .headtitle_con .addinputInfo {
font-size: 16px;
}
/* 内容部分中内容的样式 */
.formaddcopy02 .more_content .span-sty {
font-size: 16px;
width: 88px;
}
.formaddcopy02 .more_content /deep/ .el-form-item__content {
font-size: 16px;
}
.formaddcopy02 .headtitle_con .headtitle .icon_sty .el-icon-arrow-down, .el-icon-arrow-up {
font-size: 14px;
text-align: center;
}
/* 标题部分的展开与收起按钮*/
.formaddcopy02 .headtitle_con .headtitle .icon_sty {
display: inline-block;
position: absolute;
font-size: 14px;
top: 14px;
right: 10px;
text-align: center;
cursor: pointer;
}
/* 销售指导价的样式 */
.formaddcopy02 .headtitle_con .headtitle .headtitle_jia {
display: inline-block;
position: absolute;
right: 70px;
color: #d00000;
}
/* 内容部分的展开与收起按钮 */
.formaddcopy02 .headline .icon_sty {
display: inline-block;
position: absolute;
font-size: 14px;
font-weight: bolder;
right: 10px;
text-align: center;
cursor: pointer;
}
/* 更多配置一行的内边距 */
.formaddcopy02 .more_content /deep/ .el-col-24 {
padding: 20px;
}
/* 更多配置一行的行高 */
.formaddcopy02 .more_content .el-col-24 /deep/ .el-form-item__content {
line-height: 28px;
}
</style>

20
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -127,6 +127,7 @@ import ChangyongpeizhiInfo from '@/views/cheliang/chexingpeizhi/changyongpeizhiI
import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration' import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
import ButtonBar from '@/components/ButtonBar' import ButtonBar from '@/components/ButtonBar'
import Vehicle from '@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle' import Vehicle from '@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle'
import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
export default { export default {
name: 'cheliangtaizhang', name: 'cheliangtaizhang',
@ -196,7 +197,8 @@ export default {
location: '', location: '',
modelName: '', modelName: '',
vehicleState: '', vehicleState: '',
vinNo: '' vinNo: '',
createOrgSid:''
}, },
current: 1, current: 1,
size: 20 size: 20
@ -233,7 +235,7 @@ export default {
// //
this.init() this.init()
// //
this.getList() this.getPathSid()
this.getUseOrg() this.getUseOrg()
}, },
mounted() { mounted() {
@ -322,6 +324,15 @@ export default {
} }
}) })
}, },
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid:userSid}).then((res) => {
if (res.code === '200') {
this.listQuery.params.createOrgSid = res.data
this.getList()
}
})
},
// //
getList() { getList() {
this.listLoading = true this.listLoading = true
@ -364,12 +375,13 @@ export default {
location: '', location: '',
modelName: '', modelName: '',
vehicleState: '', vehicleState: '',
vinNo: '' vinNo: '',
createOrgSid:''
}, },
current: 1, current: 1,
size: 20 size: 20
} }
this.getList() this.getPathSid()
}, },
// ------------------------------------------------------ // ------------------------------------------------------
// //

41
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@ -68,10 +68,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="engineNo"> <el-form-item prop="">
<span slot="label">发动机号/许可证号</span> <span slot="label">内部编码</span>
<el-input v-model="temp.engineNo" maxlength="125" placeholder="" class="addinputw" clearable/> <el-input placeholder="" class="addinputw" v-model="temp.insideCode" clearable/>
</el-form-item> </el-form-item>
<!-- <el-form-item prop="engineNo">-->
<!-- <span slot="label">发动机号/许可证号</span>-->
<!-- <el-input v-model="temp.engineNo" maxlength="125" placeholder="" class="addinputw" clearable/>-->
<!-- </el-form-item>-->
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item prop="orderingNo"> <el-form-item prop="orderingNo">
@ -140,8 +144,8 @@
<span slot="label">结算状态</span> <span slot="label">结算状态</span>
<el-select v-model="temp.settlementStatus" class="addinputw" clearable placeholder="" <el-select v-model="temp.settlementStatus" class="addinputw" clearable placeholder=""
@change="settlementStatusChange"> @change="settlementStatusChange">
<el-option v-for="(item,index) in settlementStatus_list" :key="item.key" :label="item.value" <el-option v-for="(item,index) in settlementStatus_list" :key="item.dictKey" :label="item.dictValue"
:value="item.key"/> :value="item.dictKey"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -218,13 +222,10 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">-->
<el-form-item prop="">
<span slot="label">内部编码</span> <!-- </el-col>-->
<el-input placeholder="" class="addinputw" v-model="temp.insideCode" clearable/> <!-- <el-col :span="12" />-->
</el-form-item>
</el-col>
<el-col :span="12" />
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
@ -310,6 +311,7 @@ export default {
returnDate: '',// 退 returnDate: '',// 退
salesDate: '',// salesDate: '',//
settlementStatus: '',//012 settlementStatus: '',//012
settlementStatusValue:'',
solidDate: '',// solidDate: '',//
specialInstructions: '',// specialInstructions: '',//
useOrg: '',// 使sid useOrg: '',// 使sid
@ -525,7 +527,7 @@ export default {
getType() { getType() {
// //
typeValues({ typeValues({
type: 'vehicleLedgerState' type: 'vehicleState'
}).then((res) => { }).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.vehicleState_list = res.data this.vehicleState_list = res.data
@ -549,6 +551,15 @@ export default {
console.log('锁定状态', this.lockedState_list) console.log('锁定状态', this.lockedState_list)
} }
}) })
//
typeValues({
type: 'settlementStatus'
}).then((res) => {
if (res.code === '200') {
this.settlementStatus_list = res.data
console.log('结算状态', this.settlementStatus_list)
}
})
}, },
vehicleStateValueChange(val) { vehicleStateValueChange(val) {
const choosetItem = this.vehicleState_list.filter((item) => item.dictKey == val) const choosetItem = this.vehicleState_list.filter((item) => item.dictKey == val)
@ -562,8 +573,8 @@ export default {
}, },
settlementStatusChange(val) { settlementStatusChange(val) {
const choosetItem = this.settlementStatus_list.filter((item) => item.dictKey == val) const choosetItem = this.settlementStatus_list.filter((item) => item.dictKey == val)
// this.temp.vehicleStateValue = choosetItem[0].dictValue this.temp.settlementStatusValue = choosetItem[0].dictValue
console.log('name:', this.temp.settlementStatus, 'key:', this.temp.settlementStatus) console.log('name:', this.temp.settlementStatusValue, 'key:', this.temp.settlementStatus)
}, },
// //
locationChange(val) { locationChange(val) {

28
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangInfo.vue

@ -38,12 +38,18 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="trightb">发动机号/许可证号</el-col> <el-col :span="4" class="trightb">内部编码</el-col>
<el-col :span="8" class="tleft"> <el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
<span>{{ temp.engineNo }}</span> <span>{{ temp.insideCode }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" class="trightb">发动机号/许可证号</el-col>-->
<!-- <el-col :span="8" class="tleft">-->
<!-- <el-form-item>-->
<!-- <span>{{ temp.engineNo }}</span>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="4" class="trightb">厂家订单编码</el-col> <el-col :span="4" class="trightb">厂家订单编码</el-col>
<el-col :span="8" class="tleft"> <el-col :span="8" class="tleft">
<el-form-item> <el-form-item>
@ -163,15 +169,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <!-- <el-row>-->
<el-col :span="4" class="trightb">内部编码</el-col> <!-- <el-col :span="4" class="trightb">内部编码</el-col>-->
<el-col :span="8" class="tleft"> <!-- <el-col :span="8" class="tleft">-->
<el-form-item> <!-- <el-form-item>-->
<span>{{ temp.insideCode }}</span> <!-- <span>{{ temp.insideCode }}</span>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="12" class="trightb"/> <!-- <el-col :span="12" class="trightb"/>-->
</el-row> <!-- </el-row>-->
</el-form> </el-form>
</div> </div>
</div> </div>

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

@ -6,202 +6,207 @@
<el-button type="info" size="small" @click="handleReturn">关闭</el-button> <el-button type="info" size="small" @click="handleReturn">关闭</el-button>
</div> </div>
</div> </div>
<div class="listconadd"> <vehicleconfiguration ref="divConfig" :params="sid_list"/>
<el-form ref="dataForm" :model="formobj" class="formaddcopy02"> <!-- <div class="listconadd">-->
<!-- <div class="headtitle">{{ formobj.vehicleAlias }}</div>--> <!-- <el-form ref="dataForm" :model="formobj" class="formaddcopy02">-->
<!-- <div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>--> <!-- &lt;!&ndash; <div class="headtitle">{{ formobj.vehicleAlias }}</div>&ndash;&gt;-->
<div class="headtitle_con"> <!-- &lt;!&ndash; <div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>&ndash;&gt;-->
<div class="headtitle"> <!-- <div class="headtitle_con">-->
{{ formobj.vehicleAlias }} <!-- <div class="headtitle">-->
<div class="headtitle_jia">销售指导价:<span>{{guidedPrice}}</span></div> <!-- {{ formobj.vehicleAlias }}-->
<div class="icon_sty" @click="changeDown(false)" v-show="isDown"> <!-- <div class="headtitle_jia">销售指导价:<span>{{guidedPrice}} 万元</span></div>-->
<i class="el-icon-arrow-down"/> <!-- <div class="icon_sty" @click="changeDown(false)" v-show="isDown">-->
<span>展开</span> <!-- <i class="el-icon-arrow-down"/>-->
</div> <!-- <span>展开</span>-->
<div class="icon_sty" @click="changeUp(true)" v-show="!isDown"> <!-- </div>-->
<i class="el-icon-arrow-up"/> <!-- <div class="icon_sty" @click="changeUp(true)" v-show="!isDown">-->
<span>收起</span> <!-- <i class="el-icon-arrow-up"/>-->
</div> <!-- <span>收起</span>-->
</div> <!-- </div>-->
<el-row> <!-- </div>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>品牌</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item> <!-- <div class="span-sty"><span>品牌</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>功能</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeValue }}</span></el-form-item> <!-- <div class="span-sty"><span>功能</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeValue }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>系列</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.productLineValue }}</span></el-form-item> <!-- <div class="span-sty"><span>系列</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.productLineValue }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>驱动</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.driveFormValue }}</span></el-form-item> <!-- <div class="span-sty"><span>驱动</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.driveFormValue }}</span></el-form-item>-->
<el-col :span="4"> <!-- </el-col>-->
<div class="span-sty"><span>马力</span></div> <!-- <el-col :span="4">-->
<el-form-item><span class="addinputInfo">{{ formobj.powerValue }}</span></el-form-item> <!-- <div class="span-sty"><span>马力</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.powerValue }}</span></el-form-item>-->
</el-row> <!-- </el-col>-->
<el-row> <!-- </el-row>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>版本</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.vehicleVersionValue }}</span></el-form-item> <!-- <div class="span-sty"><span>版本</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.vehicleVersionValue }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>燃料</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.fuelTypeValue }}</span></el-form-item> <!-- <div class="span-sty"><span>燃料</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.fuelTypeValue }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>变速箱</span></div> <!-- <el-col :span="14">-->
<el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item> <!-- <div class="span-sty"><span>变速箱</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>-->
</el-row> <!-- </el-col>-->
</div> <!-- </el-row>-->
<div class="more_content" v-show="!isDown"> <!-- </div>-->
<div class="headline">车型信息</div> <!-- <div class="more_content" v-show="!isDown">-->
<el-row> <!-- <div class="headline">车型信息</div>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>排放标准</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.emissionStandardValue }}</span> <!-- <div class="span-sty"><span>排放标准</span></div>-->
</el-form-item> <!-- <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.emissionStandardValue }}</span>-->
</el-col> <!-- </el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>发动机型号</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item> <!-- <div class="span-sty"><span>发动机型号</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>细分市场</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.marketSegmentsValue }}</span> <!-- <div class="span-sty"><span>细分市场</span></div>-->
</el-form-item> <!-- <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.marketSegmentsValue }}</span>-->
</el-col> <!-- </el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>规格型号</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.specifications }}</span></el-form-item> <!-- <div class="span-sty"><span>规格型号</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.specifications }}</span></el-form-item>-->
<el-col :span="4"> <!-- </el-col>-->
<div class="span-sty"><span>系别</span></div> <!-- <el-col :span="4">-->
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item> <!-- <div class="span-sty"><span>系别</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item>-->
</el-row> <!-- </el-col>-->
<div class="headline">常用配置</div> <!-- </el-row>-->
<el-row> <!-- <div class="headline">常用配置</div>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>颜色</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item> <!-- <div class="span-sty"><span>颜色</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>缓速器</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item> <!-- <div class="span-sty"><span>缓速器</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>后视镜</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item> <!-- <div class="span-sty"><span>后视镜</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>轮胎</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item> <!-- <div class="span-sty"><span>轮胎</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>-->
<el-col :span="4"> <!-- </el-col>-->
<div class="span-sty"><span>驾驶室</span></div> <!-- <el-col :span="4">-->
<el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item> <!-- <div class="span-sty"><span>驾驶室</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>-->
</el-row> <!-- </el-col>-->
<el-row> <!-- </el-row>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>后桥速比</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item> <!-- <div class="span-sty"><span>后桥速比</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>空调</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item> <!-- <div class="span-sty"><span>空调</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>轮毂材质</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item> <!-- <div class="span-sty"><span>轮毂材质</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>导流罩</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item> <!-- <div class="span-sty"><span>导流罩</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>-->
<el-col :span="4"> <!-- </el-col>-->
<div class="span-sty"><span>悬架</span></div> <!-- <el-col :span="4">-->
<el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item> <!-- <div class="span-sty"><span>悬架</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>-->
</el-row> <!-- </el-col>-->
<el-row> <!-- </el-row>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>座椅</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item> <!-- <div class="span-sty"><span>座椅</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>护轮罩</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item> <!-- <div class="span-sty"><span>护轮罩</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>鞍座</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item> <!-- <div class="span-sty"><span>鞍座</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>轴距</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item> <!-- <div class="span-sty"><span>轴距</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>-->
<el-col :span="4"> <!-- </el-col>-->
<div class="span-sty"><span>保险杠</span></div> <!-- <el-col :span="4">-->
<el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item> <!-- <div class="span-sty"><span>保险杠</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>-->
</el-row> <!-- </el-col>-->
<el-row> <!-- </el-row>-->
<el-col :span="5"> <!-- <el-row>-->
<div class="span-sty"><span>配置包</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item> <!-- <div class="span-sty"><span>配置包</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>独立热源</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item> <!-- <div class="span-sty"><span>独立热源</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>燃料箱</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item> <!-- <div class="span-sty"><span>燃料箱</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>-->
<el-col :span="5"> <!-- </el-col>-->
<div class="span-sty"><span>多媒体</span></div> <!-- <el-col :span="5">-->
<el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item> <!-- <div class="span-sty"><span>多媒体</span></div>-->
</el-col> <!-- <el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item>-->
<el-col :span="4"> <!-- </el-col>-->
<!-- <div class="span-sty"><span>货箱</span></div>--> <!-- <el-col :span="4">-->
<!-- <el-form-item><span class="addinputInfo">{{ formobj.packingCase }}</span></el-form-item>--> <!-- &lt;!&ndash; <div class="span-sty"><span>货箱</span></div>&ndash;&gt;-->
</el-col> <!-- &lt;!&ndash; <el-form-item><span class="addinputInfo">{{ formobj.packingCase }}</span></el-form-item>&ndash;&gt;-->
</el-row> <!-- </el-col>-->
<div class="headline"> <!-- </el-row>-->
更多配置 <!-- <div class="headline">-->
<div class="icon_sty" @click="changeDownOtherConfig(false)" v-show="isDownOther"> <!-- 更多配置-->
<i class="el-icon-arrow-down"/> <!-- <div class="icon_sty" @click="changeDownOtherConfig(false)" v-show="isDownOther">-->
<span>展开</span> <!-- <i class="el-icon-arrow-down"/>-->
</div> <!-- <span>展开</span>-->
<div class="icon_sty" @click="changeUpOtherConfig(true)" v-show="!isDownOther"> <!-- </div>-->
<i class="el-icon-arrow-up"/> <!-- <div class="icon_sty" @click="changeUpOtherConfig(true)" v-show="!isDownOther">-->
<span>收起</span> <!-- <i class="el-icon-arrow-up"/>-->
</div> <!-- <span>收起</span>-->
</div> <!-- </div>-->
<el-row v-show="!isDownOther"> <!-- </div>-->
<el-col :span="24"> <!-- <el-row v-show="!isDownOther">-->
<el-form-item>{{ formobj.otherConfig }}</el-form-item> <!-- <el-col :span="24">-->
</el-col> <!-- <el-form-item>{{ formobj.otherConfig }}</el-form-item>-->
</el-row> <!-- </el-col>-->
</div> <!-- </el-row>-->
</el-form> <!-- </div>-->
</div> <!-- </el-form>-->
<!-- </div>-->
</div> </div>
</template> </template>
<script> <script>
import vehicleconfiguration from '@/components/VehicleConfigurationSub/vehicleconfiguration'
import { selectExiCarConfig } from '@/api/cheliang/chexingbaojia' import { selectExiCarConfig } from '@/api/cheliang/chexingbaojia'
export default { export default {
name: 'chexingpeizhibiaozhun', name: 'chexingpeizhibiaozhun',
components:{
vehicleconfiguration
},
data() { data() {
return { return {
FormLoading: false, FormLoading: false,
@ -213,7 +218,8 @@ export default {
sid_list: { sid_list: {
modelSid: '', modelSid: '',
configSid: '', configSid: '',
userSid: window.sessionStorage.getItem('userSid') vehModelConfigSid:'',
guidedPrice:''
} }
} }
}, },
@ -249,19 +255,25 @@ export default {
this.FormLoading = true this.FormLoading = true
this.sid_list.modelSid = row.modelSid this.sid_list.modelSid = row.modelSid
this.sid_list.configSid = row.modelConfigSid this.sid_list.configSid = row.modelConfigSid
this.guidedPrice = row.guidedPrice this.sid_list.vehModelConfigSid = row.vehModelConfigSid
selectExiCarConfig(this.sid_list).then((response) => { this.sid_list.guidedPrice = row.guidedPrice
this.FormLoading = false // if (row.guidedPrice !== '' || row.guidedPrice !== null){
if (response.success) { // const guidedPrice_two = parseFloat(Number(row.guidedPrice) / 10000).toFixed(2)
this.formobj = response.data // this.guidedPrice = guidedPrice_two
} else { // }
this.$notify({ // selectExiCarConfig(this.sid_list).then((response) => {
title: '失败', // this.FormLoading = false
message: '查询失败', // if (response.success) {
type: 'error' // this.formobj = response.data
}) //
} // } else {
}) // this.$notify({
// title: '',
// message: '',
// type: 'error'
// })
// }
// })
} }
} }
} }
@ -325,10 +337,12 @@ export default {
cursor: pointer; cursor: pointer;
} }
/* 销售指导价的样式 */
.formaddcopy02 .headtitle_con .headtitle .headtitle_jia { .formaddcopy02 .headtitle_con .headtitle .headtitle_jia {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
right: 400px; right: 70px;
color: #d00000;
} }
/* 内容部分的展开与收起按钮 */ /* 内容部分的展开与收起按钮 */

13
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiAdd.vue

@ -270,7 +270,7 @@
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="22">--> <!-- <el-col :span="22">-->
<el-form-item prop="otherConfig"> <el-form-item prop="otherConfig">
<el-input type="textarea" :rows="3" placeholder="请输入内容" class="addinputw" v-model="temp.otherConfig"> <el-input type="textarea" :rows="3" placeholder="请输入内容" class="addinputw addinputwTwo" v-model="temp.otherConfig">
</el-input> </el-input>
<!-- <el-input v-model="temp.otherConfig" maxlength="125" placeholder="" class="addinputw" clearable/>--> <!-- <el-input v-model="temp.otherConfig" maxlength="125" placeholder="" class="addinputw" clearable/>-->
</el-form-item> </el-form-item>
@ -1049,12 +1049,15 @@ export default {
line-height: 40px !important; line-height: 40px !important;
font-weight: 600; font-weight: 600;
} }
.addinputw {
width: 60% !important;
}
.addinputw02{ .addinputw02{
width: 52% !important; width: 52% !important;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw{
width: 60%;
margin-left: 65px;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputwTwo{
width: 95%;
}
</style> </style>

4
anrui-scm/anrui-scm-ui/src/views/cheliang/chexingpeizhi/changyongpeizhiInfo.vue

@ -282,5 +282,7 @@ export default {
.tleftb { .tleftb {
text-align: left; text-align: left;
} }
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputInfo{
margin-left: 65px;
}
</style> </style>

Loading…
Cancel
Save