From a294e8f06623f87713c03fcbb781b3be3617bd0f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 8 Dec 2022 09:26:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=AC=BE=E9=A1=B9=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4--=E6=94=B6=E6=AC=BE=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anruifinmanagement/paymentConfirmation.js | 10 +- .../src/api/jichuxinxi/dictcommons.js | 9 + .../acknowledgementReceipt.vue | 70 ++++-- .../acknowledgementReceiptAdd.vue | 200 ++++++++++++------ .../acknowledgementReceiptInfo.vue | 93 +++++--- .../cashierConfirmationInfo.vue | 4 +- 6 files changed, 267 insertions(+), 119 deletions(-) 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 @@