Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 2 years ago
parent
commit
6bcf6ff79e
  1. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOut.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java
  3. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
  4. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
  5. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutVo.java
  6. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java
  7. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java
  8. 1
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
  9. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java
  10. 8
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
  11. 99
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  12. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  13. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java
  14. 41
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml
  15. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
  16. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
  17. 5
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java
  18. 32
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
  19. 39
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java
  20. 1
      anrui-buscenter/anrui-buscenter-ui/src/views/hetongguanli/hetongdanganguanli/hetongdanganguanliAdd.vue
  21. 1
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdanganEdit.vue
  22. 9
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/chunafukuan/cashier.js
  23. 12
      anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js
  24. 378
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue
  25. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java
  26. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java
  27. 1
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
  28. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java
  29. 56
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
  30. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  31. 2
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java
  32. 6
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java
  33. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
  34. 461
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java
  35. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
  36. 2
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrolefunction/SysRoleFunctionMapper.java
  37. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml
  38. 9
      anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js
  39. 10
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  40. 43
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  41. 73
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue
  42. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue
  43. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue
  44. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue
  45. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue
  46. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue
  47. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue
  48. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue
  49. 2
      anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue

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

@ -113,4 +113,8 @@ public class BaseVehicleOut extends BaseEntity {
@ApiModelProperty("财务中客户编码")
private String cwCustomerNo;
@ApiModelProperty("采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

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

@ -83,4 +83,9 @@ public class BaseVehicleOutDetailsVo implements Vo {
private String innerName;
@ApiModelProperty("内部引荐人用户sid")
private String innerUserSid;
@ApiModelProperty("采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

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

@ -106,4 +106,9 @@ public class BaseVehicleOutDto implements Dto {
private String innerName;
@ApiModelProperty("内部引荐人用户sid")
private String innerUserSid;
@ApiModelProperty("采购类型key")
private String manPurOrderTypeKey;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

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

@ -21,7 +21,6 @@ import java.util.Map;
path = "v1/basevehicleout",
fallback = BaseVehicleOutFeignFallback.class)
public interface BaseVehicleOutFeign {
@ApiOperation("车辆出库")
@PostMapping("/vehicleOut")
@ResponseBody
@ -52,6 +51,10 @@ public interface BaseVehicleOutFeign {
@ResponseBody
ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySid")
@ResponseBody
public ResultBean delBySid(@RequestParam("sid") String sid);
}

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

@ -109,4 +109,7 @@ public class BaseVehicleOutVo implements Vo {
private String trailerOrInstallCode;
@ApiModelProperty("内部引荐人姓名")
private String innerName;
@ApiModelProperty("采购类型value")
private String manPurOrderTypeValue;
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@ -3,6 +3,8 @@ package com.yxt.anrui.base.api.busvehicleapply;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@ -73,4 +75,6 @@ public class BusVehicleApplyDetailsVo implements Vo {
@ApiModelProperty(value = "供应商sid")
private String supplierSid;
@ApiModelProperty("附件信息")
private List<CommonAppendixVo> commonAppendixs; //附件信息
}

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.busvehicleapply;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -87,5 +88,6 @@ public class BusVehicleApplyDto implements Dto {
@ApiModelProperty("当前组织机构全路径sid")
private String orgPath;
@ApiModelProperty("附件信息")
private List<CommonAppendixDto> commonAppendixs; //附件信息
}

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

@ -13,6 +13,7 @@ public enum BillTypeEnum {
CLWC("CLWC", "车辆外采"),
RZSQ("RZSQ", "入账申请"),
NGSQ("NGSQ", "内购申请"),
TZSQ("TZSQ", "调账申请"),
CJTKSQ("CJTKSQ", "厂家退库申请"),
FYSQ("FYSQ","费用申请"),
FKSQ("FKSQ","付款申请"),

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java

@ -73,4 +73,6 @@ public interface BaseAccadjApplyMapper extends BaseMapper<BaseAccadjApply> {
int updateFlowFiled(Map<String, Object> map);
int selectBySid(String join);
String selectNum(String bill);
}

8
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml

@ -60,4 +60,12 @@
WHERE nodeState != '待提交'
and find_in_set(sid, #{list})
</select>
<select id="selectNum" resultType="java.lang.String">
select RIGHT (applyNo, 4)
from base_accadj_apply
where applyNo LIKE concat(#{bill}, '%')
order by applyNo desc
limit 1
</select>
</mapper>

99
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@ -61,8 +61,11 @@ import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
@ -215,6 +218,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
dto.setApplyDate(DateUtil.today());
dto.setNodeState("待提交");
dto.setOrgSidPath(orgSidPath);
String applyNo = getApplyCode(dto.getCallInOrgSid());
dto.setApplyNo(applyNo);
ResultBean resultBean = this.insertByDto(dto);
String sid = (String) resultBean.getData();
for (String accSid : accSids) {
@ -241,6 +246,23 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return rb.success().setMsg("修改成功").setData(dtoSid);
}
public String getApplyCode(String useOrgSid) {
ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
String orgCode = resultBean1.getData().getOrgCode();
BillNo b = new BillNo();
b.setOrgCode(orgCode);
b.setBillType(BillTypeEnum.TZSQ.getBillType());
String bill = Rule.getBill(b);
String i = baseMapper.selectNum(bill);
String billNo = "";
if (StringUtils.isNotBlank(i)) {
billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
} else {
billNo = Rule.getBillNo(bill, 0);
}
return billNo;
}
public ResultBean<String> insertByDto(BaseAccadjApplyDto dto) {
ResultBean rb = ResultBean.fireFail();
BaseAccadjApply entity = new BaseAccadjApply();
@ -491,9 +513,14 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
}
for (BaseAccadjApplyToJDRu baseAccadjApplyToJDRu : baseAccadjApplyToJDRus) {
List<BaseVehicle> baseVehicles = baseAccadjApplyToJDRu.getBaseVehicles();
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles1 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicles1.get(0);
//调入取车辆信息
BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle1.getVinNo(), baseAccadjApply.getCallInOrgSid());
//调出取车辆信息
BaseVehicle baseVehicleDC = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle1.getVinNo(), baseAccadjApply.getCallOutOrgSid());
//调出采购系统sid(部门sid)
String purchaseSystemSid = baseVehicles.get(0).getPurchaseSystemSid();
String purchaseSystemSid = baseVehicleDC.getPurchaseSystemSid();
//调出获取采购系统
BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVoDC = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
//调出获取采购系统中的财务分公司编码
@ -502,8 +529,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
SysOrganization sysOrganizationDC = sysOrganizationFeign.selectByOrgCode(orgCodeDC).getData();
//调出获取组织的otherCode
String otherCodeDC = sysOrganizationDC.getOtherCode();
//调入取车辆信息
BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicles.get(0).getVinNo(), baseAccadjApply.getCallInOrgSid());
//调入采购系统sid(部门sid)
String purchaseSystemSidDR = baseVehicleDR.getPurchaseSystemSid();
//调入获取采购系统
@ -526,56 +551,58 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
String callInBuyerOrgSid = baseAccadjApplyToJDRu.getCallInBuyerOrgSid();
SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
stkInStock.setFPurchaseDeptId(data.getOrgCode());
//stkInStock.setFPurchaseDeptId("05.04");
//采购组织:FPurchaseOrgId (必填项)
//分公司id
List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles2 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicles2.get(0);
//ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
stkInStock.setFPurchaseOrgId(orgCodeDR);
//分配目标组织:TOrgId (必填项)
stkInStock.setTOrgId(stkInStock.getFPurchaseOrgId());
//供应商:FSupplierId (必填项)
stkInStock.setFSupplierId(otherCodeDC);
//stkInStock.setFSupplierId("010001");
// 物料列表:FInStockEntry (必填项)
List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
String vinNo = baseInternalPurchaseVehicle.getVinNo();
//单价 目前放的是内销价 应该是厂家结算价 目前没有厂家结算价 需要后期修改为厂家结算价
sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
//车辆类型
BaseVehicle baseVehicle2 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
String manufacturerSid = baseVehicle2.getManufacturerSid();
String s = baseManufacturerBankService.fetchByMainSidAndManufSaleAccessName(manufacturerSid, baseVehicle2.getManufSaleAccessName());
BaseVehicle baseVehicleDRCL = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
String manufacturerSid = baseVehicleDRCL.getManufacturerSid();
String s = baseManufacturerBankService.fetchByMainSidAndManufSaleAccessName(manufacturerSid, baseVehicleDRCL.getManufSaleAccessName());
sf.setCllx(s);//TODO
//车辆类型
sf.setCllxType(s);
// 批号:FLot
//批号:FLot
sf.setFLot(baseInternalPurchaseVehicle.getVinNo());
// 物料编码:FMaterialId (必填项)
//物料编码:FMaterialId (必填项)
sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo().substring(baseInternalPurchaseVehicle.getVinNo().length() - 8));
// 仓库:FStockId
BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
//fe.setFStockID(voResultBean.getData().getGressionCode());
String location = baseVehicle1.getLocation();
//仓库:FStockId
String location = baseVehicleDRCL.getLocation();
ScmWarehouseVo data1 = scmWarehouseFeign.fetchBySid(location).getData();
sf.setFStockId(data1.getGressionCode());
// fe.setFStockID("CK001");
//fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
//物料分组
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseInternalPurchaseVehicle.getModelSid());
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicleDRCL.getCarBrandSid());
if (baseVehicleBrand != null) {
sf.setWlfz(baseVehicleBrand.getBrandCode());
// sf.setWlfz("01");
}
//物料分组
//sf.setWlfzType("01");
//存货类别
sf.setFCategoryIDKey(baseVehicle1.getManPurOrderTypeKey());
sf.setFCategoryIDKey(baseVehicleDRCL.getManPurOrderTypeKey());
sf.setFCategoryIDType("purchaseOrderType");
fInStockEntry.add(sf);
//构造入库查询车辆
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo());
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDRCL.getManufSaleAccessKey());
scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleDRCL.getManufSaleAccessName());
scmApplyInboundVehQueryDto.setIunit("辆");
scmApplyInboundVehQueryDto.setNum("1");
scmApplyInboundVehQueryDto.setSettleMoney(String.valueOf(baseVehicleDRCL.getCostPrice()));
scmApplyInboundVehQueryDto.setLocalName("在途仓库");
scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
}
stkInStock.setFInStockEntry(fInStockEntry);
//推送财务供应商信息
@ -583,7 +610,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
bdSupplier.setFName(sysOrganizationDC.getName());
bdSupplier.setFLocMobile("13333333333");
bdSupplier.setFNumber(otherCodeDC);
bdSupplier.setFUseOrgId(orgCodeDC);
bdSupplier.setFUseOrgId(orgCodeDR);
//推送车辆入库查询
ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date()));
@ -606,24 +633,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
scmApplyInboundQueryDto.setCreateOrgName(sysOrganizationVoCreate.getName());
scmApplyInboundQueryDto.setBusSid(baseAccadjApply.getSid());
List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo());
BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), baseAccadjApply.getCallInOrgSid());
BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle1.getCarBrandSid());
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicle1.getModelSid()).getData();
scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
scmApplyInboundVehQueryDto.setIunit("辆");
scmApplyInboundVehQueryDto.setNum("1");
scmApplyInboundVehQueryDto.setSettleMoney(String.valueOf(baseVehicle1.getCostPrice()));
scmApplyInboundVehQueryDto.setLocalName("在途仓库");
scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
}
scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
ResultBean<String> save = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto);
if (!save.getSuccess()) {

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@ -491,6 +491,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(baseVehicleOut.getCreateBySid());
baseVehicleOut.setCreateByName(baseVehicleOut.getCreateByName());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseVehicleOutService.save(baseVehicleOut);
//推送金蝶挂车销售出库单

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

@ -491,4 +491,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid);
void updateVehicleStateAndSaleDate(String sid);
}

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

@ -592,19 +592,19 @@
</select>
<select id="getVins" resultType="com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo">
SELECT bv.vinNo AS vin,
bv.locationName AS address,
bv.sid AS carSid
SELECT bv.vinNo AS vin,
bv.locationName AS address,
bv.sid AS carSid
FROM base_vehicle bv
WHERE bv.modelSid = #{modelSid}
AND bv.modelConfigSid = #{configSid}
AND bv.lockedState = #{state}
and bv.useOrgSid = #{orgSid}
AND (
bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入'
)
AND bv.modelConfigSid = #{configSid}
AND bv.lockedState = #{state}
and bv.useOrgSid = #{orgSid}
AND (
bv.vehicleStateValue = '库存'
or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入'
)
<if test="name != null and name != ''">
and bv.vinNo LIKE concat('%', #{name}, '%')
</if>
@ -1048,7 +1048,7 @@
or bv.vehicleStateValue = '在途'
or bv.vehicleStateValue = '调入'
)
order by isFictitious,bv.locationName,bv.vinNo desc
order by isFictitious, bv.locationName, bv.vinNo desc
</select>
<select id="selectAppListOne" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
@ -1563,11 +1563,22 @@
<select id="selectByfMaterialID" resultType="java.lang.String">
SELECT orderingNo
FROM base_vehicle
WHERE vinNo like concat('%', #{fMaterialID}, '%')
LIMIT 1
WHERE vinNo like concat('%', #{fMaterialID}, '%') LIMIT 1
</select>
<select id="getSystem" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo">
select purchaseSystemName,sid from base_purchase_system where useOrgSid = #{useOrgSid} and deptSid = #{purchaseSystemSid}
select purchaseSystemName, sid
from base_purchase_system
where useOrgSid = #{useOrgSid}
and deptSid = #{purchaseSystemSid}
</select>
<update id="updateVehicleStateAndSaleDate">
UPDATE
base_vehicle
SET vehicleState = "0001",
vehicleStateValue = "库存",
salesDate = null
WHERE sid = #{sid}
</update>
</mapper>

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

@ -525,9 +525,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo());
scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode());
scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName());
BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData();
scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey());
scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleDto1.getManufSaleAccessName());
scmApplyInboundVehQueryDto.setIunit("辆");
scmApplyInboundVehQueryDto.setNum("1");
scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice()));

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

@ -3645,4 +3645,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
basePurchSystemVo.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
return rb.success().setData(basePurchSystemVo);
}
public void updateVehicleStateAndSaleDate(String sid) {
baseMapper.updateVehicleStateAndSaleDate(sid);
}
}

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

@ -58,4 +58,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid,printerType);
return rb.success().setData(pdf);
}
@Override
public ResultBean delBySid(String sid) {
return baseVehicleOutService.delBySid(sid);
}
}

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

@ -84,8 +84,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
@Autowired
private BaseVehinstallService baseVehinstallService;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private BusSalesOrderFeign busSalesOrderFeign;
@Autowired
private SysUserFeign sysUserFeign;
@ -293,6 +291,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(dto.getCreateBySid());
baseVehicleOut.setCreateByName(dto.getCreateByName());
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo);
@ -582,6 +583,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
baseVehicleOut.setCreateBySid(dto.getCreateBySid());
baseVehicleOut.setCreateByName(dto.getCreateByName());
baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
baseVehicleOut.setManPurOrderTypeKey(baseVehicle.getManPurOrderTypeKey());
baseVehicleOut.setManPurOrderTypeValue(baseVehicle.getManPurOrderTypeValue());
//保存车辆出库单子表
baseMapper.insert(baseVehicleOut);
dto.setBillNo(billNo);
@ -683,17 +687,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
private BdCustomer createBdMiddle(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
BdCustomer bdCustomer = new BdCustomer();
BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
if (data != null) {
bdCustomer.setTOrgIds(data.getOrgCode());
} else {
ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
if (resultBean.getSuccess()) {
SysOrganizationVo vo = resultBean.getData();
if (vo != null) {
bdCustomer.setTOrgIds(vo.getOrgCode());
}
}
}
bdCustomer.setTOrgIds(data.getOrgCode());
//TODO 去中介人表 查询手机号码 根据中介人sid: middleOneSid
// 拼接: bdCustomer.setFName(中介人名称(MiddleOne) + 手机号后四位);
BaseMiddleman baseMiddleman = baseMiddlemanService.fetchBySid(dto.getMiddleOneSid());
@ -1115,4 +1109,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
public BaseVehicleOutDetailsVo selByOrgSidAndVehSid(String useOrgSid, String vehSid) {
return baseMapper.selByOrgSidAndVehSid(useOrgSid, vehSid);
}
public ResultBean delBySid(String sid) {
ResultBean rb = ResultBean.fireFail();
BaseVehicleOut baseVehicleOut = fetchBySid(sid);
//删除出库车辆信息
deleteBySid(sid);
//删除出库申请单
baseVehicleOutApplyService.deleteBySid(baseVehicleOut.getMainSid());
BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicleOut.getVinNo(), baseVehicleOut.getCreateOrgSid());
baseVehicleService.updateVehicleStateAndSaleDate(baseVehicle.getSid());
return rb.success();
}
}

39
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@ -23,6 +23,8 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailDto;
import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
import com.yxt.anrui.base.api.busvehicleapplysz.BusVehicleApplySz;
import com.yxt.anrui.base.api.busvehicleorder.ActualAndOrgDeptVo;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.biz.basemanufactorsubscription.BaseManufactorSubscriptionService;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
@ -31,6 +33,8 @@ import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
import com.yxt.anrui.base.biz.busvehicleapplydetail.BusVehicleApplyDetailService;
import com.yxt.anrui.base.biz.busvehicleapplysz.BusVehicleApplySzService;
import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService;
import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.base.common.enums.ManPurOrderType;
@ -52,6 +56,7 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -127,7 +132,10 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
private SysProUrlFeign sysProUrlFeign;
@Autowired
private BasePurchaseSystemService basePurchaseSystemService;
@Autowired
private FileUploadComponent fileUploadComponent;
@Autowired
private CommonAppendixService commonAppendixService;
/**
* 分页列表
*
@ -215,6 +223,14 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
busVehicleApplyDetailsVo.setOrgPath(busVehicleApply.getOrgSidPath());
List<BusVehicleApplyDetailVo> busVehicleApplyDetailVos = busVehicleApplyDetailService.fetchByApplySid(sid);
busVehicleApplyDetailsVo.setBusVehicleApplyDetailList(busVehicleApplyDetailVos);
List<CommonAppendixVo> commonAppendixVos = commonAppendixService.selByLinkSid(sid);
for (CommonAppendixVo commonAppendixVo : commonAppendixVos) {
String filePath = commonAppendixVo.getFilePath();
String urlPrefix = fileUploadComponent.getUrlPrefix();
filePath = urlPrefix + filePath;
commonAppendixVo.setFilePath(filePath);
}
busVehicleApplyDetailsVo.setCommonAppendixs(commonAppendixVos);
return busVehicleApplyDetailsVo;
}
@ -237,6 +253,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
public ResultBean<String> saveOrUpdateDto(BusVehicleApplyDto dto) {
ResultBean<String> rb = ResultBean.fireFail();
String sid = dto.getSid();
List<CommonAppendixDto> commonAppendixs = dto.getCommonAppendixs();
if (StringUtils.isBlank(sid)) {//新增
//=======================================
String orgSidPath = "";
@ -295,6 +312,15 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
entity.setSupplierSid(manufacturerSid);
baseMapper.insert(entity);
sid = entity.getSid();
for (CommonAppendixDto commonAppendix : commonAppendixs) {
String filePath = commonAppendix.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendix.setFilePath(filePath);
commonAppendix.setLinkSid(sid);
commonAppendixService.saveOrUpdateDto(commonAppendix);
}
} else {//修改
BusVehicleApply busVehicleApply = fetchBySid(sid);
if (busVehicleApply == null) {
@ -326,7 +352,16 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
}
busVehicleApply.setCurrentAmount(i);
baseMapper.updateById(busVehicleApply);
commonAppendixService.deleteFiles(sid);
for (CommonAppendixDto commonAppendix : commonAppendixs) {
String filePath = commonAppendix.getFilePath();
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) {
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), "");
}
commonAppendix.setFilePath(filePath);
commonAppendix.setLinkSid(sid);
commonAppendixService.saveOrUpdateDto(commonAppendix);
}
}
return rb.success().setData(sid);
}

1
anrui-buscenter/anrui-buscenter-ui/src/views/hetongguanli/hetongdanganguanli/hetongdanganguanliAdd.vue

@ -207,6 +207,7 @@ export default {
getOneContract(row.sid).then((res) => {
if (res.success) {
this.temp = res.data
this.temp.instanceId = res.data.procInstId
this.temp.userSid = window.sessionStorage.getItem('userSid')
if (this.temp.contractImages.length > 0) {
this.temp.contractImages.forEach((e) => {

1
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdanganEdit.vue

@ -214,6 +214,7 @@ export default {
getOneContract(row).then((res) => {
if (res.success) {
this.temp = res.data
this.temp.instanceId = res.data.procInstId
if (this.temp.contractImages.length > 0) {
this.temp.contractImages.forEach((e) => {
this.list1.push({

9
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/chunafukuan/cashier.js

@ -10,6 +10,15 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表(待付款列表--层级查询)
listPageCJCX: function(params) {
return request({
url: '/fin/v1/finpaymentrecord/listPageCJCX',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 更新
update: function(params) {
return request({

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

@ -155,12 +155,20 @@ const codemenu = [
meta: {
title: '出纳付款列表'
},
children: [{
children: [
{
path: '/chunafukuan/chunafukuanguanli',
component: () => import('@/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue'),
name: 'cashier',
meta: { title: '出纳付款', noCache: true }
}]
},
{
path: '/chunafukuan/daifukuanguanli',
component: () => import('@/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue'),
name: 'DaiFuKuan',
meta: { title: '待付款', noCache: true }
}
]
},
// 开票信息管理
{

378
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue

@ -0,0 +1,378 @@
<template>
<div class="app-container">
<!-- Start 列表页面 -->
<div>
<button-bar view-title="待付款列表" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="款项类别">
<el-select v-model="listQuery.params.costTypeKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in costType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="款项名称">
<el-select v-model="listQuery.params.costTitleKey" placeholder="请选择" clearable class="addinputw">
<el-option v-for="item in costTitle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="审批日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="handleFilter" icon="el-icon-search" size="small">查询</el-button>
<el-button type="primary" @click="handleReset" icon="el-icon-refresh" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">待付款列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50" fixed type="selection" align="center"/>
<el-table-column width="80" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed width="100" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handlePrint(scope.row)">审批下载</el-button>
</template>
</el-table-column>
<el-table-column label="状态" width="80" align="center">
<template slot-scope="scope">
<span>{{ scope.row.state }}</span>
</template>
</el-table-column>
<el-table-column label="审批日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="款项类别" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.costTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="款项名称" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.costTitleValue }}</span>
</template>
</el-table-column>
<el-table-column label="收款单位名称" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.receiveCompany }}</span>
</template>
</el-table-column>
<el-table-column label="收款账号" align="center" width="130">
<template slot-scope="scope">
<span>{{ scope.row.receiveBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="收款账户开户行" align="center" min-width="150">
<template slot-scope="scope">
<span>{{ scope.row.receiveBank }}</span>
</template>
</el-table-column>
<el-table-column label="金额" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.cost }}</span>
</template>
</el-table-column>
<el-table-column label="开户名称" align="center" width="150">
<template slot-scope="scope">
<span>{{ scope.row.payBank }}</span>
</template>
</el-table-column>
<el-table-column label="付款账号" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.payBankAccount }}</span>
</template>
</el-table-column>
<el-table-column label="付款备注" align="center" width="180">
<template slot-scope="scope">
<span>{{ scope.row.payRemark }}</span>
</template>
</el-table-column>
<el-table-column label="付款人" align="center" width="90">
<template slot-scope="scope">
<span>{{ scope.row.name }}</span>
</template>
</el-table-column>
<el-table-column label="付款日期" align="center" width="100">
<template slot-scope="scope">
<span>{{ scope.row.payDate }}</span>
</template>
</el-table-column>
<el-table-column label="付款凭证" align="center" class-name="small-padding fixed-width" width="90">
<template slot-scope="scope">
<el-button v-show="scope.row.payFiles" size="mini" type="primary" @click="handleGetCheck(scope.row)">查看</el-button>
</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>
<!-- End 列表页面 -->
<!-- 照片弹窗 -->
<el-dialog title="" :visible.sync="dialogImgVisible" :append-to-body="true">
<el-form>
<el-row>
<el-col :span="24">
<el-form-item>
<el-image style="width: 178px;height: 178px;" v-for="(item) in url_list" @click="open(item)" :src="item"></el-image>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<el-dialog :visible.sync="dialogUrlVisible" :append-to-body="true">
<img width="100%" :src="dialogUrl" alt="">
</el-dialog>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { typeValues } from '@/api/jichuxinxi/dictcommons'
import req from '@/api/anruifinmanagement/chunafukuan/cashier'
import { getStorage } from '@/utils/auth'
export default {
name: 'DaiFuKuan',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
submitdisabled: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
dialogImgVisible: false,
dialogUrlVisible: false,
// -----------
tableKey: 0,
list: [],
dialogUrl: '',
url_list: [],
sids: [],
state_list: [
{
dictKey: 1,
dictValue: '未支付'
},
{
dictKey: 2,
dictValue: '已支付'
},
{
dictKey: 3,
dictValue: '已作废'
}
],
costType_list: [],
costTitle_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
costTitleKey: '',
costTypeKey: '',
createEndDate: '',
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
},
current: 1,
size: 10,
total: 0
}
}
},
created() {
//
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
init() {
typeValues({ type: 'payCostType' }).then((res) => {
if (res.success) {
this.costType_list = res.data
}
})
typeValues({ type: 'payCostTitle' }).then((res) => {
if (res.success) {
this.costTitle_list = res.data
}
})
this.getList()
},
handleSelectionChange(row) {
console.log('aaa', row)
const aa = []
row.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
console.log('获取sids数组', this.sids)
},
//
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.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPageCJCX(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
this.listQuery = {
params: {
costTitleKey: '',
costTypeKey: '',
createEndDate: '',
createStartDate: '',
state: '',
userSid: '',
orgPath: ''
},
current: 1,
size: 10,
total: 0
}
this.getList()
},
handleGetCheck(row) {
this.dialogImgVisible = true
this.url_list = row.payFiles
},
handlePrint(row) {
req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((resp) => {
if (resp.success && resp.data.pdfPath !== '') {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.pdfPath + '&outFileName=' + '出纳', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '预付款申请.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
if (resp.success && resp.data.fjPath !== '' && resp.data.fjType !== '') {
var FJ = new XMLHttpRequest()
FJ.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + resp.data.fjPath + '&outFileName=' + '车辆外采合同附件', true)
FJ.setRequestHeader('token', getStorage())
FJ.responseType = 'blob'
FJ.onload = function(e) {
//
var blob = this.response
var filename = '申请附件' + resp.data.fjType
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
FJ.send()
}
})
},
open(value) {
this.dialogUrlVisible = true
this.dialogUrl = value
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeign.java

@ -62,6 +62,11 @@ public interface FinPaymentrecordFeign {
@ResponseBody
public ResultBean<PagerVo<FinPaymentrecordVo>> listPage(@RequestBody PagerQuery<FinPaymentrecordQuery> pq);
@ApiOperation("根据条件分页查询数据的列表(层级查询)")
@PostMapping("/listPageCJCX")
@ResponseBody
public ResultBean<PagerVo<FinPaymentrecordVo>> listPageCJCX(@RequestBody PagerQuery<FinPaymentrecordQuery> pq);
@ApiOperation("新增")
@PostMapping("/save")
@ResponseBody

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordFeignFallback.java

@ -56,6 +56,11 @@ public class FinPaymentrecordFeignFallback implements FinPaymentrecordFeign {
return rb.setMsg("接口anrui-fin/finpaymentrecord/listPage无法访问");
}
@Override
public ResultBean<PagerVo<FinPaymentrecordVo>> listPageCJCX(PagerQuery<FinPaymentrecordQuery> pq) {
return null;
}
@Override
public ResultBean save(FinPaymentrecordDto dto) {
return ResultBean.fireFail().setMsg("接口anrui-fin/finpaymentrecord/save无法访问");

1
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml

@ -25,6 +25,7 @@
fp.payFile,
fp.payCode
FROM fin_paymentrecord fp
LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
<where>
${ew.sqlSegment}
</where>

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordRest.java

@ -65,6 +65,13 @@ public class FinPaymentrecordRest implements FinPaymentrecordFeign {
return rb.success().setData(pv);
}
@Override
public ResultBean<PagerVo<FinPaymentrecordVo>> listPageCJCX(PagerQuery<FinPaymentrecordQuery> pq) {
ResultBean rb = ResultBean.fireFail();
PagerVo<FinPaymentrecordVo> pv = finPaymentrecordService.listPageCJCX(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean save(FinPaymentrecordDto dto) {
return finPaymentrecordService.saveDto(dto);

56
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java

@ -182,6 +182,62 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
return p;
}
public PagerVo<FinPaymentrecordVo> listPageCJCX(PagerQuery<FinPaymentrecordQuery> pq) {
FinPaymentrecordQuery pageQuery = pq.getParams();
QueryWrapper<FinPaymentrecord> qw = new QueryWrapper<>();
if (pageQuery != null) {
//根据用户的组织机构查询分公司
String orgSidPath = pageQuery.getOrgPath();
//分公司sid
String orgSid = sysStaffOrgFeign.getOrgSidByPath(orgSidPath).getData();
SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
String orgLevelKey = data.getOrgLevelKey();
if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, 73);
qw.like("so.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
qw.eq("fp.createOrgSid", orgSid);
}
//付款状态
if (StringUtils.isNotBlank(pageQuery.getState())) {
qw.eq("fp.state", pageQuery.getState());
}
//款项类别
if (StringUtils.isNotBlank(pageQuery.getCostTypeKey())) {
qw.eq("fp.costTypekey", pageQuery.getCostTypeKey());
}
//款项名称
if (StringUtils.isNotBlank(pageQuery.getCostTitleKey())) {
qw.eq("fp.costTitleKey", pageQuery.getCostTitleKey());
}
//申请日期
qw.apply(StringUtils.isNotBlank(pageQuery.getCreateStartDate()), "date_format (fp.createTime,'%Y-%m-%d') >= date_format('" + pageQuery.getCreateStartDate() + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(pageQuery.getCreateEndDate()), "date_format (fp.createTime,'%Y-%m-%d') <= date_format('" + pageQuery.getCreateEndDate() + "','%Y-%m-%d')"
);
}
qw.orderByDesc("fp.createTime");
IPage<FinPaymentrecord> page = PagerUtil.queryToPage(pq);
IPage<FinPaymentrecordVo> pagging = baseMapper.selectPageVo(page, qw);
List<FinPaymentrecordVo> list = pagging.getRecords();
list.removeAll(Collections.singleton(null));
if (!list.isEmpty()) {
for (FinPaymentrecordVo vv : list) {
String payFile = vv.getPayFile();
if (StringUtils.isNotBlank(payFile)) {
List<String> strings = Arrays.asList(payFile.split(","));
for (int i = 0; i < strings.size(); i++) {
if (!strings.get(i).contains(fileUploadComponent.getUrlPrefix())) {
strings.set(i, fileUploadComponent.getUrlPrefix() + strings.get(i));
}
}
vv.setPayFiles(strings);
}
}
}
PagerVo<FinPaymentrecordVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public ResultBean saveDto(FinPaymentrecordDto dto) {
ResultBean rb = ResultBean.fireFail();
FinPaymentrecord finPaymentrecord = new FinPaymentrecord();

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -10,7 +10,7 @@ public enum ProcDefEnum {
ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO:正式新2022-11-25
SALESPOLICY("销售政策审批流程", "process_biw9gfh7:3:917504"),//TODO:正式新2023-02-21
FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
ARREARSCARRYVEHICLE("欠款提车审批流程", "process_8ax1xxn3:1:795004"),

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

@ -54,4 +54,6 @@ public class SysFunctionVo implements Vo {
@ApiModelProperty("前端控制按钮的id")
@JsonProperty("cId")
private String cId;
@ApiModelProperty("说明")
private String remarks;
}

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

@ -62,8 +62,10 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
@Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
@Select("SELECT sf.name,sf.sid FROM sys_function sf WHERE sf.actionUrl= #{pageUrl}")
List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
@Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked FROM sys_function sf " +
" LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid " +
" WHERE sf.actionUrl= #{pageUrl} ")
List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
" WHERE sf.actionUrl= #{pageUrl} AND srf.roleSid = #{roleSid} ")
List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl,@Param("roleSid") String roleSid);
}

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

@ -62,7 +62,7 @@
</select>
<select id="getButtonPermissions" resultType="com.yxt.anrui.portal.api.sysfunction.ButtonPermissionVo">
select sf.cId as buttonId from sys_function sf
where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid in(
where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid not in(
SELECT srf.functionSid FROM sys_user_role sur
LEFT JOIN sys_role_function srf ON sur.roleSid = srf.rolesid
WHERE sur.userSid=#{query.userSid})

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

@ -35,247 +35,268 @@ import java.util.Map;
*/
@Service
public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, SysFunction> {
@Autowired
private SysSourceService sysSourceService;
@Autowired
private SysSourceFunctionService sysSourceFunctionService;
public PagerVo<SysFunction> listPage(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunction> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysFunction> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysFunction> listAll(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysFunction> createQueryWrapper(SysFunctionQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
@Autowired
private SysSourceService sysSourceService;
@Autowired
private SysSourceFunctionService sysSourceFunctionService;
public PagerVo<SysFunction> listPage(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunction> pagging = baseMapper.selectPage(page, qw);
PagerVo<SysFunction> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysFunction> listAll(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
return baseMapper.selectList(qw);
}
private QueryWrapper<SysFunction> createQueryWrapper(SysFunctionQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(query.getName())) {
qw.eq("name", query.getName());
}
if (query.getLevel() != null) {
qw.eq("level", query.getLevel());
}
if (StringUtils.isNotBlank(query.getParentSid())) {
qw.eq("parentSid", query.getParentSid());
}
if (StringUtils.isNotBlank(query.getActionUrl())) {
qw.eq("actionUrl", query.getActionUrl());
}
if (StringUtils.isNotBlank(query.getControllerName())) {
qw.eq("controllerName", query.getControllerName());
}
if (StringUtils.isNotBlank(query.getFunId())) {
qw.eq("funId", query.getFunId());
}
if (query.getPhoneFunction() != null) {
qw.eq("phoneFunction", query.getPhoneFunction());
}
return qw;
}
public PagerVo<SysFunctionVo> listPageVo(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunctionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysFunctionVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
if (StringUtils.isNotBlank(query.getName())) {
qw.eq("name", query.getName());
}
public List<SysFunctionVo> listAllVo(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
qw.eq("func.parentSid", "0");
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
for (SysFunctionVo s : sysFunctionVos) {
getChildrens(s);
}
return sysFunctionVos;
}
if (query.getLevel() != null) {
qw.eq("level", query.getLevel());
}
private void getChildrens(SysFunctionVo s) {
String sid = s.getSid();
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid);
}
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
if (!sysFunctionVos.isEmpty()) {
for (SysFunctionVo sfv : sysFunctionVos) {
getChildrens(sfv);
}
}
s.setChildren(sysFunctionVos);
}
if (StringUtils.isNotBlank(query.getParentSid())) {
qw.eq("parentSid", query.getParentSid());
}
public List<SysFunctionVo> listVo() {
return baseMapper.selectListVo();
}
if (StringUtils.isNotBlank(query.getActionUrl())) {
qw.eq("actionUrl", query.getActionUrl());
}
public void saveOrUpdateDto(SysFunctionDto dto) {
SysFunction entity = new SysFunction();
dto.fillEntity(entity);
SysSourceFunction sysSourceFunction = new SysSourceFunction();
sysSourceFunction.setFunctionSid(entity.getSid());
sysSourceFunction.setSourceSid(dto.getSourceSid());
setRootSid(entity, sysSourceFunction);
sysSourceFunctionService.save(sysSourceFunction);
this.saveOrUpdate(entity);
}
if (StringUtils.isNotBlank(query.getControllerName())) {
qw.eq("controllerName", query.getControllerName());
}
private void setRootSid(SysFunction entity, SysSourceFunction sysSourceFunction) {
String pSid = entity.getParentSid();
if ("0".equals(pSid)) {
sysSourceFunction.setFunctionRootSid(entity.getSid());
} else {
SysFunction sysFunction = this.fetchBySid(pSid);
String pSid1 = sysFunction.getParentSid();
if ("0".equals(pSid1)) {
sysSourceFunction.setFunctionRootSid(sysFunction.getSid());
}
setRootSid(sysFunction, sysSourceFunction);
}
}
if (StringUtils.isNotBlank(query.getFunId())) {
qw.eq("funId", query.getFunId());
}
public SysFunctionVo fetchByIdVo(String id) {
SysFunction entity = this.fetchById(id);
SysFunctionVo vo = new SysFunctionVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
if (query.getPhoneFunction() != null) {
qw.eq("phoneFunction", query.getPhoneFunction());
}
return qw;
}
public PagerVo<SysFunctionVo> listPageVo(PagerQuery<SysFunctionQuery> pq) {
SysFunctionQuery query = pq.getParams();
QueryWrapper<SysFunction> qw = createQueryWrapper(query);
IPage<SysFunction> page = PagerUtil.queryToPage(pq);
IPage<SysFunctionVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<SysFunctionVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
public List<SysFunctionVo> listAllVo(SysFunctionQuery query) {
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
qw.eq("func.parentSid", "0");
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
for(SysFunctionVo s:sysFunctionVos){
getChildrens(s);
}
return sysFunctionVos;
}
private void getChildrens(SysFunctionVo s){
String sid = s.getSid();
QueryWrapper<SysFunction> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid);
}
List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
if(!sysFunctionVos.isEmpty()){
for(SysFunctionVo sfv:sysFunctionVos){
getChildrens(sfv);
}
}
s.setChildren(sysFunctionVos);
}
public List<SysFunctionVo> listVo() {
return baseMapper.selectListVo();
}
public void saveOrUpdateDto(SysFunctionDto dto){
SysFunction entity = new SysFunction();
dto.fillEntity(entity);
SysSourceFunction sysSourceFunction = new SysSourceFunction();
sysSourceFunction.setFunctionSid(entity.getSid());
sysSourceFunction.setSourceSid(dto.getSourceSid());
setRootSid(entity,sysSourceFunction);
sysSourceFunctionService.save(sysSourceFunction);
this.saveOrUpdate(entity);
}
private void setRootSid(SysFunction entity,SysSourceFunction sysSourceFunction){
String pSid = entity.getParentSid();
if("0".equals(pSid)){
sysSourceFunction.setFunctionRootSid(entity.getSid());
}else{
SysFunction sysFunction = this.fetchBySid(pSid);
String pSid1 = sysFunction.getParentSid();
if("0".equals(pSid1)){
sysSourceFunction.setFunctionRootSid(sysFunction.getSid());
}
setRootSid(sysFunction,sysSourceFunction);
}
}
public SysFunctionVo fetchByIdVo(String id){
SysFunction entity = this.fetchById(id);
SysFunctionVo vo = new SysFunctionVo();
BeanUtil.copyProperties(entity, vo);
return vo;
}
public List<SysFunctionVo> listAllByRoleSid(SysFunctionQuery query) {
List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(), "0");
for (SysFunctionVo s : sysFunctionVos) {
getChildrensByRoleSid(s, query.getRoleSid());
}
return sysFunctionVos;
}
public List<SysFunctionVo> listAllByRoleSid(SysFunctionQuery query) {
List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(),"0");
for(SysFunctionVo s:sysFunctionVos){
getChildrensByRoleSid(s,query.getRoleSid());
}
return sysFunctionVos;
}
private void getChildrensByRoleSid(SysFunctionVo s,String roleSid){
List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid,s.getSid());
if(!sysFunctionVos.isEmpty()){
for(SysFunctionVo sfv:sysFunctionVos){
getChildrensByRoleSid(sfv,roleSid);
}
}
s.setChildren(sysFunctionVos);
}
private void getChildrensByRoleSid(SysFunctionVo s, String roleSid) {
List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid, s.getSid());
if (!sysFunctionVos.isEmpty()) {
for (SysFunctionVo sfv : sysFunctionVos) {
getChildrensByRoleSid(sfv, roleSid);
}
}
s.setChildren(sysFunctionVos);
}
public List<SysFunctionTreeVo> listAllVoForSource(SysFunctionQuery query) {
String name = query.getName();
List<SysFunctionTreeVo> sysSourceVos = sysSourceService.listFunctionTreeVo(name);
for (SysFunctionTreeVo s : sysSourceVos) {
List<SysFunctionTreeVo> sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid());
s.setChildren(sysFunctionVoList);
s.setIsSource("1");
//判断该资源下的功能是否有可用的状态
int isEnable = 1;
int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid());
if (count == 0) {
s.setIsEnable("0");
} else {
s.setIsEnable("1");
}
if (!sysFunctionVoList.isEmpty()) {
public List<SysFunctionTreeVo> listAllVoForSource(SysFunctionQuery query) {
String name = query.getName();
List<SysFunctionTreeVo> sysSourceVos = sysSourceService.listFunctionTreeVo(name);
for (SysFunctionTreeVo s : sysSourceVos) {
List<SysFunctionTreeVo> sysFunctionVoList = sysSourceFunctionService.fetchRootFunctionBySourceSid(s.getSourceSid());
for (SysFunctionTreeVo sysFunctionTreeVo : sysFunctionVoList) {
if (StringUtils.isNotBlank(sysFunctionTreeVo.getRemarks())){
sysFunctionTreeVo.setName(sysFunctionTreeVo.getName() + "(" + sysFunctionTreeVo.getRemarks() + ")");
}
}
s.setChildren(sysFunctionVoList);
s.setIsSource("1");
//判断该资源下的功能是否有可用的状态
int isEnable = 1;
int count = baseMapper.selectBySourceSid(isEnable, s.getSourceSid());
if (count == 0) {
s.setIsEnable("0");
} else {
s.setIsEnable("1");
}
if (!sysFunctionVoList.isEmpty()) {
// sysFunctionVoList = getChildrensForFunctionTree(sysFunctionVoList);
getChildList(sysFunctionVoList);
}
}
return sysSourceVos;
}
getChildList(sysFunctionVoList);
}
}
return sysSourceVos;
}
public void getChildList(List<SysFunctionTreeVo> list) {
list.forEach(str -> {
String sid = str.getSid();
List<SysFunctionTreeVo> listChildren = baseMapper.selectChildernList(sid);
str.setChildren(listChildren);
getChildList(listChildren);
});
}
public void getChildList(List<SysFunctionTreeVo> list) {
list.forEach(str -> {
String sid = str.getSid();
List<SysFunctionTreeVo> listChildren = baseMapper.selectChildernList(sid);
str.setChildren(listChildren);
getChildList(listChildren);
});
}
private List<SysFunctionTreeVo> getChildrensForFunctionTree(List<SysFunctionTreeVo> sysFunctionVoList) {
List<SysFunctionTreeVo> list = new ArrayList<>();
for (SysFunctionTreeVo s : sysFunctionVoList) {
SysFunction sysFunction = fetchBySid(s.getFunctionRootSid());
SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo();
BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo);
/*sysFunctionTreeVo.setParentName("顶级功能");*/
list.add(sysFunctionTreeVo);
}
for (SysFunctionTreeVo s : list) {
getChildrensForFunctionTree(s, s.getSid());
}
return list;
}
private List<SysFunctionTreeVo> getChildrensForFunctionTree(List<SysFunctionTreeVo> sysFunctionVoList) {
List<SysFunctionTreeVo> list = new ArrayList<>();
for (SysFunctionTreeVo s : sysFunctionVoList) {
SysFunction sysFunction = fetchBySid(s.getFunctionRootSid());
SysFunctionTreeVo sysFunctionTreeVo = new SysFunctionTreeVo();
BeanUtil.copyProperties(sysFunction, sysFunctionTreeVo);
/*sysFunctionTreeVo.setParentName("顶级功能");*/
list.add(sysFunctionTreeVo);
}
for (SysFunctionTreeVo s : list) {
getChildrensForFunctionTree(s, s.getSid());
}
return list;
}
private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) {
QueryWrapper<SysFunctionTreeVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid);
}
List<SysFunctionTreeVo> sysMenuVos = baseMapper.getChildrensForFunctionTree(qw);
if (!sysMenuVos.isEmpty()) {
for (SysFunctionTreeVo smv : sysMenuVos) {
private void getChildrensForFunctionTree(SysFunctionTreeVo s, String sid) {
QueryWrapper<SysFunctionTreeVo> qw = new QueryWrapper<>();
if (StringUtils.isNotBlank(sid)) {
qw.eq("func.parentSid", sid);
}
List<SysFunctionTreeVo> sysMenuVos = baseMapper.getChildrensForFunctionTree(qw);
if (!sysMenuVos.isEmpty()) {
for (SysFunctionTreeVo smv : sysMenuVos) {
/*SysFunction sysFunction = fetchBySid(sid);
smv.setParentName(sysFunction.getName());*/
getChildrensForFunctionTree(smv, smv.getSid());
}
}
s.setChildren(sysMenuVos);
}
getChildrensForFunctionTree(smv, smv.getSid());
}
}
s.setChildren(sysMenuVos);
}
public int updateBySourceSid(Integer isEnable, List<String> sids) {
return baseMapper.updateBySourceSid(isEnable, sids);
}
public int updateBySourceSid(Integer isEnable, List<String> sids) {
return baseMapper.updateBySourceSid(isEnable, sids);
}
public List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) {
List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
return buttonPermissions ;
public List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) {
List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
return buttonPermissions;
}
public List<Map<String, Object>> getFunctionAuthorization(String roleSid) {
List<Map<String,Object>> list=new ArrayList<>();
List<Map<String, Object>> lsources=baseMapper.getSourceAuthorization(roleSid);
lsources.forEach(f->{
Map<String,Object> map=new HashMap<>();
map.put("name",f.get("sourceName").toString());
map.put("sid",f.get("sid").toString());
map.put("checked","1");
list.add(map);
});
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> lsources = baseMapper.getSourceAuthorization(roleSid);
lsources.forEach(f -> {
Map<String, Object> map = new HashMap<>();
map.put("name", f.get("sourceName").toString());
map.put("sid", f.get("sid").toString());
map.put("checked", "1");
list.add(map);
});
list.forEach(f->{
List<Map<String,Object>> list2=new ArrayList<>();
String sid = f.get("sid").toString();
List<Map<String, Object>> lmenus=baseMapper.getMenuAuthorization(sid);
lmenus.forEach(ff->{
Map<String,Object> map=new HashMap<>();
map.put("name",ff.get("name"));
String sids = ff.get("sid").toString();
map.put("sid",sids);
map.put("checked","1");
map.put("children",new ArrayList<>());
if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){
String pageUrl =ff.get("pageUrl").toString();
List<Map<String, Object>> lfuncs=baseMapper.getFunctionAuthorization(pageUrl);
lfuncs.forEach(fun->{
fun.put("children",new ArrayList<>());
});
map.put("children",lfuncs);
}
list2.add(map);
});
f.put("children",list2);
});
return list;
list.forEach(f -> {
List<Map<String, Object>> list2 = new ArrayList<>();
String sid = f.get("sid").toString();
List<Map<String, Object>> lmenus = baseMapper.getMenuAuthorization(sid);
lmenus.forEach(ff -> {
Map<String, Object> map = new HashMap<>();
map.put("name", ff.get("name"));
String sids = ff.get("sid").toString();
map.put("sid", sids);
map.put("checked", "1");
map.put("children", new ArrayList<>());
if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) {
String pageUrl = ff.get("pageUrl").toString();
List<Map<String, Object>> lfuncs = baseMapper.getFunctionAuthorization(pageUrl);
List<Map<String, Object>> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid);
if (lfuncs.size() > 0){
for (Map<String, Object> lfunc : lfuncs) {
for (Map<String, Object> funByRole : functionByRoleSid) {
if (lfunc.get("sid").equals(funByRole.get("sid"))) {
lfunc.put("checked", "0");
}
}
lfunc.put("children", new ArrayList<>());
}
}
map.put("children", lfuncs);
}
list2.add(map);
});
f.put("children", list2);
});
return list;
}
}

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java

@ -85,7 +85,7 @@ public class SysMenuRest implements SysMenuFeign {
@Override
public ResultBean<List<Map<String, String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
ResultBean rb = ResultBean.fireFail();
ResultBean rb = ResultBean.fireFail();
SysMenuQuery smq= new SysMenuQuery();
smq.setSourceSid(sysMenuFunctionQuery.getSourceSid());
List<SysMenuTreeVo> list = sysMenuService.listAllVoForSource(smq);

2
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrolefunction/SysRoleFunctionMapper.java

@ -38,6 +38,6 @@ public interface SysRoleFunctionMapper extends BaseMapper<SysRoleFunction> {
@Select("select * from sys_role_function")
List<SysRoleFunctionVo> selectListVo();
@Delete("delete from sys_source_role where roleSid=#{roleSid} ")
@Delete("delete from sys_role_function where roleSid=#{roleSid} ")
void deleteByRoleSid(@Param("roleSid") String roleSid);
}

1
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml

@ -9,6 +9,7 @@
<where>
${ew.sqlSegment}
</where>
ORDER BY saiq.createTime DESC
</select>
<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo">

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

@ -18,6 +18,15 @@ export function fetcBySid(sid) {
})
}
// 车辆销售台账--删除
export function delBySid(data) {
return request({
url: '/base/v1/basevehicleout/delBySid',
method: 'delete',
params: data
})
}
// 下载
export function createPdf(data) {
return request({

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

@ -244,3 +244,13 @@ export function selectModelName(data) {
params: data
})
}
// 根据当前登录用户的角色获取菜单分页列表页面右上角按钮的隐藏
export function getButtonPermissions(data) {
return request({
url: '/portal/v1/sysfunction/getButtonPermissions',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

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

@ -444,7 +444,7 @@
<script>
import { basefinbankExportExcel, deleteBySids, pagerList, selectCarTransferListAll, updateVehRemarks } from '@/api/cheliang/basevehicle'
import { typeValues, brandDown, getOrgSidByPath, fetchByUseOrgSid } from '@/api/cheliang/dictcommons'
import { typeValues, brandDown, getOrgSidByPath, fetchByUseOrgSid, getButtonPermissions } from '@/api/cheliang/dictcommons'
import cheliangtaizhangAdd from './cheliangtaizhangAdd'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
@ -482,13 +482,13 @@ export default {
btndisabled: false,
// ---------
btnList: [
// {
// type: 'primary',
// size: 'small',
// icon: 'plus',
// btnKey: 'toAdd',
// btnLabel: ''
// },
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'primary',
size: 'small',
@ -496,13 +496,13 @@ export default {
btnKey: 'toEdit',
btnLabel: '编辑'
},
// {
// type: 'danger',
// size: 'small',
// icon: 'del',
// btnKey: 'doDel',
// btnLabel: ''
// },
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'primary',
size: 'small',
@ -677,7 +677,18 @@ export default {
this.getPathSid()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
//

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

@ -61,9 +61,10 @@
<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 width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="130" align="center">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50" fixed type="selection" align="center"/>
<el-table-column width="60" fixed label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" fixed width="130" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleDownLoad(scope.row)">下载</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
@ -219,11 +220,11 @@
</template>
<script>
import { pagerList, createPdf } from '@/api/cheliang/cheliangxiaoshou'
import { pagerList, createPdf, delBySid } from '@/api/cheliang/cheliangxiaoshou'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { typeValues, getOrgSidByPath, selectOrgList, selectOrgByLevel } from '@/api/cheliang/dictcommons'
import { typeValues, getOrgSidByPath, selectOrgList, selectOrgByLevel, getButtonPermissions } from '@/api/cheliang/dictcommons'
import chelaingxiaoshouInfo from './chelaingxiaoshouInfo'
import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/vehicleconfiguration'
import { getStorage } from '@/utils/auth'
@ -246,6 +247,13 @@ export default {
printSid: '',
print: '',
btnList: [
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
@ -258,6 +266,7 @@ export default {
searchxianshitit: '显示查询条件',
// -----------
tableKey: 0,
sids: [],
list: [],
org_list: [],
userOrg_list: [],
@ -292,7 +301,18 @@ export default {
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
if (res.success) {
for (var i = 0; i < res.data.length; i++) {
for (var k = 0; k < this.btnList.length; k++) {
if (res.data[i].buttonId === this.btnList[k].btnKey) {
this.btnList.splice(k, 1)
}
}
}
this.$refs['btnbar'].setButtonList(this.btnList)
}
})
},
methods: {
init() {
@ -330,6 +350,9 @@ export default {
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
@ -359,6 +382,13 @@ export default {
}
})
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
},
//
handleFilter() {
this.listQuery.current = 1
@ -437,6 +467,37 @@ export default {
this.viewState = 3
this.$refs['divPeizhi'].showInfo(row)
},
doDel() {
if (this.sids.length === 1) {
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
delBySid({ sid: this.sids[0] }).then((resp) => {
if (resp.success) {
loading.close()
this.$message({ showClose: true, type: 'success', message: '删除成功' })
this.getList()
} else {
loading.close()
}
}).catch(() => {
loading.close()
})
})
} else {
this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行删除操作'})
return
}
},
resetState() {
this.viewState = 1
},

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouAdd.vue

@ -51,7 +51,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<el-select v-model="formobj.callInBuyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeCallInBuyerOrg">
<el-option v-for="item in callInBuyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangneigou/cheliangneigouInfo.vue

@ -49,7 +49,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByBusinessDivisionInfo.vue

@ -51,7 +51,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByShunTingTypeValueInfo.vue

@ -51,7 +51,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanByVinNoInfo.vue

@ -51,7 +51,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue

@ -51,7 +51,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue

@ -50,7 +50,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<el-select v-model="formobj.callInBuyerOrgName" placeholder="请选择" clearable class="addinputw addinputwOne" :disabled="dialogStatus == 'edit'" @change="changeCallInBuyerOrg">
<el-option v-for="item in callInBuyerOrg_list" :key="item.sid" :label="item.name" :value="item.name"/>

2
anrui-scm/anrui-scm-ui/src/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue

@ -49,7 +49,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty spanOneWidth"><span>调入采购部门</span></div>
<div class="span-sty spanOneWidth"><span>调入采购系统</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.callInBuyerOrgName }}</span>
</el-form-item>

Loading…
Cancel
Save