Browse Source

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
commit
d1ab9205a2
  1. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
  2. 58
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java
  3. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  4. 40
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  5. 489
      anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
  6. 9
      anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
  7. 6
      anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js
  8. 304
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue
  9. 881
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue
  10. 333
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue
  11. 26
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
  12. 36
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
  13. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  14. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
  15. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java
  16. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
  17. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  18. 1
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java
  19. 5
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  20. 14
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java
  21. 2
      anrui-scm/anrui-scm-ui/src/api/purchasereceipt/purchasereceipt.js
  22. 459
      anrui-scm/anrui-scm-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue
  23. 28
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
  24. 2
      anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue
  25. 4
      anrui-system-ui/src/store/modules/user.js
  26. 46
      anrui-system-ui/src/views/Home/Home.vue

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml

@ -229,7 +229,7 @@
</select>
<select id="selectCarConfigSummary"
resultType="com.yxt.anrui.base.api.basemodelconfig.AppModelConfigListVo">
SELECT bmc.sid,
SELECT bmc.sid as configSid,
bvm.sid AS modelSid,
bvm.vehicleAlias AS model,
bvm.carBrand AS brandSid,

58
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/common/BusSalesOrderConstantUtils.java

@ -0,0 +1,58 @@
package com.yxt.anrui.buscenter.api.common;
import lombok.Getter;
/**
* @Author dimengzhe
* @Date 2023/2/8 8:52
* @Description 销售订单常量等相关参数
*/
public class BusSalesOrderConstantUtils {
/**
* 销售部经理角色sid
*/
public static String SALES_MANAGER_ROLESID = "f07e98d3-d179-48ee-a5ff-5928addead3f";
/**
* 总经理角色sid
*/
public static String GENERAL_MANAGER_ROLESID = "135b4829-2928-4124-a5b3-7d4b1101a863";
/**
* 车辆临时状态
*/
@Getter
public static enum TypeEnum {
/**
* 现车
*/
EXISTING_CAR("1", "现车"),
/**
* 采购订单
*/
PURCHASE_ORDER("2", "采购订单"),
/**
* 需采购
*/
PRODUCTION_SCHEDULING("3", "排产");
/**
* code值
*/
private final String code;
/**
* 备注
*/
private final String remarks;
/**
* 构造器
*
* @param code code值
* @param remarks 备注
*/
private TypeEnum(String code, String remarks) {
this.code = code;
this.remarks = remarks;
}
}
}

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@ -2208,6 +2208,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
finConfirmDto.setPurchaseSystemSid(busDeposit.getPurchaseSystemSid());
ResultBean<String> codeString = finCollectionConfirmationFeign.getApplyCode(busMainDeposit.getOrgSid());
finConfirmDto.setBillNo(codeString.getData());
finConfirmDto.setStaffName(busDeposit.getStaffName());
finConfirmDto.setStaffUserSid(busMainDeposit.getCreateBySid());
finConfirmDto.setStaffDeptName(finConfirmDto.getCreateDept());
finConfirmDto.setStaffDeptSid(finConfirmDto.getCreateDeptSid());
finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
}
if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

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

@ -98,6 +98,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
@ -465,10 +466,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
if (StringUtils.isNotBlank(dto.getType())) {
if ("1".equals(dto.getType())) {
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getCode().equals(dto.getType())) {
//现车车辆信息
busSalesOrderVehicleService.saveVehicle(list, sid);
} else if ("2".equals(dto.getType())) {
} else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(dto.getType())) {
//采购订单信息
busSalesVehicleOrderService.saveOrder(vehicleList, sid);
}
@ -981,23 +982,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
//计算总指导价-总成交价-总优惠包的价值
bigDecimalOne = guildPriceAll.subtract(finalPriceAll).add(discountPrice);
List<String> vehicleList = new ArrayList<>();
//是否是现车//ToDo:暂去掉
/*if ("1".equals(busSalesOrder.getType())) {
//根据销售订单sid查询现车的sid集合
vehicleList = busSalesOrderVehicleService.selectVehicleSid(sid);
//根据现车去查询销售政策的总促销政策之和
if (vehicleList.size() > 0) {
for (int i = 0; i < vehicleList.size(); i++) {
//根据sid去查询销售政策的sid,根据销售政策查询销售政策的金额
ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vehicleList.get(i), busSalesOrder.getUseOrgSid());
if (listResultBean.getSuccess()) {
List<String> stringList = listResultBean.getData();
initBigDecimal = initBigDecimal.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
}
}
}
}*/
//查询返利金额
BusSalesOrderSubmit busSalesOrderSubmit = busSalesOrderSubmitService.selectBySaleOrderSid(sid);
if (busSalesOrderSubmit != null) {
@ -1014,8 +998,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
}
//销售经理的角色sid
// String roleSid = "f0a79b5e-5338-435e-b0c6-08fc01048f55";
String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
// String roleSid = "f07e98d3-d179-48ee-a5ff-5928addead3f";
String roleSid = BusSalesOrderConstantUtils.SALES_MANAGER_ROLESID;
//查询销售部经理是否超权限
BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(sid);
BaseBrandMitQuery baseBrandMitQuery = new BaseBrandMitQuery();
@ -1043,8 +1027,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
isHavePower = true;
}
//总经理的角色sid
// roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
roleSid = "135b4829-2928-4124-a5b3-7d4b1101a863";
roleSid = BusSalesOrderConstantUtils.GENERAL_MANAGER_ROLESID;
//查询总经理审批是否超权限
baseBrandMitQuery = new BaseBrandMitQuery();
baseBrandMitQuery.setRoleSid(roleSid);
@ -1293,7 +1276,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
}
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if ("现车".equals(vo.getOrderType())) {
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
//更新已选择的车架号的状态为未锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@ -1302,7 +1285,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
if ("采购订单".equals(vo.getOrderType())) {
if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getRemarks().equals(vo.getOrderType())) {
List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
for (BusSalesVehicleOrder b : list) {
String linkSid = b.getLinkSid();
@ -1348,7 +1331,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
if ("销售订单申请".equals(nextName)) {
ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(query.getBusinessSid());
AppOrderDetailsVo vo = details.getData();
if ("现车".equals(vo.getOrderType())) {
if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
//更新已选择的车架号的状态为未锁定
List<String> list = busSalesOrderVehicleService.selectVehicleSid(query.getBusinessSid());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
@ -1357,7 +1340,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
if ("采购订单".equals(vo.getOrderType())) {
if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getRemarks().equals(vo.getOrderType())) {
List<BusSalesVehicleOrder> list = busSalesVehicleOrderService.selectLinkSid(query.getBusinessSid());
for (BusSalesVehicleOrder b : list) {
String linkSid = b.getLinkSid();
@ -3919,7 +3902,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
//根据车辆sid分公司sid查询已办结的销售订单
BusSaleOrderVehicleOutVo busSaleOrderVehicleOutVo = baseMapper.selectOrderOne(vinSid);
if(busSaleOrderVehicleOutVo == null){
return rb;
return rb.success().setData(busSaleOrderVehicleOutVo);
}
//根据销售订单sid查询优惠价值
//查询销售销售订单的单台销售折让
@ -3943,6 +3926,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
busSaleOrderVehicleOutVo.setDiscountExplain(String.join(",",discountLists));
}
}
busSaleOrderVehicleOutVo.setCarDiscountPrice(singleCarDiscountPrice);
}
if(StringUtils.isBlank(busSaleOrderVehicleOutVo.getIntermediaryName())){
busSaleOrderVehicleOutVo.setDistributorPrice("");

489
anrui-buscenter/anrui-buscenter-ui/src/components/VehicleConfigurationSub/vehicleconfiguration.vue

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

9
anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js

@ -144,3 +144,12 @@ export function selectHaveMessage(data) {
headers: { 'Content-Type': 'application/json' }
})
}
// 根据当前登录用户sid获取本分公司下的销售部门和销售专员
export function selectOrgList(data) {
return request({
url: '/portal/v1/sysorganization/selectOrgList',
method: 'get',
params: data
})
}

6
anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js

@ -60,6 +60,12 @@ const codemenu = [
name: 'shoukuanquerenguanli',
meta: { title: '款项确认管理', noCache: true }
},
{
path: '/anruifinmanagement/agencyfund',
component: () => import('@/views/anruifinmanagement/agencyfund/agencyfund.vue'),
name: 'DaiShouKuan',
meta: { title: '代收款申请', noCache: true }
},
{
path: '/anruifinmanagement/cashierConfirmation',
component: () => import('@/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue'),

304
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue

@ -0,0 +1,304 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar view-title="代收款申请" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="付款方:" class="searchlist">
<el-input v-model="listQuery.params.payerName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款方式:" class="searchlist">
<el-select v-model="listQuery.params.collectionTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in collectionType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="收款银行:" class="searchlist">
<el-input v-model="listQuery.params.collectionBank" placeholder="" clearable/>
</el-form-item>
<el-form-item label="收款日期:" class="searchlist">
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.collectionStartDate" clearable style="width: 160px" type="date" placeholder="开始日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.collectionEndDate" clearable style="width: 160px" type="date" placeholder="结束日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<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="handReset">重置</el-button>
</div>
</div>
</div>
<div>
<div class="listtop">
<div class="tit">收款申请列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span>
</template>
</el-table-column>
<el-table-column label="申请部门" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.createDept }}</span>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" width="80">
<template slot-scope="scope">
<span>{{ scope.row.createByName }}</span>
</template>
</el-table-column>
<el-table-column label="申请日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
</template>
</el-table-column>
<el-table-column label="收款银行账号" align="center" width="140">
<template slot-scope="scope">
<span>{{ scope.row.collectionBankNum }}</span>
</template>
</el-table-column>
<el-table-column label="收款银行名称" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.receivingName }}</span>
</template>
</el-table-column>
<el-table-column label="收款银行" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.collectionBank }}</span>
</template>
</el-table-column>
<el-table-column label="收款金额" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span>
</template>
</el-table-column>
<el-table-column label="收款日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="收款方式" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="付款方" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.payerName }}</span>
</template>
</el-table-column>
<el-table-column label="付款账号后4位" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.payAccount }}</span>
</template>
</el-table-column>
<el-table-column label="付款银行" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.payBank }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
</div>
<agencyfundAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
<agencyfundInfo v-show="viewState == 3" ref="divInfo" @doback="resetState"/>
</div>
</template>
<script>
import { listPage } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import pageye from '@/components/pagination/pageye'
import { typeValues } from '@/api/jichuxinxi/dictcommons'
import agencyfundAdd from './agencyfundAdd.vue'
import agencyfundInfo from './agencyfundInfo.vue'
export default {
name: 'DaiShouKuan',
components: {
Pagination,
pageye,
ButtonBar,
agencyfundAdd,
agencyfundInfo
},
data() {
return {
btndisabled: false,
isSearchShow: false,
searchxianshitit: '隐藏查询条件',
viewState: 1,
tableKey: 0,
list: [],
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
receiptBank_list: [],
collectionType_list: [],
listLoading: false,
listQuery: {
current: 1,
size: 10,
params: {
payerName: '',
collectionStartDate: '',
collectionEndDate: '',
collectionBank: '',
collectionTypeKey: '',
subscriptionState: '',
useOrgSid: '',
createBySid: '',
state: '',
orgPath: ''
},
total: 0
}
}
},
created() {
this.getList()
this.DataDictionary()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
DataDictionary() {
typeValues({ type: 'receiptBank' }).then((res) => {
if (res.success) {
this.receiptBank_list = res.data
}
})
typeValues({ type: 'customerPayType' }).then((res) => {
if (res.success) {
this.collectionType_list = res.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
// ------------------
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.createBySid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.state = 0
listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.code === '200') {
this.listQuery.total = response.data.total
this.list = response.data.records
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handReset() {
this.listQuery = {
current: 1,
size: 10,
params: {
collectionStartDate: '',
collectionEndDate: '',
collectionBank: '',
collectionTypeKey: '',
subscriptionState: '',
useOrgSid: '',
createBySid: '',
state: '',
orgPath: ''
},
total: 0
}
this.getList()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
handUpdate(row) {
this.viewState = 2
this.$refs['divAdd'].showEdit(row)
},
handLook(row) {
this.viewState = 3
this.$refs['divInfo'].showInfo(row)
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

881
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@ -0,0 +1,881 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>申请部门</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.createDept }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>申请人</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.createByName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>申请日期</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.createDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>销售部门</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="staffDeptName">
<el-select v-model="formobj.staffDeptName" placeholder="请选择" :disabled="forbidden" @change="changeStaffDept" filterable>
<el-option v-for="item in staffDept_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>销售专员</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="staffName">
<el-select v-model="formobj.staffName" placeholder="请选择" :disabled="forbidden" @change="changeStaff" filterable>
<el-option v-for="item in staff_list" :key="item.staffSid" :label="item.staffName" :value="item.staffName"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>采购系统</span>
</el-col>
<el-col :span="4">
<el-form-item prop="purchaseSystemName">
<el-select v-model="formobj.purchaseSystemName" placeholder="请选择" :disabled="forbidden" @change="changePurchase" filterable clearable>
<el-option v-for="item in purchase_list" :key="item.deptSid" :label="item.purchaseSystemName" :value="item.purchaseSystemName"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>收款方式</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="collectionTypeValue">
<el-select v-model="formobj.collectionTypeValue" placeholder="请选择" :disabled="forbidden" @change="changeCollectionType" filterable clearable>
<el-option v-for="item in receiptType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>收款金额()</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="collectionMoney">
<el-input v-model="formobj.collectionMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" :disabled="forbidden" @change="changeCollectionMoney" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>收款日期</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="collectionDate">
<el-date-picker value-format="yyyy-MM-dd" v-model="formobj.collectionDate" :disabled="forbidden" clearable type="date" style="width: 93%" placeholder="请选择"/>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.collectionTypeKey === '03'">
<el-col :span="4" class="tleftb balanceStyle">
<span><span class="icon">*</span>收款银行账号</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>
<el-select v-model="formobj.collectionBankNum" placeholder="请选择" :disabled="forbidden" @change="changeCollectionBankNum" filterable clearable>
<el-option v-for="item in collectionBankNum_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>
<span>{{ formobj.receivingName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>
<span>{{ formobj.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span><span class="icon">*</span>付款方名称</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="payerName">
<el-input v-model="formobj.payerName" :disabled="forbidden" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<el-input v-model="formobj.payAccount" v-show="formobj.collectionTypeKey === '03'" :disabled="forbidden" maxlength="4" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<el-input v-model="formobj.payBank" v-show="formobj.collectionTypeKey === '03'" :disabled="forbidden" placeholder="" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="20" class="trightb">
<el-form-item>
<el-input v-model="formobj.remarks" :disabled="forbidden" style="width: 70%" placeholder="" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>打款凭证</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<Upload v-show="forbidden !== true" style="float:left;" ref="remit" @handleSuccess="remitAdd" @handleRemove="remitRemove" />
<span v-show="forbidden == true" v-for="(item, index) in list1" :key="index">{{ item.name }}
</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>汇款确认书</span>
</el-col>
<el-col :span="8" class="trightb">
<el-form-item>
<Upload style="float:left;" ref="remittance" @handleSuccess="remittanceAdd" @handleRemove="remittanceRemove" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" style="padding: 0px">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="合同编号:">
<el-input v-model="listQuery.contractNo" size="mini" placeholder="" style="width: 110px" clearable/>
</el-form-item>
<el-form-item label="客户名称:">
<el-input v-model="listQuery.customerName" size="mini" placeholder="" style="width: 100px" clearable/>
</el-form-item>
<el-form-item label="联系电话:">
<el-input v-model="listQuery.customerPhone" size="mini" placeholder="" style="width: 140px" clearable/>
</el-form-item>
<el-form-item label="车架号:">
<el-input v-model="listQuery.vinNo" size="mini" placeholder="" style="width: 140px" clearable/>
</el-form-item>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div style="padding-left: 20%">
<el-button type="primary" size="mini" @click="handleFilter">查询</el-button>
<el-button type="primary" size="mini" @click="handReset">重置</el-button>
</div>
<div>
<span >余额:</span><el-input v-model="balance" placeholder="" style="width: 120px" readonly/>
</div>
</div>
</el-col>
</el-row>
<el-row>
<el-col :span="10">
<div>
<div class="tableTitle">应收未收款款项明细</div>
<el-table border :key="overduereceivableKey" width="100%" :data="overduereceivable_list">
<el-table-column fixed label="操作" align="center" width="80">
<template slot-scope="scope">
<el-button type="primary" size="small" @click="handAdd(scope.row)">添加</el-button>
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.contractNo }}
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.VIN }}
</template>
</el-table-column>
<el-table-column label="客户/电话" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.customerName }} {{ scope.row.customerPhone }}
</template>
</el-table-column>
<el-table-column label="付款" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.payType }}
</template>
</el-table-column>
<el-table-column label="应收金额" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.reveivableMoney }}
</template>
</el-table-column>
<el-table-column label="应收项目" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.receivablesName }}
</template>
</el-table-column>
<el-table-column label="当前应收" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.currentReceivableMoney }}
</template>
</el-table-column>
</el-table>
</div>
</el-col>
<el-col :span="14">
<div>
<div class="tableTitle">已选应收款项明细</div>
<el-table border :key="selectedreceivableKey" width="100%" :data="formobj.finSelectedReceivablesDetaileds">
<el-table-column fixed label="操作" align="center" width="70">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handDelete(scope.row)">移除</el-button>
</template>
</el-table-column>
<el-table-column label="合同编号" align="center" width="95">
<template slot-scope="scope">
{{ scope.row.contractNo }}
</template>
</el-table-column>
<el-table-column label="车架号" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.VIN }}
</template>
</el-table-column>
<el-table-column label="客户/电话" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.customerName }} {{ scope.row.customerPhone }}
</template>
</el-table-column>
<el-table-column label="付款" align="center" width="70">
<template slot-scope="scope">
{{ scope.row.payType }}
</template>
</el-table-column>
<el-table-column label="应收项目" align="center" width="90">
<template slot-scope="scope">
{{ scope.row.receivablesName }}
</template>
</el-table-column>
<el-table-column label="当前应收" align="center" width="100">
<template slot-scope="scope">
{{ scope.row.currentReceivableMoney }}
</template>
</el-table-column>
<el-table-column label="认款金额" align="center" width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.subscriptionMoney" @input="changeMoney(scope.row)" @change="changeSubscriptionMoney" placeholder="" clearable/>
</template>
</el-table-column>
<el-table-column label="剩余应收" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.surplusReceivable }}</span>
</template>
</el-table-column>
<el-table-column label="认款申请日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.subscriptionDate }}</span>
</template>
</el-table-column>
</el-table>
</div>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import { save, listAll, fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Upload from '@/components/uploadFile/filesUpload' //
import { selAccountByOrgSid, typeValues, fetchDetailsByUseOrgSid, getOrgSidByPath, selectOrgList } from '@/api/jichuxinxi/dictcommons'
export default {
name: 'DaiShouKuanAdd',
components: {
Upload
},
data() {
return {
viewTitle: '',
dialogStatus: '',
overduereceivableKey: 0,
selectedreceivableKey: 1,
staffDept_list: [],
staff_list: [],
receiptBank_list: [],
collectionBankNum_list: [],
receiptType_list: [],
overduereceivable_list: [],
purchase_list: [],
forbidden: false,
list1: [],
list2: [],
formobj: {
sid: '',
createDept: '',
createDeptSid: '',
createDate: '',
createByName: '',
staffSid: '',
collectionDate: '',
collectionBank: '',
collectionBankKey: '',
collectionBankNum: '',
collectionBankNumKey: '',
collectionTypeKey: '',
collectionTypeValue: '',
payerName: '',
collectionMoney: '',
paymentVoucherUrl: '',
remittanceConfirmationUrl: '',
balance: '',
useOrgSid: '',
userSid: '',
receivingName: '',
payBank: '',
payAccount: '',
accountSid: '',
purchaseSystemName: '',
purchaseSystemSid: '',
orgPath: '',
staffName: '',
staffUserSid: '',
staffDeptName: '',
staffDeptSid: '',
finSelectedReceivablesDetaileds: [],
paymentVoucherAppendixs: [],
remittanceConfirmationAppendixs: []
},
listQuery: {
contractNo: '',
customerName: '',
customerPhone: '',
sids: [],
createBySid: '',
vinNo: '',
orgPath: '',
purchaseSystemSid: '',
},
rules: {
collectionMoney: [{ required: true, message: '收款金额不能为空', trigger: 'blur' }],
collectionDate: [{ required: true, message: '收款日期不能为空', trigger: 'change' }],
collectionTypeValue: [{ required: true, message: '收款方式不能为空', trigger: 'change' }],
payerName: [{ required: true, message: '付款方不能为空', trigger: 'blur' }],
purchaseSystemName: [{ required: true, message: '采购系统不能为空', trigger: 'change' }],
staffDeptName: [{ required: true, message: '销售部门不能为空', trigger: 'change' }],
staffName: [{ required: true, message: '销售专员不能为空', trigger: 'change' }]
},
submitdisabled: false,
balance: '', //
balanceCopy: '' // 使()
}
},
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.createDate = year + '-' + month + '-' + day
this.formobj.collectionDate = year + '-' + month + '-' + day
},
UpNumber(e) {
e.target.value = e.target.value.replace(/[^\d]/g, '') // ."-"
e.target.value = e.target.value.replace(/^00/, '0') // 0
if (e.target.value.indexOf('.') < 0 && e.target.value !== '' && e.target.value !== '-') {
// 0102
console.log(e.target.value)
e.target.value = parseFloat(e.target.value)
}
},
DataDictionary() {
typeValues({ type: 'receiptBank' }).then((res) => {
if (res.code === '200') {
this.receiptBank_list = res.data
}
})
typeValues({ type: 'customerPayType' }).then((res) => {
if (res.code === '200') {
this.receiptType_list = res.data
}
})
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
fetchDetailsByUseOrgSid(res.data).then((resp) => {
if (resp.success) {
this.purchase_list = resp.data
}
})
}
})
selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.collectionBankNum_list = resp.data
}
})
selectOrgList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.staffDept_list = res.data
}
})
},
changeStaffDept(value) {
const choose = this.staffDept_list.filter((item) => item.orgDeptName === value)
this.formobj.staffDeptSid = choose[0].orgDeptSid
this.staff_list = choose[0].staffinfoVoList
},
changeStaff(value) {
const choose = this.staff_list.filter((item) => item.staffName === value)
this.formobj.staffUserSid = choose[0].staffSid
this.listQuery.createBySid = choose[0].userSid
},
changeCollectionBankNum(value) {
let aa = null
this.collectionBankNum_list.forEach((e) => {
if (e.bankAccount === value) {
aa = {
accountSid: e.accountSid,
accountName: e.accountName,
depositBank: e.depositBank,
bankAccount: e.bankAccount
}
}
})
this.formobj.accountSid = aa.accountSid
this.formobj.collectionBankNum = aa.bankAccount
this.formobj.receivingName = aa.accountName
this.formobj.collectionBank = aa.depositBank
},
changePurchase(value) {
if (this.formobj.staffName === '') {
this.formobj.purchaseSystemName = ''
this.$message({ showClose: true, type: 'error', message: '请先选择销售专员' })
return
}
const choose = this.purchase_list.filter((item) => item.purchaseSystemName === value)
this.formobj.purchaseSystemSid = choose[0].deptSid
this.getlist()
},
changeCollectionType(value) {
let aa = null
this.receiptType_list.forEach((e) => {
if (e.dictKey === value) {
aa = {
name: e.dictValue,
value: e.dictKey
}
}
})
this.formobj.collectionTypeValue = aa.name
this.formobj.collectionTypeKey = aa.value
},
changeCollectionMoney() {
if (this.dialogStatus === '') {
this.balance = this.formobj.collectionMoney
this.balanceCopy = this.formobj.collectionMoney
}
},
changeMoney(row) {
if (row.subscriptionMoney !== '') {
row.surplusReceivable = parseFloat(row.currentReceivableMoney) - parseFloat(row.subscriptionMoney)
} else {
row.surplusReceivable = ''
}
},
changeSubscriptionMoney() {
let subscriptionMoney = '0'
for (var i = 0; i < this.formobj.finSelectedReceivablesDetaileds.length; i++) {
if (this.formobj.finSelectedReceivablesDetaileds[i].subscriptionMoney === '') {
subscriptionMoney = '1'
return
}
}
if (subscriptionMoney === '0') {
this.calculateBalance()
}
},
//
calculateBalance() {
var list = []
for (var b = 0; b < this.formobj.finSelectedReceivablesDetaileds.length; b++) {
list.push(this.formobj.finSelectedReceivablesDetaileds[b].subscriptionMoney)
}
var sumNum = 0
for (var i = 0; i < list.length; i++) {
//
sumNum += Number(list[i].replace(/,/g, ''))
}
//
var f1 = Math.round(sumNum * 100) / 100
//
var strNum = f1.toString()
//
var rs = strNum.indexOf('.')
if (rs < 0) {
rs = strNum.length
strNum += '.'
}
while (strNum.length <= rs + 2) {
strNum += '0'
}
var resNum = strNum.replace(/\d+/, function(n) {
return n.replace(/(\d)(?=(\d{3})+$)/g, function(u) {
return u
})
})
this.balance = parseInt(this.balanceCopy) - parseInt(resNum)
},
getlist() {
if (this.formobj.purchaseSystemName === '') {
this.$message({ showClose: true, type: 'error', message: '请选择采购系统' })
return
}
this.listQuery.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.purchaseSystemSid = this.formobj.purchaseSystemSid
listAll(this.listQuery).then((res) => {
if (res.code === '200') {
this.overduereceivable_list = res.data
}
})
},
handleFilter() {
this.getlist()
},
handReset() {
this.listQuery = {
contractNo: '',
customerName: '',
customerPhone: '',
sids: [],
createBySid: '',
vinNo: '',
orgPath: '',
purchaseSystemSid: ''
}
this.getlist()
},
showAdd() {
this.DataDictionary()
this.newDate()
this.viewTitle = '【新建】收款申请'
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
this.formobj.createDept = window.sessionStorage.getItem('departmentName')
this.formobj.createDeptSid = window.sessionStorage.getItem('departmentSid')
this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
},
showEdit(row) {
this.DataDictionary()
this.viewTitle = '【编辑】收款申请'
this.dialogStatus = 'edit'
fetchDetailBySid(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
this.balance = this.formobj.balance
this.balanceCopy = this.formobj.balance
this.getlist()
this.forbidden = true
if (this.formobj.paymentVoucherAppendixs.length > 0) {
for (var i = 0; i < this.formobj.paymentVoucherAppendixs.length; i++) {
this.list1.push({
name: this.formobj.paymentVoucherAppendixs[i].fileName
}
)
}
}
if (this.formobj.remittanceConfirmationAppendixs.length > 0) {
for (var b = 0; b < this.formobj.remittanceConfirmationAppendixs.length; b++) {
this.list2.push({
name: this.formobj.remittanceConfirmationAppendixs[b].fileName
}
)
}
}
this.formobj.finSelectedReceivablesDetaileds = []
this.$nextTick(() => {
this.$refs['remit'].show(this.list1)
this.$refs['remittance'].show(this.list2)
this.$refs['form_obj'].clearValidate()
})
}
}).catch(e => {
this.formobj = row
})
},
remitAdd(item) {
var arrayList = []
arrayList = item.data
this.formobj.paymentVoucherAppendixs.push({
createBySid: window.sessionStorage.getItem('userSid'),
name: window.sessionStorage.getItem('name'),
fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
linkSid: '',
attachType: '',
fileSize: arrayList.size,
filePath: arrayList.fullUrl
})
},
remitRemove(item) {
this.formobj.paymentVoucherAppendixs.forEach((e, index) => {
if (item.name.indexOf(e.fileName) === 0) {
this.formobj.paymentVoucherAppendixs.splice(index, 1)
}
})
},
remittanceAdd(item) {
var arrayList = []
arrayList = item.data
this.formobj.remittanceConfirmationAppendixs.push({
createBySid: window.sessionStorage.getItem('userSid'),
name: window.sessionStorage.getItem('name'),
fileName: arrayList.sourceFileName.substr(0, arrayList.sourceFileName.lastIndexOf('.')),
fileType: arrayList.sourceFileName.substr(arrayList.sourceFileName.lastIndexOf('.')),
linkSid: '',
attachType: '',
fileSize: arrayList.size,
filePath: arrayList.fullUrl
})
},
remittanceRemove(item) {
this.formobj.remittanceConfirmationAppendixs.forEach((e, index) => {
if (item.name.indexOf(e.fileName) === 0) {
this.formobj.remittanceConfirmationAppendixs.splice(index, 1)
}
})
},
handAdd(row) {
if (this.formobj.collectionMoney === '') {
this.$message({ showClose: true, type: 'error', message: '请先填写收款金额' })
} else {
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
var dayDate = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
this.formobj.finSelectedReceivablesDetaileds.push({
createByName: window.sessionStorage.getItem('name'),
contractSid: row.contractSid,
contractNo: row.contractNo,
customerSid: row.customerSid,
customerName: row.customerName,
VIN: row.VIN,
useOrgSid: '',
customerPhone: row.customerPhone,
receivablesName: row.receivablesName,
currentReceivableMoney: row.currentReceivableMoney,
lastSubscriptionMoney: '',
subscriptionMoney: '',
surplusReceivable: '',
subscriptionDate: dayDate,
collSid: '',
receivablesSid: row.sid,
payType: row.payType,
payTypeKey: row.payTypeKey,
sid: row.sid
})
this.listQuery.sids.push(row.sid)
this.getlist()
}
},
handDelete(row) {
this.listQuery.sids.splice(this.listQuery.sids.indexOf(row.sid), 1)
this.formobj.finSelectedReceivablesDetaileds.splice(this.formobj.finSelectedReceivablesDetaileds.indexOf(row), 1)
this.calculateBalance()
this.getlist()
},
submit() {
if (this.formobj.collectionTypeKey === '03' && this.formobj.collectionBankNum === '') {
this.$message({ showClose: true, type: 'error', message: '收款银行账号不能为空' })
return
}
if (this.formobj.collectionTypeKey === '03' && this.formobj.collectionBankNum === '付款账号后4位不能为空') {
this.$message({ showClose: true, type: 'error', message: '' })
return
}
if (this.formobj.paymentVoucherAppendixs.length > 0) {
var paymentVoucherUrl_list = []
for (var i = 0; i < this.formobj.paymentVoucherAppendixs.length; i++) {
paymentVoucherUrl_list.push(this.formobj.paymentVoucherAppendixs[i].filePath)
}
this.formobj.paymentVoucherUrl = paymentVoucherUrl_list.join(',')
} else {
this.$message({ showClose: true, type: 'error', message: '请上传打款凭证' })
return
}
if (this.formobj.remittanceConfirmationAppendixs.length > 0) {
var remittanceConfirmationUrl_list = []
for (var b = 0; b < this.formobj.remittanceConfirmationAppendixs.length; b++) {
remittanceConfirmationUrl_list.push(this.formobj.remittanceConfirmationAppendixs[b].filePath)
}
this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',')
} else {
for (var k = 0; k < this.formobj.finSelectedReceivablesDetaileds.length; k++) {
if (this.formobj.finSelectedReceivablesDetaileds[k].customerName !== this.formobj.payerName) {
this.$message({ showClose: true, type: 'error', message: '请上传汇款确认书' })
return
}
}
}
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
save(this.formobj).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
createDept: '',
createDeptSid: '',
createDate: '',
createByName: '',
staffSid: '',
collectionDate: '',
collectionBank: '',
collectionBankKey: '',
collectionBankNum: '',
collectionBankNumKey: '',
collectionTypeKey: '',
collectionTypeValue: '',
payerName: '',
collectionMoney: '',
paymentVoucherUrl: '',
remittanceConfirmationUrl: '',
balance: '',
useOrgSid: '',
userSid: '',
receivingName: '',
payBank: '',
payAccount: '',
accountSid: '',
purchaseSystemName: '',
purchaseSystemSid: '',
orgPath: '',
staffName: '',
staffUserSid: '',
staffDeptName: '',
staffDeptSid: '',
finSelectedReceivablesDetaileds: [],
paymentVoucherAppendixs: [],
remittanceConfirmationAppendixs: []
}
this.listQuery = {
contractNo: '',
customerName: '',
customerPhone: '',
sids: [],
createBySid: ''
}
this.list1 = []
this.list2 = []
this.forbidden = false
this.$nextTick(() => {
this.$refs['remit'].show(this.list1)
this.$refs['remittance'].show(this.list2)
})
this.balance = ''
this.balanceCopy = ''
this.dialogStatus = ''
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.titwu {
padding: 0;
}
.tableTitle{
border: 1px solid #e0e3eb;
line-height: 42px;
text-align: center;
font-weight: bold;
font-size: 18px;
}
.balanceStyle {
line-height: 15px !important;
display: flex;
justify-content: flex-end;
align-items: center;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
</style>

333
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundInfo.vue

@ -0,0 +1,333 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>申请部门</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.createDept }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>申请人</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.createByName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>申请日期</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.createDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售部门</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.staffDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售专员</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.staffName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>采购系统</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.purchaseSystemName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>收款方式</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.collectionTypeValue }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>收款金额()</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.collectionMoney }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>收款日期</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.collectionDate }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.collectionTypeKey === '03'">
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行账号</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>
<span>{{ formobj.collectionBankNum }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行名称</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>
<span>{{ formobj.receivingName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb balanceStyle">
<span>收款银行</span>
</el-col>
<el-col :span="4" class="tlineheightb">
<el-form-item>
<span>{{ formobj.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>付款方名称</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.payerName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款账号后4位</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payAccount }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span v-show="formobj.collectionTypeKey === '03'">付款银行</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span v-show="formobj.collectionTypeKey === '03'">{{ formobj.payBank }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="20" class="trightb">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span>打款凭证</span></el-form-item>
</el-col>
<el-col :span="20" class="trightb">
<el-form-item>
<span v-for="(item, index) in list1" :key="index">
<el-link :underline="false" :href="item.path" target="_blank">{{ item.name }}</el-link>
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span>汇款确认书</span></el-form-item>
</el-col>
<el-col :span="20" class="trightb">
<el-form-item>
<span v-for="(item, index) in list2" :key="index">
<el-link :underline="false" :href="item.path" target="_blank">{{ item.name }}</el-link>
</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6" class="tleftb">
<el-form-item><span>收款金额</span></el-form-item>
</el-col>
<el-col :span="6" class="trightb">
<el-form-item>
<span>{{ formobj.collectionMoney }}</span>
</el-form-item>
</el-col>
<el-col :span="6" class="tleftb">
<el-form-item><span>余额</span></el-form-item>
</el-col>
<el-col :span="6" class="trightb">
<el-form-item>
<span>{{ formobj.balance }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="formobj.reason !== ''">
<el-col :span="6" class="tleftb">
<el-form-item><span>审核状态</span></el-form-item>
</el-col>
<el-col :span="18" class="trightb">
<el-form-item>
<span>{{ formobj.reason }}</span>
</el-form-item>
</el-col>
</el-row>
<el-table border :key="selectedreceivableKey" style="width: 100%" :data="formobj.finSelectedReceivablesDetaileds">
<el-table-column label="合同编号" align="center">
<template slot-scope="scope">
{{ scope.row.contractNo }}
</template>
</el-table-column>
<el-table-column label="车架号" align="center">
<template slot-scope="scope">
{{ scope.row.VIN }}
</template>
</el-table-column>
<el-table-column label="客户名称" align="center">
<template slot-scope="scope">
{{ scope.row.customerName }}
</template>
</el-table-column>
<el-table-column label="联系电话" align="center">
<template slot-scope="scope">
{{ scope.row.customerPhone }}
</template>
</el-table-column>
<el-table-column label="付款方式" align="center">
<template slot-scope="scope">
{{ scope.row.payType }}
</template>
</el-table-column>
<el-table-column label="应收项目" align="center">
<template slot-scope="scope">
{{ scope.row.receivablesName }}
</template>
</el-table-column>
<el-table-column label="当前应收" align="center">
<template slot-scope="scope">
{{ scope.row.currentReceivableMoney }}
</template>
</el-table-column>
<el-table-column label="认款金额" align="center">
<template slot-scope="scope">
{{ scope.row.subscriptionMoney }}
</template>
</el-table-column>
<el-table-column label="认款申请日期" align="center">
<template slot-scope="scope">
{{ scope.row.subscriptionDate }}
</template>
</el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState == 3 ? '已审核' : '其他' }}
</template>
</el-table-column>
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import { fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
export default {
name: 'DaiShouKuanInfo',
data() {
return {
viewTitle: '',
selectedreceivableKey: 0,
formobj: {},
rules: {},
list1: [],
list2: []
}
},
methods: {
showInfo(row) {
this.viewTitle = '认款详情'
fetchDetailBySid(row.sid).then(resp => {
if (resp.code === '200') {
this.formobj = resp.data
if (this.formobj.paymentVoucherAppendixs.length > 0) {
this.formobj.paymentVoucherAppendixs.forEach((e) => {
this.list1.push({
name: e.fileName,
path: e.filePath
})
})
}
if (this.formobj.remittanceConfirmationAppendixs.length > 0) {
this.formobj.remittanceConfirmationAppendixs.forEach((e) => {
this.list2.push({
name: e.fileName,
path: e.filePath
})
})
}
}
}).catch(e => {
this.formobj = row
})
},
handleReturn() {
this.formobj = {}
this.list1 = []
this.list2 = []
this.$emit('doback')
}
}
}
</script>
<style scoped>
.balanceStyle {
line-height: 15px !important;
display: flex;
justify-content: flex-end;
align-items: center;
}
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/deep/ .tlineheightb .el-form-item .el-form-item__content {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
</style>

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

@ -35,6 +35,32 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售部门</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.staffDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售专员</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.staffName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>采购系统</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.purchaseSystemName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>收款方式</span>

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

@ -44,6 +44,32 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售部门</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.staffDeptName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>销售专员</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.staffName }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>采购系统</span>
</el-col>
<el-col :span="4">
<el-form-item>
<span>{{ formobj.purchaseSystemName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>收款方式</span>
@ -126,19 +152,11 @@
<el-col :span="4" class="tleftb">
<span>备注</span>
</el-col>
<el-col :span="12" class="trightb">
<el-col :span="20" class="trightb">
<el-form-item>
<span>{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>采购系统</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.purchaseSystemName }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java

@ -125,4 +125,13 @@ public class FinCollectionConfirmation extends BaseEntity {
private String purchaseSystemSid;
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("销售专员用户sid")
private String staffUserSid;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
}

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java

@ -116,5 +116,14 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
private String reason;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("销售专员用户sid")
private String staffUserSid;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
}

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java

@ -121,4 +121,13 @@ public class FinCollectionConfirmationDto implements Dto {
@ApiModelProperty("采购系统名称")
private String purchaseSystemName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("销售专员用户sid")
private String staffUserSid;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
}

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java

@ -92,6 +92,15 @@ public class FinConfirmDto implements Dto {
@ApiModelProperty("单据编号")
private String billNo;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("销售专员用户sid")
private String staffUserSid;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员部门sid")
private String staffDeptSid;
}

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

@ -289,6 +289,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//对收款申请进行赋值操作
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
if(StringUtils.isBlank(finCollectionConfirmation.getStaffUserSid())){
finCollectionConfirmation.setStaffName(finCollectionConfirmation.getCreateByName());
finCollectionConfirmation.setStaffUserSid(finCollectionConfirmation.getCreateBySid());
finCollectionConfirmation.setStaffDeptName(finCollectionConfirmation.getCreateDept());
finCollectionConfirmation.setStaffDeptSid(finCollectionConfirmation.getCreateDeptSid());
}
sid = finCollectionConfirmation.getSid();
//根据用户sid查询分公司sid
String useOrgSid = "";

1
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrgStaffVo.java

@ -14,4 +14,5 @@ public class SysOrgStaffVo implements Vo {
private String staffName;
private String staffSid;
private String userSid;
}

5
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -188,10 +188,11 @@
</select>
<select id="selectByOrgDeptSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrgStaffVo">
select distinct si.name staffName, si.sid staffSid
select distinct si.name staffName, si.sid staffSid,su.sid userSid
from sys_staff_org so
left join sys_staffinfo si on so.staffSid = si.sid
where so.orgSid = #{orgDeptSid}
left join sys_user su on su.staffSid = si.sid
where so.orgSid = #{orgDeptSid} and si.personTypeKey != '01'
</select>
<select id="selectByPSid" resultType="com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo">

14
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserService.java

@ -1272,6 +1272,20 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
OrgList orgList1 = new OrgList();
orgList1.setOrgPath(vv.getOrgSidPath());
orgList1.setOrgName(vv.getOrgNamePath());
String orgName = "";
if (StringUtils.isNotBlank(vv.getOrgSidPath())) {
List<String> split = Arrays.asList(vv.getOrgSidPath().split("/"));
if(split.size()>1){
//获取本级sid获取本级部门信息
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(split.size()-2));
SysOrganization sysOrganization1 = sysOrganizationService.fetchBySid(split.get(split.size()-1));
orgName = sysOrganization.getName()+"/"+sysOrganization1.getName();
}else{
SysOrganization sysOrganization = sysOrganizationService.fetchBySid(split.get(0));
orgName = sysOrganization.getName();
}
orgList1.setOrgName(orgName);
}
orgList.add(orgList1);
}
}

2
anrui-scm/anrui-scm-ui/src/api/purchasereceipt/purchasereceipt.js

@ -30,7 +30,7 @@ export default {
return request({
url: '/scm/v1/scmapplyinboundquery/ctcgykd',
method: 'post',
data: data,
params: data,
headers: { 'Content-Type': 'application/json' }
})
}

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

@ -2,189 +2,173 @@
<div class="app-container">
<div class="listconadd">
<el-form ref="dataForm" :model="formobj" class="formaddcopy02">
<!-- <div class="headtitle"><span>系列{{ formobj.productLineValue }}<span style="margin-left: 20px">驱动{{ formobj.driveFormValue }}<span style="margin-left: 20px">功能{{ formobj.vehicleTypeValue }}<span style="margin-left: 20px">马力{{ formobj.powerValue }}</span></span></span></span></div>-->
<div class="headtitle_con">
<div class="headtitle">
{{ formobj.vehicleAlias }}
<div class="headtitle_jia">销售指导价:<span>{{ guidedPrice }} 万元</span></div>
<div class="icon_sty" @click="changeDown(false)" v-show="isDown">
<i class="el-icon-arrow-down"/>
<span>展开</span>
</div>
<div class="icon_sty" @click="changeUp(true)" v-show="!isDown">
<i class="el-icon-arrow-up"/>
<span>收起</span>
</div>
</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>品牌</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>功能</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>系列</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.productLineValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>驱动</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.driveFormValue }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>马力</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.powerValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>版本</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleVersionValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>燃料</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="14">
<div class="span-sty"><span>变速箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="title" style="display: flex;flex-direction: row;justify-content: space-between;align-items: center">
<div>{{ formobj.vehicleAlias }}</div>
<div>销售指导价:<span>{{guidedPrice}} 万元</span></div>
</div>
<div class="more_content" v-show="!isDown">
<div class="headline">车型信息</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>排放标准</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.emissionStandardValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>发动机型号</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.engineTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>细分市场</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.marketSegmentsValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>规格型号</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.specifications }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>系别</span></div>
<el-form-item><span class="addinputInfo addinputwTwo">{{ formobj.departmentValue }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">常用配置</div>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>后桥</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleValue }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>速比</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>轴距</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>悬架</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>鞍座</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>颜色</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>驾驶室</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>保险杠</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>燃料箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>导流罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>独立热源</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>缓速器</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>护轮罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>后视镜</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>轮胎</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5">
<div class="span-sty"><span>轮毂材质</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>空调</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>座椅</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>
</el-col>
<el-col :span="5">
<div class="span-sty"><span>多媒体</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item>
</el-col>
<el-col :span="4">
<div class="span-sty"><span>配置包</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
</el-col>
</el-row>
<div class="headline">
更多配置
<div class="icon_sty" @click="changeDownOtherConfig(false)" v-show="isDownOther">
<i class="el-icon-arrow-down"/>
<span>展开</span>
</div>
<div class="icon_sty" @click="changeUpOtherConfig(true)" v-show="!isDownOther">
<i class="el-icon-arrow-up"/>
<span>收起</span>
</div>
</div>
<el-row v-show="!isDownOther">
<el-col :span="24">
<el-form-item>{{ formobj.otherConfig }}</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>品牌</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>功能</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>系列</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.productLineValue }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>驱动</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.driveFormValue }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
<div class="span-sty"><span>马力</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.powerValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>版本</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.vehicleVersionValue }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>燃料</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>排放标准</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.emissionStandardValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>发动机型号</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.engineTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
<div class="span-sty"><span>变速箱类型</span></div>
<el-form-item><span class="addinputInfo"></span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>变速箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.gearboxTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>细分市场</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.marketSegmentsValue }}</span>
</el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>规格型号</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.specifications }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>系别</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.departmentValue }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
</el-col>
</el-row>
<div class="title">常用配置</div>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>后桥</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleValue }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>速比</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearAxleRatio }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>轴距</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.wheelbase }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>悬架</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.suspension }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
<div class="span-sty"><span>鞍座</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.saddle }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>颜色</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.carColor }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>驾驶室</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.specification }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>保险杠</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.bumper }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>燃料箱</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.fuelTank }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
<div class="span-sty"><span>导流罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.baffleModel }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>独立热源</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.independentSources }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>缓速器</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.slowMachine }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>护轮罩</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireCover }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>后视镜</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.rearViewMirror }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
<div class="span-sty"><span>轮胎</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.tireSize }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>轮毂材质</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.hubMaterial }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>空调</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.airConditioner }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>座椅</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.seat }}</span></el-form-item>
</el-col>
<el-col :span="5" class="tlineheightb">
<div class="span-sty"><span>多媒体</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.multimedia }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tlineheightb">
<div class="span-sty"><span>配置包</span></div>
<el-form-item><span class="addinputInfo">{{ formobj.configuringBao }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">
更多配置
</div>
<el-row>
<el-col :span="24">
<el-form-item>{{ formobj.otherConfig }}</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
@ -194,7 +178,7 @@
import { selectExiCarConfig } from '@/api/vehicleModel/vehicleconfiguration.js'
export default {
name: 'chexingpeizhibiaozhun',
name: 'CheXingPeiZhiBiaoZhun',
props: {
params: {
type: Object
@ -247,122 +231,31 @@ export default {
}
},
methods: {
//
changeDown(val) {
this.isDown = val
},
changeUp(val) {
this.isDown = val
},
//
changeDownOtherConfig(val) {
this.isDownOther = val
},
changeUpOtherConfig(val) {
this.isDownOther = val
}
}
}
</script>
<style scoped>
/* 标题头部的样式 */
.headtitle {
padding: 9px;
/*font-weight: bold;*/
font-size: 20px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
position: relative;
}
/* 内容头部的样式 */
.headline {
padding: 9px;
/*font-weight: bold;*/
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
position: relative;
}
/* 标题中内容的样式 */
.formaddcopy02 .headtitle_con .span-sty {
font-size: 16px;
width: 88px;
.span-sty {
width: 80px !important;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
}
.formaddcopy02 .headtitle_con .addinputInfo {
font-size: 16px;
.addinputInfo {
margin-left: 70px !important;
}
.formaddcopy02 .headtitle_con /deep/ .el-form-item__content {
font-size: 16px;
line-height: 15px !important;
.tlineheightb {
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
/* 内容部分中内容的样式 */
.formaddcopy02 .more_content .span-sty {
font-size: 16px;
width: 88px;
}
.formaddcopy02 .more_content /deep/ .el-form-item__content {
font-size: 16px;
/deep/ .tlineheightb .el-form-item .el-form-item__content .addinputInfo {
line-height: 15px !important;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: center;
}
.formaddcopy02 .headtitle_con .headtitle .icon_sty .el-icon-arrow-down, .el-icon-arrow-up {
font-size: 14px;
text-align: center;
}
/* 标题部分的展开与收起按钮*/
.formaddcopy02 .headtitle_con .headtitle .icon_sty {
display: inline-block;
position: absolute;
font-size: 14px;
top: 14px;
right: 10px;
text-align: center;
cursor: pointer;
}
/* 销售指导价的样式 */
.formaddcopy02 .headtitle_con .headtitle .headtitle_jia {
display: inline-block;
position: absolute;
right: 70px;
/*color: #d00000;*/
}
/* 内容部分的展开与收起按钮 */
.formaddcopy02 .headline .icon_sty {
display: inline-block;
position: absolute;
font-size: 14px;
font-weight: bolder;
right: 10px;
text-align: center;
cursor: pointer;
}
/* 更多配置一行的内边距 */
.formaddcopy02 .more_content /deep/ .el-col-24 {
padding: 20px;
}
/* 更多配置一行的行高 */
.formaddcopy02 .more_content .el-col-24 /deep/ .el-form-item__content {
line-height: 28px;
}
</style>

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

@ -34,7 +34,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="orgName">
<el-select v-model="temp.orgName" class="addinputw" placeholder="" @change="changeOrg">
<el-select v-model="temp.orgName" class="addinputw" filterable placeholder="" @change="changeOrg">
<el-option v-for="item in org_list" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptName"/>
</el-select>
</el-form-item>
@ -44,7 +44,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="staffName">
<el-select v-model="temp.staffName" class="addinputw" placeholder="" @change="changeStaff">
<el-select v-model="temp.staffName" class="addinputw" filterable placeholder="" @change="changeStaff">
<el-option v-for="item in staff_list" :key="item.staffSid" :label="item.staffName" :value="item.staffName"/>
</el-select>
</el-form-item>
@ -95,7 +95,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="customerName">
<el-select v-model="temp.customerName" class="addinputw" filterable clearable placeholder="" @change="changeCustomer">
<el-select v-model="temp.customerName" class="addinputw" filterable placeholder="" @change="changeCustomer">
<el-option v-for="item in customer_list" :key="item.sid" :label="item.name" :value="item.name"/>
</el-select>
</el-form-item>
@ -133,7 +133,7 @@
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="temp.middleOne" class="addinputw" clearable placeholder="" @change="changeDistributorOne">
<el-select v-model="temp.middleOne" class="addinputw" clearable placeholder="" @change="changeDistributorOne" @clear="clearDistributorOne">
<el-option v-for="item in distributor_list" :key="item.middleSid" :label="item.middleNameAndCompany" :value="item.middleNameAndCompany"/>
</el-select>
</el-form-item>
@ -153,7 +153,7 @@
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="temp.middleTwo" class="addinputw" clearable placeholder="" @change="changeDistributorTwo">
<el-select v-model="temp.middleTwo" class="addinputw" clearable placeholder="" @change="changeDistributorTwo" @clear="clearDistributorTwo">
<el-option v-for="item in distributor_list" :key="item.middleSid" :label="item.middleNameAndCompany" :value="item.middleNameAndCompany"/>
</el-select>
</el-form-item>
@ -181,7 +181,7 @@
</el-col>
<el-col :span="8">
<el-form-item>
<el-select v-model="temp.innerName" class="addinputw" filterable placeholder="" @change="changeInner">
<el-select v-model="temp.innerName" class="addinputw" filterable placeholder="" @change="changeInner" @clear="clearInner">
<el-option v-for="item in inner_list" :key="item.userSid" :label="item.userName" :value="item.userName"/>
</el-select>
</el-form-item>
@ -412,16 +412,30 @@ export default {
this.temp.middleOneSid = choosetItem[0].middleSid
this.temp.middleCodeOne = choosetItem[0].middleCode
},
clearDistributorOne() {
this.temp.middleOne = ''
this.temp.middleOneSid = ''
this.temp.middleCodeOne = ''
},
changeDistributorTwo(value) {
const choosetItem = this.distributor_list.filter((item) => item.middleNameAndCompany === value)
this.temp.middleTwo = choosetItem[0].middleName
this.temp.middleTwoSid = choosetItem[0].middleSid
this.temp.middleCodeTwo = choosetItem[0].middleCode
},
clearDistributorTwo() {
this.temp.middleTwo = ''
this.temp.middleTwoSid = ''
this.temp.middleCodeTwo = ''
},
changeInner(value) {
const choose = this.inner_list.filter((item) => item.userName === value)
this.temp.innerUserSid = choose[0].userSid
},
clearInner() {
this.temp.innerName = ''
this.temp.innerUserSid = ''
},
showChu(multipleSelection, createOrgSid) {
this.$nextTick(() => {
this.$refs['dataForm'].clearValidate()
@ -440,7 +454,7 @@ export default {
this.temp.rebateMoneyTwo = '0'
this.temp.salesAllowance = '0'
selectOrderOne({ vinSid: multipleSelection[0].sid }).then((resp) => {
if (resp.success) {
if (resp.success && resp.data !== null) {
this.temp.type = resp.data.payType
this.temp.typeKey = resp.data.payTypeKey
this.temp.orgName = resp.data.deptName

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

@ -347,7 +347,7 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
return
} else {
req.ctcgykd(this.sids[0]).then((resp) => {
req.ctcgykd({ cgrkdSid: this.sids[0] }).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '推送成功' })
this.getList()

4
anrui-system-ui/src/store/modules/user.js

@ -43,7 +43,8 @@ const actions = {
pNameAndDepartmentNameAndPostName: data.pNameAndDepartmentNameAndPostName,
roleName: data.roleName,
defaultOrgPathName: data.defaultOrgPathName,
defaultOrgPath: data.defaultOrgPath
defaultOrgPath: data.defaultOrgPath,
postName: data.postName
}
commit('SET_UESRINFO', user)
window.sessionStorage.setItem('userSid', user.userSid)
@ -54,6 +55,7 @@ const actions = {
window.sessionStorage.setItem('roleName', user.roleName)
window.sessionStorage.setItem('defaultOrgPathName', user.defaultOrgPathName)
window.sessionStorage.setItem('defaultOrgPath', user.defaultOrgPath)
window.sessionStorage.setItem('postName', user.postName)
resolve(data)
}).catch(error => {
reject(error)

46
anrui-system-ui/src/views/Home/Home.vue

@ -2,15 +2,21 @@
<div style="height: 100%;">
<div class="header">
<p class="title"><img src="../../assets/loginImg/logo.png"/>安瑞集团信息化平台</p>
<div class="head_info">
<p>欢迎您</p>
<p>
<div class="head_info" style="display: flex;flex-direction: row;justify-content:space-between;align-items: center">
<div>欢迎您</div>
<div>
<el-select v-model="defaultOrgPathName" class="selectStyle" size="small" placeholder="" @change="changeOrg" filterable>
<el-option v-for="item in orgDept_list" :key="item.orgPath" :label="item.orgName" :value="item.orgName"/>
</el-select>
</p>
<p>{{ roleName }} {{ name }}</p>
<p @click="logout()" class="dy"><img src="@/assets/images/dy.png"/></p>
</div>
<div style="padding-right: 5px">
<el-tooltip placement="top">
<div slot="content">{{ roleName }}</div>
<el-button style="color: #FFFFFF;font-size: 17px" type="text">{{ postName }}</el-button>
</el-tooltip>
</div>
<div>{{ name }}</div>
<div @click="logout()" style="display: flex;flex-direction: row;justify-content:center;align-items: center;padding-left: 20px;padding-right: 10px"><img src="@/assets/images/dy.png"/></div>
</div>
</div>
<div class="container1">
@ -260,6 +266,7 @@ export default {
defaultOrgPathName: '',
defaultOrgPath: '',
roleName: '',
postName: '',
year: ''
}
},
@ -276,6 +283,7 @@ export default {
this.defaultOrgPathName = window.sessionStorage.getItem('defaultOrgPathName')
this.defaultOrgPath = window.sessionStorage.getItem('defaultOrgPath')
this.roleName = window.sessionStorage.getItem('roleName')
this.postName = window.sessionStorage.getItem('postName')
this.name = window.sessionStorage.getItem('name')
var nowDate = new Date()
this.year = nowDate.getFullYear()
@ -295,7 +303,7 @@ export default {
})
User.getOrgListByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.orgDept_list= res.data
this.orgDept_list = res.data
}
})
},
@ -464,18 +472,18 @@ p {
}
}
.head_info img {
width: 25px;
margin-top: 20px;
margin-left: 30px;
margin-right: 10px;
float: left;
}
.head_info .dy {
margin-left: 10px;
margin-right: 20px;
}
//.head_info img {
// width: 25px;
// margin-top: 20px;
// margin-left: 30px;
// margin-right: 10px;
// float: left;
//}
//
//.head_info .dy {
// margin-left: 10px;
// margin-right: 20px;
//}
.container1 {
background: #E9F1F7;

Loading…
Cancel
Save