From 09807abd91e6c632bea4482fbbbafef87c8cd1e2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 19 Nov 2024 16:15:36 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=94=AE=E5=90=8E?= =?UTF-8?q?=E8=AE=A4=E6=AC=BE=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subscriptionAfterSale.js | 62 ++ .../src/router/modules/codemenu.js | 6 + .../subscriptionAfterSale.vue | 406 +++++++++++ .../subscriptionAfterSaleAdd.vue | 640 ++++++++++++++++++ .../subscriptionAfterSaleInfo.vue | 221 ++++++ 5 files changed, 1335 insertions(+) create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSale.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleAdd.vue create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleInfo.vue diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js new file mode 100644 index 0000000000..28a674a8e5 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js @@ -0,0 +1,62 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 -- 售后认款 + listPage: function(data) { + return request({ + url: '/fin/fincollectionconfirmation/asListPagess', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 应收未收款项明细分页 + asListAll: function(data) { + return request({ + url: '/fin/finuncollectedreceivablesdetailed/asListAll', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + saveOrUpdate: function(data) { + return request({ + url: '/fin/fincollectionconfirmation/asSave', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + fetchBySid: function(data) { + return request({ + url: '/fin/fincollectionconfirmation/asFetchBySid/' + data, + method: 'get' + }) + }, + // 打印出门证 + createPdf: function(data) { + return request({ + url: '/fin/fincollectionconfirmation/asCreatePdf', + method: 'post', + params: data + }) + }, + // 出纳款项管理--确认 + asCashierConfirm: function(data) { + return request({ + url: '/fin/fincollectionconfirmation/asCashierConfirm', + method: 'post', + params: data, + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } + }) + }, + // 出纳款项管理--驳回 + cashierReject: function(data) { + return request({ + url: '/fin/fincollectionconfirmation/cashierReject', + method: 'post', + params: data, + headers: { 'Content-Type': 'application/x-www-form-urlencoded' } + }) + } +} diff --git a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js index 324ff1f08d..9d8ade7d0f 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -66,6 +66,12 @@ const codemenu = [ name: 'DaiShouKuan', meta: { title: '代收款申请', noCache: true } }, + { + path: '/subscriptionAfterSale/subscriptionAfterSale', + component: () => import('@/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSale.vue'), + name: 'SubscriptionAfterSale', + meta: { title: '售后认款申请', noCache: true } + }, { path: '/anruifinmanagement/cashierConfirmation', component: () => import('@/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue'), diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSale.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSale.vue new file mode 100644 index 0000000000..021c977748 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSale.vue @@ -0,0 +1,406 @@ + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleAdd.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleAdd.vue new file mode 100644 index 0000000000..9b05338670 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleAdd.vue @@ -0,0 +1,640 @@ + + + + + diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleInfo.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleInfo.vue new file mode 100644 index 0000000000..95b0b6af06 --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/subscriptionAfterSale/subscriptionAfterSaleInfo.vue @@ -0,0 +1,221 @@ + + + + + From be525fcd6835f1585baf73b1e6b132bca0cef1f6 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 19 Nov 2024 16:16:31 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E7=BA=B3?= =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E7=AE=A1=E7=90=86--?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=94=AE=E5=90=8E=E8=AE=A4=E6=AC=BE=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashierConfirmation.vue | 23 +- ...cashierConfirmationBySubscriptionAfter.vue | 284 ++++++++++++++++++ 2 files changed, 301 insertions(+), 6 deletions(-) create mode 100644 anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationBySubscriptionAfter.vue diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue index 4af1402bd6..5aec05a418 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -148,9 +148,12 @@ 取消 + - + + + @@ -162,6 +165,7 @@ import ButtonBar from '@/components/ButtonBar' import { typeValues, getButtonPermissions } from '@/api/jichuxinxi/dictcommons' import cashierConfirmationInfo from './cashierConfirmationInfo.vue' import cashierConfirmationByFinancial from './cashierConfirmationByFinancial' +import cashierConfirmationBySubscriptionAfter from './cashierConfirmationBySubscriptionAfter' import { getStorage } from '@/utils/auth' export default { @@ -171,7 +175,8 @@ export default { pageye, ButtonBar, cashierConfirmationInfo, - cashierConfirmationByFinancial + cashierConfirmationByFinancial, + cashierConfirmationBySubscriptionAfter }, data() { return { @@ -347,10 +352,13 @@ export default { this.getList() }, handUpdate(row) { - if (row.loan) { + if (row.source === '02') { // 金融认款 this.viewState = 4 this.$refs['divFinancial'].showInfo(row, this.viewState) - } else { + } else if (row.source === '03') { // 售后认款 + this.viewState = 6 + this.$refs['divSub'].showInfo(row, this.viewState) + } else { // 销售认款 this.viewState = 2 this.$refs['divInfo'].showInfo(row, this.viewState) } @@ -434,10 +442,13 @@ export default { } }, handLook(row) { - if (row.loan) { + if (row.source === '02') { // 金融认款 this.viewState = 5 this.$refs['divFinancial'].showInfo(row, this.viewState) - } else { + } else if (row.source === '03') { // 售后认款 + this.viewState = 7 + this.$refs['divSub'].showInfo(row, this.viewState) + } else { // 销售认款 this.viewState = 3 this.$refs['divInfo'].showInfo(row, this.viewState) } diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationBySubscriptionAfter.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationBySubscriptionAfter.vue new file mode 100644 index 0000000000..5b3c62144d --- /dev/null +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmationBySubscriptionAfter.vue @@ -0,0 +1,284 @@ + + + + + + From 1449db85162e0f631b3a714ca202e2d60786afb4 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 19 Nov 2024 16:26:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subscriptionAfterSale.js | 1 - .../cashierConfirmation.vue | 47 ++++++++++++++++--- .../subscriptionAfterSale.vue | 4 +- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js index 28a674a8e5..dceb700829 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/api/anruifinmanagement/subscriptionAfterSale.js @@ -33,7 +33,6 @@ export default { method: 'get' }) }, - // 打印出门证 createPdf: function(data) { return request({ url: '/fin/fincollectionconfirmation/asCreatePdf', diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue index 5aec05a418..e802206b71 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/cashierConfirmation.vue @@ -159,6 +159,7 @@