Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
zhanglei
God 3 years ago
parent
commit
e25a13a27f
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
  2. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
  3. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
  4. 8
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java
  5. 10
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java
  6. 22
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/VinByWarehouseQuery.java
  7. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
  8. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  9. 15
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  10. 18
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  11. 33
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  12. 21
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java
  13. 4
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  14. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
  15. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java
  16. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
  17. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
  18. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
  19. 2
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  20. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java
  21. 5
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java
  22. 36
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java
  23. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java
  24. 6
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml
  25. 5
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java
  26. 187
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
  27. 8
      anrui-scm/anrui-scm-ui/src/api/baseoutsourcingapplication/baseoutsourcingapplication.js
  28. 19
      anrui-scm/anrui-scm-ui/src/api/supplychain/cunfangdidianbiangeng.js
  29. 216
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue
  30. 448
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue
  31. 143
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue
  32. 2
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicleAdd.vue
  33. 202
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue
  34. 141
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue
  35. 272
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue
  36. 158
      anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue
  37. 8
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue
  38. 163
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue
  39. 141
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue
  40. 47
      anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue
  41. 21
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue
  42. 12
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangInfo.vue
  43. 37
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangguanli.vue
  44. 2
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhangtaizhangInfo.vue
  45. 125
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangpeizhijiansuo.vue
  46. 56
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangAdd.vue
  47. 135
      anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue
  48. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuInfo.vue
  49. 7
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue
  50. 19
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue
  51. 168
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue
  52. 201
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue
  53. 42
      anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue
  54. 26
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue
  55. 20
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue
  56. 29
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue
  57. 28
      anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliInfo.vue
  58. 48
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue
  59. 16
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  60. 18
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
  61. 47
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue
  62. 198
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue
  63. 44
      anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue
  64. 7
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue
  65. 7
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue
  66. 19
      anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue
  67. 8
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue
  68. 200
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue
  69. 182
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue
  70. 175
      anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue
  71. 6
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
  72. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
  73. 15
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java
  74. 18
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java
  75. 65
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java

@ -107,4 +107,6 @@ public class BaseOutsourcingApplication extends BaseEntity {
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("备注")
private String remarks; // 备注
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java

@ -104,6 +104,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo {
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("外采车辆列表")
private List<BaseOutsourcingApplicationVehicleVo> baseOutsourcingApplicationVehicleVos; // 外采车辆列表
}

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java

@ -118,6 +118,8 @@ public class BaseOutsourcingApplicationDto implements Dto {
private String useOrgSid; // 分公司sid
@ApiModelProperty("分公司名称")
private String useOrgName; // 分公司名称
@ApiModelProperty("备注")
private String remarks; // 备注
@ApiModelProperty("外采车辆列表")
private List<BaseOutsourcingApplicationVehicleDto> baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
@ApiModelProperty("合同附件信息")

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

@ -253,6 +253,10 @@ public interface BaseVehicleFeign {
@PostMapping("/updateVehicleGressionByVin")
ResultBean updateVehicleGressionByVin(@RequestBody VehicleGression vehicleGression);
@ApiOperation("根据车架号获取车辆sid")
@GetMapping("/selVehicleByVinNo/{vinNo}")
ResultBean<BaseVehicleVo> selVehicleByVinNo(@PathVariable("vinNo") String vinNo);
/***************************************************** App接口 **********************************************************/
@ApiOperation("手机端现车分页列表")
@ -309,6 +313,10 @@ public interface BaseVehicleFeign {
@GetMapping("/getVinByWarehouseSid/{warehouseSid}/{userSid}")
public ResultBean<List<AppScmWarehouseVinVo>> getVinByWarehouseSid(@PathVariable("warehouseSid") String warehouseSid, @PathVariable("userSid") String userSid);
@ApiOperation("Pc根据仓库sid 获取车架号")
@PostMapping("/getPcVinByWarehouseSid")
public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(@RequestBody PagerQuery<VinByWarehouseQuery> pagerQuery);
@ApiOperation("根据用户sid 获取库存车辆信息")
@GetMapping("/selectInventoryRecords/{userSid}")
public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(@PathVariable("userSid") String userSid);

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

@ -171,6 +171,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<BaseVehicleVo> selVehicleByVinNo(String vinNo) {
return null;
}
@Override
public ResultBean<PagerVo<AppCurrentCarModelByPageListVo>> getAppCurrentCarByPageList(PagerQuery<AppCurrentCarByPageListQuery> pagerQuery) {
return null;
@ -231,6 +236,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
return null;
}
@Override
public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
return null;
}
@Override
public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
return null;

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

@ -0,0 +1,22 @@
package com.yxt.anrui.base.api.basevehicle;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class VinByWarehouseQuery implements Query {
private static final long serialVersionUID = -4205300860994909841L;
@ApiModelProperty("仓库sid")
private String warehouseSid;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("车架号")
private String vin;
}

1
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@ -16,6 +16,7 @@ public enum BillTypeEnum {
CJTKSQ("CJTKSQ", "厂家退库申请"),
FYSQ("FYSQ","费用申请"),
FKSQ("FKSQ","付款申请"),
KCDDBGSQ("KCDDBGSQ","库存地点变更申请")
;
private String billType;

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

@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageQuery;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
import com.yxt.common.core.result.ResultBean;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -409,5 +411,9 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
IPage<BaseVehicleActualVo> vehiclePurchasePageList(IPage<BaseVehicleActualVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
Map<String,String> checkVinNo(@Param("vinNo") String vinNo,@Param("modelSid") String modelSid,@Param("configSid") String configSid,@Param("sellerOrgSid") String sellerOrgSid);
BaseVehicleVo selVehicleByVinNo(@Param("vinNo") String vinNo);
Map<String, String> checkVinNo(@Param("vinNo") String vinNo, @Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("sellerOrgSid") String sellerOrgSid);
IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(IPage<VinByWarehouseQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppScmWarehouseVinVo> qw, @Param("warehouseSid") String warehouseSid);
}

15
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@ -891,4 +891,19 @@
AND modelConfigSid = #{configSid}
AND createOrgSid = #{sellerOrgSid}
</select>
<select id="selVehicleByVinNo" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
SELECT *
FROM base_vehicle bv
WHERE vinNo = #{vinNo}
</select>
<select id="getPcVinByWarehouseSid" resultType="com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo">
select vinNo as vin
from base_vehicle bv
<where>
${ew.sqlSegment}
and bv.location = #{warehouseSid}
</where>
</select>
</mapper>

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

@ -13,6 +13,7 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.busvehicleinquiry.BusVehicleInquiryService;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.StringUtils;
@ -407,6 +408,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return baseVehicleService.updateVehicleGressionByVin(vehicleGression);
}
@Override
public ResultBean<BaseVehicleVo> selVehicleByVinNo(String vinNo) {
return baseVehicleService.selVehicleByVinNo(vinNo);
}
/**
* 手机端现车列表
*
@ -641,6 +647,18 @@ public class BaseVehicleRest implements BaseVehicleFeign {
return baseVehicleService.getVinByWarehouseSid(warehouseSid, userSid);
}
@Override
public ResultBean<PagerVo<AppScmWarehouseVinVo>> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
return rb.setMsg("用户sid不能为空");
}
PagerVo<AppScmWarehouseVinVo> page = new PagerVo<>();
IPage<AppScmWarehouseVinVo> iPage = baseVehicleService.getPcVinByWarehouseSid(pagerQuery);
PagerVo<AppScmWarehouseVinVo> pagerVo = PagerUtil.pageToVo(iPage, page);
return new ResultBean<PagerVo<AppScmWarehouseVinVo>>().success().setData(pagerVo);
}
@Override
public ResultBean<List<AppScmInventoryRecordsVo>> selectInventoryRecords(String userSid) {
return baseVehicleService.selectInventoryRecords(userSid);

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

@ -21,6 +21,7 @@ import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuer
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.DateUtils;
@ -820,8 +821,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {
qw.like("bvm.specifications", pagerQuery.getSpecifications());
}
qw.like("bb.useOrg",pagerQuery.getUseOrg());
qw.eq("bvm.isDelete",0);
qw.like("bb.useOrg", pagerQuery.getUseOrg());
qw.eq("bvm.isDelete", 0);
return qw;
}
@ -1032,7 +1033,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
qw.eq("bv.lockedState", VehicleState.LockEnum.UN_LOCK.getCode());
// qw.and(wrapper -> wrapper.isNull("bv.lockedStateValue").or().eq("bv.lockedStateValue", ""));
qw.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode());
qw.eq("bv.settlementStatus",VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
qw.eq("bv.settlementStatus", VehicleState.BuyoutEnum.UN_BUYOUT.getCode());
}
return qw;
}
@ -1570,7 +1571,29 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
return rb.success();
}
public Map<String,String> checkVinNo(String vinNo, String modelSid, String configSid, String sellerOrgSid) {
return baseMapper.checkVinNo(vinNo,modelSid,configSid,sellerOrgSid);
public Map<String, String> checkVinNo(String vinNo, String modelSid, String configSid, String sellerOrgSid) {
return baseMapper.checkVinNo(vinNo, modelSid, configSid, sellerOrgSid);
}
public ResultBean<BaseVehicleVo> selVehicleByVinNo(String vinNo) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleVo vo = baseMapper.selVehicleByVinNo(vinNo);
return rb.success().setData(vo);
}
public IPage<AppScmWarehouseVinVo> getPcVinByWarehouseSid(PagerQuery<VinByWarehouseQuery> pagerQuery) {
IPage<VinByWarehouseQuery> page = PagerUtil.queryToPage(pagerQuery);
QueryWrapper<AppScmWarehouseVinVo> qw = new QueryWrapper();
VinByWarehouseQuery params = pagerQuery.getParams();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
params.setUseOrgSid(useOrgSid);
if (StringUtils.isNotBlank(params.getVin())) {
qw.like("bv.vinNo", params.getVin());
}
if (StringUtils.isNotBlank(params.getUseOrgSid())) {
qw.eq("bv.createOrgSid", params.getUseOrgSid());
}
IPage<AppScmWarehouseVinVo> iPage = baseMapper.getPcVinByWarehouseSid(page, qw, params.getWarehouseSid());
return iPage;
}
}

21
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/AppBusDeliveredPageVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.buscenter.api.busdelivered;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -10,13 +11,31 @@ import java.util.List;
public class AppBusDeliveredPageVo implements Vo {
private static final long serialVersionUID = 2366744572396819068L;
@ApiModelProperty("列表sid")
private String sid;
@ApiModelProperty("合同编号")
@JsonProperty("contractId")
private String contractNo;
@ApiModelProperty("类型 1 已认款 2 未认款")
private String type;
@JsonProperty("subscription")
private String subscription;
@ApiModelProperty("类型 1 已认款 2 未认款")
@JsonProperty("subscriptionKey")
private String subscriptionKey;
@ApiModelProperty("付款方式 1 全款 2 贷款")
@JsonProperty("paymentMethod")
private String paymentMethod;
@ApiModelProperty("付款方式 1 全款 2 贷款")
@JsonProperty("paymentMethodKey")
private String paymentMethodKey;
@ApiModelProperty("客户名称")
@JsonProperty("customerName")
private String name;
@ApiModelProperty("车架号集合")

4
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java

@ -182,9 +182,9 @@ public interface BusDeliveredApplyFeign {
public ResultBean<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<AppDeliveredApplyPageQuery> pagerQuery);
@ApiOperation("手机端-初始化 出库申请")
@GetMapping("/getRetrievalApplyInfo/{sid}")
@GetMapping("/getRetrievalApplyInfoBySid/{sid}")
@ResponseBody
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(@PathVariable("sid") String sid);
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
@ApiOperation("手机端-保存 出库申请")
@PostMapping("/saveRetrievalApplyInfo")

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java

@ -141,7 +141,7 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
}
@Override
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
return null;
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredMapper.java

@ -79,7 +79,7 @@ public interface BusDeliveredMapper extends BaseMapper<BusDelivered> {
* @param qw
* @return
*/
IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, QueryWrapper<AppBusDeliveredPageQuery> qw);
IPage<AppBusDeliveredPageVo> getRetrievalNotList(IPage<AppBusDeliveredPageVo> page, @Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw);
/**
* 查询车架号

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java

@ -158,7 +158,7 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
public IPage<AppBusDeliveredPageVo> getRetrievalNotList(PagerQuery<AppBusDeliveredPageQuery> pq) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(pq.getParams().getName())) {
qw.eq("name", pq.getParams().getName());
qw.like("name", pq.getParams().getName());
}
IPage<AppBusDeliveredPageVo> page = PagerUtil.queryToPage(pq);
IPage<AppBusDeliveredPageVo> iPage = baseMapper.getRetrievalNotList(page, qw);

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java

@ -100,5 +100,5 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
* @param qw
* @return
*/
IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, QueryWrapper<AppDeliveredApplyPageQuery> qw);
IPage<AppDeliveredApplyPageVo> getRetrievalApplyList(IPage<AppDeliveredApplyPageQuery> page, @Param(Constants.WRAPPER) QueryWrapper<AppDeliveredApplyPageQuery> qw);
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java

@ -209,9 +209,9 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
}
@Override
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
ResultBean<AppDeliveredApplyInfoVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfo(sid);
ResultBean<AppDeliveredApplyInfoVo> retrievalApplyInfo = busDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
return rb.success().setData(retrievalApplyInfo.getData());
}

2
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -744,7 +744,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
return rb.success().setData(dtoSid);
}
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
public ResultBean<AppDeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
ResultBean<AppDeliveredApplyInfoVo> rb = ResultBean.fireFail();
AppDeliveredApplyInfoVo vo = new AppDeliveredApplyInfoVo();
BusDeliveredApply busDeliveredApply = fetchBySid(sid);

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeign.java

@ -128,6 +128,10 @@ public interface ScmVehicleGressionFeign {
@ResponseBody
public ResultBean pictureUpload(@RequestParam("sid") String sid, @RequestParam(value = "file") MultipartFile file);
@ApiOperation("初始化临时出门证")
@GetMapping("/temporaryExitPermitInfo/{sid}/{userSid}")
@ResponseBody
public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(@PathVariable("sid") String sid, @PathVariable("userSid") String userSid);
/*************************************************PC移位审批流程***************************************************/

5
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionFeignFallback.java

@ -116,6 +116,11 @@ public class ScmVehicleGressionFeignFallback implements ScmVehicleGressionFeign
return null;
}
@Override
public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid, String userSid) {
return null;
}
@Override
public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
return null;

36
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/TemporaryExitPermitInfo.java

@ -0,0 +1,36 @@
package com.yxt.anrui.scm.api.scmvehiclegression;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
public class TemporaryExitPermitInfo implements Vo {
private static final long serialVersionUID = -7815832719602641764L;
@ApiModelProperty("分公司名称")
private String orgName;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date date;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("车型名称")
private String modelName;
@ApiModelProperty("台数")
private String num;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("出门原因")
private String reason;
@ApiModelProperty("经办人")
private String creatName;
@ApiModelProperty("提车人")
private String carryCarName;
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.java

@ -111,4 +111,6 @@ public interface ScmVehicleGressionMapper extends BaseMapper<ScmVehicleGression>
int selectBySid(String list);
void updateStateBySid(@Param("sid") String sid, @Param("state") String state);
int selectNum(String bill);
}

6
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@ -90,6 +90,12 @@
and find_in_set(sid, #{list})
</select>
<select id="selectNum" resultType="java.lang.Integer">
select count(*)
from scm_vehicle_gression
where applicantNo LIKE concat(#{bill}, '%')
</select>
<update id="updateFlowFiled">
UPDATE scm_vehicle_gression
SET nodeState=#{nodeState}

5
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@ -200,6 +200,11 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
return rb.success().setData(data).setMsg("上传成功");
}
@Override
public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid,String userSid) {
return scmVehicleGressionService.temporaryExitPermitInfo(sid,userSid);
}
@Override
public ResultBean submitCarTransfer(SubmitCarTransferDto dto) {
return scmVehicleGressionService.submitCarTransfer(dto);

187
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@ -29,8 +29,14 @@ import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.VehicleGression;
import com.yxt.anrui.base.api.basevehicle.*;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyDto;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
@ -39,6 +45,9 @@ import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@ -105,6 +114,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private BaseVehicleModelFeign baseVehicleModelFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
private QueryWrapper<ScmVehicleGression> createQueryWrapper(ScmVehicleGressionQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -279,18 +294,23 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
String userSid = dto.getUserSid();
String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(userSid).getData();
String vehicleSid = baseVehicleFeign.selVehicleByVinNo(dto.getVinNo()).getData().getSid();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
ScmVehicleGression scmVehicleGression = null;
if (StringUtils.isBlank(dto.getSid())) {
scmVehicleGression = new ScmVehicleGression();
BeanUtil.copyProperties(dto, scmVehicleGression, "sid");
scmVehicleGression.setHandleState("1");
scmVehicleGression.setVehicleSid(vehicleSid);
scmVehicleGression.setApplicantName(data.getStaffName());
scmVehicleGression.setApplicantDate(simpleDateFormat.format(new Date()));
scmVehicleGression.setOrgSid(data.getOrgSid());
scmVehicleGression.setUseOrgSid(useOrgSid);
Map<String, String> stringStringMap = generateBillNo(userSid);
scmVehicleGression.setApplicantNo(stringStringMap.get("billNo_Num"));
//申请编号规则:单据名称大写首字母+分公司编码+年份+月份+4位顺序号
//获取单据名称大写首字母+分公司编码+年份+月份
// Map<String, String> stringStringMap = generateBillNo(userSid);
String billNo = getApplyCode(dto);
scmVehicleGression.setApplicantNo(billNo);
save(scmVehicleGression);
if ("1".equals(dto.getInsuranceStateKey())) { // 如果保单状态为否 不保存保单照片
List<String> factoryImage = dto.getPolicyImage();
@ -456,48 +476,63 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
return rb.success().setMsg("保存成功");
}
/**
* 移位单生成编号
*
* @param userSid 用户sid
* @return
*/
public Map<String, String> generateBillNo(String userSid) {
List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
String billsType = "";
if (commonVoList.size() > 0) {
for (int i = 0; i < commonVoList.size(); i++) {
if (commonVoList.get(i).getDictValue().contains("移位单")) {
billsType = commonVoList.get(i).getDictKey();
}
}
}
AppUserOrgInfoVo userOrgInfo = null;
String orgCode = "";
String orgSid = "";
String orgName = "";
ResultBean<AppUserOrgInfoVo> resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid);
if (resultBean.getSuccess() && resultBean.getData() != null) {
userOrgInfo = resultBean.getData();
orgSid = userOrgInfo.getOrgSid();
orgName = userOrgInfo.getOrgName();
orgCode = userOrgInfo.getOrgCode();
}
String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd");
// 流水号
int i = selectCountByOrgSid(billsType, date, orgSid);
String num = String.format("%04d", i + 1); // 不足4位补0
Map<String, String> map = new HashMap<>();
map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num);
map.put("billNo", billsType + orgCode + date.replaceAll("-", ""));
map.put("staffSid", userOrgInfo.getStaffSid());
map.put("staffName", userOrgInfo.getStaffName());
map.put("orgSid", orgSid);
map.put("orgName", orgName);
return map;
public String getApplyCode(AppScmVehicleGressionDto dto) {
String userSid = dto.getUserSid();
//获取分公司sid
ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.KCDDBGSQ.getBillType());
String bill = Rule.getBill(b);
int i = baseMapper.selectNum(bill);
String billNo = Rule.getBillNo(bill, i);
return billNo;
}
// /**
// * 移位单生成编号
// *
// * @param userSid 用户sid
// * @return
// */
// public Map<String, String> generateBillNo(String userSid) {
// List<DictCommonVo> commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
// String billsType = "";
// if (commonVoList.size() > 0) {
// for (int i = 0; i < commonVoList.size(); i++) {
// if (commonVoList.get(i).getDictValue().contains("移位单")) {
// billsType = commonVoList.get(i).getDictKey();
// }
// }
// }
// AppUserOrgInfoVo userOrgInfo = null;
// String orgCode = "";
// String orgSid = "";
// String orgName = "";
// ResultBean<AppUserOrgInfoVo> resultBean = sysUserFeign.getUserOrgInfoByUserSid(userSid);
// if (resultBean.getSuccess() && resultBean.getData() != null) {
// userOrgInfo = resultBean.getData();
// orgSid = userOrgInfo.getOrgSid();
// orgName = userOrgInfo.getOrgName();
// orgCode = userOrgInfo.getOrgCode();
// }
// String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd");
// // 流水号
// int i = selectCountByOrgSid(billsType, date, orgSid);
// String num = String.format("%04d", i + 1); // 不足4位补0
// Map<String, String> map = new HashMap<>();
// map.put("billNo_Num", billsType + orgCode + date.replaceAll("-", "") + num);
// map.put("billNo", billsType + orgCode + date.replaceAll("-", ""));
// map.put("staffSid", userOrgInfo.getStaffSid());
// map.put("staffName", userOrgInfo.getStaffName());
// map.put("orgSid", orgSid);
// map.put("orgName", orgName);
//
// return map;
// }
public int selectCountByOrgSid(String billsType, String date, String orgSid) {
return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
}
@ -535,9 +570,9 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
String state = "2";
baseMapper.updateStateBySid(dto.getSid(), state);
String businessSid = resultBean.getData();
String state = "2";
baseMapper.updateStateBySid(businessSid, state);
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
@ -625,19 +660,19 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
ResultBean rb = ResultBean.fireFail();
ScmVehicleGression scmVehicleGression = fetchBySid(bv.getBusinessSid());
if (bv.getTaskId().equals(scmVehicleGression.getTaskId())) {
boolean isTrue = false;
if (StringUtils.isNotBlank(scmVehicleGression.getApplicantFunds())) {
if ("0".equals(scmVehicleGression.getApplicantFunds())) {
isTrue = false;
} else {
isTrue = true;
}
} else {
isTrue = false;
}
Map<String, Object> map = new HashMap<>();
map.put("isTrue", isTrue);
bv.setFormVariables(map);
// boolean isTrue = false;
// if (StringUtils.isNotBlank(scmVehicleGression.getApplicantFunds())) {
// if ("0".equals(scmVehicleGression.getApplicantFunds())) {
// isTrue = false;
// } else {
// isTrue = true;
// }
// } else {
// isTrue = false;
// }
// Map<String, Object> map = new HashMap<>();
// map.put("isTrue", isTrue);
// bv.setFormVariables(map);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
@ -667,10 +702,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
Map<String, Object> formVariables = query.getFormVariables();
// Map<String, Object> formVariables = query.getFormVariables();
//判断流程分支
Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
bv.setFormVariables(map);
// Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
@ -688,10 +723,10 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
Map<String, Object> formVariables = query.getFormVariables();
// Map<String, Object> formVariables = query.getFormVariables();
//判断流程分支
Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
bv.setFormVariables(map);
// Map<String, Object> map = IsTrue(formVariables.get("businessSid"));
// bv.setFormVariables(map);
bv.setModelId(ProcDefEnum.SCMCARTRANSFER.getProDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
@ -816,7 +851,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
}
/**
* 根据业务sid查询判断流程分支
* 根据业务sid查询判断流程分支(暂时不用)
*
* @param businessSid
* @return
@ -837,4 +872,24 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
map.put("isTrue", isTrue);
return map;
}
public ResultBean<TemporaryExitPermitInfo> temporaryExitPermitInfo(String sid, String userSid) {
ResultBean<TemporaryExitPermitInfo> rb = ResultBean.fireFail();
TemporaryExitPermitInfo temporaryExitPermitInfo = new TemporaryExitPermitInfo();
ScmVehicleGression scmVehicleGression = fetchBySid(sid);
SysOrganization sysOrganization = sysOrganizationFeign.selectBySid(scmVehicleGression.getUseOrgSid()).getData();
temporaryExitPermitInfo.setCustomerName("—");
temporaryExitPermitInfo.setOrgName(sysOrganization.getName());
temporaryExitPermitInfo.setDate(new Date());
temporaryExitPermitInfo.setContractNo("—");
BaseVehicleSelectVo data = baseVehicleFeign.details(scmVehicleGression.getVehicleSid()).getData();
ExiCarConfigDetailVo exiCarConfigDetailVo = baseVehicleFeign.selectExiCarConfig(data.getModelSid(), data.getModelConfigSid(), userSid).getData();
temporaryExitPermitInfo.setModelName(exiCarConfigDetailVo.getVehicleAlias() + exiCarConfigDetailVo.getCarColor());
temporaryExitPermitInfo.setNum("1");
temporaryExitPermitInfo.setVinNo(scmVehicleGression.getVinNo());
temporaryExitPermitInfo.setReason("存放地点变更");
temporaryExitPermitInfo.setCreatName(scmVehicleGression.getOperator());
temporaryExitPermitInfo.setCarryCarName("—");
return rb.success().setData(temporaryExitPermitInfo);
}
}

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

@ -27,6 +27,14 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
// 根据分公司sid查询分公司name
fetchOrgBySid: function (data) {
return request({
url: 'portal/v1/sysorganization/fetchBySid/' + data,
method: 'get',
params: data
})
},
// 通过sid查询一条记录
fetchBySid: function(sid) {
return request({

19
anrui-scm/anrui-scm-ui/src/api/supplychain/cunfangdidianbiangeng.js

@ -64,10 +64,27 @@ export function selectWarehouseByUserSid(data) {
})
}
// // 根据仓库sid 获取车架号
// export function getVinByWarehouseSid(data) {
// return request({
// url: '/terminal/autoservice/v1/virtualOrders/getVinByWarehouseSid/' + data.warehouseSid + '/' + data.userSid,
// method: 'get'
// })
// }
// 根据仓库sid 获取车架号
export function getVinByWarehouseSid(data) {
return request({
url: '/terminal/autoservice/v1/virtualOrders/getVinByWarehouseSid/' + data.warehouseSid + '/' + data.userSid,
url: 'base/v1/basevehicle/getPcVinByWarehouseSid',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 获取出门证数据
export function temporaryExitPermitInfo(data) {
return request({
url: '/scm/v1/scmvehiclegression/temporaryExitPermitInfo/' + data.sid + '/' + data.userSid,
method: 'get'
})
}

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

@ -1,74 +1,83 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar view-title="外采申请表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="申请日期:">
<el-date-picker v-model="queryParams.params.applicationStartDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
<label></label>
<el-date-picker v-model="queryParams.params.applicationEndDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
</el-form-item>
<el-form-item label="车型:">
<el-input v-model="queryParams.params.modelName" placeholder="请输入车型名称" clearable /></el-form-item>
<el-divider />
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="dosearch">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
</div>
</el-form>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">外采申请表列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="listcon">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column width="30px" type="selection" align="center" style="padding-left:0px;" />
<el-table-column prop="applicationCode" width="130px;" label="申请单编号" align="center" />
<el-table-column width="150px" label="操作" align="center" >
<template slot-scope="scope">
<el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')"
type="primary" size="mini" @click="edit(scope.row)">办理</el-button>
<el-button v-else type="info" size="mini">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button></template>
</el-table-column>
<el-table-column prop="nodeState" width="100px;" label="状态" align="center" >
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini" >待提交</span>
<span v-else @click="flowRecord(scope.row)" style="color: #018ad2;cursor: pointer;">{{scope.row.nodeState}}</span>
</template>
</el-table-column>
<el-table-column prop="applicationDate" width="110px;" label="申请日期" align="center" />
<el-table-column prop="modelName" label="车型" align="center" />
<el-table-column prop="num" width="60px;" label="台数" align="center" />
<el-table-column prop="purchasePrice" width="90px;" label="采购价格" align="center" />
<el-table-column prop="guidedPrice" width="90px;" label="销售指导价" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
</div>
</div>
<button-bar view-title="外采申请表" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">
{{ isSearchShow ? '隐藏查询条件' : '显示查询条件' }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="申请日期:">
<el-date-picker v-model="queryParams.params.applicationStartDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
<label></label>
<el-date-picker v-model="queryParams.params.applicationEndDate" class="filter-item" type="date"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择"/>
</el-form-item>
<el-form-item label="车型:">
<el-input v-model="queryParams.params.modelName" placeholder="请输入车型名称" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="dosearch">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">外采申请表列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="listcon">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="150px" label="操作" align="center">
<template slot-scope="scope">
<el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='外采申请')"
type="primary" size="mini" @click="edit(scope.row)">办理
</el-button>
<el-button v-else type="info" size="mini">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="applicationCode" width="140px;" label="申请单编号" align="center"/>
<el-table-column prop="nodeState" width="100px;" label="状态" align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)"
style="color: #018ad2;cursor: pointer;">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="applicationDate" width="110px;" label="申请日期" align="center"/>
<el-table-column prop="modelName" label="车型" align="center"/>
<el-table-column prop="num" width="60px;" label="台数" align="center"/>
<el-table-column prop="purchasePrice" width="90px;" label="采购价格" align="center"/>
<el-table-column prop="guidedPrice" width="120px;" label="销售指导价" align="center"/>
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination
v-show="dataList.length > 0"
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
@ -99,46 +108,47 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './baseoutsourcingapplicationAdd'
import divInfo from './baseoutsourcingapplicationInfo'
import {getStorage,setStorage} from "@/utils/auth";
import { getStorage } from '@/utils/auth'
export default {
name: 'baseoutsourcingapplication',
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
url:'',
name: 'baseoutsourcingapplication',
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
tableLoading: false,
dataList: [],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
tableLoading: false,
dataList: [],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
staffSid: window.sessionStorage.getItem('staffSid'),
userSid: window.sessionStorage.getItem('userSid'),
sids: [], // SID
applicationCode: '', //
createByName: '', //
applicationDate: '', //
applicationStartDate:'',
applicationEndDate:'',
externalMiningTypeKey: '', // key
externalMiningTypeValue: '', // value
purchasingUnitSid: '', // sid
purchasingUnitName: '', //
modelSid: '', // sid
modelName: '', //
configName: '', //
sids: [], // SID
applicationCode: '', //
createByName: '', //
applicationDate: '', //
applicationStartDate: '',
applicationEndDate: '',
externalMiningTypeKey: '', // key
externalMiningTypeValue: '', // value
purchasingUnitSid: '', // sid
purchasingUnitName: '', //
modelSid: '', // sid
modelName: '', //
configName: '', //
purchasePrice: '', //
guidedPrice: '', //
manufactorSettlementPrice: '', //

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

@ -1,152 +1,213 @@
<template>
<div>
<div>
<div v-show="viewState == 1">
<!-- 标题按钮部分开始 -->
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{ viewTitle }}</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="doSubmit">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<!-- 标题按钮部分结束 -->
<!-- Start 新增修改部分 -->
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
<div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
<br><br>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请编号</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">{{formobj.applicationCode}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请人</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName">{{formobj.createByName}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请日期</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate">{{formobj.applicationDate}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>外采类型</span>
</el-col>
<el-col :span="21" class="trightb" >
<el-radio v-model="formobj.externalMiningTypeKey" label="1">直接外采</el-radio>
<el-radio v-model="formobj.externalMiningTypeKey" label="2">政策外采</el-radio>
</el-col>
</el-row>
<el-row style="border-left: none; ">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购单位</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>车型</span>
</el-col>
<el-col :span="19" class="trightb">
<el-form-item prop="modelName">{{formobj.modelName}}</el-form-item>
</el-col>
<el-col :span="2" class="trightb">
<!--<button type="primary" size="small" @click="saveOrUpdate">选择</button>-->
<el-button type="primary" size="small" @click="selectModel">选择</el-button>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>常用配置名称</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="configName">{{formobj.configName}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasePrice"><el-input size="small" v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>销售指导价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="guidedPrice"><el-input size="small" v-model="formobj.guidedPrice" placeholder="销售指导价" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="guidedPrice">{{formobj.guidedPrice}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>厂家合同价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="manufactorSettlementPrice"><el-input size="small" v-model="formobj.manufactorSettlementPrice" placeholder="厂家合同价" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="manufactorSettlementPrice">{{formobj.manufactorSettlementPrice}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="num"><el-input size="small" v-model="formobj.num" placeholder="台数" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="num">{{formobj.num}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="deposit"><el-input size="small" style="height:10px;" v-model="formobj.deposit" placeholder="订金" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>费用名称</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="expenseName"><el-input size="small" v-model="formobj.expenseName" placeholder="费用名称" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>费用金额合计</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="totalExpenseAmount"><el-input size="small" v-model="formobj.totalExpenseAmount" placeholder="费用金额合计" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
<el-button type="primary" size="small" @click="selectVehicleDialog">选择车辆</el-button>
</div>
<el-table :data="formobj.baseOutsourcingApplicationVehicleDtos" border style="width: 100%">
<el-table-column width="60px" label="序号" type="index" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="deleteVehicle(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="vinNo" label="车架号" align="center"/>
</el-table>
<!-- 标题按钮部分开始 -->
<div class="tab-header webtop">
<!-- 标题 -->
<div>{{ viewTitle }}</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="doSubmit">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
</div>
</el-form>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<!-- 标题按钮部分结束 -->
<!-- Start 新增修改部分 -->
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
<div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
<br><br>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>分公司名称</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">{{formobj.useOrgName}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请人</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName">{{formobj.createByName}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请日期</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate">{{formobj.applicationDate}}</el-form-item>
</el-col>
</el-row>
<!-- <el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>外采类型</span>
</el-col>
<el-col :span="21" class="trightb" >
<el-radio v-model="formobj.externalMiningTypeKey" label="1">直接外采</el-radio>
<el-radio v-model="formobj.externalMiningTypeKey" label="2">政策外采</el-radio>
</el-col>
</el-row>-->
<!--<el-row style="border-left: none; ">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购单位</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>-->
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>车型</span>
</el-col>
<el-col :span="19" class="trightb">
<el-form-item prop="modelName">{{formobj.modelName}}</el-form-item>
</el-col>
<el-col :span="2" class="trightb">
<!--<button type="primary" size="small" @click="saveOrUpdate">选择</button>-->
<el-button type="primary" size="small" @click="selectModel">选择</el-button>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>常用配置名称</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="configName">{{formobj.configName}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<!-- <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasePrice"><el-input size="small" v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable /></el-form-item>
</el-col>-->
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>销售指导价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="guidedPrice"><el-input size="small" v-model="formobj.guidedPrice" placeholder="销售指导价" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="guidedPrice">{{formobj.guidedPrice}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>厂家合同价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="manufactorSettlementPrice"><el-input size="small" v-model="formobj.manufactorSettlementPrice" placeholder="厂家合同价" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="manufactorSettlementPrice">{{formobj.manufactorSettlementPrice}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购单位</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>开户银行</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.depositBankName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.bankAccount" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
<!-- <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="num"><el-input size="small" v-model="formobj.num" placeholder="台数" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="num">{{formobj.num}}</el-form-item>
</el-col>-->
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasePrice"><el-input size="small" v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="num"><el-input size="small" v-model="formobj.num" placeholder="台数" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="num">{{formobj.num}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="deposit"><el-input size="small" style="height:10px;" v-model="formobj.deposit" placeholder="订金" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>其他费用名称</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="expenseName"><el-input size="small" v-model="formobj.expenseName" placeholder="费用名称" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>费用合计</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="totalExpenseAmount"><el-input size="small" v-model="formobj.totalExpenseAmount" placeholder="费用金额合计" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>备注</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="remarks"><el-input size="small" v-model="formobj.remarks" placeholder="备注" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>合同附件</span>
</el-col>
<el-col :span="21">
<el-form-item>
<el-upload
:action="uploadAction"
:data="requestData"
:headers="accessToken"
:accept="filType"
:multiple="false"
:on-success="uploadSuccessHetong"
:limit="1"
:file-list="fileList"
class="upload-demo"
><!--:show-file-list="false"-->
<el-button size="small" type="primary">合同上传</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
<el-button type="primary" size="small" @click="selectVehicleDialog">选择车辆</el-button>
</div>
<el-table :data="formobj.baseOutsourcingApplicationVehicleDtos" border style="width: 100%">
<el-table-column width="60px" label="序号" type="index" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="deleteVehicle(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="vinNo" label="车架号" align="center"/>
</el-table>
</div>
</el-form>
</div>
</div><!-- End 添加修改部分 -->
<!-- 车型配置分页列表 -->
<el-dialog
@ -164,8 +225,8 @@
</el-dialog>
<!-- 选择待办人 -->
<modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
<!-- <modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
@ -201,6 +262,8 @@
</el-form>
</el-dialog>
<!--选择车型和常用配置-->
<configuration v-show="viewState == 1.2" ref="divconfiguration" @backData="selectChexing" @doback="closePage"/>
</div>
</template>
<script>
@ -208,14 +271,19 @@
import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibrary'
import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
import vehicle from '@/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue'
import configuration from './chexingbyconfiguration'
import {getStorage} from '@/utils/auth'
import {getPathSidByUserSid} from "@/api/cheliang/basevehiclemodel";
export default {
name: 'BaseOutsourcingApplicationAdd',
components: {
modellibrary, vehicle
modellibrary, vehicle,configuration
},
data() {
return {
accessToken: {
token: getStorage()
},
//
firstNode:{},
//
@ -234,11 +302,23 @@ export default {
viewState: '1',
submitdisabled: false,
viewTitle: '',
requestData: {
departmentName: window.sessionStorage.getItem('userSid'),
staffSid: window.sessionStorage.getItem('staffSid')
},
uploadAction: process.env.VUE_APP_BASE_API + '/base/file/upload',
filType:'.pdf,.docx',
fileList:[],
formobj: {
remarks : "",
useOrgName : "",
depositBankName : "",
bankAccount : "",
contract : {},
//sid
nextUserSid:'',
nextUserSid : '',
sid: '',
userSid:'',
userSid : '',
staffSid: window.sessionStorage.getItem('staffSid'),
applicationCode: '', //
createByName: window.sessionStorage.getItem('name'), //
@ -280,8 +360,27 @@ export default {
}
},
created() {
this.getPathSid();
},
methods: {
//
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid:userSid}).then((res) => {
if (res.code === '200') {
//this.listQuery.params.createOrgSId = res.data
req.fetchOrgBySid(res.data).then((ress)=>{
this.formobj.useOrgName=ress.data.name;
})
/* this.useOrg = res.data
this.getList()
this.getBrand(res.data)*/
}
})
},
uploadSuccessHetong(response, file) {
this.formobj.contract = response.data
},
closeNodeDialog(){
this.nodeDialogVisible = false
},
@ -303,16 +402,18 @@ export default {
},
selectModel() {
this.viewState = '1.2'
this.$refs['chexingxuanze'].showChexing()
//this.viewState = 2
this.$refs['divconfiguration'].showData(this.formobj.baseOutsourcingApplicationVehicleDtos)
// this.$refs['chexingxuanze'].showChexing()
},
selectChexing(info) {
this.viewState = '1'
this.formobj.modelSid = info.modelSid // sid
this.formobj.modelName = info.modelName //
this.formobj.configName = info.configName //
this.formobj.configSid = info.configSid // sid
this.formobj.guidedPrice = info.guidedPrice//
this.formobj.manufactorSettlementPrice = info.manufactorSettlementPrice//
this.formobj.modelSid = info[0].modelSid // sid
this.formobj.modelName = info[0].vehicleAlias //
this.formobj.configName = info[0].configName //
this.formobj.configSid = info[0].configSid // sid
this.formobj.guidedPrice = info[0].guidedPrice//
this.formobj.manufactorSettlementPrice = info[0].manufactorSettlementPrice//
},
selectVehicleDialog() {
var objs = this.formobj.baseOutsourcingApplicationVehicleDtos
@ -374,6 +475,10 @@ export default {
.then(resp => {
if (resp.success) {
const vdata = resp.data
_this.formobj.remarks = vdata.remarks
_this.formobj.useOrgName = vdata.useOrgName
_this.formobj.depositBankName = vdata.depositBankName
_this.formobj.bankAccount = vdata.bankAccount
_this.formobj.applicationCode = vdata.applicationCode //
_this.formobj.createByName = vdata.createByName //
_this.formobj.applicationDate = vdata.applicationDate //
@ -410,19 +515,19 @@ export default {
return pageindex;*/
},
//
/* selectUser() {
this.nodeUserDialogVisible = true;
req.getUsers( this.roleSid ).then(res => {
this.users = res.data
})
},*/
/* selectUser() {
this.nodeUserDialogVisible = true;
req.getUsers( this.roleSid ).then(res => {
this.users = res.data
})
},*/
//
/* checkedUser(val) {
/* checkedUser(val) {
this.userName = val.name
this.formobj.nextUserSid =val.sid
this.nodeUserDialogVisible = false
},*/
this.userName = val.name
this.formobj.nextUserSid =val.sid
this.nodeUserDialogVisible = false
},*/
doSubmit(row) {
//
this.submitdisabled = true
@ -498,6 +603,9 @@ export default {
}
})
},
closePage() {
this.viewState = 1
},
deleteVehicle(row) {
var arr = this.formobj.baseOutsourcingApplicationVehicleDtos

143
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue

@ -10,28 +10,27 @@
</div>
<!-- 标题按钮部分结束 -->
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd"> <div class="wlInfo" style="text-align: center;"><span style="font-size:28px;">外采申请表</span></div>
<el-row>
<el-col :span="3" class="tleftb">申请编号</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="applicationCode">
<span>{{ formobj.applicationCode }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">申请人姓名</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="createByName"><span>{{ formobj.createByName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">申请日期</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="applicationDate"><span>{{ formobj.applicationDate }}</span></el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">外采类型</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="externalMiningTypeValue">
<span v-show="formobj.externalMiningTypeKey==2">政策外采</span>
<span v-show="formobj.externalMiningTypeKey==1">直接外采</span>
</el-form-item></el-col>
</el-row>
<el-row>
<div class="titwu">外采申请表</div>
<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="3" class="tleftb">分公司名称</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">
<span>{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">申请人姓名</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName"><span>{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">申请日期</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate"><span>{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
</el-row>
<!-- <el-row>
<el-col :span="3" class="tleftb">采购单位名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="purchasingUnitName"><span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
</el-row>
</el-row>-->
<el-row>
<el-col :span="3" class="tleftb">车型名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.modelName }}</span></el-form-item></el-col>
@ -40,27 +39,91 @@
<el-col :span="3" class="tleftb">常用配置名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.configName }}</span></el-form-item></el-col>
</el-row>
<el-row><el-col :span="3" class="tleftb">采购价格</el-col>
<!-- <el-row><el-col :span="3" class="tleftb">采购价格</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.purchasePrice }}</span></el-form-item></el-col>
-->
<el-row>
<el-col :span="3" class="tleftb">销售指导价</el-col>
<el-col :span="7" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.guidedPrice }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="11" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">销售指导价</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.guidedPrice }}</span></el-form-item></el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">台数</el-col>
<!-- <el-col :span="4" class="tleftb">台数</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.num }}</span></el-form-item></el-col>
-->
</el-row>
<el-row> <el-col :span="3" class="tleftb">订金</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.deposit }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">费用名称</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.expenseName }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">采购单位名称</el-col>
<el-col :span="7" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>开户银行</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.depositBankName}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.bankAccount }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">费用金额合计</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.totalExpenseAmount }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="7" class="trightb">
<el-form-item prop="purchasePrice">
<span>{{formobj.purchasePrice }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="num">
<span>{{formobj.num}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="deposit">
<span>{{formobj.deposit}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">费用名称</el-col>
<el-col :span="7" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.expenseName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">费用金额合计</el-col>
<el-col :span="11" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.totalExpenseAmount }}</span></el-form-item></el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>备注</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="remarks">
<span>{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>合同附件</span>
</el-col>
<el-col :span="21">
<el-form-item>
</el-form-item>
</el-col>
</el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
@ -78,11 +141,17 @@
<script>
import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
export default {
name: 'BaseOutsourcingApplicationInfo',
data() {
return {
formobj: {
remarks:"",
useOrgName:"",
depositBankName:"",
bankAccount:"",
contract:{},
sid: '',
applicationCode: '123456', //
createByName: window.sessionStorage.getItem('name'), //
@ -120,6 +189,10 @@ export default {
.then(resp => {
if (resp.success) {
const vdata = resp.data
_this.formobj.remarks = vdata.remarks
_this.formobj.useOrgName = vdata.useOrgName
_this.formobj.depositBankName = vdata.depositBankName
_this.formobj.bankAccount = vdata.bankAccount
_this.formobj.applicationCode = vdata.applicationCode //
_this.formobj.createByName = vdata.createByName //
_this.formobj.applicationDate = vdata.applicationDate //

2
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicleAdd.vue

@ -15,8 +15,8 @@
<!-- 标题按钮部分结束 -->
<!-- Start 新增修改部分 -->
<div class="listconadd">
<div class="titwu">外采申请车辆列表</div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
<div class="wlInfo"><span>外采申请车辆列表</span></div>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>外采申请单sid</span>

202
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/chexingbyconfiguration.vue

@ -0,0 +1,202 @@
<template>
<div class="app-container">
<div>
<div class="tab-header webtop">
<div>车型常用列表</div>
<div>
<el-button type="primary" size="small" @click="AddUpdateReturn">确定</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<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" class="tab-header" label-width="100px">
<el-form-item label="车型:">
<el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable class="filter-item"/>
</el-form-item>
<el-form-item label="常用配置:">
<el-input v-model="listQuery.params.configName" placeholder="" clearable class="filter-item"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handresetting">重置</el-button>
</div>
</div>
</div>
<div class="">
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车型" align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column label="销售指导价(元)" width="200" align="center">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import req from '@/api/kucunguanli/price'
import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
export default {
name: "chexingbyconfiguration",
components: {
Pagination
},
data() {
return {
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
tableKey: 0,
showbackState: 30,
sids: [],
list: [],
number: '',
listLoading: false,
userOrgSid: '',
listQuery: {
current: 1,
size: 10,
params: {
vehicleAlias: '',
configName: '',
useOrgSid: '',
vehicleStateValue: '',
sidList: []
},
total: 1
}
}
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
handleReturn() {
this.$emit('doback')
},
getPathSid() {
const userSid = window.sessionStorage.getItem('userSid')
getPathSidByUserSid({userSid:userSid}).then((res) => {
if (res.code === '200') {
this.listQuery.params.useOrgSid = res.data
this.getList()
}
})
},
//
getList() {
this.listLoading = true
req.configurationlistPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.getPathSid()
},
//
handresetting() {
this.listQuery = {
current: 1,
size: 10,
params: {
vehicleAlias: '',
configName: '',
useOrgSid: '',
vehicleStateValue: '',
sidList: []
},
total: 1
}
this.getPathSid()
},
handleSelectionChange(row) {
this.sids = []
const aa = []
row.forEach((element) => {
aa.push({
vehicleAlias: element.vehicleAlias,
modelSid: element.modelSid,
configName: element.configName,
configSid: element.configSid,
guidedPrice: element.guidedPrice,
manufactorSettlementPrice: element.manufactorSettlementPrice
})
})
this.sids = aa
},
showData(value) {
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push({
modelSid: value[i].vehicleSid,
configSid: value[i].configSid
})
}
this.listQuery.params.sidList = aa
} else {
this.listQuery.params.sidList = []
}
this.getPathSid()
},
//
AddUpdateReturn() {
if (this.sids.length > 0) {
console.log('勾选的车辆信息',this.sids)
this.$emit('backData', this.sids)
} else {
this.$notify({
title: '提示',
message: '请选择至少一条车型记录!',
type: 'error',
duration: 2000
})
}
}
}
}
</script>
<style scoped>
</style>

141
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue

@ -15,27 +15,22 @@
<!-- 标题按钮部分结束 -->
<div>
<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd" >
<el-row >
<el-col :span="3" class="tleftb" >申请编号</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="applicationCode">
<span>{{ formobj.applicationCode }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">申请人姓名</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="createByName"><span>{{ formobj.createByName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">申请日期</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="applicationDate"><span>{{ formobj.applicationDate }}</span></el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">外采类型</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="externalMiningTypeValue">
<span v-show="formobj.externalMiningTypeKey==2">政策外采</span>
<span v-show="formobj.externalMiningTypeKey==1">直接外采</span>
</el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">采购单位名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="purchasingUnitName"><span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
</el-row>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="3" class="tleftb">分公司名称</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">
<span>{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">申请人姓名</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName"><span>{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">申请日期</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate"><span>{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">车型名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.modelName }}</span></el-form-item></el-col>
@ -44,27 +39,88 @@
<el-col :span="3" class="tleftb">常用配置名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.configName }}</span></el-form-item></el-col>
</el-row>
<el-row><el-col :span="3" class="tleftb">采购价格</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.purchasePrice }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">销售指导价</el-col>
<el-col :span="7" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.guidedPrice }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="11" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">销售指导价</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.guidedPrice }}</span></el-form-item></el-col>
<!-- <el-col :span="4" class="tleftb">台数</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.num }}</span></el-form-item></el-col>
-->
</el-row>
<el-row> <el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">台数</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.num }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">采购单位名称</el-col>
<el-col :span="7" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>开户银行</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.depositBankName}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.bankAccount }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">订金</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.deposit }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="7" class="trightb">
<el-form-item prop="purchasePrice">
<span>{{formobj.purchasePrice }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="num">
<span>{{formobj.num}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="deposit">
<span>{{formobj.deposit}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">费用名称</el-col>
<el-col :span="7" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.expenseName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">费用金额合计</el-col>
<el-col :span="11" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.totalExpenseAmount }}</span></el-form-item></el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>备注</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="remarks">
<span>{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>合同附件</span>
</el-col>
<el-col :span="21">
<el-form-item>
<el-col :span="4" class="tleftb">费用名称</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.expenseName }}</span></el-form-item></el-col>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">费用金额合计</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.totalExpenseAmount }}</span></el-form-item></el-col>
</el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
@ -123,6 +179,7 @@
<script>
import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
export default {
name: 'BaseOutsourcingApplicationInfo',
components: {
@ -153,6 +210,11 @@ export default {
//
nextNode:{},
formobj: {
remarks:"",
useOrgName:"",
depositBankName:"",
bankAccount:"",
contract:{},
sid: '',
comment:'',
applicationCode: '123456', //
@ -273,6 +335,7 @@ export default {
},
//
openAgree() {
this.formobj.comment="同意"
//id
req.getNextNodesForSubmit(this.formobj).then(resp=>{
if (resp.success) {
@ -296,6 +359,10 @@ export default {
.then(resp => {
if (resp.success) {
const vdata = resp.data
_this.formobj.remarks = vdata.remarks
_this.formobj.useOrgName = vdata.useOrgName
_this.formobj.depositBankName = vdata.depositBankName
_this.formobj.bankAccount = vdata.bankAccount
_this.formobj.applicationCode = vdata.applicationCode //
_this.formobj.createByName = vdata.createByName //
_this.formobj.applicationDate = vdata.applicationDate //

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

@ -17,129 +17,162 @@
<!-- 标题按钮部分结束 -->
<!-- Start 新增修改部分 -->
<div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请编号</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">{{formobj.applicationCode}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请人</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName">{{formobj.createByName}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请日期</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate">{{formobj.applicationDate}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>外采类型</span>
</el-col>
<el-col :span="21" class="trightb" >
<el-radio v-model="formobj.externalMiningTypeKey" label="1">直接外采</el-radio>
<el-radio v-model="formobj.externalMiningTypeKey" label="2">政策外采</el-radio>
</el-col>
</el-row>
<el-row style="border-left: none; ">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购单位</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>车型</span>
</el-col>
<el-col :span="19" class="trightb">
<el-form-item prop="modelName">{{formobj.modelName}}</el-form-item>
</el-col>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="right" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>分公司名称</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">{{ formobj.useOrgName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请人</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName">{{ formobj.createByName }}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>申请日期</span>
</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate">{{ formobj.applicationDate }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>车型</span>
</el-col>
<el-col :span="19" class="trightb">
<el-form-item prop="modelName">{{ formobj.modelName }}</el-form-item>
</el-col>
<el-col :span="2" class="trightb">
<!--<button type="primary" size="small" @click="saveOrUpdate">选择</button>-->
<el-button type="primary" size="small" @click="selectModel">选择</el-button>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>常用配置名称</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="configName">{{formobj.configName}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasePrice"><el-input size="small" v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>销售指导价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="guidedPrice"><el-input size="small" v-model="formobj.guidedPrice" placeholder="销售指导价" class="addinputw" clearable /></el-form-item>
<el-button type="primary" size="small" @click="selectModel">选择</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>常用配置名称</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="configName">{{ formobj.configName }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>销售指导价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="guidedPrice"><el-input size="small" v-model="formobj.guidedPrice" placeholder="销售指导价" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="guidedPrice">{{formobj.guidedPrice}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>厂家合同价</span>
</el-col>
<el-col :span="9" class="trightb">
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>厂家合同价</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="manufactorSettlementPrice"><el-input size="small" v-model="formobj.manufactorSettlementPrice" placeholder="厂家合同价" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="manufactorSettlementPrice">{{formobj.manufactorSettlementPrice}}</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="9" class="trightb">
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购单位</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.purchasingUnitName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>开户银行</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.depositBankName" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item prop="purchasingUnitName"><el-input size="small" v-model="formobj.bankAccount" placeholder="采购单位" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="purchasePrice"><el-input size="small" v-model="formobj.purchasePrice" placeholder="采购价格" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item v-show="formobj.externalMiningTypeKey==1" prop="num"><el-input size="small" v-model="formobj.num" placeholder="台数" class="addinputw" clearable /></el-form-item>
<el-form-item v-show="formobj.externalMiningTypeKey==2" prop="num">{{formobj.num}}</el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金</span>
</el-col>
<el-col :span="21" class="trightb">
<el-col :span="3" class="trightb">
<el-form-item prop="deposit"><el-input size="small" style="height:10px;" v-model="formobj.deposit" placeholder="订金" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: none;">
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>费用名称</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="expenseName"><el-input size="small" v-model="formobj.expenseName" placeholder="费用名称" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>费用金额合计</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="totalExpenseAmount"><el-input size="small" v-model="formobj.totalExpenseAmount" placeholder="费用金额合计" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>其他费用名称</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="expenseName"><el-input size="small" v-model="formobj.expenseName" placeholder="费用名称" class="addinputw" clearable /></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>费用合计</span>
</el-col>
<el-col :span="9" class="trightb">
<el-form-item prop="totalExpenseAmount"><el-input size="small" v-model="formobj.totalExpenseAmount" placeholder="费用金额合计" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>备注</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="remarks"><el-input size="small" v-model="formobj.remarks" placeholder="备注" class="addinputw" clearable /></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>合同附件</span>
</el-col>
<el-col :span="21">
<el-form-item>
<el-upload
:action="uploadAction"
:data="requestData"
:headers="accessToken"
:accept="filType"
:multiple="false"
:on-success="uploadSuccessHetong"
:limit="1"
:file-list="fileList"
class="upload-demo"
><!--:show-file-list="false"-->
<el-button size="small" type="primary">合同上传</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表 <el-button type="primary" size="small" @click="selectVehicleDialog">选择车辆</el-button>
车辆列表
<el-button type="primary" size="small" @click="selectVehicleDialog">选择车辆</el-button>
</div>
<el-table :data="formobj.baseOutsourcingApplicationVehicleDtos" border style="width: 100%" >
<el-table-column width="60px" label="序号" type="index" align="center" />
<el-table-column label="操作" align="center" >
<template slot-scope="scope">
<el-button type="danger" size="small" @click="deleteVehicle(scope.row)">删除</el-button>
</template>
<el-table :data="formobj.baseOutsourcingApplicationVehicleDtos" border style="width: 100%">
<el-table-column width="60px" label="序号" type="index" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="deleteVehicle(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="vinNo" label="车架号" align="center" />
<el-table-column prop="vinNo" label="车架号" align="center"/>
</el-table>
</div>
</el-form>
@ -152,7 +185,7 @@
width="90%"
show-close="false"
:before-close="handleClose">-->
<modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>
<!-- <modellibrary @doback="resetState" v-show="viewState == 1.2" ref="chexingxuanze" @handleChexing="selectChexing"></modellibrary>-->
<!--<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="queding(this)"> </el-button>
</span>
@ -177,20 +210,38 @@
import modellibrary from '@/views/baseoutsourcingapplication/relation/modellibrary'
import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
import vehicle from '@/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue'
import configuration from "@/views/baseoutsourcingapplication/chexingbyconfiguration";
import {getStorage} from "@/utils/auth";
export default {
name: 'BaseOutsourcingApplicationAdd',
components:{
modellibrary,vehicle
modellibrary,vehicle,configuration
},
data() {
return {
accessToken: {
token: getStorage()
},
selectedSids:'',
vehicleDialogVisible: false,
dialogVisible: false,
viewState: '1',
submitdisabled: false,
viewTitle: '',
requestData: {
departmentName: window.sessionStorage.getItem('userSid'),
staffSid: window.sessionStorage.getItem('staffSid')
},
uploadAction: process.env.VUE_APP_BASE_API + '/base/file/upload',
filType:'.pdf,.docx',
fileList:[],
formobj: {
remarks : "",
useOrgName : "",
depositBankName : "",
bankAccount : "",
contract : {},
sid: '',
staffSid: window.sessionStorage.getItem('staffSid'),
applicationCode: '', //
@ -273,6 +324,9 @@ export default {
}, '*')
},
methods: {
uploadSuccessHetong(response, file) {
this.formobj.contract = response.data
},
selectChexing(info) {
this.viewState = '1'
this.formobj.modelSid = info.modelSid // sid
@ -411,6 +465,10 @@ export default {
.then(resp => {
if (resp.success) {
const vdata = resp.data
_this.formobj.remarks = vdata.remarks
_this.formobj.useOrgName = vdata.useOrgName
_this.formobj.depositBankName = vdata.depositBankName
_this.formobj.bankAccount = vdata.bankAccount
_this.formobj.applicationCode = vdata.applicationCode //
_this.formobj.createByName = vdata.createByName //
_this.formobj.applicationDate = vdata.applicationDate //

158
anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue

@ -12,56 +12,114 @@
<!-- 标题按钮部分结束 -->
<div >
<el-form ref="form_obj" :model="formobj" label-position="right" class="formadd">
<el-row>
<el-col :span="3" class="tleftb">申请编号</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="applicationCode">
<span>{{ formobj.applicationCode }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">申请人姓名</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="createByName"><span>{{ formobj.createByName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">申请日期</el-col>
<el-col :span="5" class="trightb"><el-form-item prop="applicationDate"><span>{{ formobj.applicationDate }}</span></el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">外采类型</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="externalMiningTypeValue">
<span v-show="formobj.externalMiningTypeKey==2">政策外采</span>
<span v-show="formobj.externalMiningTypeKey==1">直接外采</span>
</el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">采购单位名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="purchasingUnitName"><span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">车型名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.modelName }}</span></el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">常用配置名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.configName }}</span></el-form-item></el-col>
</el-row>
<el-row><el-col :span="3" class="tleftb">采购价格</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.purchasePrice }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">销售指导价</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.guidedPrice }}</span></el-form-item></el-col>
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="3" class="tleftb">分公司名称</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationCode">
<span>{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">申请人姓名</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="createByName"><span>{{ formobj.createByName }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">申请日期</el-col>
<el-col :span="5" class="trightb">
<el-form-item prop="applicationDate"><span>{{ formobj.applicationDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">车型名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.modelName }}</span></el-form-item></el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">常用配置名称</el-col>
<el-col :span="21" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.configName }}</span></el-form-item></el-col>
</el-row>
<!-- <el-row><el-col :span="3" class="tleftb">采购价格</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.purchasePrice }}</span></el-form-item></el-col>
-->
<el-row>
<el-col :span="3" class="tleftb">销售指导价</el-col>
<el-col :span="7" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.guidedPrice }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">厂家合同价</el-col>
<el-col :span="11" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.manufactorSettlementPrice }}</span></el-form-item></el-col>
<el-col :span="4" class="tleftb">台数</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.num }}</span></el-form-item></el-col>
<!-- <el-col :span="4" class="tleftb">台数</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.num }}</span></el-form-item></el-col>
-->
</el-row>
<el-row>
<el-col :span="3" class="tleftb">采购单位名称</el-col>
<el-col :span="7" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.purchasingUnitName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>开户银行</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.depositBankName}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>银行账号</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="purchasingUnitName">
<span>{{ formobj.bankAccount }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">订金</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.deposit }}</span></el-form-item></el-col>
<el-row>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>采购价格</span>
</el-col>
<el-col :span="7" class="trightb">
<el-form-item prop="purchasePrice">
<span>{{formobj.purchasePrice }}</span></el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>台数</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="num">
<span>{{formobj.num}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="deposit">
<span>{{formobj.deposit}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">费用名称</el-col>
<el-col :span="7" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.expenseName }}</span></el-form-item></el-col>
<el-col :span="3" class="tleftb">费用金额合计</el-col>
<el-col :span="11" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.totalExpenseAmount }}</span></el-form-item></el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>备注</span>
</el-col>
<el-col :span="21" class="trightb">
<el-form-item prop="remarks">
<span>{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row >
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>合同附件</span>
</el-col>
<el-col :span="21">
<el-form-item>
<el-col :span="4" class="tleftb">费用名称</el-col>
<el-col :span="8" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.expenseName }}</span></el-form-item></el-col>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-col :span="3" class="tleftb">费用金额合计</el-col>
<el-col :span="9" class="trightb"><el-form-item prop="useOrg"><span>{{ formobj.totalExpenseAmount }}</span></el-form-item></el-col>
</el-row>
<div class="listcon" v-show="formobj.externalMiningTypeKey==2">
<div style="border:1px solid #c0c0c0;padding:5px 5px 5px 5px;">
车辆列表
@ -78,6 +136,7 @@
<script>
import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplication'
export default {
name: 'BaseOutsourcingApplicationInfo',
data() {
@ -85,6 +144,11 @@ export default {
obj:{},
isBtnShow: true,
formobj: {
remarks:"",
useOrgName:"",
depositBankName:"",
bankAccount:"",
contract:{},
sid: '',
applicationCode: '123456', //
createByName: window.sessionStorage.getItem('name'), //
@ -184,6 +248,10 @@ export default {
.then(resp => {
if (resp.success) {
const vdata = resp.data
_this.formobj.remarks = vdata.remarks
_this.formobj.useOrgName = vdata.useOrgName
_this.formobj.depositBankName = vdata.depositBankName
_this.formobj.bankAccount = vdata.bankAccount
_this.formobj.applicationCode = vdata.applicationCode //
_this.formobj.createByName = vdata.createByName //
_this.formobj.applicationDate = vdata.applicationDate //

8
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue

@ -21,8 +21,8 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" @click="handresetting">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handresetting">重置</el-button>
</div>
</div>
</div>
@ -30,12 +30,12 @@
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车型" align="center">
<el-table-column label="车型" align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>

163
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceAdd.vue

@ -17,78 +17,68 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
<el-col :span="4">
<span>申请人:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="el-form-item-right">
<span>调价原因:</span>
</el-col>
<el-col :span="20">
<el-form-item>
<el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><el-input v-model="formobj.modpriceReason" clearable class="addinputw addinputOne" placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
<div style="margin-left: 15px">
<div class="title">
<div>车辆列表</div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
@ -273,39 +263,26 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
}
.tableStyle {
background-color: #FFFFFF;
.title {
padding: 7px;
display: flex;
justify-content: flex-start;
flex-direction: row;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.addinputOne {
margin-left: 200px !important;
}
.icon {
color: #e84026;
margin-right: 4px;
.rowStyle {
border-left: 0px;
}
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

141
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceInfo.vue

@ -13,69 +13,61 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
<el-col :span="4">
<span>申请人:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="el-form-item-right">
<span>调价原因:</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
@ -121,34 +113,19 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.addinputOne {
margin-left: 200px !important;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.rowStyle {
border-left: 0px;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

47
anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/priceguanli.vue

@ -9,18 +9,14 @@
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="申请日期">
<div class="block" style="float: left;">
<el-date-picker v-model="listQuery.params.createStartTime" 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.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</div>
<el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" @click="handleReset" size="small">重置</el-button>
<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>
@ -30,9 +26,9 @@
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column label="操作" width="150px" align="center">
<el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed width="50px" type="selection" align="center"/>
<el-table-column fixed label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='调价申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
@ -291,31 +287,4 @@ export default {
}
</script>
<style scoped>
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
</style>

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

@ -9,9 +9,9 @@
</div>
</div>
<div class="listconadd">
<div class="titwu"><span>上装配置信息</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<div class="wlInfo"><span>上装配置信息</span></div>
<el-row>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>车辆功能</span></div>
<el-form-item prop="vehicleTypeValue">
@ -44,7 +44,7 @@
<el-col :span="12">
<div class="span-sty spanOneWidth"><span><span class="icon">*</span>委改厂</span></div>
<el-form-item prop="refitFactory">
<el-input v-model="formobj.refitFactory" placeholder="委改厂" class="addinputw" style="margin-left: 120px;width: 50%" clearable/>
<el-input v-model="formobj.refitFactory" placeholder="委改厂" class="addinputw addinputwOne" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -121,7 +121,7 @@
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>更多配置</span></div>
<el-form-item>
<el-input v-model="formobj.moreConfig" placeholder="更多配置" class="addinputw" style="margin-left: 120px !important; width: 80% !important; " clearable/>
<el-input v-model="formobj.moreConfig" placeholder="更多配置" class="addinputw addinputwOne" style="width: 80% !important;" clearable/>
</el-form-item>
</el-col>
</el-row>
@ -343,20 +343,11 @@ export default {
</script>
<style scoped>
.wlInfo {
padding-bottom: 40px;
font-size: 24px;
border-bottom: 1px solid #edf1f7;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
}
.spanOneWidth {
width: 110px !important;
}
.addinputwOne {
margin-left: 120px !important;
margin-left: 110px !important;
width: 30% !important;
}
.icon {
@ -364,7 +355,7 @@ export default {
margin-right: 4px;
}
/deep/ .el-form-item__error {
margin-left: 120px;
margin-left: 110px;
}
.inputStyle {
display: inline-block;

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

@ -7,9 +7,9 @@
</div>
</div>
<div class="listconadd">
<div class="titwu"><span>上装配置信息</span></div>
<el-form ref="dataForm" :model="formobj" class="formaddcopy02">
<div class="wlInfo"><span>上装配置信息</span></div>
<el-row>
<el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>车辆功能</span></div>
<el-form-item><span class="addinputInfo addinputwOne">{{ formobj.vehicleTypeValue }}</span></el-form-item>
@ -33,7 +33,7 @@
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>外廓尺寸</span></div>
<el-form-item>
<div class="addinputInfo" style="margin-left: 120px;">
<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
@ -53,7 +53,7 @@
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputInfo" style="display: inline-block;margin-left: 120px;">
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.plateThicknessEdge }}</span>mm
</div>
@ -98,7 +98,7 @@ export default {
name: 'ShangZhuangInfo',
data() {
return {
formobj: {},
formobj: {}
}
},
methods: {
@ -131,7 +131,7 @@ export default {
width: 110px !important;
}
.addinputwOne {
margin-left: 120px !important;
margin-left: 110px !important;
}
.inputStyle {
display: inline-block;

37
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangguanli.vue

@ -8,7 +8,7 @@
{{ isSearchShow ? "隐藏查询条件" : "显示查询条件" }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form :inline="true" class="tab-header" label-width="100px">
<el-row>
<el-form-item label="车辆功能">
<el-select v-model="queryParams.params.vehicleTypeKey" filterable placeholder="请选择">
@ -46,8 +46,8 @@
</el-row>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" @click="dosearch">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@ -360,35 +360,4 @@ export default {
}
</script>
<style scoped>
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
</style>

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

@ -185,7 +185,7 @@ export default {
width: 110px !important;
}
.addinputwOne {
margin-left: 120px !important;
margin-left: 110px !important;
}
.inputStyle {
display: inline-block;

125
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangpeizhijiansuo.vue

@ -2,13 +2,13 @@
<div class="app-container">
<div v-show="viewState == 1">
<button-bar view-title="上装配置管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">
{{ isSearchShow ? "隐藏查询条件" : "显示查询条件" }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-row>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">
{{ isSearchShow ? "隐藏查询条件" : "显示查询条件" }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header" label-width="100px">
<el-form-item label="车辆功能">
<el-select v-model="queryParams.params.vehicleTypeKey" filterable placeholder="请选择">
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
@ -42,48 +42,48 @@
</el-option>
</el-select>
</el-form-item>
</el-row>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" @click="dosearch">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
</div>
<!--Start 项目列表头部-->
<div class="listtop">
<div class="tit">上装配置列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="init"/>
</div>
<!--End 项目列表头部-->
<!--Start 项目列表-->
<div class="listcon">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<el-table-column width="70px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleSelect(scope.row)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center"/>
<el-table-column prop="installNameValue" label="上装名称" align="center"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center"/>
<el-table-column prop="refitFactory" label="委改厂" align="center"/>
<el-table-column prop="wk" label="外廓尺寸" header-align="center" align="left" width="200"/>
<el-table-column prop="colorValue" label="颜色" align="center"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center"/>
<el-table-column prop="plateThickness" label="板材厚度" header-align="center" align="left" width="150"/>
<el-table-column prop="tarpaulinSlide" label="篷布滑道" align="center"/>
<el-table-column prop="refrigerator" label="冷藏冷机" align="center"/>
<el-table-column prop="selfUnHyCoPl" label="自卸液压盖板" align="center"/>
<el-table-column prop="floorHeating" label="底板加热" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="init"/>
<!--Start 项目列表头部-->
<div class="listtop">
<div class="tit">上装配置列表</div>
<pageye v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="init"/>
</div>
<!--End 项目列表头部-->
<!--Start 项目列表-->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<el-table-column width="70px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handleSelect(scope.row)">选择</el-button>
</template>
</el-table-column>
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center"/>
<el-table-column prop="installNameValue" label="上装名称" align="center"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center"/>
<el-table-column prop="refitFactory" label="委改厂" align="center"/>
<el-table-column prop="wk" label="外廓尺寸" header-align="center" align="left" width="200"/>
<el-table-column prop="colorValue" label="颜色" align="center"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center"/>
<el-table-column prop="plateThickness" label="板材厚度" header-align="center" align="left" width="150"/>
<el-table-column prop="tarpaulinSlide" label="篷布滑道" align="center"/>
<el-table-column prop="refrigerator" label="冷藏冷机" align="center"/>
<el-table-column prop="selfUnHyCoPl" label="自卸液压盖板" align="center" width="150"/>
<el-table-column prop="floorHeating" label="底板加热" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="init"/>
</div>
</div>
</div>
<!--End 查询和其列表部分-->
@ -248,35 +248,4 @@ export default {
}
</script>
<style scoped>
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
</style>

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

@ -10,10 +10,10 @@
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<div class="tableStyle">
<div class="headline">上装配置信息</div>
<div class="title">
<div>上装配置信息</div>
<div>
<el-button type="primary" size="small" icon="el-icon-plus" class="btntopblueline" @click="handleSelect()">选择</el-button>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="handleSelect()">选择</el-button>
</div>
</div>
<el-row>
@ -40,7 +40,7 @@
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>外廓尺寸</span></div>
<el-form-item>
<div class="addinputw" style="display: inline-block;margin-left: 120px;">
<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
@ -60,7 +60,7 @@
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>板材厚度</span></div>
<el-form-item>
<div class="addinputw" style="display: inline-block;margin-left: 120px;">
<div class="addinputInfo addinputwOne">
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessBottom }}</span>mm,
<span class="inputStyle">{{ formobj.baseVehinstallmodel.plateThicknessEdge }}</span>mm
</div>
@ -98,7 +98,7 @@
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>主车车架号</span></div>
<el-form-item>
<el-select v-model="formobj.vinNo" @change="changeVinNo" filterable placeholder="请选择" class="addinputw addinputwOne">
<el-select v-model="formobj.vinNo" @change="changeVinNo" filterable placeholder="请选择" class="addinputw addinputwTwo">
<el-option v-for="item in vinNo_list" :key="item.vinNo" :label="item.vinNo" :value="item.vinNo">
</el-option>
</el-select>
@ -123,11 +123,11 @@
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>厂家结算价()</span></div>
<el-form-item><el-input v-model="formobj.costPrice" class="addinputw addinputwOne" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable></el-input></el-form-item>
<el-form-item><el-input v-model="formobj.costPrice" class="addinputw addinputwTwo" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable></el-input></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.guidePrice" class="addinputw addinputwOne" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable></el-input></el-form-item>
<el-form-item><el-input v-model="formobj.guidePrice" class="addinputw addinputwTwo" @keyup.native="UpNumber" @keydown.native="UpNumber" placeholder="" clearable></el-input></el-form-item>
</el-col>
</el-row>
</el-form>
@ -342,32 +342,30 @@ export default {
</script>
<style scoped>
.spanOneWidth {
width: 110px !important;
}
.addinputwOne {
margin-left: 120px !important;
width: 30% !important;
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.headline{
height: 40px;
padding: 10px;
.headline {
padding: 12px;
font-weight: bold;
font-size: 20px;
background-color: #018ad2;
text-align: left;
font-size: 16px;
background-color: #0294d7;
color: #ffffff;
text-align: left;
}
.tableStyle {
background-color: #018ad2;
display: flex;
justify-content: space-between;
align-items: center;
/*border: 1px solid #dfe4ed;*/
height: 40px;
.spanOneWidth {
width: 110px !important;
}
.addinputwOne {
margin-left: 110px !important;
}
.btntopblueline {
margin-right: 10px;
.addinputwTwo {
margin-left: 110px !important;
width: 30% !important;
}
.inputStyle {
display: inline-block;

135
anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue

@ -8,54 +8,50 @@
{{ isSearchShow ? "隐藏查询条件" : "显示查询条件" }}
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-row>
<el-form-item label="车辆功能">
<el-select v-model="queryParams.params.vehicleTypeKey" filterable placeholder="请选择">
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="委改方式">
<el-select v-model="queryParams.params.refitMethodKey" filterable placeholder="请选择">
<el-option v-for="item in refitMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<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="请选择">
<el-option v-for="item in installName_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="颜色">
<el-select v-model="queryParams.params.colorKey" 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-form-item label="板材材质">
<el-select v-model="queryParams.params.plateMaterialKey" 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-row>
<el-row>
<el-form-item label="公告型号">
<el-input v-model="queryParams.params.noticeModel" placeholder="请输入公告型号" clearable/>
</el-form-item>
<el-form-item label="主车车架号">
<el-input v-model="queryParams.params.vinNo" placeholder="请输入主车车架号" clearable/>
</el-form-item>
</el-row>
<el-form :inline="true" class="tab-header" label-width="100px">
<el-form-item label="车辆功能">
<el-select v-model="queryParams.params.vehicleTypeKey" filterable placeholder="请选择">
<el-option v-for="item in vehicleType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="委改方式">
<el-select v-model="queryParams.params.refitMethodKey" filterable placeholder="请选择">
<el-option v-for="item in refitMethod_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<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="请选择">
<el-option v-for="item in installName_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="颜色">
<el-select v-model="queryParams.params.colorKey" 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-form-item label="板材材质">
<el-select v-model="queryParams.params.plateMaterialKey" 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-form-item label="公告型号">
<el-input v-model="queryParams.params.noticeModel" placeholder="请输入公告型号" clearable/>
</el-form-item>
<el-form-item label="主车车架号">
<el-input v-model="queryParams.params.vinNo" placeholder="请输入主车车架号" clearable/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" @click="dosearch">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@ -76,21 +72,21 @@
<el-button type="primary" size="small" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="vehicleTypeValue" label="车辆功能" align="center"/>
<el-table-column prop="installNameValue" label="上装名称" align="center"/>
<el-table-column prop="refitMethodValue" label="委改方式" align="center"/>
<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="colorValue" label="颜色" align="center"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center"/>
<el-table-column prop="plateMaterialValue" label="板材材质" align="center" width="100"/>
<el-table-column prop="brandName" label="品牌" align="center"/>
<el-table-column prop="noticeModel" label="公告型号" align="center"/>
<el-table-column prop="noticeModel" label="公告型号" align="center" width="150"/>
<el-table-column prop="vehModel" label="车型" align="center" width="180"/>
<el-table-column prop="vinNo" label="主车车架号" align="center" width="250"/>
<el-table-column prop="vehicleStateValue" label="库存状态" align="center"/>
<el-table-column prop="vehicleStateValue" label="库存状态" align="center" width="100"/>
<el-table-column prop="priceDate" label="入库日期" align="center" width="100"/>
<el-table-column prop="salesDate" label="出库日期" align="center" width="100"/>
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="100"/>
<el-table-column prop="guidePrice" label="销售指导价" align="center" width="100"/>
<el-table-column prop="costPrice" label="厂家结算价" align="center" width="120"/>
<el-table-column prop="guidePrice" label="销售指导价" align="center" width="120"/>
</el-table>
</div>
<!--End 项目列表-->
@ -353,35 +349,4 @@ export default {
}
</script>
<style scoped>
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
</style>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuikuInfo.vue

@ -16,7 +16,7 @@
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd"><!-- -->
<div class="title">车辆采购退库申请</div> <!--:rules="rules"-->
<div class="titwu">车辆采购退库申请</div> <!--:rules="rules"-->
<el-form ref="form_obj" :model="formobj" :rules="rules" :inline="true" label-width="120px">
<div>
<!--第一行-->

7
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue

@ -216,13 +216,6 @@ export default {
</script>
<style scoped>
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.spanOneWidth {
border-right: 0px !important;
width: 150px !important;

19
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/chexingbyconfiguration.vue

@ -137,18 +137,13 @@ export default {
},
//
handresetting() {
this.listQuery = {
current: 1,
size: 10,
params: {
vehicleAlias: '',
configName: '',
useOrgSid: '',
vehicleStateValue: '',
sidList: []
},
total: 1
}
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 10
this.listQuery.params.vehicleAlias = ''
this.listQuery.params.configName = ''
this.listQuery.params.useOrgSid = ''
this.listQuery.params.vehicleStateValue = ''
this.getPathSid()
},
handleSelectionChange(row) {

168
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangeng.vue

@ -56,14 +56,14 @@
<el-button size="mini" type="primary" @click="handleCheck(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="120px" prop="state" label="状态" align="center"/>
<el-table-column width="120px" prop="state" label="状态" header-align="center" align="left"/>
<el-table-column width="160px" prop="applyId" label="申请编号" align="center"/>
<el-table-column width="140px" prop="applyDate" label="申请日期" align="center"/>
<el-table-column width="130px" prop="applyName" label="申请人" align="center"/>
<el-table-column width="180px" prop="vin" label="车架号" align="center"/>
<el-table-column width="160px" prop="location" label="现存放地点" align="center"/>
<el-table-column width="160px" prop="targetLocation" label="目标存放地点" align="center"/>
<el-table-column width="130px" prop="operator" label="经办人" align="center"/>
<el-table-column width="130px" prop="operator" label="移库操作人" align="center"/>
<el-table-column width="160px" prop="applyPrice" label="申请费用" align="center"/>
<el-table-column width="180px" label="现场照片" align="center">
<template slot-scope="{row}"> <!-- row.state == '已办结' -->
@ -75,6 +75,12 @@
<el-button size="mini" type="primary" @click="handleCheckImg(row)">查看</el-button>
</template>
</el-table-column>
<el-table-column width="120px" label="临时出门证" align="center">
<template slot-scope="{row}"> <!-- row.state == '已办结' -->
<el-button v-show="row.state == '已办结'" size="mini" type="primary" @click="handleExitPermit(row)">出门证
</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!--End 项目列表-->
@ -103,6 +109,115 @@
</el-carousel>
</div>
</el-dialog>
<!-- 临时出门证 -->
<el-dialog :visible.sync="isExitPermit" :title="formList.orgName + '出门证'" center width="1000px"
:close-on-click-modal="false">
<el-form ref="dataForm" :model="formList" label-position="right" class="formadd">
<el-row class="dialogRow">
<el-col :span="3">
<span>日期:</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.date }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>合同编号:</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.contractNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>客户名称</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ formList.customerName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>车型名称</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.modelName }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>台数</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.num }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{formList.vinNo}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>出门原因</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ formList.reason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>业务经办人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{formList.creatName}}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>财务经办人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span></span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>提车人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ formList.carryCarName }}</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>出门签章</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span></span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<!-- <el-dialog title="查看" :visible.sync="dialogImgVisible">-->
<!-- <el-image v-for="item in srcList" :key="item" style="width: 100px; height: 100px" :src="item"-->
<!-- :preview-src-list="srcList"/>-->
@ -114,7 +229,7 @@
</template>
<script>
import { deleteCarTransfer, selectCarTransferList } from '@/api/supplychain/cunfangdidianbiangeng'
import { deleteCarTransfer, selectCarTransferList, temporaryExitPermitInfo } from '@/api/supplychain/cunfangdidianbiangeng'
import { getUseOrgByUserSid, selectModelName } from '@/api/cheliang/basevehicle'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
@ -141,16 +256,18 @@ export default {
isSearchShow: false,
tableLoading: false,
dialogImgVisible: false,
isExitPermit: false,
srcList: [],
imgList:[],
multipleSelection:[],
sids:[],
imgList: [],
multipleSelection: [],
sids: [],
dataList: [],
useOrg_list: [],
modelName_list: [],
slowMachine_list: [],
useOrg: '', // 使
useOrgSid: '', // 使sid
formList: {},
listQuery: {
current: 1,
size: 10,
@ -324,13 +441,26 @@ export default {
this.sids = aa
console.log('勾选的数据', this.sids)
},
handleUpload(){
handleUpload() {
},
handleCheckImg(row){
handleCheckImg(row) {
this.dialogImgVisible = true
this.srcList = row.images
},
//
handleExitPermit(row) {
this.isExitPermit = true
this.getExitPermitInfo(row.sid)
},
getExitPermitInfo(sid){
const userSid = window.sessionStorage.getItem('userSid')
temporaryExitPermitInfo({ sid,userSid }).then((res) => {
if (res.success){
this.formList = res.data
}
})
},
//
getModelName() {
selectModelName({ name: '' }).then((response) => {
@ -386,8 +516,30 @@ export default {
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.upload_img {
display: inline-block;
padding-right: 10px;
}
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
}
.formadd {
padding: 40px 40px 0 40px
}
.dialogRow {
border-left: 0;
}
.dialogRow /deep/ .el-col {
border-right: 0;
}
</style>

201
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengAdd.vue

@ -9,21 +9,27 @@
</div>
</div>
<div class="listconadd">
<div class="title">车辆存放地点变更申请</div>
<div class="titwu">车辆存放地点变更申请</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="tit">
<div class="times">
<div>
<span>申请日期</span>
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>申请日期</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>申请人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
<el-row style="border-top: 1px solid #e0e3eb;">
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>现存放地点</span>
</el-col>
@ -36,22 +42,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<span><span class="icon">*</span>车架号</span>
</el-col>
<el-col :span="9">
<el-form-item prop="vinNo">
<el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>目标存放地点</span>
</el-col>
<el-col :span="21">
<el-col :span="9">
<el-form-item prop="targetLocation">
<el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
@change="targetLocationChange">
@ -63,12 +57,26 @@
</el-row>
<el-row>
<el-col :span="3">
<span>变更原因</span>
<span>移库原因</span>
</el-col>
<el-col :span="21">
<el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span><span class="icon">*</span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item prop="vinNo">
<span>{{ temp.vinNo }}</span>
<el-button size="small" type="primary" @click="selectVinNo" class="selectVinNoBtn">选择</el-button>
<!-- <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">-->
<!-- <el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>-->
<!-- </el-select>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>申请费用</span>
@ -80,7 +88,7 @@
</el-row>
<el-row>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>经办</span>
<span>移库操作</span>
</el-col>
<el-col :span="9">
<el-form-item prop="operator">
@ -115,6 +123,47 @@
</el-row>
</el-form>
</div>
<!-- ======== 打开选择车架号 ======== -->
<el-dialog :showClose="false" :visible.sync="vinNoVisible">
<div slot="title">
<span>选择车架号</span>
<div class="vinNoBtn">
<el-button type="primary" @click="selectionvinNo()"> </el-button>
<el-button @click="vinNoVisible = false"> </el-button>
</div>
</div>
<div>
<el-form ref="multipleTable" :inline="true" :model="vinNoList" class="vinNoForm" label-width="100px">
<el-col :span="14">
<el-form-item label="车架号:">
<el-input v-model="vinNoList.params.vin" clearable class="addinputw" placeholder="车架号"/>
</el-form-item>
</el-col>
<el-col :span="10" class="dialogBtn">
<el-button type="primary" size="small" @click="handlevinNo">查询</el-button>
</el-col>
</el-form>
</div>
<el-table :key="tableKey" v-loading="vinNoLoading" :data="listvinNo" border fit highlight-current-row
style="width: 100%;" @selection-change="handleSelectionvinNo">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column :index="vinNoindexMethod" align="center" label="序号" type="index" width="80"/>
<el-table-column align="center" label="车架号" prop="billNo">
<template slot-scope="scope">
<span>{{ scope.row.vin }}</span>
</template>
</el-table-column>
</el-table>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination
v-show="vinNototal > 0"
:limit.sync="vinNoList.size"
:page.sync="vinNoList.current"
:total="vinNototal" class="pagination" @pagination="getvinNoList"/>
</div>
</el-dialog>
</div>
</template>
@ -174,6 +223,23 @@ export default {
dialogFormShowVisible: false, //
dialogStatus: '', //
vehiclePhoto: [],
//
vinNoVisible: false,
tableKey: 0,
vinNototal: 1,
vinNoLoading: false,
vinNoCount: 0,
vinNoChoice: [],
listvinNo: [],
vinNoList: {
current: 1,
size: 20,
params: {
vin: '',
warehouseSid: '',
userSid: window.sessionStorage.getItem('userSid')
}
},
rules: {
vinNo: [{ required: true, message: '车架号不能为空', trigger: 'change' }],
operator: [{ required: true, message: '经办人不能为空', trigger: 'change' }],
@ -222,6 +288,7 @@ export default {
getVinByWarehouseSid(data).then((res) => {
if (res.code === '200') {
this.vinNo_list = res.data
this.listvinNo = res.data
console.log('车架号', this.vinNo_list)
}
})
@ -230,7 +297,8 @@ export default {
const choosetItem = this.warehouwarehouse_list.filter((item) => item.dictValue == val)
this.temp.locationKey = choosetItem[0].dictKey
this.temp.locationSid = choosetItem[0].sid
this.getVin(this.temp.locationSid)
this.vinNoList.params.warehouseSid = this.temp.locationSid
// this.getVin(this.temp.locationSid)
console.log('name:', this.temp.location, 'key:', this.temp.locationKey, 'sid:', this.temp.locationSid)
},
targetLocationChange(val) {
@ -284,6 +352,67 @@ export default {
})
this.getType()
},
// ------------ ------------
//
selectVinNo() {
if (this.temp.locationSid !== '') {
this.vinNoVisible = true
this.$nextTick(() => {
this.handlevinNo()
})
} else {
this.$message({
showClose: true,
message: '请选择现存放地点!',
type: 'error'
})
}
},
//
handlevinNo() {
this.vinNoList.current = 1
this.getvinNoList()
},
//
getvinNoList() {
const _this = this
this.vinNoLoading = true
getVinByWarehouseSid(this.vinNoList)
.then(resp => {
_this.vinNoLoading = false
const data = resp.data
_this.vinNototal = data.total
_this.listvinNo = data.records
})
.catch(() => {
_this.vinNoLoading = false
})
},
//
handleSelectionvinNo(row) {
this.vinNoChoice = row
if (this.vinNoChoice.length > 1){
this.$message({
showClose: true,
message: '仅可选择一个车架号!',
type: 'error'
});
return
}
},
//
selectionvinNo() {
this.temp.vinNo = this.vinNoChoice[0].vin
this.vinNoVisible = false
// this.$refs.multipleTable.clearSelection();
},
//
vinNoindexMethod(index) {
var pagestart = (this.vinNoList.current - 1) * this.vinNoList.size
var pageindex = index + 1 + pagestart
return pageindex
},
getUrl() {
if (this.temp.InsuranceStateKey == '1') {
if (this.imgList.length > 0) {
@ -438,6 +567,7 @@ export default {
margin-bottom: 30px;
border-bottom: 1px solid #e0e3eb;
}
.times {
display: flex;
flex-direction: row;
@ -448,4 +578,19 @@ export default {
font-size: 14px;
text-align: center;
}
.selectVinNoBtn {
display: inline-block;
position: absolute;
top: 5px;
right: 5px;
}
.vinNoBtn {
float: right;
}
.vinNoForm {
text-align: center;
}
</style>

42
anrui-scm/anrui-scm-ui/src/views/supplychain/cunfangdidianbiangeng/cunfangdidianbiangengInfo.vue

@ -9,19 +9,25 @@
<div class="listconadd">
<div class="title">车辆存放地点变更申请</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="tit">
<div class="times">
<div>
<span>申请日期</span>
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>申请日期</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>申请人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
<el-row style="border-top: 1px solid #e0e3eb;">
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>现存放地点</span>
</el-col>
@ -31,31 +37,31 @@
</el-form-item>
</el-col>
<el-col :span="3">
<span>车架号</span>
<span>目标存放地点</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.vinNo }}</span>
<span>{{ temp.targetLocation }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>目标存放地点</span>
<span>移库原因</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ temp.targetLocation }}</span>
<span>{{ temp.changeReason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>变更原因</span>
<span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ temp.changeReason }}</span>
<span>{{ temp.vinNo }}</span>
</el-form-item>
</el-col>
</el-row>
@ -71,7 +77,7 @@
</el-row>
<el-row>
<el-col :span="3">
<span>经办</span>
<span>移库操作</span>
</el-col>
<el-col :span="9">
<el-form-item>

26
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAdd.vue

@ -8,7 +8,7 @@
</div>
</div>
<div class="listconadd">
<div class="title">车辆入库</div>
<div class="titwu">车辆入库</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
@ -234,26 +234,10 @@ export default {
width: 80%;
}
.listconadd {
width: 100%;
padding: 0 240px !important;
}
.title {
padding: 28px 0;
}
.formadd .title {
padding: 10px !important;
}
.yancheAdd .el-row {
border: 0 !important;
}
.yancheAdd .el-col {
border: 0 !important;
}
/*.listconadd {*/
/* width: 100%;*/
/* padding: 0 240px !important;*/
/*}*/
/deep/ .el-col-3 {
text-align: right;

20
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAlready.vue

@ -267,24 +267,4 @@ export default {
font-weight: 600;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
background: white;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
</style>

29
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliAwait.vue

@ -17,7 +17,8 @@
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable class="addinputw">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable
class="addinputw addinputw_chexing">
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseAttribute" placeholder="请输入存放地点属性" clearable/>-->
@ -31,8 +32,8 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="getList">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@ -266,25 +267,7 @@ export default {
color: white;
font-weight: 600;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
background: white;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
.addinputw_chexing {
width: 500px;
}
</style>

28
anrui-scm/anrui-scm-ui/src/views/supplychain/rukuguanli/rukuguanliInfo.vue

@ -7,7 +7,7 @@
</div>
</div>
<div class="listconadd">
<div class="title">车辆入库</div>
<div class="titwu">车辆入库</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
@ -158,33 +158,17 @@ export default {
width: 80%;
}
.listconadd {
width: 100%;
padding: 0 240px !important;
}
.title {
padding: 28px 0;
}
.formadd .title {
padding: 10px !important;
}
.yancheAdd .el-row {
border: 0 !important;
}
.yancheAdd .el-col {
border: 0 !important;
}
/*.listconadd {*/
/* width: 100%;*/
/* padding: 0 240px !important;*/
/*}*/
/deep/ .el-col-3 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
line-height: 42px !important;
font-weight: 600;
}
</style>

48
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue

@ -12,15 +12,16 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="车型">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable class="addinputw">
<el-select v-model="listQuery.params.model" placeholder="请选择" filterable clearable
class="addinputw addinputw_chexing">
<el-option v-for="item in modelName_list" :key="item.sid" :label="item.modelName" :value="item.sid"/>
</el-select>
<!-- <el-input v-model="listQuery.params.warehouseAttribute" placeholder="请输入存放地点属性" clearable/>-->
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vin" placeholder="请输入车架号" clearable/>
</el-form-item>
<el-form-item label="订单类型">
<el-select v-model="listQuery.params.purchaseType" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue"
@ -30,8 +31,8 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="getList">查询</el-button>
<el-button type="primary" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-search" size="small" @click="getList">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
</div>
</div>
</div>
@ -47,7 +48,7 @@
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
<!-- <el-table-column width="50px" type="selection" align="center"/>-->
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="160px" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" width="110px" class-name="small-padding fixed-width">
<template slot-scope="{row}"><!--v-show="!row.result"-->
<el-button size="mini" type="primary" v-show="row.showInspectedBtn" @click="handleYanche(row)">验车
</el-button>
@ -57,10 +58,10 @@
<el-table-column width="200px" prop="vin" label="车架号" align="center"/>
<el-table-column prop="model" label="车型" align="center"/>
<el-table-column width="160px" prop="purchaseType" label="订单类型" align="center"/>
<el-table-column width="200px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="dispatchedDate" label="发车日期" align="center"/>
<el-table-column width="140px" prop="inspectedDate" label="验车日期" align="center"/>
<el-table-column width="140px" prop="inspectedName" label="验车人" align="center"/>
<el-table-column width="140px" prop="inspectedType" label="验车结果" align="center"/>
<el-table-column width="150px" prop="inspectedType" label="验车结果" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
@ -256,33 +257,8 @@ export default {
</script>
<style scoped>
.switch_btn {
padding: 15px 0 10px 0;
}
.btn_style {
background-color: #018ad2;
color: white;
font-weight: 600;
}
.searchbtn {
border: #2cab69 1px solid;
color: #2cab69;
}
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
background: white;
.addinputw_chexing {
width: 500px;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
</style>

16
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -9,7 +9,7 @@
</div>
</div>
<div class="listconadd">
<div class="title">验车单</div>
<div class="titwu">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
@ -404,20 +404,6 @@ export default {
width: 80%;
}
.listconadd {
width: 100%;
padding: 0 48px !important;
}
.title {
padding: 28px 0;
}
.formadd .title {
padding: 10px !important;
text-align: left;
}
.yancheAdd .el-row {
border: 0 !important;
}

18
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -4,11 +4,11 @@
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">返回</el-button>
<el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<div class="title">验车单</div>
<div class="titwu">验车单</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="yancheAdd" style="margin-top: 5px;">
<el-row class="yancheAdd-bor">
@ -170,20 +170,6 @@ export default {
width: 80%;
}
.listconadd {
width: 100%;
padding: 0 48px !important;
}
.title {
padding: 28px 0;
}
.formadd .title {
padding: 10px !important;
text-align: left;
}
.yancheAdd .el-row {
border: 0 !important;
}

47
anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue

@ -10,21 +10,27 @@
</div>
</div>
<div class="">
<div class="title">车辆存放地点变更申请</div>
<div class="titwu">车辆存放地点变更申请</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="tit">
<div class="times">
<div>
<span>申请日期</span>
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>申请日期</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>申请人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
<el-row style="border-top: 1px solid #e0e3eb;">
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>现存放地点</span>
</el-col>
@ -34,31 +40,31 @@
</el-form-item>
</el-col>
<el-col :span="3">
<span>车架号</span>
<span>目标存放地点</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.vinNo }}</span>
<span>{{ temp.targetLocation }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>目标存放地点</span>
<span>移库原因</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ temp.targetLocation }}</span>
<span>{{ temp.changeReason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>变更原因</span>
<span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ temp.changeReason }}</span>
<span>{{ temp.vinNo }}</span>
</el-form-item>
</el-col>
</el-row>
@ -74,7 +80,7 @@
</el-row>
<el-row>
<el-col :span="3">
<span>经办</span>
<span>移库操作</span>
</el-col>
<el-col :span="9">
<el-form-item>
@ -305,6 +311,7 @@ export default {
//
openAgree(val) {
this.operation = val
this.dialogList.comment = '同意'
this.currentLink = true //
const formVariables = {
businessSid: this.agreeList.businessSid
@ -321,6 +328,7 @@ export default {
//
openReject(val) {
this.operation = val
this.dialogList.comment = ''
this.currentLink = true //
const formVariables = {
businessSid: this.regectList.businessSid
@ -337,6 +345,7 @@ export default {
//
openStop(val) {
this.operation = val
this.dialogList.comment = ''
this.currentLink = false //
this.nodeDialogVisible = true
},

198
anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengEdit.vue

@ -8,21 +8,27 @@
</div>
</div>
<div class="">
<div class="title">车辆存放地点变更申请</div>
<div class="titwu">车辆存放地点变更申请</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="tit">
<div class="times">
<div>
<span>申请日期</span>
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>申请日期</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>申请人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
<el-row style="border-top: 1px solid #e0e3eb;">
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>现存放地点</span>
</el-col>
@ -35,20 +41,10 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="3">
<span>车架号</span>
</el-col>
<el-col :span="9">
<el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">
<el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>
</el-select>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>目标存放地点</span>
</el-col>
<el-col :span="21">
<el-col :span="9">
<el-form-item prop="targetLocation">
<el-select v-model="temp.targetLocation" placeholder="请选择" clearable class="addinputw"
@change="targetLocationChange">
@ -60,12 +56,26 @@
</el-row>
<el-row>
<el-col :span="3">
<span>变更原因</span>
<span>移库原因</span>
</el-col>
<el-col :span="21">
<el-input v-model="temp.changeReason" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span><span class="icon">*</span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item prop="vinNo">
<span>{{ temp.vinNo }}</span>
<el-button size="small" type="primary" @click="selectVinNo" class="selectVinNoBtn">选择</el-button>
<!-- <el-select v-model="temp.vinNo" placeholder="请选择" filterable clearable class="addinputw">-->
<!-- <el-option v-for="item in vinNo_list" :key="item.vin" :label="item.vin" :value="item.vin"/>-->
<!-- </el-select>-->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>申请费用</span>
@ -77,7 +87,7 @@
</el-row>
<el-row>
<el-col :span="3"> <!--<span class="icon">*</span>-->
<span>经办</span>
<span>移库操作</span>
</el-col>
<el-col :span="9">
<el-form-item prop="operator">
@ -112,6 +122,47 @@
</el-row>
</el-form>
</div>
<!-- ======== 打开选择车架号 ======== -->
<el-dialog :showClose="false" :visible.sync="vinNoVisible">
<div slot="title">
<span>选择车架号</span>
<div class="vinNoBtn">
<el-button type="primary" @click="selectionvinNo()"> </el-button>
<el-button @click="vinNoVisible = false"> </el-button>
</div>
</div>
<div>
<el-form ref="multipleTable" :inline="true" :model="vinNoList" class="vinNoForm" label-width="100px">
<el-col :span="14">
<el-form-item label="车架号:">
<el-input v-model="vinNoList.params.vin" clearable class="addinputw" placeholder="车架号"/>
</el-form-item>
</el-col>
<el-col :span="10" class="dialogBtn">
<el-button type="primary" size="small" @click="handlevinNo">查询</el-button>
</el-col>
</el-form>
</div>
<el-table :key="tableKey" v-loading="vinNoLoading" :data="listvinNo" border fit highlight-current-row
style="width: 100%;" @selection-change="handleSelectionvinNo">
<el-table-column align="center" type="selection" width="50"/>
<el-table-column :index="vinNoindexMethod" align="center" label="序号" type="index" width="80"/>
<el-table-column align="center" label="车架号" prop="billNo">
<template slot-scope="scope">
<span>{{ scope.row.vin }}</span>
</template>
</el-table-column>
</el-table>
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination
v-show="vinNototal > 0"
:limit.sync="vinNoList.size"
:page.sync="vinNoList.current"
:total="vinNototal" class="pagination" @pagination="getvinNoList"/>
</div>
</el-dialog>
</div>
</template>
@ -181,6 +232,23 @@ export default {
dialogFormShowVisible: false, //
dialogStatus: '', //
vehiclePhoto: [],
//
vinNoVisible: false,
tableKey: 0,
vinNototal: 1,
vinNoLoading: false,
vinNoCount: 0,
vinNoChoice: [],
listvinNo: [],
vinNoList: {
current: 1,
size: 20,
params: {
vin: '',
warehouseSid: '',
userSid: window.sessionStorage.getItem('userSid')
}
},
rules: {
vinNo: [{ required: true, message: '车架号不能为空', trigger: 'change' }],
operator: [{ required: true, message: '经办人不能为空', trigger: 'change' }],
@ -246,6 +314,7 @@ export default {
getVinByWarehouseSid(data).then((res) => {
if (res.code === '200') {
this.vinNo_list = res.data
this.listvinNo = res.data
console.log('车架号', this.vinNo_list)
}
})
@ -254,7 +323,8 @@ export default {
const choosetItem = this.warehouwarehouse_list.filter((item) => item.dictValue == val)
this.temp.locationKey = choosetItem[0].dictKey
this.temp.locationSid = choosetItem[0].sid
this.getVin(this.temp.locationSid)
this.vinNoList.params.warehouseSid = this.temp.locationSid
// this.getVin(this.temp.locationSid)
console.log('name:', this.temp.location, 'key:', this.temp.locationKey, 'sid:', this.temp.locationSid)
},
targetLocationChange(val) {
@ -314,6 +384,67 @@ export default {
})
this.getType()
},
// ------------ ------------
//
selectVinNo() {
if (this.temp.locationSid !== '') {
this.vinNoVisible = true
this.$nextTick(() => {
this.handlevinNo()
})
} else {
this.$message({
showClose: true,
message: '请选择现存放地点!',
type: 'error'
})
}
},
//
handlevinNo() {
this.vinNoList.current = 1
this.getvinNoList()
},
//
getvinNoList() {
const _this = this
this.vinNoLoading = true
getVinByWarehouseSid(this.vinNoList)
.then(resp => {
_this.vinNoLoading = false
const data = resp.data
_this.vinNototal = data.total
_this.listvinNo = data.records
})
.catch(() => {
_this.vinNoLoading = false
})
},
//
handleSelectionvinNo(row) {
this.vinNoChoice = row
if (this.vinNoChoice.length > 1){
this.$message({
showClose: true,
message: '仅可选择一个车架号!',
type: 'error'
});
return
}
},
//
selectionvinNo() {
this.temp.vinNo = this.vinNoChoice[0].vin
this.vinNoVisible = false
// this.$refs.multipleTable.clearSelection();
},
//
vinNoindexMethod(index) {
var pagestart = (this.vinNoList.current - 1) * this.vinNoList.size
var pageindex = index + 1 + pagestart
return pageindex
},
getUrl() {
if (this.temp.InsuranceStateKey == '1') {
if (this.imgList.length > 0) {
@ -484,4 +615,19 @@ export default {
.title{
text-align: center;
}
.selectVinNoBtn {
display: inline-block;
position: absolute;
top: 5px;
right: 5px;
}
.vinNoBtn {
float: right;
}
.vinNoForm {
text-align: center;
}
</style>

44
anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangengInfo.vue

@ -7,21 +7,27 @@
</div>
</div>
<div class="">
<div class="title">车辆存放地点变更申请</div>
<div class="titwu">车辆存放地点变更申请</div>
<el-form ref="dataForm" :model="temp" label-position="right" class="formadd" :rules="rules">
<div class="tit">
<div class="times">
<div>
<span>申请日期</span>
<el-row style="border-top: 1px solid #e0e3eb;">
<el-col :span="3">
<span>申请日期</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantDate }}</span>
</div>
<div>
<span>申请人</span>
</el-form-item>
</el-col>
<el-col :span="3">
<span>申请人</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.applicantName }}</span>
</div>
</div>
</div>
<el-row style="border-top: 1px solid #e0e3eb;">
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>现存放地点</span>
</el-col>
@ -31,31 +37,31 @@
</el-form-item>
</el-col>
<el-col :span="3">
<span>车架号</span>
<span>目标存放地点</span>
</el-col>
<el-col :span="9">
<el-form-item>
<span>{{ temp.vinNo }}</span>
<span>{{ temp.targetLocation }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>目标存放地点</span>
<span>移库原因</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ temp.targetLocation }}</span>
<span>{{ temp.changeReason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3">
<span>变更原因</span>
<span>车架号</span>
</el-col>
<el-col :span="21">
<el-form-item>
<span>{{ temp.changeReason }}</span>
<span>{{ temp.vinNo }}</span>
</el-form-item>
</el-col>
</el-row>
@ -71,7 +77,7 @@
</el-row>
<el-row>
<el-col :span="3">
<span>经办</span>
<span>移库操作</span>
</el-col>
<el-col :span="9">
<el-form-item>

7
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue

@ -404,13 +404,6 @@ export default {
.listconadd {
height: calc(100vh - 0px) !important;
}
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.spanOneWidth {
border-right: 0px !important;
width: 150px !important;

7
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue

@ -264,13 +264,6 @@ export default {
.listconadd {
height: calc(100vh - 0px) !important;
}
.title {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.spanOneWidth {
border-right: 0px !important;
width: 150px !important;

19
anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/chexingbyconfiguration.vue

@ -137,18 +137,13 @@ export default {
},
//
handresetting() {
this.listQuery = {
current: 1,
size: 10,
params: {
vehicleAlias: '',
configName: '',
useOrgSid: '',
vehicleStateValue: '',
sidList: []
},
total: 1
}
this.listQuery.current = 1
this.listQuery.total = 0
this.listQuery.size = 10
this.listQuery.params.vehicleAlias = ''
this.listQuery.params.configName = ''
this.listQuery.params.useOrgSid = ''
this.listQuery.params.vehicleStateValue = ''
this.getPathSid()
},
handleSelectionChange(row) {

8
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/chexingbyconfiguration.vue

@ -21,8 +21,8 @@
</el-form-item>
</el-form>
<div class="btn" style="text-align: center">
<el-button type="primary" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" @click="handresetting">重置</el-button>
<el-button type="primary" size="small" icon="el-icon-search" @click="handleFilter">查询</el-button>
<el-button type="primary" size="small" icon="el-icon-refresh" @click="handresetting">重置</el-button>
</div>
</div>
</div>
@ -30,12 +30,12 @@
<el-table :key="tableKey" ref="multipleTable" v-loading="listLoading" :data="list" border style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column width="50px" type="selection" align="center"/>
<el-table-column width="80px" label="编号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="车型" align="center">
<el-table-column label="车型" align="center" width="300">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" header-align="center" align="left">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>

200
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue

@ -7,94 +7,81 @@
<div>车辆调价详情</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" @click="openAgree('同意')"> </el-button>
<el-button type="danger" @click="openReject('驳回')"> </el-button>
<el-button type="danger" @click="openStop('终止')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
<el-col :span="4">
<span>申请人:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="el-form-item-right">
<span>调价原因:</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form label-position="right" class="formadd" >
<el-row v-show="currentLink">
<el-col :span="4" class="tleftb">当前环节</el-col>
<el-col :span="20" class="trightb">
<el-form-item prop="purchasingUnitName"><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo addinputTwo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">意见</el-col>
<el-col :span="20" class="trightb">
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" clearable ></el-input>
<el-col :span="24">
<div class="span-sty spanTwoWidth"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputTwo" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -108,13 +95,9 @@
<script>
import req from '@/api/kucunguanli/price'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'tiaojiaInfo',
components: {
flow
},
data() {
return {
dialogStatus: '',
@ -124,8 +107,6 @@ export default {
dialogList: {
comment: ''
},
xmlData: '', // xml
taskList: [],
startTask: true,
current: {
taskDefKey: '',
@ -166,8 +147,6 @@ export default {
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -175,7 +154,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 450 + 'px'
}
}, '*')
},
@ -187,19 +166,6 @@ export default {
}
})
},
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
//
openAgree(val) {
this.operation = val
@ -318,34 +284,28 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.listconadd {
height: calc(100vh - 0px) !important;
}
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
.addinputOne {
margin-left: 200px !important;
}
.spanTwoWidth {
width: 150px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.addinputTwo {
margin-left: 150px !important;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.rowStyle {
border-left: 0px;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

182
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue

@ -15,79 +15,69 @@
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="listconadd">
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
<el-col :span="4">
<span>申请人:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="el-form-item-right">
<span>调价原因:</span>
</el-col>
<el-col :span="20">
<el-form-item>
<el-input v-model="formobj.modpriceReason" clearable style="width: 30%"/>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><el-input v-model="formobj.modpriceReason" clearable class="addinputw addinputOne" placeholder=""/></el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
<div style="margin-left: 15px">
<div class="title">
<div>车辆列表</div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addCommodity()">选择车型</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="dataDelete(scope.$index, formobj.baseModelModpriceModels[scope.$index])">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="车型" align="left" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.costPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.incOrDecInPrice" placeholder="" @keyup.native="UpNumber" @keydown.native="UpNumber" class="addinputw" clearable/>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
<!--End 添加修改部分-->
@ -141,25 +131,11 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 450 + 'px'
}
}, '*')
},
methods: {
//
newDate() {
let date = new Date()
let year = date.getFullYear() //
let month = date.getMonth() + 1 //
let day = date.getDate() //
if (month < 10) {
month = '0' + month
}
if (day < 10) {
day = '0' + day
}
this.formobj.createTime = year + '-' + month + '-' + day
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d.-]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0.') // 0
@ -282,39 +258,29 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.listconadd {
height: calc(100vh - 0px) !important;
}
.tableStyle {
background-color: #FFFFFF;
.title {
padding: 7px;
display: flex;
justify-content: flex-start;
flex-direction: row;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.addinputOne {
margin-left: 200px !important;
}
.icon {
color: #e84026;
margin-right: 4px;
.rowStyle {
border-left: 0px;
}
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

175
anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo.vue

@ -10,96 +10,77 @@
<el-button type="danger" @click="openRevoke()"> </el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top">
<el-row>
<el-col :span="4">
<span>调价申请日期:</span>
<div class="titwu"><span>车辆调价申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row class="rowStyle">
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价申请日期:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.createTime }}</span>
</el-col>
<el-col :span="4">
<span>申请人:</span>
</el-col>
<el-col :span="8">
<span style="margin-left: 5px">{{ formobj.applyPeoName }}</span>
<el-col :span="12" class="colStyle">
<div class="span-sty spanOneWidth"><span>申请人:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.applyPeoName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="el-form-item-right">
<span>调价原因:</span>
</el-col>
<el-col :span="20">
<el-form-item>
<span style="margin-left: 5px">{{ formobj.modpriceReason }}</span>
</el-form-item>
<el-row class="rowStyle">
<el-col :span="24" class="colStyle">
<div class="span-sty spanOneWidth"><span>调价原因:</span></div>
<el-form-item><span class="addinputInfo addinputOne">{{ formobj.modpriceReason }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
<div>车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(元)" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold">车辆列表</div>
</div>
<el-table :key="tableKey" :data="formobj.baseModelModpriceModels" :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" header-align="center" width="250">
<template slot-scope="scope">
<span>{{ scope.row.vehicleAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>
</el-table-column>
<el-table-column prop="applyForDeposit" label="成本价" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.costPrice }}</span>
</template>
</el-table-column>
<el-table-column label="现销售指导价(万元)" header-align="center" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.guidedPrice }}</span>
</template>
</el-table-column>
<el-table-column label="价格增减数额" header-align="center" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.incOrDecInPrice }}</span>
</template>
</el-table-column>
<el-table-column label="备注" header-align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<span class="el-icon-picture-outline">流程图</span>
<flow :xmlData="xmlData" :taskData="taskList"></flow>
</div>
</template>
<script>
import req from '@/api/kucunguanli/price'
import flow from '../../../baseoutsourcingapplication/workflow/flow'
export default {
name: 'tiaojiaInfo',
components: {
flow
},
name: 'tiaojianYibanInfo',
data() {
return {
dialogStatus: '',
index: 0,
tableKey: 0,
xmlData: '', // xml
taskList: [],
//
formobj: {},
//
@ -129,9 +110,6 @@ export default {
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
//
this.getModelDetail(obj.deployId)
this.getFlowViewer(obj.instanceId)
},
mounted() {
window.parent.postMessage({
@ -139,7 +117,7 @@ export default {
params: {
//
code: 2,
data: document.body.scrollHeight + 'px'
data: 450 + 'px'
}
}, '*')
},
@ -151,19 +129,6 @@ export default {
}
})
},
/** xml 文件 */
getModelDetail(deployId) {
// xml
req.readXml(deployId).then((res) => {
this.xmlData = res.data
})
},
//
getFlowViewer(procInsId) {
req.getFlowViewer(procInsId).then((res) => {
this.taskList = res.data
})
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
@ -205,34 +170,22 @@ export default {
</script>
<style scoped>
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
.listconadd {
height: calc(100vh - 0px) !important;
}
.spanOneWidth {
border-right: 0px !important;
width: 200px !important;
}
.tableStyle {
background-color: #FFFFFF;
display: flex;
justify-content: flex-start;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
.addinputOne {
margin-left: 200px !important;
}
/deep/ .el-col-4 {
text-align: right;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.rowStyle {
border-left: 0px;
}
/deep/ .el-col-8 {
text-align: left;
float: left;
font-size: 14px;
color: #606266;
line-height: 40px !important;
font-weight: 600;
.colStyle {
border-right: 0px !important;
border-bottom: 0px !important;
}
</style>

6
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@ -69,7 +69,7 @@ public interface AppBusDeliveredApplyFeign {
@ApiOperation("移动端-获取待出库列表")
@PostMapping("/getRetrievalNotList")
@ResponseBody
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(@RequestBody PagerQuery<DeliveredPageQuery> pq);
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(@RequestBody PagerQuery<DeliveredPageQuery> pagerQuery);
@ApiOperation("移动端-初始化 出库申请 待出库进入")
@PostMapping("/getRetrievalApplyInfo")
@ -82,9 +82,9 @@ public interface AppBusDeliveredApplyFeign {
public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(@RequestBody PagerQuery<DeliveredApplyPageQuery> pagerQuery);
@ApiOperation("手机端-初始化 出库申请")
@GetMapping("/getRetrievalApplyInfo/{sid}")
@GetMapping("/getRetrievalApplyInfoBySid/{sid}")
@ResponseBody
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(@PathVariable("sid") String sid);
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(@PathVariable("sid") String sid);
@ApiOperation("手机端-保存 出库申请")
@PostMapping("/saveRetrievalApplyInfo")

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java

@ -52,7 +52,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
@Override
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pq) {
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) {
return null;
}
@ -67,7 +67,7 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe
}
@Override
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
return null;
}

15
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageVo.java

@ -1,5 +1,6 @@
package com.yxt.anrui.terminal.api.autoservice.retrieval;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.buscenter.api.busdelivered.AppVinListVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
@ -11,11 +12,23 @@ import java.util.List;
public class DeliveredPageVo implements Vo {
private static final long serialVersionUID = 5016267000560011865L;
@ApiModelProperty("列表sid")
private String sid;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("类型 1 已认款 2 未认款")
private String type;
private String subscription;
@ApiModelProperty("类型 1 已认款 2 未认款")
private String subscriptionKey;
@ApiModelProperty("付款方式 1 全款 2 贷款")
private String paymentMethod;
@ApiModelProperty("付款方式 1 全款 2 贷款")
private String paymentMethodKey;
@ApiModelProperty("客户名称")
private String name;

18
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java

@ -57,34 +57,36 @@ import java.util.List;
@RequestMapping("/autoservice/v1/retrieval")
public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign {
@Autowired
AppBusDeliveredApplyService appBusDeliveredApplyService;
@Override
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pq) {
return null;
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) {
return appBusDeliveredApplyService.getRetrievalNotList(pagerQuery);
}
@Override
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
return null;
return appBusDeliveredApplyService.getRetrievalApplyInfo(query);
}
@Override
public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<DeliveredApplyPageQuery> pagerQuery) {
return null;
return appBusDeliveredApplyService.getRetrievalApplyList(pagerQuery);
}
@Override
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(String sid) {
return null;
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
return appBusDeliveredApplyService.getRetrievalApplyInfoBySid(sid);
}
@Override
public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
return null;
return appBusDeliveredApplyService.saveRetrievalApplyInfo(deliveredApplyDto);
}
@Override
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
return null;
return appBusDeliveredApplyService.getRetrievalCarVin(sid);
}
}

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

@ -25,12 +25,26 @@
*********************************************************/
package com.yxt.anrui.terminal.biz.autoservice.retrieval;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.buscenter.api.busdelivered.*;
import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.AppCarVinListVo;
import com.yxt.anrui.scm.api.scmvehiclegression.AppScmVehicleGressionPageQuery;
import com.yxt.anrui.scm.api.scmvehiclestaypatrolinspection.AppScmVehicleStayPatrolinspectionPageQuery;
import com.yxt.anrui.terminal.api.autoservice.retrieval.*;
import com.yxt.anrui.terminal.api.supplychain.inspection.StayPatrolinspectionPageVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionInfoVo;
import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppGressionPageVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* Project: anrui-buscenter(业务管理) <br/>
@ -48,16 +62,59 @@ import org.springframework.stereotype.Service;
@Service
public class AppBusDeliveredApplyService {
@Autowired
BusDeliveredFeign busDeliveredFeign;
@Autowired
BusDeliveredApplyFeign busDeliveredApplyFeign;
public ResultBean<PagerVo<DeliveredPageVo>> getRetrievalNotList(PagerQuery<DeliveredPageQuery> pagerQuery) {
ResultBean<PagerVo<DeliveredPageVo>> rb = ResultBean.fireFail();
PagerQuery<AppBusDeliveredPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppBusDeliveredPageVo>> retrievalNotList = busDeliveredFeign.getRetrievalNotList(pq);
PagerVo<DeliveredPageVo> vo = CoverUtils.selectPagerVo(retrievalNotList.getData());
return rb.success().setData(vo);
}
public ResultBean<DeliveredDetailsVo> getRetrievalApplyInfo(AppDeliveredDetailsQuery query) {
ResultBean<DeliveredDetailsVo> rb = ResultBean.fireFail();
AppDeliveredDetailsQuery appDeliveredDetailsQuery = new AppDeliveredDetailsQuery();
BeanUtils.copyProperties(query, appDeliveredDetailsQuery);
ResultBean<AppDeliveredDetailsVo> retrievalApplyInfo = busDeliveredFeign.getRetrievalApplyInfo(appDeliveredDetailsQuery);
AppDeliveredDetailsVo appDeliveredDetailsVo = retrievalApplyInfo.getData();
DeliveredDetailsVo vo = new DeliveredDetailsVo();
BeanUtils.copyProperties(appDeliveredDetailsVo, vo);
return rb.success().setData(vo);
}
public ResultBean<PagerVo<DeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<DeliveredApplyPageQuery> pagerQuery) {
return null;
ResultBean<PagerVo<DeliveredApplyPageVo>> rb = ResultBean.fireFail();
PagerQuery<AppDeliveredApplyPageQuery> pq = CoverUtils.getPagerQuery(pagerQuery);
ResultBean<PagerVo<AppDeliveredApplyPageVo>> retrievalApplyList = busDeliveredApplyFeign.getRetrievalApplyList(pq);
PagerVo<DeliveredApplyPageVo> vo = CoverUtils.selectPagerVo(retrievalApplyList.getData());
return rb.success().setData(vo);
}
public ResultBean<PagerVo<StayDeliveredApplyPageVo>> getRetrievalNotList(PagerQuery<StayDeliveredApplyPageQuery> pagerQuery) {
return null;
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfoBySid(String sid) {
ResultBean<DeliveredApplyInfoVo> rb = ResultBean.fireFail();
DeliveredApplyInfoVo vo = new DeliveredApplyInfoVo();
ResultBean<AppDeliveredApplyInfoVo> resultBean = busDeliveredApplyFeign.getRetrievalApplyInfoBySid(sid);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
AppDeliveredApplyInfoVo appDeliveredApplyInfoVo = resultBean.getData();
BeanUtil.copyProperties(appDeliveredApplyInfoVo, vo);
return rb.success().setData(vo);
}
public ResultBean saveRetrievalApplyInfo(DeliveredApplyDto deliveredApplyDto) {
AppDeliveredApplyDto dto = new AppDeliveredApplyDto();
BeanUtil.copyProperties(deliveredApplyDto, dto);
ResultBean resultBean = busDeliveredApplyFeign.saveRetrievalApplyInfo(dto);
return resultBean;
}
public ResultBean<DeliveredApplyInfoVo> getRetrievalApplyInfo(DeliveredApplyInfoQuery query) {
public ResultBean<List<AppCarVinListVo>> getRetrievalCarVin(String sid) {
return null;
}
}
Loading…
Cancel
Save