diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java index bda053d969..8d8ed28dc1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBusDetailsVo.java +++ b/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("制单日期") private String createDate; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java index 833c0450eb..dc770d0366 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java +++ b/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") private String taskId; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + + + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java index 9acf45a211..4b384a3a5e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDeposit.java +++ b/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("付款凭证") private String paymentProof; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + + // @ApiModelProperty(value = "节点状态") // private String nodeState; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java index 6b90e7b127..d4841f75f4 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusDepositBuscenterDto.java +++ b/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("收款银行") private String collectionBankKey; + @ApiModelProperty("收款账户名称") + private String collectionAccountName; + + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; + + @ApiModelProperty("开户银行") + private String depositBank; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java index b46cd06b21..2b0fa71b4b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/AppBusMainDepositVo.java +++ b/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; -import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -114,7 +113,10 @@ public class AppBusMainDepositVo implements Vo { @ApiModelProperty("订车特殊:审批成功后不再显示流程状态显示为 : 有效期:3天/2天/1天;失效") private String virtualOrderState2; - + @ApiModelProperty("已使用订金") private String usedDeposit; + @ApiModelProperty("财务确认状态") + private String paymentState; + } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml index afcb4809c3..8bfc206d7a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositMapper.xml @@ -22,7 +22,10 @@ draweeMobile AS phone, vehicleNum AS carNumber, staffName AS sellerName, - orgName AS departmentName + orgName AS departmentName, + collectionAccountName, + depositBank, + accountSid FROM bus_deposit WHERE billSid = #{virtualOrderSid} @@ -45,7 +48,10 @@ payBankAcc AS payNumber, proBankValue AS collectionBank, proBankKey AS collectionBankKey, - proBankAccKey AS collectionNumberKey + proBankAccKey AS collectionNumberKey, + collectionAccountName, + depositBank, + accountSid FROM bus_deposit WHERE billSid = #{virtualOrderSid} AND staffSid = #{staffSid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index d00c0c13b3..2402ef27fc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/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.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; 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.app.FinConfirmDto; import com.yxt.anrui.flowable.api.flow.FlowableFeign; @@ -676,6 +677,23 @@ public class BusMainDepositService extends MybatisBaseService 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")) { BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid); int count = baseMapper.selByBillSidCount(virtualOrderSid); @@ -684,8 +702,6 @@ public class BusMainDepositService extends MybatisBaseService resultBean = sysFormLinkFeign.selectStateByBusinessSid(record.getVirtualOrderSid()); - // 状态判断:0未提交,1办理中, 2已办结, -1退回到发起人,-2终止 if ("待提交".equals(record.getVirtualOrderState())) { record.setShowDeleteBtn(true); @@ -2110,24 +2126,25 @@ public class BusMainDepositService extends MybatisBaseService list = new ArrayList<>(); - if (StringUtils.isNotBlank(busDeposit.getVehicleNum())) { - List customerList = busDepositCustomerService.selectListByBillSid(bv.getBusinessSid()); - for (int i = 0; i < Integer.valueOf(busDeposit.getVehicleNum()); i++) { - FinSelectDto finSelectDto = new FinSelectDto(); - BusDepositCustomerVo bus = customerList.get(0); - if (bus != null) { - finSelectDto.setCustomerName(bus.getCustomerName()); - finSelectDto.setCustomerSid(bus.getCustomerSid()); - finSelectDto.setCustomerPhone(bus.getCustomerMobile()); - finSelectDto.setCurrentReceivableMoney(busDeposit.getDeposit().divide(new BigDecimal(busDeposit.getVehicleNum())).toString()); - finSelectDto.setSubscriptionDate(DateUtil.today()); - finSelectDto.setReceivablesName("订金"); - list.add(finSelectDto); - } - } + finConfirmDto.setRemarks(busDeposit.getRemarks()); + //ToDo:赋值 + //查询打款凭证 + finConfirmDto.setPaymentVoucherUrl(busDeposit.getPaymentProof()); + //申请部门 + List orgList = Arrays.asList(bv.getOrgSidPath().split("/")); + String deptSid = orgList.get(orgList.size() - 1); + ResultBean sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(deptSid); + if(sysOrganizationVoResultBean.getData() != null){ + finConfirmDto.setCreateDept(sysOrganizationVoResultBean.getData().getName()); } - finConfirmDto.setFinSelectList(list);*/ + //申请日期 + finConfirmDto.setCreateDate(DateUtil.today()); + //收款账户名称 + finConfirmDto.setReceivingName(busDeposit.getCollectionAccountName()); + //付款账号后4位 + finConfirmDto.setPayAccount(busDeposit.getPayBankAcc()); + //付款银行 + finConfirmDto.setPayBank(busDeposit.getDepositBank()); finCollectionConfirmationFeign.saveFinConfirm(finConfirmDto); } if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js b/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js index 4128471010..8dd5c55eb5 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/dictcommons/dictcommons.js +++ b/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) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue index 13a6c2ba36..91e8a31278 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouqu.vue @@ -12,12 +12,7 @@
销售简易订单
- - - 金额单位: 元 - - - + 分公司 @@ -71,17 +66,25 @@ - 车辆台数 + 付款方式 - {{ temp.carNumber }} + {{ temp.payTypeValue }} - 订金金额 + 付款日期 - + + + {{ temp.payDate }} + + + + 订金金额(元) + + {{ temp.deposit }} @@ -89,29 +92,43 @@ - 付款日期 + 付款账号后4位 - {{ temp.payDate }} + {{ temp.payNumber }} - 付款方式 + 开户银行 - {{ temp.payTypeValue }} + {{ temp.depositBank }} - 付款银行账号 + + + + + + + 车辆台数 - {{ temp.payNumber }} + {{ temp.carNumber }} + + + + + + + + @@ -122,10 +139,18 @@ {{ temp.collectionNumber }} + + 收款银行名称 + + + + {{ temp.collectionAccountName }} + + 收款银行 - + {{ temp.collectionBank }} @@ -492,12 +517,6 @@ export default { text-align: center; padding: 30px 0 20px 0; } -.rowStyle { - border-left: 0px !important; -} -.colStyle { - border-right: 0px !important; -} .rowClass{ border-top: 1px solid #E0E3EB; } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue index f8df25ce4c..1644be72a4 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/dingjinshouquEdit.vue @@ -11,12 +11,7 @@
销售简易订单
- - - 金额单位: 元 - - - + 分公司 @@ -70,17 +65,27 @@ - 车辆台数 + *付款方式 - - + + + + - *订金金额 + *付款日期 - + + + + + + + *订金金额(元) + + @@ -88,53 +93,71 @@ - *付款日期 + *付款账号后4位 - - + + - *付款方式 + 开户银行 - - - - + + - *付款银行账号 - - - - *收款银行 + 车辆台数 - - - - - + + + + + + + + + + + + + *收款银行账号 - - + + + + 收款银行名称 + + + + {{ temp.collectionAccountName }} + + + + *收款银行 + + + + {{ temp.collectionBank }} + + @@ -196,7 +219,7 @@ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js index 314817d8ef..8fd7c82925 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/paymentConfirmation.js @@ -1,5 +1,4 @@ import request from '@/utils/request' -import qs from 'querystring' // 收款确认管理和出纳款项管理分页列表条件查询 export function listPage(data) { @@ -24,11 +23,11 @@ export function listAll(data) { }) } -// 收款确认管理h和出纳款项确认管理--回显、详情 -export function fetchBySid(data) { +// 收款确认管理和出纳款项确认管理--回显、详情 +export function fetchDetailBySid(data) { return request({ url: '/fin/fincollectionconfirmation/fetchBySid/' + data, - method: 'get', + method: 'get' }) } @@ -111,7 +110,8 @@ export function dataDictionary(data) { // 上传文件 export function upload(data) { return request({ - url: '/fin/file/upload',data, + url: '/fin/file/upload', + data, method: 'post', headers: { 'Content-Type': 'multipart/form-data' diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js b/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js index 987b79bcd2..bfc96fa673 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/jichuxinxi/dictcommons.js +++ b/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) { return request({ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue index f2ff190c8e..c0bcbf0a42 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceipt.vue @@ -8,7 +8,7 @@
- - + + - + - + - + - + - + + + + - + - + + + + - + + + + + + + - + + + + + + + @@ -204,7 +232,7 @@ export default { this.receiptBank_list = res.data } }) - dataDictionary({ type: 'receiptType' }).then((res) => { + dataDictionary({ type: 'customerPayType' }).then((res) => { if (res.code === '200') { this.collectionType_list = res.data } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue index 51af126a8b..9559179988 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue @@ -13,59 +13,109 @@ - 收款日期 + 申请部门 - + - + {{ formobj.createDept }} - 收款银行 + 申请人 - + - - - + {{ formobj.createByName }} - 收款银行账号 + 申请日期 - + + {{ formobj.createDate }} + + + + + + *收款银行账号 + + + - + + + 收款银行名称 + + + + {{ formobj.receivingName }} + + + + *收款银行 + + + + {{ formobj.collectionBank }} + + - 收款方式 + *收款金额(元) - + + + + + + *收款日期 + + + + + + + + *收款方式 + + + + + - 付款方名称 + *付款方 - + - 收款金额 + *付款账号后4位 + + + + + + + + 付款银行 - + @@ -234,8 +284,9 @@ diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue index 214303a3fe..e0ad95383b 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationInfo.vue @@ -168,7 +168,7 @@