Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
God 3 years ago
parent
commit
28d400255c
  1. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java
  2. 11
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java
  3. 10
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java
  4. 9
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java
  5. 6
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java
  6. 10
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml
  7. 55
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
  8. 9
      anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js
  9. 65
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue
  10. 160
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue
  11. 73
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue
  12. 164
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue
  13. 73
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue
  14. 10
      anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js
  15. 9
      anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js
  16. 70
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue
  17. 200
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
  18. 93
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptInfo.vue
  19. 4
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue
  20. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java
  21. 15
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java
  22. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java
  23. 16
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmation.java
  24. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDetailsVo.java
  25. 14
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationDto.java
  26. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java
  27. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java
  28. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java
  29. 17
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/app/FinConfirmDto.java
  30. 11
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java
  31. 10
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java
  32. 21
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java
  33. 7
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java
  34. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java
  35. 21
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml
  36. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java
  37. 86
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  38. 6
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java
  39. 40
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml
  40. 15
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java
  41. 33
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java
  42. 2
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java
  43. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java
  44. 10
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java
  45. 9
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java
  46. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java
  47. 63
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java
  48. 56
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java
  49. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java
  50. 19
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java
  51. 16
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java
  52. 15
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java
  53. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java
  54. 67
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java
  55. 80
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java

@ -98,5 +98,16 @@ public class AppBusDepositBusDetailsVo implements Vo {
@ApiModelProperty("制单日期") @ApiModelProperty("制单日期")
private String createDate; private String createDate;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
} }

11
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java

@ -85,4 +85,15 @@ public class AppBusDepositBuscenterDetailVo implements Vo {
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private String taskId; private String taskId;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
} }

10
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java

@ -107,6 +107,16 @@ public class BusDeposit extends BaseEntity {
@ApiModelProperty("付款凭证") @ApiModelProperty("付款凭证")
private String paymentProof; private String paymentProof;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
// @ApiModelProperty(value = "节点状态") // @ApiModelProperty(value = "节点状态")
// private String nodeState; // private String nodeState;

9
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java

@ -84,4 +84,13 @@ public class AppBusDepositBuscenterDto implements Dto {
@ApiModelProperty("收款银行") @ApiModelProperty("收款银行")
private String collectionBankKey; private String collectionBankKey;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
} }

6
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java

@ -26,7 +26,6 @@
package com.yxt.anrui.buscenter.api.busmaindeposit; package com.yxt.anrui.buscenter.api.busmaindeposit;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo; import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -114,7 +113,10 @@ public class AppBusMainDepositVo implements Vo {
@ApiModelProperty("订车特殊:审批成功后不再显示流程状态显示为 : 有效期:3天/2天/1天;失效") @ApiModelProperty("订车特殊:审批成功后不再显示流程状态显示为 : 有效期:3天/2天/1天;失效")
private String virtualOrderState2; private String virtualOrderState2;
@ApiModelProperty("已使用订金")
private String usedDeposit; private String usedDeposit;
@ApiModelProperty("财务确认状态")
private String paymentState;
} }

10
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml

@ -22,7 +22,10 @@
draweeMobile AS phone, draweeMobile AS phone,
vehicleNum AS carNumber, vehicleNum AS carNumber,
staffName AS sellerName, staffName AS sellerName,
orgName AS departmentName orgName AS departmentName,
collectionAccountName,
depositBank,
accountSid
FROM bus_deposit FROM bus_deposit
WHERE billSid = #{virtualOrderSid} WHERE billSid = #{virtualOrderSid}
</select> </select>
@ -45,7 +48,10 @@
payBankAcc AS payNumber, payBankAcc AS payNumber,
proBankValue AS collectionBank, proBankValue AS collectionBank,
proBankKey AS collectionBankKey, proBankKey AS collectionBankKey,
proBankAccKey AS collectionNumberKey proBankAccKey AS collectionNumberKey,
collectionAccountName,
depositBank,
accountSid
FROM bus_deposit FROM bus_deposit
WHERE billSid = #{virtualOrderSid} WHERE billSid = #{virtualOrderSid}
AND staffSid = #{staffSid} AND staffSid = #{staffSid}

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

@ -64,6 +64,7 @@ import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCu
import com.yxt.anrui.buscenter.biz.flow.FlowableService; import com.yxt.anrui.buscenter.biz.flow.FlowableService;
import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign; import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.FinConfirmDto;
import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -676,6 +677,23 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元"); record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
}*/ }*/
record.setCarNumber(vo.getCarNumber()); record.setCarNumber(vo.getCarNumber());
//财务确认状态字段
if("已办结".equals(record.getVirtualOrderState())){
//查询款项确认的busSid是否存在该申请的sid
ResultBean<FinCollectionConfirmation> finCollectionConfirmationResultBean = finCollectionConfirmationFeign.selectByBusSid(record.getVirtualOrderSid());
//审核状态(1待审核/2已驳回/3已审核)
FinCollectionConfirmation finCollectionConfirmation = finCollectionConfirmationResultBean.getData();
if(finCollectionConfirmation != null){
if("1".equals(finCollectionConfirmation.getAuditState())){
record.setPaymentState("待确认");
}else if("2".equals(finCollectionConfirmation.getAuditState())){
record.setPaymentState("驳回");
}else{
record.setPaymentState("已确认");
}
}
}
} else if (record.getVirtualOrderType().equals("02")) { } else if (record.getVirtualOrderType().equals("02")) {
BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid); BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid);
int count = baseMapper.selByBillSidCount(virtualOrderSid); int count = baseMapper.selByBillSidCount(virtualOrderSid);
@ -684,8 +702,6 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
record.setCustomerName(busDepositVehicleCustomer.getCustomerName()); record.setCustomerName(busDepositVehicleCustomer.getCustomerName());
record.setMobile(busDepositVehicleCustomer.getCustomerMobile()); record.setMobile(busDepositVehicleCustomer.getCustomerMobile());
} }
// ResultBean<SysFormStateVo> resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid());
// 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止 // 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止
if ("待提交".equals(record.getVirtualOrderState())) { if ("待提交".equals(record.getVirtualOrderState())) {
record.setShowDeleteBtn(true); record.setShowDeleteBtn(true);
@ -2110,24 +2126,25 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
finConfirmDto.setBusNo(busMainDeposit.getBillNo()); finConfirmDto.setBusNo(busMainDeposit.getBillNo());
finConfirmDto.setAuditState(1); finConfirmDto.setAuditState(1);
finConfirmDto.setCreateByName(busDeposit.getStaffName()); finConfirmDto.setCreateByName(busDeposit.getStaffName());
/* List<FinSelectDto> list = new ArrayList<>(); finConfirmDto.setRemarks(busDeposit.getRemarks());
if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) { //ToDo:赋值
List<BusDepositCustomerVo> customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid()); //查询打款凭证
for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) { finConfirmDto.setPaymentVoucherUrl(busDeposit.getPaymentProof());
FinSelectDto finSelectDto = new FinSelectDto(); //申请部门
BusDepositCustomerVo bus = customerList.get(0); List<String> orgList = Arrays.asList(bv.getOrgSidPath().split("/"));
if (bus != null) { String deptSid = orgList.get(orgList.size() - 1);
finSelectDto.setCustomerName(bus.getCustomerName()); ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid);
finSelectDto.setCustomerSid(bus.getCustomerSid()); if(sysOrganizationVoResultBean.getData() != null){
finSelectDto.setCustomerPhone(bus.getCustomerMobile()); finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName());
finSelectDto.setCurrentReceivableMoney(busDeposit.getDeposit().divide(new BigDecimal(busDeposit.getVehicleNum())).toString());
finSelectDto.setSubscriptionDate(DateUtil.today());
finSelectDto.setReceivablesName("订金");
list.add(finSelectDto);
}
}
} }
finConfirmDto.setFinSelectList(list);*/ //申请日期
finConfirmDto.setCreateDate(DateUtil.today());
//收款账户名称
finConfirmDto.setReceivingName(busDeposit.getCollectionAccountName());
//付款账号后4位
finConfirmDto.setPayAccount(busDeposit.getPayBankAcc());
//付款银行
finConfirmDto.setPayBank(busDeposit.getDepositBank());
finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto); finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto);
} }
if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {

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

@ -28,6 +28,15 @@ export function typeValues(data) {
}) })
} }
// 根据用户sid获取本分公司下的银行账号
export function selAccountByOrgSid(data) {
return request({
url: '/fin/v1/finmanufacturerbank/selAccountByOrgSid',
method: 'get',
params: data
})
}
// 品牌下拉 // 品牌下拉
export function brandDown(data) { export function brandDown(data) {
return request({ return request({

65
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue

@ -12,12 +12,7 @@
<div class=""> <div class="">
<div class="titwu">销售简易订单</div> <div class="titwu">销售简易订单</div>
<el-form ref="dataForm" :model="temp" class="formadd"> <el-form ref="dataForm" :model="temp" class="formadd">
<el-row class="rowStyle"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb colStyle">
<span>金额单位: </span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>分公司</span> <span>分公司</span>
</el-col> </el-col>
@ -71,17 +66,25 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>车辆台数</span> <span>付款方式</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.carNumber }}</span> <span>{{ temp.payTypeValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>订金金额</span> <span>付款日期</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item>
<span>{{ temp.payDate }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>订金金额()</span>
</el-col>
<el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.deposit }}</span> <span>{{ temp.deposit }}</span>
</el-form-item> </el-form-item>
@ -89,29 +92,43 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款日期</span> <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payDate }}</span> <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款方式</span> <span>开户银行</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payTypeValue }}</span> <span>{{ temp.depositBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款银行账号</span> </el-col>
<el-col :span="5">
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb">
<span>车辆台数</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payNumber }}</span> <span>{{ temp.carNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
@ -122,10 +139,18 @@
<span>{{ temp.collectionNumber }}</span> <span>{{ temp.collectionNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
<span>收款银行名称</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionAccountName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>收款银行</span> <span>收款银行</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.collectionBank }}</span> <span>{{ temp.collectionBank }}</span>
</el-form-item> </el-form-item>
@ -492,12 +517,6 @@ export default {
text-align: center; text-align: center;
padding: 30px 0 20px 0; padding: 30px 0 20px 0;
} }
.rowStyle {
border-left: 0px !important;
}
.colStyle {
border-right: 0px !important;
}
.rowClass{ .rowClass{
border-top: 1px solid #E0E3EB; border-top: 1px solid #E0E3EB;
} }

160
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue

@ -11,12 +11,7 @@
<div class=""> <div class="">
<div class="titwu">销售简易订单</div> <div class="titwu">销售简易订单</div>
<el-form ref="dataForm" :model="temp" class="formadd" :rules="rules"> <el-form ref="dataForm" :model="temp" class="formadd" :rules="rules">
<el-row class="rowStyle"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb colStyle">
<span>金额单位: </span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>分公司</span> <span>分公司</span>
</el-col> </el-col>
@ -70,17 +65,27 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>车辆台数</span> <span><span class="icon">*</span>付款方式</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item prop="payType">
<el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/> <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
<el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金金额</span> <span><span class="icon">*</span>付款日期</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item prop="payDate">
<el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金金额()</span>
</el-col>
<el-col :span="5">
<el-form-item prop="deposit"> <el-form-item prop="deposit">
<el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/> <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
</el-form-item> </el-form-item>
@ -88,53 +93,71 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>付款日期</span> <span v-show="temp.payTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="payDate"> <el-form-item prop="payNumber">
<el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker> <el-input v-show="temp.payTypeKey === '03'" v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>付款方式</span> <span>开户银行</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="payType"> <el-form-item>
<el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType"> <el-input v-model="temp.depositBank" class="addinputw" placeholder="" clearable/>
<el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>付款银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="payNumber">
<el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>收款银行</span> <span>车辆台数</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item prop="collectionBank"> <el-form-item>
<el-select v-model="temp.collectionBank" class="addinputw" placeholder="" @change="changeproBank"> <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
<el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>收款银行账号</span> <span><span class="icon">*</span>收款银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="collectionNumber"> <el-form-item prop="collectionNumber">
<el-select v-model="temp.collectionNumber" class="addinputw" placeholder="" @change="changeProBankAccValue"> <el-select v-model="temp.collectionNumber" class="addinputw" filterable clearable placeholder="" @change="changeProBankAccValue">
<el-option v-for="item in ProBankAcc_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/> <el-option v-for="item in ProBankAcc_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
<span>收款银行名称</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionAccountName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>收款银行</span>
</el-col>
<el-col :span="5">
<el-form-item prop="collectionBank">
<span>{{ temp.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
@ -196,7 +219,7 @@
<script> <script>
import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit' import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons' import { fetchBySid, getPathSidByUserSid, selAccountByOrgSid } from '@/api/dictcommons/dictcommons'
import Upload from '@/components/uploadFile/upload.vue' // import Upload from '@/components/uploadFile/upload.vue' //
import xuanzekehu from './relation/xuanzekehu' import xuanzekehu from './relation/xuanzekehu'
@ -222,7 +245,6 @@ export default {
viewState: 1, viewState: 1,
listLoading: false, listLoading: false,
paymentType_list: [], paymentType_list: [],
proBank_list: [],
ProBankAcc_list: [], ProBankAcc_list: [],
temp: { temp: {
departmentName: '', departmentName: '',
@ -247,7 +269,10 @@ export default {
userSid: window.sessionStorage.getItem('userSid'), // Sid userSid: window.sessionStorage.getItem('userSid'), // Sid
virtualOrderSid: '', // Sid virtualOrderSid: '', // Sid
taskId: '', // Id taskId: '', // Id
procInsId: '' // ID procInsId: '', // ID
depositBank: '',
collectionAccountName: '',
accountSid: ''
}, },
customerName: [], customerName: [],
rules: { rules: {
@ -256,7 +281,6 @@ export default {
deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }], deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }], payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }], payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
payNumber: [{ required: true, message: '付款银行账号不能为空', trigger: 'blur' }],
collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }], collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }] collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }]
} }
@ -283,21 +307,15 @@ export default {
methods: { methods: {
getType() { getType() {
// //
typeValues({ typeValues({ type: 'customerPayType' }).then((res) => {
type: 'customerPayType'
}).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.paymentType_list = res.data this.paymentType_list = res.data
console.log('下拉框请求111', res.data) console.log('下拉框请求111', res.data)
} }
}) })
// selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
typeValues({ if (resp.success) {
type: 'receiptBank' this.ProBankAcc_list = resp.data
}).then((res) => {
if (res.code === '200') {
this.proBank_list = res.data
console.log('下拉框请求111', res.data)
} }
}) })
}, },
@ -319,47 +337,23 @@ export default {
this.temp.payTypeKey = bb.key this.temp.payTypeKey = bb.key
console.log('name', this.temp.payType, 'key', this.temp.payTypeKey) console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
}, },
changeproBank(value) {
console.log('触发下拉框按钮')
let bb = null
this.proBank_list.forEach((e) => {
if (e.dictValue === value) {
bb = {
type: e.dictType,
name: e.dictValue,
key: e.dictKey,
sid: e.sid
}
}
})
this.temp.collectionBank = bb.name
this.temp.collectionBankKey = bb.key
this.getProBankAcc(bb.sid)
},
getProBankAcc(sid) {
typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
if (res.code === '200') {
this.ProBankAcc_list = res.data
console.log('下拉框请求111', res.data)
}
})
},
changeProBankAccValue(value) { changeProBankAccValue(value) {
console.log('触发下拉框按钮') console.log('触发下拉框按钮')
let bb = null let bb = null
this.ProBankAcc_list.forEach((e) => { this.ProBankAcc_list.forEach((e) => {
if (e.dictValue === value) { if (e.bankAccount === value) {
bb = { bb = {
type: e.dictType, accountSid: e.accountSid,
name: e.dictValue, accountName: e.accountName,
key: e.dictKey, depositBank: e.depositBank,
sid: e.sid bankAccount: e.bankAccount
} }
} }
}) })
this.temp.collectionNumber = bb.name this.temp.collectionNumber = bb.bankAccount
this.temp.collectionNumberKey = bb.key this.temp.collectionAccountName = bb.accountName
console.log('name', this.temp.collectionNumber, 'key', this.temp.collectionNumberKey) this.temp.accountSid = bb.accountSid
this.temp.collectionBank = bb.depositBank
}, },
getPathSid() { getPathSid() {
const userSid = window.sessionStorage.getItem('userSid') const userSid = window.sessionStorage.getItem('userSid')
@ -466,6 +460,10 @@ export default {
// //
handleSubmit() { handleSubmit() {
this.getUrl() this.getUrl()
if (this.temp.payTypeKey === '03' && this.temp.payNumber === '') {
this.$message({ showClose: true, type: 'error', message: '因付款方式为转账,则付款账号不能为空' })
return
}
if (this.temp.payImages.length === 0) { if (this.temp.payImages.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' }) this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
return return
@ -533,12 +531,6 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.rowStyle {
border-left: 0px !important;
}
.colStyle {
border-right: 0px !important;
}
.tips { .tips {
font-size: 12px; font-size: 12px;
color: #606266; color: #606266;

73
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquInfo.vue

@ -10,12 +10,7 @@
<div class=""> <div class="">
<div class="titwu">销售简易订单</div> <div class="titwu">销售简易订单</div>
<el-form ref="dataForm" :model="temp" class="formadd"> <el-form ref="dataForm" :model="temp" class="formadd">
<el-row class="rowStyle"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb colStyle">
<span>金额单位: </span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>分公司</span> <span>分公司</span>
</el-col> </el-col>
@ -69,17 +64,25 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>车辆台数</span> <span>付款方式</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.carNumber }}</span> <span>{{ temp.payTypeValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>订金金额</span> <span>付款日期</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item>
<span>{{ temp.payDate }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>订金金额()</span>
</el-col>
<el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.deposit }}</span> <span>{{ temp.deposit }}</span>
</el-form-item> </el-form-item>
@ -87,39 +90,45 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款日期</span> <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payDate }}</span> <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款方式</span> <span>开户银行</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payTypeValue }}</span> <span>{{ temp.depositBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item>
<span>{{ temp.payNumber }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>收款银行</span> <span>车辆台数</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.collectionBank }}</span> <span>{{ temp.carNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -128,6 +137,22 @@
<span>{{ temp.collectionNumber }}</span> <span>{{ temp.collectionNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
<span>收款银行名称</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionAccountName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>收款银行</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
@ -298,10 +323,4 @@ export default {
text-align: center; text-align: center;
padding: 30px 0 20px 0; padding: 30px 0 20px 0;
} }
.rowStyle {
border-left: 0px !important;
}
.colStyle {
border-right: 0px !important;
}
</style> </style>

164
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjinAdd.vue

@ -12,12 +12,7 @@
<div class="listconadd"> <div class="listconadd">
<div class="titwu">销售简易订单</div> <div class="titwu">销售简易订单</div>
<el-form ref="dataForm" :model="temp" class="formadd" :rules="rules"> <el-form ref="dataForm" :model="temp" class="formadd" :rules="rules">
<el-row class="rowStyle"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb colStyle">
<span>金额单位: </span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>分公司</span> <span>分公司</span>
</el-col> </el-col>
@ -71,17 +66,27 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>车辆台数</span> <span><span class="icon">*</span>付款方式</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item prop="payType">
<el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/> <el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType">
<el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金金额</span> <span><span class="icon">*</span>付款日期</span>
</el-col>
<el-col :span="5">
<el-form-item prop="payDate">
<el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker>
</el-form-item>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>订金金额()</span>
</el-col>
<el-col :span="5">
<el-form-item prop="deposit"> <el-form-item prop="deposit">
<el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/> <el-input v-model="temp.deposit" class="addinputw" placeholder="" clearable/>
</el-form-item> </el-form-item>
@ -89,53 +94,71 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>付款日期</span> <span v-show="temp.payTypeKey === '03'"><span class="icon">*</span>付款账号后4位</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="payDate"> <el-form-item>
<el-date-picker v-model="temp.payDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" class="addinputw"></el-date-picker> <el-input v-show="temp.payTypeKey === '03'" v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>付款方式</span> <span>开户银行</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="payType"> <el-form-item>
<el-select v-model="temp.payType" class="addinputw" placeholder="" @change="changePaymentType"> <el-input v-model="temp.depositBank" class="addinputw" placeholder="" clearable/>
<el-option v-for="item in paymentType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>付款银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="payNumber">
<el-input v-model="temp.payNumber" class="addinputw" placeholder="" clearable/>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>收款银行</span> <span>车辆台数</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item prop="collectionBank"> <el-form-item>
<el-select v-model="temp.collectionBank" placeholder="" @change="changeproBank"> <el-input v-model="temp.carNumber" class="addinputw" placeholder="" clearable/>
<el-option v-for="item in proBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span><span class="icon">*</span>收款银行账号</span> <span><span class="icon">*</span>收款银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item prop="collectionNumber"> <el-form-item prop="collectionNumber">
<el-select v-model="temp.collectionNumber" class="addinputw" placeholder="" @change="changeProBankAccValue"> <el-select v-model="temp.collectionNumber" class="addinputw" filterable clearable placeholder="" @change="changeProBankAccValue">
<el-option v-for="item in ProBankAcc_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/> <el-option v-for="item in ProBankAcc_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
<span>收款银行名称</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionAccountName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span><span class="icon">*</span>收款银行</span>
</el-col>
<el-col :span="5">
<el-form-item prop="collectionBank">
<span>{{ temp.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
@ -198,7 +221,7 @@
<script> <script>
import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit' import { depositDetail, saveDing, submitApprove, typeValues } from '@/api/jichuxinxi/busdeposit'
import { fetchBySid, getPathSidByUserSid } from '@/api/dictcommons/dictcommons' import { fetchBySid, getPathSidByUserSid, selAccountByOrgSid } from '@/api/dictcommons/dictcommons'
import Upload from '@/components/uploadFile/upload.vue' // import Upload from '@/components/uploadFile/upload.vue' //
import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu' import xuanzekehu from '@/views/xiaoshouguanli/xunidingdan/com/xuanzekehu'
@ -224,7 +247,6 @@ export default {
viewState: 1, viewState: 1,
listLoading: false, listLoading: false,
paymentType_list: [], paymentType_list: [],
proBank_list: [],
ProBankAcc_list: [], ProBankAcc_list: [],
temp: { temp: {
departmentName: '', departmentName: '',
@ -249,7 +271,10 @@ export default {
userSid: window.sessionStorage.getItem('userSid'), // Sid userSid: window.sessionStorage.getItem('userSid'), // Sid
virtualOrderSid: '', // Sid virtualOrderSid: '', // Sid
taskId: '', // Id taskId: '', // Id
procInsId: '' // ID procInsId: '', // ID
depositBank: '',
collectionAccountName: '',
accountSid: ''
}, },
customerName: [], customerName: [],
rules: { rules: {
@ -258,7 +283,6 @@ export default {
deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }], deposit: [{ required: true, message: '订金金额不能为空', trigger: 'blur' }],
payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }], payDate: [{ required: true, message: '付款日期不能为空', trigger: 'change' }],
payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }], payType: [{ required: true, message: '付款方式不能为空', trigger: 'change' }],
payNumber: [{ required: true, message: '付款银行账号不能为空', trigger: 'blur' }],
collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }], collectionBank: [{ required: true, message: '收款银行不能为空', trigger: 'change' }],
collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }] collectionNumber: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }]
} }
@ -267,21 +291,15 @@ export default {
methods: { methods: {
getType() { getType() {
// //
typeValues({ typeValues({ type: 'customerPayType' }).then((res) => {
type: 'customerPayType'
}).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.paymentType_list = res.data this.paymentType_list = res.data
console.log('下拉框请求111', res.data) console.log('下拉框请求111', res.data)
} }
}) })
// selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
typeValues({ if (resp.success) {
type: 'receiptBank' this.ProBankAcc_list = resp.data
}).then((res) => {
if (res.code === '200') {
this.proBank_list = res.data
console.log('下拉框请求111', res.data)
} }
}) })
}, },
@ -301,45 +319,22 @@ export default {
this.temp.payTypeKey = bb.key this.temp.payTypeKey = bb.key
console.log('name', this.temp.payType, 'key', this.temp.payTypeKey) console.log('name', this.temp.payType, 'key', this.temp.payTypeKey)
}, },
changeproBank(value) {
let bb = null
this.proBank_list.forEach((e) => {
if (e.dictValue === value) {
bb = {
type: e.dictType,
name: e.dictValue,
key: e.dictKey,
sid: e.sid
}
}
})
this.temp.collectionBank = bb.name
this.temp.collectionBankKey = bb.key
this.getProBankAcc(bb.sid)
},
getProBankAcc(sid) {
typeValues({ psid: sid, type: 'receiptAccount' }).then((res) => {
if (res.code === '200') {
this.ProBankAcc_list = res.data
console.log('下拉框请求111', res.data)
}
})
},
changeProBankAccValue(value) { changeProBankAccValue(value) {
let bb = null let bb = null
this.ProBankAcc_list.forEach((e) => { this.ProBankAcc_list.forEach((e) => {
if (e.dictValue === value) { if (e.bankAccount === value) {
bb = { bb = {
type: e.dictType, accountSid: e.accountSid,
name: e.dictValue, accountName: e.accountName,
key: e.dictKey, depositBank: e.depositBank,
sid: e.sid bankAccount: e.bankAccount
} }
} }
}) })
this.temp.collectionNumber = bb.name this.temp.collectionNumber = bb.bankAccount
this.temp.collectionNumberKey = bb.key this.temp.collectionAccountName = bb.accountName
console.log('name', this.temp.collectionNumber, 'key', this.temp.collectionNumberKey) this.temp.accountSid = bb.accountSid
this.temp.collectionBank = bb.depositBank
}, },
getPathSid() { getPathSid() {
const userSid = window.sessionStorage.getItem('userSid') const userSid = window.sessionStorage.getItem('userSid')
@ -462,6 +457,10 @@ export default {
// //
handleSubmit() { handleSubmit() {
this.getUrl() this.getUrl()
if (this.temp.payTypeKey === '03' && this.temp.payNumber === '') {
this.$message({ showClose: true, type: 'error', message: '因付款方式为转账,则付款账号不能为空' })
return
}
if (this.temp.payImages.length === 0) { if (this.temp.payImages.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' }) this.$message({ showClose: true, type: 'error', message: '请上传付款凭证' })
return return
@ -522,7 +521,10 @@ export default {
userSid: '', // Sid userSid: '', // Sid
virtualOrderSid: '', // Sid virtualOrderSid: '', // Sid
taskId: '', // Id taskId: '', // Id
procInsId: '' // ID procInsId: '', // ID
depositBank: '',
collectionAccountName: '',
accountSid: ''
} // } //
this.submitdisabled = false this.submitdisabled = false
this.$refs['uploadImg'].stateName = '' // this.$refs['uploadImg'].stateName = '' //
@ -557,10 +559,4 @@ export default {
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
.rowStyle {
border-left: 0px !important;
}
.colStyle {
border-right: 0px !important;
}
</style> </style>

73
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xunidingdan/xunidingjininfo.vue

@ -10,12 +10,7 @@
<div class="listconadd"> <div class="listconadd">
<div class="titwu">销售简易订单</div> <div class="titwu">销售简易订单</div>
<el-form ref="dataForm" :model="temp" class="formadd"> <el-form ref="dataForm" :model="temp" class="formadd">
<el-row class="rowStyle"> <el-row style="border-top: 1px solid #E0E3EB">
<el-col :span="24" class="tleftb colStyle">
<span>金额单位: </span>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>分公司</span> <span>分公司</span>
</el-col> </el-col>
@ -69,17 +64,25 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>车辆台数</span> <span>付款方式</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.carNumber }}</span> <span>{{ temp.payTypeValue }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>订金金额</span> <span>付款日期</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item>
<span>{{ temp.payDate }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>订金金额()</span>
</el-col>
<el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.deposit }}</span> <span>{{ temp.deposit }}</span>
</el-form-item> </el-form-item>
@ -87,39 +90,45 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款日期</span> <span v-show="temp.payTypeKey === '03'">付款账号后4位</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payDate }}</span> <span v-show="temp.payTypeKey === '03'">{{ temp.payNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款方式</span> <span>开户银行</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.payTypeValue }}</span> <span>{{ temp.depositBank }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>付款银行账号</span>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item>
<span>{{ temp.payNumber }}</span>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>收款银行</span> <span>车辆台数</span>
</el-col> </el-col>
<el-col :span="13"> <el-col :span="5">
<el-form-item> <el-form-item>
<span>{{ temp.collectionBank }}</span> <span>{{ temp.carNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
<el-col :span="3" class="tleftb">
</el-col>
<el-col :span="5">
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
<span>收款银行账号</span> <span>收款银行账号</span>
</el-col> </el-col>
@ -128,6 +137,22 @@
<span>{{ temp.collectionNumber }}</span> <span>{{ temp.collectionNumber }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="3" class="tleftb">
<span>收款银行名称</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionAccountName }}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="tleftb">
<span>收款银行</span>
</el-col>
<el-col :span="5">
<el-form-item>
<span>{{ temp.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="3" class="tleftb"> <el-col :span="3" class="tleftb">
@ -229,10 +254,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
.rowStyle {
border-left: 0px !important;
}
.colStyle {
border-right: 0px !important;
}
</style> </style>

10
anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js

@ -1,5 +1,4 @@
import request from '@/utils/request' import request from '@/utils/request'
import qs from 'querystring'
// 收款确认管理和出纳款项管理分页列表条件查询 // 收款确认管理和出纳款项管理分页列表条件查询
export function listPage(data) { export function listPage(data) {
@ -24,11 +23,11 @@ export function listAll(data) {
}) })
} }
// 收款确认管理h和出纳款项确认管理--回显、详情 // 收款确认管理和出纳款项确认管理--回显、详情
export function fetchBySid(data) { export function fetchDetailBySid(data) {
return request({ return request({
url: '/fin/fincollectionconfirmation/fetchBySid/' + data, url: '/fin/fincollectionconfirmation/fetchBySid/' + data,
method: 'get', method: 'get'
}) })
} }
@ -111,7 +110,8 @@ export function dataDictionary(data) {
// 上传文件 // 上传文件
export function upload(data) { export function upload(data) {
return request({ return request({
url: '/fin/file/upload',data, url: '/fin/file/upload',
data,
method: 'post', method: 'post',
headers: { headers: {
'Content-Type': 'multipart/form-data' 'Content-Type': 'multipart/form-data'

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

@ -64,6 +64,15 @@ export function selectAccountByUseOrgSid(data) {
}) })
} }
// 根据用户sid获取本分公司下的银行账号
export function selAccountByOrgSid(data) {
return request({
url: '/fin/v1/finmanufacturerbank/selAccountByOrgSid',
method: 'get',
params: data
})
}
// 获取厂家回款通路 // 获取厂家回款通路
export function selectNameByOrg(data) { export function selectNameByOrg(data) {
return request({ return request({

70
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header"> <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-row> <el-row>
<el-form-item label="付款方名称:" class="searchlist"> <el-form-item label="付款方:" class="searchlist">
<el-input v-model="listQuery.params.payerName" placeholder="" clearable/> <el-input v-model="listQuery.params.payerName" placeholder="" clearable/>
</el-form-item> </el-form-item>
<el-form-item label="收款方式:" class="searchlist"> <el-form-item label="收款方式:" class="searchlist">
@ -17,9 +17,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="收款银行:" class="searchlist"> <el-form-item label="收款银行:" class="searchlist">
<el-select v-model="listQuery.params.collectionBank" placeholder="请选择" style="width: 300px" filterable clearable> <el-input v-model="listQuery.params.collectionBank" placeholder="" clearable/>
<el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="认款状态:" class="searchlist"> <el-form-item label="认款状态:" class="searchlist">
<el-select v-model="listQuery.params.subscriptionState" placeholder="请选择" filterable clearable> <el-select v-model="listQuery.params.subscriptionState" placeholder="请选择" filterable clearable>
@ -48,54 +46,84 @@
</div> </div>
<div class=""> <div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%"> <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="操作" align="center" width="180px"> <el-table-column fixed label="操作" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" :disabled="!scope.row.showHandle" size="small" @click="handUpdate(scope.row)">认款</el-button> <el-button type="primary" :disabled="!scope.row.showHandle" size="mini" @click="handUpdate(scope.row)">认款</el-button>
<el-button type="primary" size="small" @click="handLook(scope.row)">查看</el-button> <el-button type="primary" size="mini" @click="handLook(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="审核状态" align="center"> <el-table-column label="审核状态" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span> <span>{{ scope.row.auditState == 1 ? '待审核' : scope.row.auditState == 2 ? '已驳回' : scope.row.auditState ==3 ? '已审核' : '其他' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="认款状态" align="center"> <el-table-column label="认款状态" align="center" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.subscriptionState == 1 ? '未认款' : scope.row.subscriptionState == 2 ? '部分认款' : scope.row.subscriptionState == 3 ? '已认款' : '其他' }}</span> <span>{{ scope.row.subscriptionState == 1 ? '未认款' : scope.row.subscriptionState == 2 ? '部分认款' : scope.row.subscriptionState == 3 ? '已认款' : '其他' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款日期" align="center"> <el-table-column label="申请部门" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span> <span>{{ scope.row.createDept }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款银行" align="center"> <el-table-column label="申请人" align="center" width="130">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.collectionBank }}</span> <span>{{ scope.row.createByName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款银行账号" align="center"> <el-table-column label="申请日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createDate }}</span>
</template>
</el-table-column>
<el-table-column label="收款银行账号" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.collectionBankNum }}</span> <span>{{ scope.row.collectionBankNum }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款方式" align="center"> <el-table-column label="收款银行名称" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span> <span>{{ scope.row.receivingName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="收款金额" align="center"> <el-table-column label="收款银行" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.collectionBank }}</span>
</template>
</el-table-column>
<el-table-column label="收款金额" align="center" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.collectionMoney }}</span> <span>{{ scope.row.collectionMoney }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="付款方名称" align="center"> <el-table-column label="收款日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionDate }}</span>
</template>
</el-table-column>
<el-table-column label="收款方式" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.collectionTypeValue }}</span>
</template>
</el-table-column>
<el-table-column label="付款方" align="center" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.payerName }}</span> <span>{{ scope.row.payerName }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center"> <el-table-column label="付款账号后4位" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.payAccount }}</span>
</template>
</el-table-column>
<el-table-column label="付款银行" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.payBank }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.remarks }}</span> <span>{{ scope.row.remarks }}</span>
</template> </template>
@ -204,7 +232,7 @@ export default {
this.receiptBank_list = res.data this.receiptBank_list = res.data
} }
}) })
dataDictionary({ type: 'receiptType' }).then((res) => { dataDictionary({ type: 'customerPayType' }).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.collectionType_list = res.data this.collectionType_list = res.data
} }

200
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@ -13,59 +13,109 @@
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd"> <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" class="formadd">
<el-row style="border-top: 1px solid #e0e3eb"> <el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款日期</span></el-form-item> <span>申请部门</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4">
<el-form-item> <el-form-item>
<el-date-picker value-format="yyyy-MM-dd" v-model="formobj.collectionDate" :disabled="forbidden" clearable type="date" style="width: 93%" placeholder="请选择"/> <span>{{ formobj.createDept }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款银行</span></el-form-item> <span>申请人</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4">
<el-form-item> <el-form-item>
<el-select v-model="formobj.collectionBank" :disabled="forbidden" placeholder="请选择" @change="changeCollectionBank" filterable clearable> <span>{{ formobj.createByName }}</span>
<el-option v-for="item in receiptBank_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款银行账号</span></el-form-item> <span>申请日期</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4">
<el-form-item> <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="collectionBankNum">
<el-select v-model="formobj.collectionBankNum" placeholder="请选择" :disabled="forbidden" @change="changeCollectionBankNum" filterable clearable> <el-select v-model="formobj.collectionBankNum" placeholder="请选择" :disabled="forbidden" @change="changeCollectionBankNum" filterable clearable>
<el-option v-for="item in collectionBankNum_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/> <el-option v-for="item in collectionBankNum_list" :key="item.accountSid" :label="item.bankAccount" :value="item.bankAccount"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb">
<span>收款银行名称</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
<span>{{ formobj.receivingName }}</span>
</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>
<span>{{ formobj.collectionBank }}</span>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款方式</span></el-form-item> <span><span class="icon">*</span>收款金额()</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <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-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-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-option v-for="item in receiptType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>付款方名称</span></el-form-item> <span><span class="icon">*</span>付款方</span>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item prop="payerName">
<el-input v-model="formobj.payerName" :disabled="forbidden" placeholder="" clearable/> <el-input v-model="formobj.payerName" :disabled="forbidden" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款金额</span></el-form-item> <span><span class="icon">*</span>付款账号后4位</span>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="payAccount">
<el-input v-model="formobj.payAccount" :disabled="forbidden" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span>付款银行</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
<el-input v-model="formobj.collectionMoney" @keyup.native="UpNumber" @keydown.native="UpNumber" :disabled="forbidden" @change="changeCollectionMoney" placeholder="" clearable/> <el-input v-model="formobj.payBank" :disabled="forbidden" placeholder="" clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -234,8 +284,9 @@
</template> </template>
<script> <script>
import { save, dataDictionary, listAll, fetchBySid } from '@/api/anruifinmanagement/paymentConfirmation.js' import { save, dataDictionary, listAll, fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
import Upload from '@/components/uploadFile/filesUpload' // import Upload from '@/components/uploadFile/filesUpload' //
import { getPathSidByUserSid, fetchBySid, selAccountByOrgSid } from '@/api/jichuxinxi/dictcommons'
export default { export default {
name: 'acknowledgementReceiptAdd', name: 'acknowledgementReceiptAdd',
@ -256,8 +307,10 @@ export default {
list2: [], list2: [],
formobj: { formobj: {
sid: '', sid: '',
createByName: window.sessionStorage.getItem('name'), createDept: '',
staffSid: window.sessionStorage.getItem('staffSid'), createDate: '',
createByName: '',
staffSid: '',
collectionDate: '', collectionDate: '',
collectionBank: '', collectionBank: '',
collectionBankKey: '', collectionBankKey: '',
@ -272,6 +325,10 @@ export default {
balance: '', balance: '',
useOrgSid: '', useOrgSid: '',
userSid: '', userSid: '',
receivingName: '',
payBank: '',
payAccount: '',
accountSid: '',
finSelectedReceivablesDetaileds: [], finSelectedReceivablesDetaileds: [],
paymentVoucherAppendixs: [], paymentVoucherAppendixs: [],
remittanceConfirmationAppendixs: [] remittanceConfirmationAppendixs: []
@ -283,15 +340,18 @@ export default {
sids: [], sids: [],
createBySid: '' createBySid: ''
}, },
rules: {}, rules: {
collectionBankNum: [{ required: true, message: '收款银行账号不能为空', trigger: 'change' }],
collectionMoney: [{ required: true, message: '收款金额不能为空', trigger: 'blur' }],
collectionDate: [{ required: true, message: '收款日期不能为空', trigger: 'change' }],
collectionTypeValue: [{ required: true, message: '收款方式不能为空', trigger: 'change' }],
payerName: [{ required: true, message: '付款方不能为空', trigger: 'blur' }],
payAccount: [{ required: true, message: '付款账号不能为空', trigger: 'blur' }]
},
submitdisabled: false, submitdisabled: false,
balance: '' // balance: '' //
} }
}, },
created() {
this.DataDictionary()
this.newDate()
},
methods: { methods: {
// //
newDate() { newDate() {
@ -305,6 +365,7 @@ export default {
if (day < 10) { if (day < 10) {
day = '0' + day day = '0' + day
} }
this.formobj.createDate = year + '-' + month + '-' + day
this.formobj.collectionDate = year + '-' + month + '-' + day this.formobj.collectionDate = year + '-' + month + '-' + day
}, },
UpNumber(e) { UpNumber(e) {
@ -317,51 +378,47 @@ export default {
} }
}, },
DataDictionary() { DataDictionary() {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => {
if (resp.success) {
fetchBySid(resp.data).then((res) => {
if (res.success) {
this.formobj.createDept = res.data.name
}
})
}
})
dataDictionary({ type: 'receiptBank' }).then((res) => { dataDictionary({ type: 'receiptBank' }).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.receiptBank_list = res.data this.receiptBank_list = res.data
} }
}) })
dataDictionary({ type: 'receiptType' }).then((res) => { dataDictionary({ type: 'customerPayType' }).then((res) => {
if (res.code === '200') { if (res.code === '200') {
this.receiptType_list = res.data this.receiptType_list = res.data
} }
}) })
}, selAccountByOrgSid({ userSid: window.sessionStorage.getItem('userSid'), orgPath: '' }).then((resp) => {
collectionBankNum(sid) { if (resp.success) {
dataDictionary({ type: 'receiptAccount', psid: sid }).then((res) => { this.collectionBankNum_list = resp.data
if (res.code === '200') {
this.collectionBankNum_list = res.data
}
})
},
changeCollectionBank(value) {
let aa = null
this.receiptBank_list.forEach((e) => {
if (e.dictKey === value) {
aa = {
name: e.dictValue,
value: e.dictKey,
sid: e.sid
}
} }
}) })
this.formobj.collectionBank = aa.name
this.formobj.collectionBankKey = aa.value
this.collectionBankNum(aa.sid)
}, },
changeCollectionBankNum(value) { changeCollectionBankNum(value) {
let aa = null let aa = null
this.collectionBankNum_list.forEach((e) => { this.collectionBankNum_list.forEach((e) => {
if (e.dictKey === value) { if (e.bankAccount === value) {
aa = { aa = {
name: e.dictValue, accountSid: e.accountSid,
value: e.dictKey accountName: e.accountName,
depositBank: e.depositBank,
bankAccount: e.bankAccount
} }
} }
}) })
this.formobj.collectionBankNum = aa.name this.formobj.accountSid = aa.accountSid
this.formobj.collectionBankNumKey = aa.value this.formobj.collectionBankNum = aa.bankAccount
this.formobj.receivingName = aa.accountName
this.formobj.collectionBank = aa.depositBank
}, },
changeCollectionType(value) { changeCollectionType(value) {
let aa = null let aa = null
@ -444,12 +501,20 @@ export default {
this.getlist() this.getlist()
}, },
showAdd() { showAdd() {
this.DataDictionary()
this.newDate()
this.viewTitle = '【新建】收款确认申请' this.viewTitle = '【新建】收款确认申请'
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.staffSid = window.sessionStorage.getItem('staffSid')
this.getlist() this.getlist()
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
}, },
showEdit(row) { showEdit(row) {
this.DataDictionary()
this.viewTitle = '【编辑】收款确认申请' this.viewTitle = '【编辑】收款确认申请'
fetchBySid(row.sid).then(resp => { fetchDetailBySid(row.sid).then(resp => {
if (resp.code === '200') { if (resp.code === '200') {
this.formobj = resp.data this.formobj = resp.data
this.balance = this.formobj.balance this.balance = this.formobj.balance
@ -475,6 +540,7 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['remit'].show(this.list1) this.$refs['remit'].show(this.list1)
this.$refs['remittance'].show(this.list2) this.$refs['remittance'].show(this.list2)
this.$refs['form_obj'].clearValidate()
}) })
} }
}).catch(e => { }).catch(e => {
@ -556,7 +622,6 @@ export default {
this.getlist() this.getlist()
}, },
submit() { submit() {
this.submitdisabled = true
if (this.formobj.paymentVoucherAppendixs.length > 0) { if (this.formobj.paymentVoucherAppendixs.length > 0) {
var paymentVoucherUrl_list = [] var paymentVoucherUrl_list = []
for (var i = 0; i < this.formobj.paymentVoucherAppendixs.length; i++) { for (var i = 0; i < this.formobj.paymentVoucherAppendixs.length; i++) {
@ -572,22 +637,28 @@ export default {
this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',') this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',')
} }
this.formobj.userSid = window.sessionStorage.getItem('userSid') this.formobj.userSid = window.sessionStorage.getItem('userSid')
save(this.formobj).then(resp => { this.$refs['form_obj'].validate((valid) => {
this.submitdisabled = false if (valid) {
if (resp.code === '200') { this.submitdisabled = true
this.$message({ showClose: true, type: 'success', message: resp.msg }) save(this.formobj).then((resp) => {
this.handleReturn('true') if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
} }
}).catch(() => {
this.submitdisabled = false
}) })
}, },
handleReturn(isreload) { handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist') if (isreload === 'true') this.$emit('reloadlist')
this.formobj = { this.formobj = {
sid: '', sid: '',
createByName: window.sessionStorage.getItem('name'), createDept: '',
staffSid: window.sessionStorage.getItem('staffSid'), createDate: '',
createByName: '',
staffSid: '',
collectionDate: '', collectionDate: '',
collectionBank: '', collectionBank: '',
collectionBankKey: '', collectionBankKey: '',
@ -602,6 +673,10 @@ export default {
balance: '', balance: '',
useOrgSid: '', useOrgSid: '',
userSid: '', userSid: '',
receivingName: '',
payBank: '',
payAccount: '',
accountSid: '',
finSelectedReceivablesDetaileds: [], finSelectedReceivablesDetaileds: [],
paymentVoucherAppendixs: [], paymentVoucherAppendixs: [],
remittanceConfirmationAppendixs: [] remittanceConfirmationAppendixs: []
@ -621,6 +696,7 @@ export default {
this.$refs['remittance'].show(this.list2) this.$refs['remittance'].show(this.list2)
}) })
this.balance = '' this.balance = ''
this.$refs['form_obj'].resetFields()
this.$emit('doback') this.$emit('doback')
} }
} }

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

@ -7,35 +7,77 @@
</div> </div>
</div> </div>
<div class="listconadd"> <div class="listconadd">
<div class="wlInfo"><span>收款确认申请</span></div> <div class="titwu"><span>收款确认申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" label-width="300px" class="formadd"> <el-form ref="form_obj" :model="formobj" :rules="rules" label-position="top" label-width="300px" 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-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款日期</span></el-form-item> <el-form-item><span>收款银行账号</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
{{ formobj.collectionDate }} {{ formobj.collectionBankNum }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款银行</span></el-form-item> <el-form-item><span>收款银行名称</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
{{ formobj.collectionBank }} {{ formobj.receivingName }}
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款银行账号</span></el-form-item> <el-form-item><span>收款银行</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
{{ formobj.collectionBankNum }} {{ formobj.collectionBank }}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="4" class="tleftb">
<el-form-item><span>收款金额()</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
{{ formobj.collectionMoney }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span>收款日期</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
{{ formobj.collectionDate }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款方式</span></el-form-item> <el-form-item><span>收款方式</span></el-form-item>
</el-col> </el-col>
@ -44,8 +86,10 @@
{{ formobj.collectionTypeValue }} {{ formobj.collectionTypeValue }}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>付款方名称</span></el-form-item> <el-form-item><span>付款方</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
@ -53,11 +97,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" class="tleftb"> <el-col :span="4" class="tleftb">
<el-form-item><span>收款金额</span></el-form-item> <el-form-item><span>付款账号后4位</span></el-form-item>
</el-col> </el-col>
<el-col :span="4" class="trightb"> <el-col :span="4" class="trightb">
<el-form-item> <el-form-item>
{{ formobj.collectionMoney }} {{ formobj.payAccount }}
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<el-form-item><span>付款银行</span></el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item>
{{ formobj.payBank }}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -166,7 +218,7 @@
</template> </template>
<script> <script>
import { fetchBySid } from '@/api/anruifinmanagement/paymentConfirmation.js' import { fetchDetailBySid } from '@/api/anruifinmanagement/paymentConfirmation.js'
export default { export default {
name: 'acknowledgementReceiptInfo', name: 'acknowledgementReceiptInfo',
@ -183,7 +235,7 @@ export default {
methods: { methods: {
showInfo(row) { showInfo(row) {
this.viewTitle = '认款详情' this.viewTitle = '认款详情'
fetchBySid(row.sid).then(resp => { fetchDetailBySid(row.sid).then(resp => {
if (resp.code === '200') { if (resp.code === '200') {
this.formobj = resp.data this.formobj = resp.data
if (this.formobj.paymentVoucherAppendixs.length > 0) { if (this.formobj.paymentVoucherAppendixs.length > 0) {
@ -218,21 +270,4 @@ export default {
</script> </script>
<style scoped> <style scoped>
.wlInfo {
padding-top: 20px;
font-size: 24px;
font-weight: bold;
display: flex;
justify-content: center;
align-items: center;
}
.tleftb {
text-align: right;
}
.listadd {
width: 100%;
height: calc(100vh - 0px);
overflow-y: auto;
overflow-x: hidden;
}
</style> </style>

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

@ -168,7 +168,7 @@
</template> </template>
<script> <script>
import { fetchBySid, cashierConfirm, cashierReject } from '@/api/anruifinmanagement/paymentConfirmation.js' import { fetchDetailBySid, cashierConfirm, cashierReject } from '@/api/anruifinmanagement/paymentConfirmation.js'
export default { export default {
name: 'cashierConfitmationInfo', name: 'cashierConfitmationInfo',
@ -189,7 +189,7 @@ export default {
this.viewState = viewState this.viewState = viewState
this.sid = row.sid this.sid = row.sid
this.viewTitle = '认款详情' this.viewTitle = '认款详情'
fetchBySid(row.sid).then(resp => { fetchDetailBySid(row.sid).then(resp => {
if (resp.code === '200') { if (resp.code === '200') {
this.formobj = resp.data this.formobj = resp.data
if (this.formobj.paymentVoucherAppendixs.length > 0) { if (this.formobj.paymentVoucherAppendixs.length > 0) {

15
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationDto.java

@ -72,4 +72,19 @@ public class AppFinCollectionConfirmationDto implements Dto {
@ApiModelProperty("款项明细") @ApiModelProperty("款项明细")
private List<AppFinSelectedReceivablesDetailedDto> contractList; private List<AppFinSelectedReceivablesDetailedDto> contractList;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
@ApiModelProperty("申请人")
private String createByName;
} }

15
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationInitVo.java

@ -68,5 +68,20 @@ public class AppFinCollectionConfirmationInitVo implements Vo {
@ApiModelProperty("") @ApiModelProperty("")
private boolean handle; private boolean handle;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
@ApiModelProperty("申请人名称")
private String createByName;
} }

13
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/AppFinCollectionConfirmationPageVo.java

@ -40,5 +40,18 @@ public class AppFinCollectionConfirmationPageVo implements Vo {
@ApiModelProperty("余额") @ApiModelProperty("余额")
private BigDecimal balance; private BigDecimal balance;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("申请人")
private String createByName;
} }

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

@ -52,7 +52,7 @@ import java.math.BigDecimal;
public class FinCollectionConfirmation extends BaseEntity { public class FinCollectionConfirmation extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ApiModelProperty("创建人接口") @ApiModelProperty("创建人")
private String createByName; // 创建人接口 private String createByName; // 创建人接口
@ApiModelProperty("收款日期") @ApiModelProperty("收款日期")
private String collectionDate; // 收款日期 private String collectionDate; // 收款日期
@ -91,5 +91,19 @@ public class FinCollectionConfirmation extends BaseEntity {
private String busSid; private String busSid;
@ApiModelProperty("业务单据编号") @ApiModelProperty("业务单据编号")
private String busNo; private String busNo;
@ApiModelProperty("是否是首次:0是,1不是")
private int first; private int first;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
} }

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

@ -90,4 +90,18 @@ public class FinCollectionConfirmationDetailsVo implements Vo {
private List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs; // 打款凭证附件 private List<FinCollectionConfirmationAppendixVo> paymentVoucherAppendixs; // 打款凭证附件
@ApiModelProperty("汇款确认书附件") @ApiModelProperty("汇款确认书附件")
private List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs; // 汇款确认书附件 private List<FinCollectionConfirmationAppendixVo> remittanceConfirmationAppendixs; // 汇款确认书附件
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
} }

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

@ -96,4 +96,18 @@ public class FinCollectionConfirmationDto implements Dto {
private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件 private List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs; // 打款凭证附件
@ApiModelProperty("汇款确认书附件") @ApiModelProperty("汇款确认书附件")
private List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件 private List<FinCollectionConfirmationAppendixDto> remittanceConfirmationAppendixs; // 汇款确认书附件
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
} }

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeign.java

@ -32,7 +32,6 @@ import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.cloud.openfeign.SpringQueryMap;
@ -127,5 +126,7 @@ public interface FinCollectionConfirmationFeign {
@GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}") @GetMapping("/selectArrearsMoneyOrCollectionMoney/{contractNo}")
ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo); ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(@PathVariable("contractNo") String contractNo);
@ApiOperation("根据业务sid查询款项信息")
@GetMapping("/selectByBusSid")
ResultBean<FinCollectionConfirmation> selectByBusSid(@RequestParam("virtualOrderSid") String virtualOrderSid);
} }

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationFeignFallback.java

@ -132,4 +132,9 @@ public class FinCollectionConfirmationFeignFallback implements FinCollectionConf
public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) { public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
return null; return null;
} }
@Override
public ResultBean<FinCollectionConfirmation> selectByBusSid(String virtualOrderSid) {
return null;
}
} }

11
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincollectionconfirmation/FinCollectionConfirmationVo.java

@ -75,4 +75,15 @@ public class FinCollectionConfirmationVo implements Vo {
@ApiModelProperty("余额") @ApiModelProperty("余额")
private String balance; private String balance;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
} }

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

@ -64,5 +64,22 @@ public class FinConfirmDto implements Dto {
@ApiModelProperty("创建人名称") @ApiModelProperty("创建人名称")
private String createByName; private String createByName;
@ApiModelProperty("备注")
private String remarks;
@ApiModelProperty("打款凭证url")
private String paymentVoucherUrl;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
} }

11
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeign.java

@ -31,6 +31,7 @@ import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
@ -80,4 +81,14 @@ public interface FinManufacturerBankFeign {
@GetMapping("/selectAccountByUseOrgSid/{userSid}") @GetMapping("/selectAccountByUseOrgSid/{userSid}")
@ResponseBody @ResponseBody
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@PathVariable("userSid") String userSid); public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(@PathVariable("userSid") String userSid);
@ApiOperation("获取该本分公司下的开户账号")
@GetMapping("/selAccountByOrgSid")
@ResponseBody
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(@SpringQueryMap FinManufacturerOrgPathQuery query);
@ApiOperation("App获取该本分公司下的开户账号")
@PostMapping("/selAppAccountByOrgSid")
@ResponseBody
public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(@RequestBody PagerQuery<FinManufacturerOrgPathQuery> query);
} }

10
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerBankFeignFallback.java

@ -74,4 +74,14 @@ public class FinManufacturerBankFeignFallback implements FinManufacturerBankFeig
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) { public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
return null; return null;
} }
@Override
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
return null;
}
@Override
public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
return null;
}
} }

21
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerOrgPathQuery.java

@ -0,0 +1,21 @@
package com.yxt.anrui.fin.api.finmanufacturerbank;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class FinManufacturerOrgPathQuery implements Query {
private static final long serialVersionUID = -2101692843030171417L;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "机构sid")
private String orgPath;
@ApiModelProperty(value = "查询条件")
private String name;
}

7
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finmanufacturerbank/FinManufacturerVo.java

@ -12,8 +12,15 @@ import lombok.Data;
@Data @Data
public class FinManufacturerVo implements Vo { public class FinManufacturerVo implements Vo {
private static final long serialVersionUID = 1452730449728139855L; private static final long serialVersionUID = 1452730449728139855L;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("银行账号") @ApiModelProperty("银行账号")
private String bankAccount; private String bankAccount;
@ApiModelProperty("账户名称") @ApiModelProperty("账户名称")
private String accountName; private String accountName;
@ApiModelProperty("开户银行")
private String depositBank;
@ApiModelProperty("开户银行key")
private String depositBankKey;
} }

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.java

@ -105,4 +105,6 @@ public interface FinCollectionConfirmationMapper extends BaseMapper<FinCollectio
int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal); int updateBalanceBySid(@Param("sid") String sid, @Param("balanceBigDecimal") BigDecimal balanceBigDecimal);
List<String> getList(@Param("stringList") List<String> stringList, @Param("createBySid") String createBySid, @Param("useOrgSid") String useOrgSid); List<String> getList(@Param("stringList") List<String> stringList, @Param("createBySid") String createBySid, @Param("useOrgSid") String useOrgSid);
FinCollectionConfirmation selectByBusSid(String virtualOrderSid);
} }

21
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml

@ -29,7 +29,13 @@
payerName, payerName,
collectionMoney, collectionMoney,
remarks, remarks,
balance balance,
createDate,
createDept,
receivingName,
payAccount,
payBank,
createByName
FROM FROM
fin_collection_confirmation fin_collection_confirmation
<where> <where>
@ -51,7 +57,14 @@
payerName AS paymentName, payerName AS paymentName,
collectionMoney AS paymentMoney, collectionMoney AS paymentMoney,
remarks, remarks,
balance balance,
createDept,
createDate,
receivingName,
payAccount,
payBank,
accountSid,
createByName
FROM fin_collection_confirmation FROM fin_collection_confirmation
WHERE sid = #{collectionBillSid} WHERE sid = #{collectionBillSid}
AND useOrgSid = #{useOrgSid} AND useOrgSid = #{useOrgSid}
@ -98,4 +111,8 @@
#{item} #{item}
</foreach> </foreach>
</select> </select>
<select id="selectByBusSid" resultType="com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation">
select * from fin_collection_confirmation where busSid = #{virtualOrderSid}
</select>
</mapper> </mapper>

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationRest.java

@ -205,4 +205,9 @@ public class FinCollectionConfirmationRest implements FinCollectionConfirmationF
public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) { public ResultBean<AppBusArrearsCarryMoneyVo> selectArrearsMoneyOrCollectionMoney(String contractNo) {
return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo); return finCollectionConfirmationService.selectArrearsMoneyOrCollectionMoney(contractNo);
} }
@Override
public ResultBean<FinCollectionConfirmation> selectByBusSid(String virtualOrderSid) {
return finCollectionConfirmationService.selectByBusSid(virtualOrderSid);
}
} }

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

@ -58,8 +58,11 @@ import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedRec
import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedService;
import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService; import com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedService;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; 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.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.base.utils.PagerUtil;
@ -73,10 +76,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -249,16 +249,16 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
if (remittanceConfirmationAppendixs.size() == 0) { if (remittanceConfirmationAppendixs.size() == 0) {
return rb.setMsg("请上传汇款确认书附件"); return rb.setMsg("请上传汇款确认书附件");
} }
if(finSelectedReceivablesDetailedDtos.size() > 0){ if (finSelectedReceivablesDetailedDtos.size() > 0) {
for(FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos){ for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) {
if(StringUtils.isBlank(v.getSubscriptionMoney())){ if (StringUtils.isBlank(v.getSubscriptionMoney())) {
return rb.setMsg("认款金额不允许为空"); return rb.setMsg("认款金额不允许为空");
} }
if(StringUtils.isBlank(v.getSubscriptionDate())){ if (StringUtils.isBlank(v.getSubscriptionDate())) {
return rb.setMsg("认款申请日期不能为空"); return rb.setMsg("认款申请日期不能为空");
} }
} }
} }
//对收款申请进行赋值操作 //对收款申请进行赋值操作
@ -350,12 +350,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
return rb.setMsg("该申请不存在"); return rb.setMsg("该申请不存在");
} }
List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds(); List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
if(finSelectedReceivablesDetailedDtos.size() > 0){ if (finSelectedReceivablesDetailedDtos.size() > 0) {
for(FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos){ for (FinSelectedReceivablesDetailedDto v : finSelectedReceivablesDetailedDtos) {
if(StringUtils.isBlank(v.getSubscriptionMoney())){ if (StringUtils.isBlank(v.getSubscriptionMoney())) {
return rb.setMsg("认款金额不允许为空"); return rb.setMsg("认款金额不允许为空");
} }
if(StringUtils.isBlank(v.getSubscriptionDate())){ if (StringUtils.isBlank(v.getSubscriptionDate())) {
return rb.setMsg("认款申请日期不能为空"); return rb.setMsg("认款申请日期不能为空");
} }
} }
@ -572,7 +572,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}*/ }*/
commonAppendixSelectQuery = new CommonAppendixSelectQuery(); commonAppendixSelectQuery = new CommonAppendixSelectQuery();
commonAppendixSelectQuery.setLinkSid(sid); commonAppendixSelectQuery.setLinkSid(sid);
//打款凭证附件 //汇款确认书附件
commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType()); commonAppendixSelectQuery.setAttachType(CommonAttachTypeEnum.REMITTAN_CECONFIRMATION.getAttachType());
listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery); listResultBean = commonAppendixFeign.getPcAppendix(commonAppendixSelectQuery);
if (listResultBean.getSuccess()) { if (listResultBean.getSuccess()) {
@ -711,15 +711,45 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
//获取分公司 //获取分公司
String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid(); String staffSid = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData().getStaffSid();
String orgSid = ""; String orgSid = "";
String deptName = dto.getCreateDept();
String createName = dto.getCreateByName();
//根据用户sid获取staffSid
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
if (!userVoResultBean.getSuccess()) {
return rb.setMsg(userVoResultBean.getMsg());
}
//申请部门
if (StringUtils.isNotBlank(dto.getOrgPath())) { if (StringUtils.isNotBlank(dto.getOrgPath())) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); orgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData();
if(StringUtils.isBlank(deptName)){
List<String> orgList = Arrays.asList(dto.getOrgPath().split("/"));
String deptSid = orgList.get(orgList.size()-1);
ResultBean<SysOrganizationVo> organizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid);
if(organizationVoResultBean.getData() != null){
deptName = organizationVoResultBean.getData().getName();
}
}
} else { } else {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData(); orgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
if(StringUtils.isBlank(deptName)){
deptName = staffOrgResultBean.getData().getOrgName();
}
}
if(StringUtils.isBlank(createName)){
createName =userVoResultBean.getData().getName();
} }
//新增收款申请 //新增收款申请
FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation(); FinCollectionConfirmation finCollectionConfirmation = new FinCollectionConfirmation();
BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid"); BeanUtil.copyProperties(dto, finCollectionConfirmation, "sid");
finCollectionConfirmation.setUseOrgSid(orgSid); finCollectionConfirmation.setUseOrgSid(orgSid);
finCollectionConfirmation.setCreateByName(createName);
finCollectionConfirmation.setCreateDate(deptName);
finCollectionConfirmation.setCreateDate(DateUtil.today());
finCollectionConfirmation.setCreateBySid(dto.getUserSid()); finCollectionConfirmation.setCreateBySid(dto.getUserSid());
//打款凭证 //打款凭证
List<String> payFiles = dto.getPayFiles(); List<String> payFiles = dto.getPayFiles();
@ -1374,6 +1404,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
finSelectedReceivablesDetailed.setCollSid(confirmation.getSid()); finSelectedReceivablesDetailed.setCollSid(confirmation.getSid());
finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed); finSelectedReceivablesDetailedService.insert(finSelectedReceivablesDetailed);
} }
if(StringUtils.isNotBlank(confirmation.getPaymentVoucherUrl())){
//添加进附件表
List<String> stringList = Arrays.asList(confirmation.getPaymentVoucherUrl().split(","));
//附件保存:打款凭证附件
stringList.stream().forEach(v -> {
CommonAppendixDto commonAppendixDto = new CommonAppendixDto();
commonAppendixDto.setFilePath(v);
commonAppendixDto.setFileName(CommonAttachTypeEnum.PAYMENT_VOUCHER.getMark());
commonAppendixDto.setLinkSid(confirmation.getSid());
commonAppendixDto.setCreateBySid(confirmation.getCreateBySid());
commonAppendixDto.setAttachType(CommonAttachTypeEnum.PAYMENT_VOUCHER.getAttachType());
commonAppendixFeign.save(commonAppendixDto);
});
}
return rb.success(); return rb.success();
} }
@ -1405,4 +1449,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
public List<String> getList(List<String> stringList, String createBySid, String useOrgSid) { public List<String> getList(List<String> stringList, String createBySid, String useOrgSid) {
return baseMapper.getList(stringList, createBySid, useOrgSid); return baseMapper.getList(stringList, createBySid, useOrgSid);
} }
public ResultBean<FinCollectionConfirmation> selectByBusSid(String virtualOrderSid) {
ResultBean<FinCollectionConfirmation> rb = ResultBean.fireFail();
FinCollectionConfirmation finCollectionConfirmation = baseMapper.selectByBusSid(virtualOrderSid);
return rb.success().setData(finCollectionConfirmation);
}
} }

6
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.java

@ -26,9 +26,11 @@
package com.yxt.anrui.fin.biz.finmanufacturerbank; package com.yxt.anrui.fin.biz.finmanufacturerbank;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankDetailsVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo; import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankVo;
@ -63,4 +65,8 @@ public interface FinManufacturerBankMapper extends BaseMapper<FinManufacturerBan
int selectCountByAccount1(@Param("bankAccount") String bankAccount, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid); int selectCountByAccount1(@Param("bankAccount") String bankAccount, @Param("useOrgSid") String useOrgSid, @Param("sid") String sid);
List<FinManufacturerVo> selectAccountByUseOrgSid(String useOrgSid); List<FinManufacturerVo> selectAccountByUseOrgSid(String useOrgSid);
List<FinManufacturerVo> selAccountByOrgSid(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
IPage<FinManufacturerVo> selAppAccountByOrgSid(IPage<FinManufacturerVo> page,@Param(Constants.WRAPPER) QueryWrapper<AppBusDeliveredPageQuery> qw,@Param("name") String name);
} }

40
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankMapper.xml

@ -42,13 +42,49 @@
where bankAccount = #{bankAccount} where bankAccount = #{bankAccount}
and useOrgSid = #{useOrgSid} and useOrgSid = #{useOrgSid}
and sid and sid
&lt;&gt; &lt;&gt;
#{sid} #{sid}
</select> </select>
<select id="selectAccountByUseOrgSid" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo"> <select id="selectAccountByUseOrgSid" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo">
select bankAccount, accountName select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
from fin_manufacturer_bank from fin_manufacturer_bank
where useOrgSid = #{useOrgSid} where useOrgSid = #{useOrgSid}
</select> </select>
<select id="selAccountByOrgSid" resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo">
select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
from fin_manufacturer_bank
<where>
useOrgSid = #{useOrgSid}
<if test="name != null and name != ''">
and concat(IFNULL(bankAccount
, '')
, ifnull(accountName
, '')
, ifnull(depositBank
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
<select id="selAppAccountByOrgSid"
resultType="com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerVo">
select sid as accountSid, bankAccount, accountName, depositBank, depositBankKey
from fin_manufacturer_bank
<where>
${ew.sqlSegment}
<if test="name != null and name != ''">
and concat(IFNULL(bankAccount
, '')
, ifnull(accountName
, '')
, ifnull(depositBank
, '')) LIKE concat('%'
, #{name}
, '%')
</if>
</where>
</select>
</mapper> </mapper>

15
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankRest.java

@ -25,11 +25,14 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.fin.biz.finmanufacturerbank; package com.yxt.anrui.fin.biz.finmanufacturerbank;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*; import com.yxt.anrui.fin.api.finmanufacturerbank.*;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo; import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@ -87,4 +90,16 @@ public class FinManufacturerBankRest implements FinManufacturerBankFeign {
public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) { public ResultBean<List<FinManufacturerVo>> selectAccountByUseOrgSid(String userSid) {
return finManufacturerBankService.selectAccountByUseOrgSid(userSid); return finManufacturerBankService.selectAccountByUseOrgSid(userSid);
} }
@Override
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
return finManufacturerBankService.selAccountByOrgSid(query);
}
@Override
public ResultBean<PagerVo<FinManufacturerVo>> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
ResultBean rb = ResultBean.fireFail();
IPage<FinManufacturerVo> voIPage = finManufacturerBankService.selAppAccountByOrgSid(query);
return rb.success().setData(voIPage);
}
} }

33
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finmanufacturerbank/FinManufacturerBankService.java

@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finmanufacturerbank;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageQuery;
import com.yxt.anrui.buscenter.api.busdelivered.AppBusDeliveredPageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*; import com.yxt.anrui.fin.api.finmanufacturerbank.*;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt; import com.yxt.anrui.fin.api.kingdee.cnbankcnt.CNBankacnt;
@ -167,4 +169,35 @@ public class FinManufacturerBankService extends MybatisBaseService<FinManufactur
list.removeAll(Collections.singleton(null)); list.removeAll(Collections.singleton(null));
return rb.success().setData(list); return rb.success().setData(list);
} }
public ResultBean<List<FinManufacturerVo>> selAccountByOrgSid(FinManufacturerOrgPathQuery query) {
ResultBean<List<FinManufacturerVo>> rb = ResultBean.fireFail();
String userSid = query.getUserSid();
String orgPath = query.getOrgPath();
String useOrgSid = "";
if (StringUtils.isBlank(orgPath)) {
useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
} else {
useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
}
List<FinManufacturerVo> list = baseMapper.selAccountByOrgSid(useOrgSid,query.getName());
list.removeAll(Collections.singleton(null));
return rb.success().setData(list);
}
public IPage<FinManufacturerVo> selAppAccountByOrgSid(PagerQuery<FinManufacturerOrgPathQuery> query) {
QueryWrapper<AppBusDeliveredPageQuery> qw = new QueryWrapper<>();
String name = query.getParams().getName();
IPage<FinManufacturerVo> page = PagerUtil.queryToPage(query);
String orgPath = query.getParams().getOrgPath();
String orgSid = "";
if (StringUtils.isNotBlank(orgPath)) {
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
} else {
orgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getParams().getUserSid()).getData();
}
qw.eq("useOrgSid", orgSid);
IPage<FinManufacturerVo> iPage = baseMapper.selAppAccountByOrgSid(page, qw, name);
return iPage;
}
} }

2
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/cnbankcnt/CNBankcntService.java

@ -101,7 +101,7 @@ public class CNBankcntService extends FinKingDeeService {
} }
/** /**
* 查看物料 * 查看银行账号
* @param bankName * @param bankName
* @return * @return
* @throws Exception * @throws Exception

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBusDetailsVo.java

@ -89,4 +89,14 @@ public class DepositBusDetailsVo implements Vo {
@ApiModelProperty("收款银行账号") @ApiModelProperty("收款银行账号")
private String collectionNumberKey; private String collectionNumberKey;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
} }

10
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java

@ -74,4 +74,14 @@ public class DepositBuscenterDetailVo implements Vo {
private String procInsId; private String procInsId;
@ApiModelProperty(value = "任务id") @ApiModelProperty(value = "任务id")
private String taskId; private String taskId;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
} }

9
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDto.java

@ -90,4 +90,13 @@ public class DepositBuscenterDto implements Dto {
@ApiModelProperty("制单日期") @ApiModelProperty("制单日期")
private String createDate; private String createDate;
@ApiModelProperty("收款账户名称")
private String collectionAccountName;
@ApiModelProperty("本分公司开户账号sid")
private String accountSid;
@ApiModelProperty("开户银行")
private String depositBank;
} }

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/orders/MainDepositVo.java

@ -74,4 +74,7 @@ public class MainDepositVo implements Vo {
@ApiModelProperty("订车特殊:审批成功后不再显示流程状态显示为 : 有效期:3天/2天/1天;失效") @ApiModelProperty("订车特殊:审批成功后不再显示流程状态显示为 : 有效期:3天/2天/1天;失效")
private String virtualOrderState2; private String virtualOrderState2;
@ApiModelProperty("财务确认状态")
private String paymentState;
} }

63
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeign.java

@ -0,0 +1,63 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeign.java <br/>
* Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeign <br/>
* Description: 公司开户账号表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "公司开户账号表")
@FeignClient(
contextId = "anrui-terminal-FinManufacturerBank",
name = "anrui-terminal",
path = "base/v1/account",
fallback = AppFinManufacturerBankFeignFallback.class)
public interface AppFinManufacturerBankFeign {
@ApiOperation("获取该本分公司下的开户账号")
@PostMapping("/selAccountByOrgSid")
@ResponseBody
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(@RequestBody PagerQuery<AppManufacturerOrgPathQuery> query);
}

56
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppFinManufacturerBankFeignFallback.java

@ -0,0 +1,56 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import java.util.List;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBankFeignFallback <br/>
* Description: 公司开户账号表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class AppFinManufacturerBankFeignFallback implements AppFinManufacturerBankFeign {
@Override
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(PagerQuery<AppManufacturerOrgPathQuery> query) {
return null;
}
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerOrgPathQuery.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppManufacturerOrgPathQuery implements Query {
private static final long serialVersionUID = 5132061239127199612L;
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "机构sid")
private String orgPath;
@ApiModelProperty(value = "查询条件")
private String name;
}

19
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java

@ -0,0 +1,19 @@
package com.yxt.anrui.terminal.api.base.account;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class AppManufacturerVo implements Vo {
private static final long serialVersionUID = 6743866407572366715L;
@ApiModelProperty("银行账号")
private String bankAccount;
@ApiModelProperty("账户名称")
private String accountName;
@ApiModelProperty("开户银行")
private String depositBank;
@ApiModelProperty("开户银行key")
private String depositBankKey;
}

16
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationDto.java

@ -1,7 +1,6 @@
package com.yxt.anrui.terminal.api.finance.collectionConfirm; package com.yxt.anrui.terminal.api.finance.collectionConfirm;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.AppFinSelectedReceivablesDetailedDto;
import com.yxt.common.core.dto.Dto; import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -75,4 +74,19 @@ public class ConfirmationDto implements Dto {
@ApiModelProperty("机构sid") @ApiModelProperty("机构sid")
private String orgPath; private String orgPath;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
@ApiModelProperty("申请人")
private String createByName;
} }

15
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationInitVo.java

@ -64,4 +64,19 @@ public class ConfirmationInitVo implements Vo {
@ApiModelProperty("用户sid") @ApiModelProperty("用户sid")
private String userSid; private String userSid;
@ApiModelProperty("申请部门")
private String createDept;
@ApiModelProperty("申请日期")
private String createDate;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
@ApiModelProperty("付款银行")
private String payBank;
@ApiModelProperty("收款银行账号sid")
private String accountSid;
@ApiModelProperty("申请人名称")
private String createByName;
} }

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ConfirmationPageVo.java

@ -45,4 +45,9 @@ public class ConfirmationPageVo implements Vo {
@ApiModelProperty("是否显示删除") @ApiModelProperty("是否显示删除")
private boolean showDelete; private boolean showDelete;
@ApiModelProperty("收款账户名称")
private String receivingName;
@ApiModelProperty("付款账号后4位")
private String payAccount;
} }

67
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankRest.java

@ -0,0 +1,67 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.base.account;
import com.yxt.anrui.terminal.api.base.account.AppFinManufacturerBankFeign;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerOrgPathQuery;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerVo;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankFeignFallback.java <br/>
* Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankRest <br/>
* Description: 公司开户账号表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "公司开户账号表")
@RestController
@RequestMapping("base/v1/account")
public class AppFinManufacturerBankRest implements AppFinManufacturerBankFeign {
@Autowired
private AppFinManufacturerBankService appFinManufacturerBankService;
@Override
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(PagerQuery<AppManufacturerOrgPathQuery> query) {
return appFinManufacturerBankService.selAccountByOrgSid(query);
}
}

80
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/account/AppFinManufacturerBankService.java

@ -0,0 +1,80 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.terminal.biz.base.account;
import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSON;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageQuery;
import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
import com.yxt.anrui.fin.api.finmanufacturerbank.*;
import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerOrgPathQuery;
import com.yxt.anrui.terminal.api.base.account.AppManufacturerVo;
import com.yxt.anrui.terminal.config.CoverUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
* Project: anrui-fin(安瑞财务) <br/>
* File: FinManufacturerBankService.java <br/>
* Class: com.yxt.anrui.fin.biz.finmanufacturerbank.FinManufacturerBankService <br/>
* Description: 公司开户账号表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-03 15:00:11 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class AppFinManufacturerBankService {
@Autowired
private FinManufacturerBankFeign finManufacturerBankFeign;
public ResultBean<PagerVo<AppManufacturerVo>> selAccountByOrgSid(PagerQuery<AppManufacturerOrgPathQuery> query) {
ResultBean<PagerVo<AppManufacturerVo>> rb = ResultBean.fireFail();
PagerQuery<FinManufacturerOrgPathQuery> pq = CoverUtils.getPagerQuery(query);
ResultBean<PagerVo<FinManufacturerVo>> resultBean = finManufacturerBankFeign.selAppAccountByOrgSid(pq);
List<AppManufacturerVo> voList = Optional.ofNullable(resultBean.getData().getRecords()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppManufacturerVo.class)).collect(Collectors.toList());
PagerVo<AppManufacturerVo> v = new PagerVo<>();
BeanUtil.copyProperties(resultBean.getData(), v);
v.setRecords(voList);
return rb.success().setData(v);
}
}
Loading…
Cancel
Save