Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 2 years ago
parent
commit
dc1eb80351
  1. 13
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java
  3. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java
  4. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java
  5. 30
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java
  6. 17
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java
  7. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java
  8. 8
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  9. 21
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java
  10. 116
      anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/shangzhuangInfo.vue
  11. 116
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/shangzhuangInfo.vue
  12. 16
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue
  13. 16
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue
  14. 16
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue
  15. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue
  16. 15
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue
  17. 17
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue
  18. 13
      anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomerfile/CrmCustomerFileService.java
  19. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java
  20. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java
  21. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  22. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java
  23. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml
  24. 10
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java
  25. 12
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java
  26. 12
      anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
  27. 10
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  28. 548
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue
  29. 116
      anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/relation/shangzhuangInfo.vue
  30. 6
      anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtaizhangselect.vue
  31. 208
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
  32. 116
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangInfo.vue
  33. 121
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhangtaizhangInfo.vue
  34. 129
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
  35. 6
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi.vue
  36. 96
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd.vue
  37. 96
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue
  38. 96
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd.vue
  39. 96
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue
  40. 6
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue
  41. 6
      anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtaizhangchoose.vue
  42. 12
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java
  43. 76
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

13
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleoutapply/BaseVehicleOutApplyVoNew.java

@ -84,6 +84,8 @@ public class BaseVehicleOutApplyVoNew implements Vo {
private String materialName;
@ApiModelProperty("物料编码")
private String materialCode;
@ApiModelProperty("物料sid")
private String materialSid;
@ApiModelProperty("赠品价值")
private String giftsDescription;
@ApiModelProperty("销售折让")
@ -98,7 +100,12 @@ public class BaseVehicleOutApplyVoNew implements Vo {
private String rebateMoneyTwo;
@ApiModelProperty("内部引荐人姓名")
private String innerName;
@ApiModelProperty("车型sid")
private String modelSid;
@ApiModelProperty("配置sid")
private String modelConfigSid;
@ApiModelProperty("车型与配置关联sid")
private String vehModelConfigSid;
@ApiModelProperty("车型配置简称")
private String modelName;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelDto.java

@ -76,23 +76,18 @@ public class BaseVehinstallmodelDto implements Dto {
@ApiModelProperty("颜色value")
private String colorValue; // 颜色value
@ApiModelProperty("外廓尺寸_长")
@NotBlank(message = "外廓尺寸长不能为空")
private String wk_long; // 外廓尺寸_长
@ApiModelProperty("外廓尺寸_宽")
@NotBlank(message = "外廓尺寸宽不能为空")
private String wk_wide; // 外廓尺寸_宽
@ApiModelProperty("外廓尺寸_高")
@NotBlank(message = "外廓尺寸高不能为空")
private String wk_high; // 外廓尺寸_高
@ApiModelProperty("板材材质key")
private String plateMaterialKey; // 板材材质key
@ApiModelProperty("板材材质value")
private String plateMaterialValue; // 板材材质value
@ApiModelProperty("板材厚度_底")
@NotBlank(message = "板材厚度底不能为空")
private String plateThicknessBottom; // 板材厚度_底
@ApiModelProperty("板材厚度_边")
@NotBlank(message = "板材厚度边不能为空")
private String plateThicknessEdge; // 板材厚度_边
@ApiModelProperty("篷布滑道key")
private String tarpaulinSlideKey; // 篷布滑道key

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehinstallmodel/BaseVehinstallmodelVo.java

@ -55,6 +55,8 @@ public class BaseVehinstallmodelVo implements Vo {
@ApiModelProperty("车辆功能value")
private String vehicleTypeValue; // 车辆功能value
@ApiModelProperty("上装名称key")
private String installNameKey; // 上装名称key
@ApiModelProperty("上装名称value")
private String installNameValue; // 上装名称value
@ApiModelProperty("委改方式value")
@ -91,4 +93,8 @@ public class BaseVehinstallmodelVo implements Vo {
private String floorHeating; // 底板加热
@ApiModelProperty("更多配置")
private String moreConfig; // 更多配置
@ApiModelProperty("冷机品牌")
private String coolerBrand;
@ApiModelProperty("冷机型号")
private String coolerModel;
}

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleoutapply/BaseVehicleOutApplyService.java

@ -119,7 +119,9 @@ public class BaseVehicleOutApplyService extends MybatisBaseService<BaseVehicleOu
for (BaseVehicleOutApplyVoNew record : pagging.getRecords()) {
String createOrgSid = record.getCreateOrgSid();
String createorgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
if (StringUtils.isNotBlank(record.getMaterialCode())){
record.setMaterialCode(record.getMaterialCode().substring(record.getMaterialCode().length() - 8));
}
record.setCreateOrgName(createorgName);
}
PagerVo<BaseVehicleOutApplyVoNew> p = PagerUtil.pageToVo(pagging, null);

30
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelRest.java

@ -78,20 +78,22 @@ public class BaseVehinstallmodelRest implements BaseVehinstallmodelFeign {
String wk_high = dto.getWk_high();
String plateThicknessBottom = dto.getPlateThicknessBottom();
String plateThicknessEdge = dto.getPlateThicknessEdge();
if (StringUtils.isBlank(wk_long)){
return rb.setMsg("外廓尺寸长不能为空");
}
if (StringUtils.isBlank(wk_wide)){
return rb.setMsg("外廓尺寸宽不能为空");
}
if (StringUtils.isBlank(wk_high)){
return rb.setMsg("外廓尺寸高不能为空");
}
if (StringUtils.isBlank(plateThicknessBottom)){
return rb.setMsg("板材厚度底不能为空");
}
if (StringUtils.isBlank(plateThicknessEdge)){
return rb.setMsg("板材厚度边不能为空");
if (!"08".equals(dto.getInstallNameKey())){
if (StringUtils.isBlank(wk_long)){
return rb.setMsg("外廓尺寸长不能为空");
}
if (StringUtils.isBlank(wk_wide)){
return rb.setMsg("外廓尺寸宽不能为空");
}
if (StringUtils.isBlank(wk_high)){
return rb.setMsg("外廓尺寸高不能为空");
}
if (StringUtils.isBlank(plateThicknessBottom)){
return rb.setMsg("板材厚度底不能为空");
}
if (StringUtils.isBlank(plateThicknessEdge)){
return rb.setMsg("板材厚度边不能为空");
}
}
baseVehinstallmodelService.saveOrUpdateDto(dto);
return rb.success();

17
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodel/BaseVehinstallmodelService.java

@ -85,13 +85,16 @@ public class BaseVehinstallmodelService extends MybatisBaseService<BaseVehinstal
IPage<BaseVehinstallmodelVo> pagging = baseMapper.selectPageVo(page, qw);
List<BaseVehinstallmodelVo> records = pagging.getRecords();
for (BaseVehinstallmodelVo record : records) {
String wk_long = record.getWk_long();
String wk_wide = record.getWk_wide();
String wk_high = record.getWk_high();
record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm");
String plateThicknessBottom = record.getPlateThicknessBottom();
String plateThicknessEdge = record.getPlateThicknessEdge();
record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm");
String installNameKey = record.getInstallNameKey();
if (!"08".equals(installNameKey)){
String wk_long = record.getWk_long();
String wk_wide = record.getWk_wide();
String wk_high = record.getWk_high();
record.setWk("长"+wk_long+"mm,宽"+wk_wide+"mm,高"+wk_high+"mm");
String plateThicknessBottom = record.getPlateThicknessBottom();
String plateThicknessEdge = record.getPlateThicknessEdge();
record.setPlateThickness("底"+plateThicknessBottom+"mm,边"+plateThicknessEdge+"mm");
}
}
PagerVo<BaseVehinstallmodelVo> p = PagerUtil.pageToVo(pagging, null);
return p;

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

@ -151,4 +151,11 @@ public class SolutionsDetailsssVo {
@ApiModelProperty("名义留购价")
private String nominalPrice;
@ApiModelProperty("单台成交价")
private String finalPrice;
@ApiModelProperty("挂车价格")
private String gcPrice;
@ApiModelProperty("上装成交价")
private String szPrice;
}

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

@ -306,6 +306,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
@Autowired
private LoanSolutionsOtherpolicyFeign loanSolutionsOtherpolicyFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
/**
* 构造查询条件
@ -6384,6 +6386,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
qw.notIn("bv.sid", stringList);
}
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid);
if(!listResultBean.getData().isEmpty()){
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bv.sid",listResultBean.getData());
}
List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw);
stringList.removeAll(Collections.singleton(null));
return rb.success().setData(stringList);

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

@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -93,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
@Autowired
private FinBillVehicleFeign finBillVehicleFeign;
@Autowired
private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
if (list.size() > 0) {
@ -287,8 +290,10 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
for (BusVehicleQKKPVo busVehicleQKKPVo : busVehicleQKKPVosNew) {
if (StringUtils.isNotBlank(busVehicleQKKPVo.getVehSid())) {
BaseVehicleCertificateVo baseVehicleCertificateVo = baseVehicleCertificateFeign.selStateByVehicleSid(busVehicleQKKPVo.getVehSid()).getData();
busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
if (baseVehicleCertificateVo != null){
busVehicleQKKPVo.setCertificateState(baseVehicleCertificateVo.getCertificateState());
busVehicleQKKPVo.setCertificateStateValue(baseVehicleCertificateVo.getCertificateStateValue());
}
TraliveredVo traliveredVo = baseTrailerFeign.trailerList(busVehicleQKKPVo.getVehSid(), query.getContractNo()).getData();
List<TrailerVo> trailerVos = traliveredVo.getList();
if (trailerVos != null && trailerVos.size() > 0) {
@ -329,6 +334,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
qw.notIn("bv.linkSid", vinSidList);
}
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo());
if(!listResultBean.getData().isEmpty()){
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bv.sid",listResultBean.getData());
}
List<QCarVo> list = baseMapper.getCanUseCars(qw);
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
@ -388,6 +399,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
qw.notIn("bv.linkSid", vinSidList);
}
}
//查询是否存在应收未收款项
ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
if(!listResultBean.getData().isEmpty()){
listResultBean.getData().removeAll(Collections.singleton(null));
qw.notIn("bv.sid",listResultBean.getData());
}
IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
List<QCarVo> list = pagging.getRecords();

116
anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/relation/shangzhuangInfo.vue

@ -47,63 +47,75 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.wk_long }}</span>mm,
<span class="inputStyle">{{ item.wk_wide }}</span>mm,
<span class="inputStyle">{{ item.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-row v-if="item.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ item.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.moreConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="item.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.wk_long }}</span>mm,
<span class="inputStyle">{{ item.wk_wide }}</span>mm,
<span class="inputStyle">{{ item.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ item.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.moreConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
</el-form>
</div>

116
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/relation/shangzhuangInfo.vue

@ -47,63 +47,75 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.wk_long }}</span>mm,
<span class="inputStyle">{{ item.wk_wide }}</span>mm,
<span class="inputStyle">{{ item.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-row v-if="item.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ item.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.moreConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="item.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.wk_long }}</span>mm,
<span class="inputStyle">{{ item.wk_wide }}</span>mm,
<span class="inputStyle">{{ item.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ item.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.moreConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
</el-form>
</div>

16
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue

@ -8,8 +8,22 @@
</div>
<div class="">
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6">
<div class="span-sty">单车主车销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车挂车销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.gcPrice }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单车上装销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.szPrice }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.typeKey !== '02'">
<el-row style="border-top: 1px solid #E0E3EB">
<el-row>
<el-col :span="6">
<div class="span-sty">是否打包</div>
<el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>

16
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialschemeEdit.vue

@ -9,8 +9,22 @@
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" label-position="top" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6">
<div class="span-sty">单车主车销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车挂车销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.gcPrice }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单车上装销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.szPrice }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.typeKey !== '02'">
<el-row style="border-top: 1px solid #E0E3EB">
<el-row>
<el-col :span="6">
<div class="span-sty">是否打包</div>
<el-form-item>

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

@ -8,8 +8,22 @@
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" label-position="top" label-width="130px" class="formaddcopy02">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6">
<div class="span-sty">单车主车销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.finalPrice }}</span></el-form-item>
</el-col>
<el-col :span="6">
<div class="span-sty">单车挂车销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.gcPrice }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty">单车上装销售合同价</div>
<el-form-item><span class="addinputInfo">{{ formobj.szPrice }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.typeKey !== '02'">
<el-row style="border-top: 1px solid #E0E3EB">
<el-row>
<el-col :span="6">
<div class="span-sty">是否打包</div>
<el-form-item><span class="addinputInfo">{{ formobj.isPack == '1' ? '是' : formobj.isPack == '0' ? '否' : '' }}</span></el-form-item>

4
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbilling.vue

@ -147,10 +147,10 @@
<el-form ref="multipleTable" :inline="true" :model="contractList" class="vinNoForm" label-width="100px">
<el-col :span="14">
<el-form-item label="客户名称:">
<el-input v-model="contractList.params.customerName" clearable class="addinputw" placeholder="车架号"/>
<el-input v-model="contractList.params.customerName" clearable class="addinputw" placeholder=""/>
</el-form-item>
<el-form-item label="合同编号:">
<el-input v-model="contractList.params.contractNo" clearable class="addinputw" placeholder="车架号"/>
<el-input v-model="contractList.params.contractNo" clearable class="addinputw" placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="10" class="dialogBtn">

15
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/finginvoiceapply/arrearsbilling/arrearsbillingAdd.vue

@ -91,6 +91,11 @@
</el-row>
<el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
@ -469,6 +474,16 @@ export default {
}
})
},
handleDelete(row, index) {
this.formobj.finBillVehicles.splice(index, 1)
if (this.formobj.trailersList.length > 0) {
this.formobj.trailersList.forEach((e, item) => {
if (e.vinNo === row.vinNo) {
this.formobj.trailersList.splice(item, 1)
}
})
}
},
handleSave() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {

17
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingEdit.vue

@ -89,7 +89,12 @@
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
@ -441,6 +446,16 @@ export default {
}
})
},
handleDelete(row, index) {
this.formobj.finBillVehicles.splice(index, 1)
if (this.formobj.trailersList.length > 0) {
this.formobj.trailersList.forEach((e, item) => {
if (e.vinNo === row.vinNo) {
this.formobj.trailersList.splice(item, 1)
}
})
}
},
handleSave() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {

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

@ -50,6 +50,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -203,6 +204,7 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
vo.setCustomerSid(customerSid);
vo.setUserSid(userSid);
List<AppCustomerArchivesDataVo> dataVos = baseMapper.selectByCustomerSid(customerSid);
dataVos.removeAll(Collections.singleton(null));
if (dataVos.size() > 0) {
for (AppCustomerArchivesDataVo appCustomerArchivesDataVo : dataVos) {
String createTime = appCustomerArchivesDataVo.getCreateTime();
@ -212,10 +214,15 @@ public class CrmCustomerFileService extends MybatisBaseService<CrmCustomerFileMa
appCustomerArchivesDataVo.setLastUploadTime(s);
String sid = appCustomerArchivesDataVo.getSid();
List<CrmFile> listVo = baseMapper.selArchivesFileImageBySid(sid);
listVo.removeAll(Collections.singleton(null));
List<String> list = new ArrayList<>();
for (CrmFile crmFile : listVo) {
String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
list.add(url);
if(!listVo.isEmpty()){
for (CrmFile crmFile : listVo) {
if(StringUtils.isNotBlank(crmFile.getFilePath())){
String url = fileUploadComponent.getUrlPrefix() + crmFile.getFilePath();
list.add(url);
}
}
}
appCustomerArchivesDataVo.setFiles(list);
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@ -108,4 +108,11 @@ public interface FinUncollectedReceivablesDetailedFeign {
@GetMapping("/receivedSelect")
ResultBean<ReceiveInvoiceVo> receivedSelect(@RequestParam("busVinSid") String busVinSid, @RequestParam("vinSid") String vinSid);
@ApiOperation("查询车辆的应收未收款项")
@GetMapping("/selectByContractNoOne")
ResultBean<List<String>> selectByContractNoOne(@RequestParam("contractNo") String contractNo);
@ApiOperation("查询车辆的应收未收款项")
@GetMapping("/selectByCreateBySidOne")
ResultBean<List<String>> selectByCreateBySidOne(@RequestParam("userSid") String userSid);
}

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@ -116,4 +116,14 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
return null;
}
@Override
public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
return null;
}
@Override
public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
return null;
}
}

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

@ -3156,6 +3156,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
String uncollSid = "";
@ -3240,6 +3241,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
String uncollSid = "";
@ -3314,7 +3316,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
boolean one,
String orgCode) {
String sid = confirmation.getSid();
//查询该收款单的所有已选明细:首付款及费用-待审核-全款
List<FinSelectedReceivablesDetailedVo> voListv =
finSelectedReceivablesDetailedService.selectDetailsList(sid, 1, "订金");
finSelectedReceivablesDetailedVos2.removeAll(Collections.singleton(null));
@ -3325,6 +3326,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
String customerNo = createCustomerQuery(1, v, orgCode);
//往来单位
arReceivebill.setFCONTACTUNIT(customerNo);
fEntityList = new ArrayList<>();
//查询该收款单已选款项中该合同号的所有车架号不为空的明细
String contractNo = v.getContractNo();
List<FinSelectedReceivablesDetailedVo> vinListVo = finSelectedReceivablesDetailedService.selectVinListVo_1(sid, 1, "订金", contractNo);

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@ -95,4 +95,8 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
@Select("SELECT sid FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{sid}")
List<String> fetchYsSidByOrderVehSid(String sid);
List<String> selectByContractNoOne(String contractNo);
List<String> selectByCreateBySidOne(String userSid);
}

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@ -148,4 +148,14 @@
WHERE
furd.busVinSid = #{busVinSid}
</select>
<select id="selectByContractNoOne" resultType="java.lang.String">
select distinct fun.busVinSid from fin_uncollected_receivables_detailed fun
where fun.contractNo = #{contractNo} and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney=0)
</select>
<select id="selectByCreateBySidOne" resultType="java.lang.String">
select distinct fun.busVinSid from fin_uncollected_receivables_detailed fun
where fun.createBySid = #{userSid} and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney=0)
</select>
</mapper>

10
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@ -137,6 +137,16 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid);
}
@Override
public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
return finUncollectedReceivablesDetailedService.selectByContractNoOne(contractNo);
}
@Override
public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
return finUncollectedReceivablesDetailedService.selectByCreateBySidOne(userSid);
}
@Override
public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

12
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@ -784,4 +784,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
public List<String> fetchYsSidByOrderVehSid(String sid) {
return baseMapper.fetchYsSidByOrderVehSid(sid);
}
public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> stringList = baseMapper.selectByContractNoOne(contractNo);
return rb.success().setData(stringList);
}
public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
ResultBean<List<String>> rb = ResultBean.fireFail();
List<String> stringList = baseMapper.selectByCreateBySidOne(userSid);
return rb.success().setData(stringList);
}
}

12
anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js

@ -1,7 +1,7 @@
import request from '@/utils/request'
import qs from 'qs'
// 车辆销售(出库)列表
// 车辆销售(出库)列表(之前查的是临时出库的,信息是存在子表中)
export function pagerList(data) {
return request({
url: '/base/v1/basevehicleout/pagerList',
@ -11,6 +11,16 @@ export function pagerList(data) {
})
}
// 车辆销售(出库)列表(查出库申请推送的,信息从主表和子表中获取)
export function listPage(data) {
return request({
url: '/base/v1/basevehicleoutapply/listPage',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 出库详情
export function fetcBySid(sid) {
return request({

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

@ -279,13 +279,21 @@ const codemenu = [
name: 'CheliangtaizhangInfo',
meta: { title: '车辆信息', noCache: true }
},
// 车辆销售
// 车辆销售(旧版)
{
path: '/cheliangxiaoshou/cheliangxiaoshouguanli',
component: () =>
import('@/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue'),
name: 'cheliangxiaoshou',
meta: { title: '车辆销售台账', noCache: true }
},
// 车辆销售(新版)
{
path: '/cheliangxiaoshou/cheliangxiaoshoutaizhang',
component: () =>
import('@/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue'),
name: 'cheliangxiaoshoutaizhang',
meta: { title: '销售台账', noCache: true }
}
]
},

548
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue

@ -0,0 +1,548 @@
<template>
<div class="app-container">
<!-- Start 列表页面 -->
<div v-show="viewState == 1">
<button-bar view-title="车辆销售台账" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="销售类型">
<el-select v-model="listQuery.params.typeKey" placeholder="" filterable>
<el-option v-for="item in payType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="销售日期">
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.saleDateStart" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<div style="float: left;margin: 0px 10px"></div>
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.saleDateEnd" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.concatNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="销售部门">
<el-select v-model="listQuery.params.orgDeptSid" filterable class="addinputw" placeholder="" @change="changeOrg">
<el-option v-for="item in org_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptSid"/>
</el-select>
</el-form-item>
<el-form-item label="销售专员">
<el-select v-model="listQuery.params.staffSid" filterable class="addinputw" placeholder="">
<el-option v-for="item in staff_list" :key="item.staffSid" :label="item.staffName" :value="item.staffSid"/>
</el-select>
</el-form-item>
<el-form-item label="分公司">
<el-select v-model="listQuery.params.orgSid" filterable class="addinputw" placeholder="">
<el-option v-for="item in userOrg_list" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</el-form-item>
<el-form-item label="内部编码">
<el-input v-model="listQuery.params.insideCode" placeholder="" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">车辆销售列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50" fixed type="selection" align="center"/>
<el-table-column width="60" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed width="130" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="分公司" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.createOrgName }}</span>
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.vinNo }}</span>
</template>
</el-table-column>
<el-table-column label="车型(配置简述)" align="center" width="130">
<template slot-scope="scope">
<span class="bluezi" @click="handleLook(scope.row)">{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="内部编码" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.insideCode }}</span>
</template>
</el-table-column>
<el-table-column label="销售类型" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.type }}</span>
</template>
</el-table-column>
<el-table-column label="采购类型" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.manPurOrderTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="销售日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.saleDate }}</span>
</template>
</el-table-column>
<el-table-column label="成交价(元)" align="center" width="110">
<template slot-scope="scope">
<span>{{ scope.row.price }}</span>
</template>
</el-table-column>
<el-table-column label="销售部门" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.orgName }}</span>
</template>
</el-table-column>
<el-table-column label="销售专员" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.staffName }}</span>
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.concatNo }}</span>
</template>
</el-table-column>
<el-table-column label="是否为终端客户" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.isTerminal }}</span>
</template>
</el-table-column>
<el-table-column label="客户名称" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.customerName }}</span>
</template>
</el-table-column>
<el-table-column label="手机号码" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.mobile }}</span>
</template>
</el-table-column>
<el-table-column label="物料名称" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.materialName }}</span>
</template>
</el-table-column>
<el-table-column label="物料编码" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.materialCode }}</span>
</template>
</el-table-column>
<el-table-column label="赠品价值(元)" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.giftsDescription }}</span>
</template>
</el-table-column>
<el-table-column label="销售折让" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.salesAllowance }}</span>
</template>
</el-table-column>
<el-table-column label="中介人1" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.middleOne }}</span>
</template>
</el-table-column>
<el-table-column label="返利金额1" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateMoneyOne }}</span>
</template>
</el-table-column>
<el-table-column label="中介人2" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.middleTwo }}</span>
</template>
</el-table-column>
<el-table-column label="返利金额2" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.rebateMoneyTwo }}</span>
</template>
</el-table-column>
<el-table-column label="内部引荐人" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.innerName }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<el-dialog center :visible.sync="dialogVisible" width="40%">
<el-form class="formadd">
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="6" class="tleftb">
<span>打印机类型</span>
</el-col>
<el-col :span="18">
<el-form-item>
<el-radio-group v-model="print">
<el-radio label="针孔式打印机">针孔式打印机</el-radio>
<el-radio label="激光打印机">激光打印机</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" :disabled="visibleDisabled" type="primary" @click="handleConfirm">确定</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"/>
<vehicleconfiguration v-show="viewState == 3" ref="divPeizhi" @doback="resetState"/>
</div>
</template>
<script>
import { listPage, createPdf, delBySid, exportExcel } from '@/api/cheliang/cheliangxiaoshou'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { typeValues, getOrgSidByPath, selectOrgList, selectOrgByLevel, getButtonPermissions } from '@/api/cheliang/dictcommons'
import chelaingxiaoshouInfo from './chelaingxiaoshouInfo'
import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
import { getStorage } from '@/utils/auth'
export default {
name: 'cheliangxiaoshoutaizhang',
components: {
Pagination,
pageye,
ButtonBar,
chelaingxiaoshouInfo,
vehicleconfiguration
},
data() {
return {
btndisabled: false,
viewState: 1,
dialogVisible: false,
visibleDisabled: false,
printSid: '',
print: '',
btnList: [
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'success',
size: 'small',
icon: 'export',
btnKey: 'doExport',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
// -----------
tableKey: 0,
sids: [],
list: [],
org_list: [],
userOrg_list: [],
staff_list: [],
payType_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
concatNo: '',
customerName: '',
saleDateEnd: '',
saleDateStart: '',
typeKey: '',
vinNo: '',
createOrgSid: '',
orgDeptSid: '',
staffSid: '',
orgSidPath: '',
orgSid: '',
insideCode: ''
},
current: 1,
size: 5,
total: 0
},
rules: {}
}
},
created() {
//
this.init()
},
mounted() {
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
init() {
typeValues({ type: 'payType' }).then((res) => {
if (res.success) {
this.payType_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.listQuery.params.createOrgSid = resp.data
this.getList()
}
})
selectOrgList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.org_list = res.data
}
})
selectOrgByLevel({ orgSidPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.userOrg_list = resp.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'doExport':
this.doExport()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
this.listQuery = {
params: {
concatNo: '',
customerName: '',
saleDateEnd: '',
saleDateStart: '',
typeKey: '',
vinNo: '',
createOrgSid: '',
orgDeptSid: '',
staffSid: '',
orgSidPath: '',
orgSid: '',
insideCode: ''
},
current: 1,
size: 5,
total: 0
}
this.init()
},
changeOrg(value) {
const choosetItem = this.org_list.filter((item) => item.orgDeptSid === value)
this.staff_list = choosetItem[0].staffinfoVoList
},
handleDownLoad(row) {
this.printSid = row.sid
this.print = ''
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()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '销售出库单', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '销售出库单.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
this.dialogVisible = false
this.printSid = ''
this.visibleDisabled = false
} else {
this.visibleDisabled = false
}
}).catch(() => {
this.visibleDisabled = false
})
},
toInfo(row) {
this.viewState = 2
this.$refs['divInfo'].showInfo(row)
},
handleLook(row) {
this.viewState = 3
this.$refs['divPeizhi'].showInfo(row)
},
doDel() {
if (this.sids.length === 1) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
delBySid({ sid: this.sids[0] }).then((resp) => {
if (resp.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '删除成功' })
this.getList()
} else {
loading.close()
}
}).catch(() => {
loading.close()
})
})
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行删除操作'})
return
}
},
//
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '车辆销售台账表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

116
anrui-scm/anrui-scm-ui/src/views/examinePage/chukushenhe/relation/shangzhuangInfo.vue

@ -47,63 +47,75 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.wk_long }}</span>mm,
<span class="inputStyle">{{ item.wk_wide }}</span>mm,
<span class="inputStyle">{{ item.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-row v-if="item.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ item.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.moreConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="item.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.wk_long }}</span>mm,
<span class="inputStyle">{{ item.wk_wide }}</span>mm,
<span class="inputStyle">{{ item.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ item.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ item.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ item.moreConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
</div>
</el-form>
</div>

6
anrui-scm/anrui-scm-ui/src/views/othermenu/shangzhuangtiaojia/shangzhuangtaizhangselect.vue

@ -27,8 +27,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="委改厂">
<el-input v-model="queryParams.params.refitFactory" placeholder="请输入委改厂" clearable/>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.refitFactory" placeholder="" clearable/>
</el-form-item>
<el-form-item label="上装名称">
<el-select v-model="queryParams.params.installNameKey" filterable placeholder="请选择">
@ -75,7 +75,7 @@
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center" width="100"/>
<el-table-column prop="installNameValue" label="上装名称" align="center" width="100"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center" width="100"/>
<el-table-column prop="refitFactory" label="委改厂" align="center"/>
<el-table-column prop="refitFactory" label="供应商" align="center"/>
<el-table-column prop="colorValue" label="颜色" align="center"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center" width="100"/>
<el-table-column prop="brandName" label="品牌" align="center"/>

208
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue

@ -51,92 +51,108 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputw" style="display: inline-block;margin-left: 120px;">
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.wk_long" placeholder="" class="inputStyle"/>mm,
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.wk_wide" placeholder="" class="inputStyle"/>mm,
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.wk_high" placeholder="" class="inputStyle"/>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>颜色</span></div>
<el-form-item prop="colorValue">
<el-select v-model="formobj.colorValue" @change="changeColor" class="addinputw addinputwOne" filterable placeholder="请选择">
<el-option v-for="item in color_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>板材材质</span></div>
<el-form-item prop="plateMaterialValue">
<el-select v-model="formobj.plateMaterialValue" @change="changePlateMaterial" class="addinputw addinputwOne" filterable placeholder="请选择">
<el-option v-for="item in plateMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>板材厚度</span></div>
<el-form-item>
<div class="addinputw" style="display: inline-block;margin-left: 120px;">
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.plateThicknessBottom" placeholder="" class="inputStyle"/>mm,
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.plateThicknessEdge" placeholder="" class="inputStyle"/>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item>
<el-select v-model="formobj.tarpaulinSlide" @change="changeTarpaulinSlide" class="addinputw addinputwOne" clearable @clear="clearTarpaulinSlide" filterable placeholder="请选择">
<el-option v-for="item in tarpaulinSlide_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item>
<el-input v-model="formobj.refrigerator" placeholder="冷藏冷机" class="addinputw addinputwOne" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="formobj.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item>
<el-select v-model="formobj.selfUnHyCoPl" @change="changeSelfUnHyCoPl" class="addinputw addinputwOne" filterable clearable @clear="clearSelfUnHyCoPl" placeholder="请选择">
<el-option v-for="item in selfUnHyCoPl_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>冷机品牌</span></div>
<el-form-item prop="coolerBrand ">
<el-input v-model="formobj.coolerBrand" clearable class="addinputw addinputwOne" placeholder=""/>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item>
<el-select v-model="formobj.floorHeating" @change="changeFloorHeating" class="addinputw addinputwOne" filterable clearable @clear="clearFloorHeating" placeholder="请选择">
<el-option v-for="item in floorHeating_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item>
<el-input v-model="formobj.moreConfig" placeholder="更多配置" class="addinputw addinputwOne" style="width: 80% !important;" clearable/>
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>冷机型号</span></div>
<el-form-item prop="coolerModel">
<el-input v-model="formobj.coolerModel" clearable class="addinputw addinputwOne" placeholder=""/>
</el-form-item>
</el-col>
</el-row>
<div v-if="formobj.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputw" style="display: inline-block;margin-left: 120px;">
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.wk_long" placeholder="" class="inputStyle"/>mm,
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.wk_wide" placeholder="" class="inputStyle"/>mm,
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.wk_high" placeholder="" class="inputStyle"/>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>颜色</span></div>
<el-form-item prop="colorValue">
<el-select v-model="formobj.colorValue" @change="changeColor" class="addinputw addinputwOne" filterable placeholder="请选择">
<el-option v-for="item in color_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>板材材质</span></div>
<el-form-item prop="plateMaterialValue">
<el-select v-model="formobj.plateMaterialValue" @change="changePlateMaterial" class="addinputw addinputwOne" filterable placeholder="请选择">
<el-option v-for="item in plateMaterial_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>板材厚度</span></div>
<el-form-item>
<div class="addinputw" style="display: inline-block;margin-left: 120px;">
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.plateThicknessBottom" placeholder="" class="inputStyle"/>mm,
<span></span><el-input size="mini" @keyup.native="UpNumber" @keydown.native="UpNumber" v-model="formobj.plateThicknessEdge" placeholder="" class="inputStyle"/>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item>
<el-select v-model="formobj.tarpaulinSlide" @change="changeTarpaulinSlide" class="addinputw addinputwOne" clearable @clear="clearTarpaulinSlide" filterable placeholder="请选择">
<el-option v-for="item in tarpaulinSlide_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item>
<el-input v-model="formobj.refrigerator" placeholder="冷藏冷机" class="addinputw addinputwOne" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item>
<el-select v-model="formobj.selfUnHyCoPl" @change="changeSelfUnHyCoPl" class="addinputw addinputwOne" filterable clearable @clear="clearSelfUnHyCoPl" placeholder="请选择">
<el-option v-for="item in selfUnHyCoPl_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item>
<el-select v-model="formobj.floorHeating" @change="changeFloorHeating" class="addinputw addinputwOne" filterable clearable @clear="clearFloorHeating" placeholder="请选择">
<el-option v-for="item in floorHeating_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item>
<el-input v-model="formobj.moreConfig" placeholder="更多配置" class="addinputw addinputwOne" style="width: 80% !important;" clearable/>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
<!--End 添加修改部分-->
@ -187,7 +203,9 @@ export default {
floorHeating: '',
floorHeatingKey: '',
useOrgSid: '',
createOrgSid: ''
createOrgSid: '',
coolerBrand: '',
coolerModel: ''
},
rules: {
vehicleTypeValue: [{ required: true, message: '请选择车辆功能', trigger: 'change' }],
@ -195,7 +213,9 @@ export default {
refitMethodValue: [{ required: true, message: '请填写委改方式', trigger: 'change' }],
refitFactory: [{ required: true, message: '请填写委改厂', trigger: 'blur' }],
colorValue: [{ required: true, message: '请填写颜色', trigger: 'change' }],
plateMaterialValue: [{ required: true, message: '请填写板材材质', trigger: 'change' }]
plateMaterialValue: [{ required: true, message: '请填写板材材质', trigger: 'change' }],
coolerBrand: [{ required: true, message: '请填写冷机品牌', trigger: 'blur' }],
coolerModel: [{ required: true, message: '请填写冷机型号', trigger: 'blur' }]
},
submitdisabled: false
}
@ -386,7 +406,9 @@ export default {
floorHeating: '',
floorHeatingKey: '',
useOrgSid: '',
createOrgSid: ''
createOrgSid: '',
coolerBrand: '',
coolerModel: ''
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
@ -426,6 +448,28 @@ export default {
handleSave() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
if (this.formobj.installNameKey == '08') {
this.formobj.wk_wide = ''
this.formobj.wk_long = ''
this.formobj.wk_high = ''
this.formobj.colorValue = ''
this.formobj.colorKey = ''
this.formobj.plateMaterialValue = ''
this.formobj.plateMaterialKey = ''
this.formobj.plateThicknessBottom = ''
this.formobj.plateThicknessEdge = ''
this.formobj.tarpaulinSlide = ''
this.formobj.tarpaulinSlideKey = ''
this.formobj.refrigerator = ''
this.formobj.selfUnHyCoPl = ''
this.formobj.selfUnHyCoPlKey = ''
this.formobj.floorHeatingKey = ''
this.formobj.floorHeating = ''
this.formobj.moreConfig = ''
} else {
this.formobj.coolerBrand = ''
this.formobj.coolerModel = ''
}
this.submitdisabled = true
req.saveOrUpdate(this.formobj).then((resp) => {
this.submitdisabled = false

116
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangInfo.vue

@ -29,63 +29,75 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.wk_long }}</span>mm,
<span class="inputStyle">{{ formobj.wk_wide }}</span>mm,
<span class="inputStyle">{{ formobj.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-row v-if="formobj.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>藏冷</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.moreConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.wk_long }}</span>mm,
<span class="inputStyle">{{ formobj.wk_wide }}</span>mm,
<span class="inputStyle">{{ formobj.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.moreConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
</el-form>
</div>
</div>

121
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhangtaizhangInfo.vue

@ -28,63 +28,75 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne" style="display: inline-block;margin-left: 120px;">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_long }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_wide }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne" style="display: inline-block;margin-left: 120px;">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-row v-if="formobj.baseVehinstallmodel.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>藏冷</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.refrigerator }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.moreConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.baseVehinstallmodel.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne" style="display: inline-block;margin-left: 120px;">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_long }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_wide }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne" style="display: inline-block;margin-left: 120px;">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.moreConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>主车车架号</span></div>
@ -146,6 +158,7 @@ export default {
baseVehinstallmodel: {
vehicleTypeValue: '',
installNameValue: '',
installNameKey: '',
refitMethodValue: '',
refitFactory: '',
colorValue: '',
@ -159,7 +172,9 @@ export default {
refrigerator: '',
selfUnHyCoPl: '',
floorHeating: '',
moreConfig: ''
moreConfig: '',
coolerBrand: '',
coolerModel: '',
}
}
}

129
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue

@ -36,63 +36,75 @@
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_long }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_wide }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-row v-if="formobj.baseVehinstallmodel.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.plateMaterialValue }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.coolerBrand }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.moreConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.baseVehinstallmodel.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_long }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_wide }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.wk_high }}</span>mm
</div>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.colorValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.plateMaterialValue }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessEdge }}</span>mm
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.selfUnHyCoPl }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.baseVehinstallmodel.moreConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
<div class="headline">主车信息</div>
<el-row>
<el-col :span="12">
@ -173,6 +185,7 @@ export default {
baseVehinstallmodel: {
vehicleTypeValue: '',
installNameValue: '',
installNameKey: '',
refitMethodValue: '',
refitFactory: '',
colorValue: '',
@ -186,7 +199,9 @@ export default {
refrigerator: '',
selfUnHyCoPl: '',
floorHeating: '',
moreConfig: ''
moreConfig: '',
coolerBrand: '',
coolerModel: ''
}
}
}
@ -254,6 +269,9 @@ export default {
this.formobj.baseVehinstallmodel.selfUnHyCoPl = row.selfUnHyCoPl
this.formobj.baseVehinstallmodel.floorHeating = row.floorHeating
this.formobj.baseVehinstallmodel.moreConfig = row.moreConfig
this.formobj.baseVehinstallmodel.installNameKey = row.installNameKey
this.formobj.baseVehinstallmodel.coolerBrand = row.coolerBrand
this.formobj.baseVehinstallmodel.coolerModel = row.coolerModel
this.formobj.mainSid = row.sid
},
changeVinNo(value) {
@ -347,6 +365,7 @@ export default {
baseVehinstallmodel: {
vehicleTypeValue: '',
installNameValue: '',
installNameKey: '',
refitMethodValue: '',
refitFactory: '',
colorValue: '',
@ -360,7 +379,9 @@ export default {
refrigerator: '',
selfUnHyCoPl: '',
floorHeating: '',
moreConfig: ''
moreConfig: '',
coolerBrand: '',
coolerModel: ''
}
}
this.submitdisabled = false

6
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhi.vue

@ -22,8 +22,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="委改厂">
<el-input v-model="queryParams.params.refitFactory" placeholder="请输入委改厂" clearable/>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.refitFactory" placeholder="" clearable/>
</el-form-item>
<el-form-item label="上装名称">
<el-select v-model="queryParams.params.installNameKey" filterable placeholder="请选择">
@ -69,7 +69,7 @@
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center" width="200"/>
<el-table-column prop="installNameValue" label="上装名称" align="center" width="200"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center" width="200"/>
<el-table-column prop="refitFactory" label="委改厂" align="center" width="200"/>
<el-table-column prop="refitFactory" label="供应商" align="center" width="200"/>
<el-table-column prop="wk" label="货箱内部尺寸" header-align="center" align="left" width="250"/>
<el-table-column prop="colorValue" label="颜色" align="center" width="200"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center" width="200"/>

96
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiAdd.vue

@ -26,56 +26,68 @@
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitMethod }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>委改厂</span></div>
<div class="span-sty spanOneWidth"><span>供应商</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-row v-if="formobj.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>藏冷</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算价()</span></div>

96
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/shangzhuangselect/shangzhuangpeizhiInfo.vue

@ -25,56 +25,68 @@
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitMethod }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>委改厂</span></div>
<div class="span-sty spanOneWidth"><span>供应商</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-row v-if="formobj.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>藏冷</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算价()</span></div>

96
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiAdd.vue

@ -26,56 +26,68 @@
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitMethod }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>委改厂</span></div>
<div class="span-sty spanOneWidth"><span>供应商</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-row v-if="formobj.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>藏冷</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算价()</span></div>

96
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shangzhuangpeizhiInfo.vue

@ -25,56 +25,68 @@
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitMethod }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>委改厂</span></div>
<div class="span-sty spanOneWidth"><span>供应商</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refitFactory }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-row v-if="formobj.installNameKey == '08'">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>藏冷</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机品牌</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerBrand }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
<div class="span-sty spanOneWidth"><span>冷机型号</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.coolerModel }}</span></el-form-item>
</el-col>
</el-row>
<div v-if="formobj.installNameKey != '08'">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>货箱内部尺寸</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.overallDimension }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>颜色</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.color }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材材质</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateMaterial }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.plateThickness }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.tarpaulinSlide }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>冷藏冷机</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.refrigerator }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.coverPlate }}</span></el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>底板加热</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.floorHeating }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item prop="installNameValue"><span class="addinputInfo addinputwOne">{{ formobj.otherConfig }}</span></el-form-item>
</el-col>
</el-row>
</div>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算价()</span></div>

6
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/shangzhuangselect/shuangzhuangpeizhi.vue

@ -22,8 +22,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="委改厂">
<el-input v-model="queryParams.params.refitFactory" placeholder="请输入委改厂" clearable/>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.refitFactory" placeholder="" clearable/>
</el-form-item>
<el-form-item label="上装名称">
<el-select v-model="queryParams.params.installNameKey" filterable placeholder="请选择">
@ -69,7 +69,7 @@
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center" width="200"/>
<el-table-column prop="installNameValue" label="上装名称" align="center" width="200"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center" width="200"/>
<el-table-column prop="refitFactory" label="委改厂" align="center" width="200"/>
<el-table-column prop="refitFactory" label="供应商" align="center" width="200"/>
<el-table-column prop="wk" label="货箱内部尺寸" header-align="center" align="left" width="250"/>
<el-table-column prop="colorValue" label="颜色" align="center" width="200"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center" width="200"/>

6
anrui-scm/anrui-scm-ui/src/views/workFlow/shangzhuangtiaojiaFlow/shangzhuangtiaojiaguanli/shangzhuangtaizhangchoose.vue

@ -27,8 +27,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="委改厂">
<el-input v-model="queryParams.params.refitFactory" placeholder="请输入委改厂" clearable/>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.refitFactory" placeholder="" clearable/>
</el-form-item>
<el-form-item label="上装名称">
<el-select v-model="queryParams.params.installNameKey" filterable placeholder="请选择">
@ -75,7 +75,7 @@
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center" width="100"/>
<el-table-column prop="installNameValue" label="上装名称" align="center" width="100"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center" width="100"/>
<el-table-column prop="refitFactory" label="委改厂" align="center"/>
<el-table-column prop="refitFactory" label="供应商" align="center"/>
<el-table-column prop="colorValue" label="颜色" align="center"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center" width="100"/>
<el-table-column prop="brandName" label="品牌" align="center"/>

12
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/advanceInvoice/AppBusAdvanceGinvoiceapplyService.java

@ -422,7 +422,7 @@ public class AppBusAdvanceGinvoiceapplyService {
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
finBillApplicationDto.setStaffName(dto.getSellerName());
finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit());
finBillApplicationDto.setCustomerName(dto.getName());
finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
@ -530,7 +530,7 @@ public class AppBusAdvanceGinvoiceapplyService {
finBillApplicationDto.setSaleTypeValue(dto.getSaleType());
finBillApplicationDto.setSaleDeptName(dto.getSellerName());
finBillApplicationDto.setStaffName(dto.getSellerName());
finBillApplicationDto.setOpenTickUnitName(dto.getOpenTickName());
finBillApplicationDto.setOpenTickUnitName(dto.getInvoicingUnit());
finBillApplicationDto.setCustomerName(dto.getName());
finBillApplicationDto.setOneBillMoney(dto.getInvoiceMoney());
finBillApplicationDto.setOpenTickName(dto.getOpenTickName());
@ -610,9 +610,9 @@ public class AppBusAdvanceGinvoiceapplyService {
submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath());
submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerDept());
submitAdvanceInvoiceDto.setStaffName(dto.getSellerName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getInvoicingUnit());
submitAdvanceInvoiceDto.setCustomerName(dto.getName());
submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid());
@ -1084,9 +1084,9 @@ public class AppBusAdvanceGinvoiceapplyService {
submitAdvanceInvoiceDto.setIsLQOrigInvoice(dto.getGetOriginalValue());
submitAdvanceInvoiceDto.setOrgSidPath(dto.getOrgPath());
submitAdvanceInvoiceDto.setSaleTypeValue(dto.getSaleType());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerName());
submitAdvanceInvoiceDto.setSaleDeptName(dto.getSellerDept());
submitAdvanceInvoiceDto.setStaffName(dto.getSellerName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getOpenTickName());
submitAdvanceInvoiceDto.setOpenTickUnitName(dto.getInvoicingUnit());
submitAdvanceInvoiceDto.setCustomerName(dto.getName());
submitAdvanceInvoiceDto.setOneBillMoney(dto.getInvoiceMoney());
submitAdvanceInvoiceDto.setOpenTickSid(dto.getOpenTickSid());

76
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

@ -428,35 +428,53 @@ public class AppBusDeliveredApplyService {
//成交价2个格
String topPrice = baseVehinstallmodelDetailsVo.getTopPrice();
configVoList.add(getConfigValueSpanSize("成交价", topPrice, 2));
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("委改厂", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
//外廓尺寸
configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1));
//颜色
configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1));
//板材材质
configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1));
//板材厚度
configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1));
//篷布滑道
configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1));
//冷藏冷机
configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1));
//自卸液压盖版
configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1));
//底板加热
configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1));
//更多配置2个格
configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2));
String installNameKey = baseVehinstallmodelDetailsVo.getInstallNameKey();
if("08".equals(installNameKey)){
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
configVoList.add(getConfigValueSpanSize("冷机品牌", baseVehinstallmodelDetailsVo.getCoolerBrand(), 1));
configVoList.add(getConfigValueSpanSize("冷机型号", baseVehinstallmodelDetailsVo.getCoolerModel(), 1));
}else{
//车辆功能
String vehicleTypeValue = baseVehinstallmodelDetailsVo.getVehicleTypeValue();
configVoList.add(getConfigValueSpanSize("车辆功能", vehicleTypeValue, 1));
//上装名称
String installNameValue = baseVehinstallmodelDetailsVo.getInstallNameValue();
configVoList.add(getConfigValueSpanSize("上装名称", installNameValue, 1));
//委改方式
String refitMethodValue = baseVehinstallmodelDetailsVo.getRefitMethodValue();
configVoList.add(getConfigValueSpanSize("委改方式", refitMethodValue, 1));
//委改厂
configVoList.add(getConfigValueSpanSize("供应商", baseVehinstallmodelDetailsVo.getRefitFactory(), 1));
//外廓尺寸
configVoList.add(getConfigValueSpanSize("外廓尺寸", baseVehinstallmodelDetailsVo.getWk_long() + "*" + baseVehinstallmodelDetailsVo.getWk_wide() + "*" + baseVehinstallmodelDetailsVo.getWk_high(), 1));
//颜色
configVoList.add(getConfigValueSpanSize("颜色", baseVehinstallmodelDetailsVo.getColorValue(), 1));
//板材材质
configVoList.add(getConfigValueSpanSize("板材材质", baseVehinstallmodelDetailsVo.getPlateMaterialValue(), 1));
//板材厚度
configVoList.add(getConfigValueSpanSize("板材厚度", baseVehinstallmodelDetailsVo.getPlateThicknessBottom() + "*" + baseVehinstallmodelDetailsVo.getPlateThicknessEdge(), 1));
//篷布滑道
configVoList.add(getConfigValueSpanSize("篷布滑道", baseVehinstallmodelDetailsVo.getTarpaulinSlide(), 1));
//冷藏冷机
configVoList.add(getConfigValueSpanSize("冷藏冷机", baseVehinstallmodelDetailsVo.getRefrigerator(), 1));
//自卸液压盖版
configVoList.add(getConfigValueSpanSize("自卸液压盖版", baseVehinstallmodelDetailsVo.getSelfUnHyCoPl(), 1));
//底板加热
configVoList.add(getConfigValueSpanSize("底板加热", baseVehinstallmodelDetailsVo.getFloorHeating(), 1));
//更多配置2个格
configVoList.add(getConfigValueSpanSize("更多配置", baseVehinstallmodelDetailsVo.getMoreConfig(), 2));
}
handCarInfo.add(configVoList);
}

Loading…
Cancel
Save