From a4a1cf41cade720219a2f41e57e5fa96ccb24064 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sat, 25 Feb 2023 10:41:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/anruifinmanagement/agencyfund/agencyfund.vue | 1 + .../paymentConfirmation/acknowledgementReceipt.vue | 1 + .../paymentConfirmation/cashierConfirmation.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue index 619455d66c..935b04dd47 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfund.vue @@ -350,6 +350,7 @@ export default { this.dialogVisible = false this.printSid = '' this.visibleDisabled = false + this.getList() } else { this.visibleDisabled = false } 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 c8da7a4372..500d675086 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 @@ -350,6 +350,7 @@ export default { this.dialogVisible = false this.printSid = '' this.visibleDisabled = false + this.getList() } else { this.visibleDisabled = false } 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 2b585d453b..aa8b93d683 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 @@ -375,6 +375,7 @@ export default { this.dialogVisible = false this.printSid = '' this.visibleDisabled = false + this.getList() } else { this.visibleDisabled = false } From 3cc477d783c57eb5e04e0d822662cbb1f47d0b95 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sat, 25 Feb 2023 12:49:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8F=B0=E8=B4=A6--=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/cheliang/cheliangxiaoshou.js | 2 +- .../cheliangxiaoshouguanli.vue | 49 +++++++++---------- 2 files changed, 23 insertions(+), 28 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js index 7a2a0d86ab..0c99aa5c29 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/cheliangxiaoshou.js @@ -42,7 +42,7 @@ export function exportExcel(data) { return request({ url: '/base/v1/basevehicleout/exportExcel', method: 'post', - responseType: 'blob' , // 表明返回服务器返回的数据类型 + responseType: 'blob', // 表明返回服务器返回的数据类型 data: data, headers: { 'Content-Type': 'application/json' } }) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue index 1e08b02113..664a7e705e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshouguanli.vue @@ -515,34 +515,29 @@ export default { }, // 导出 doExport() { - if (this.sids.length > 0) { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - exportExcel(this.sids).then((resp) => { - loading.close() - const blob = new Blob([resp], { - type: 'application/vnd.ms-excel' - }) - const fileName = '车辆销售台账表' + '.xls' - const elink = document.createElement('a') - elink.download = fileName - elink.style.display = 'nonde' - elink.href = URL.createObjectURL(blob) - document.body.appendChild(elink) - elink.click() - URL.revokeObjectURL(elink.href) - document.body.removeChild(elink) - }).catch(() => { - loading.close() + const loading = this.$loading({ + lock: true, + text: 'Loading', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + exportExcel(this.listQuery.params).then((resp) => { + loading.close() + const blob = new Blob([resp], { + type: 'application/vnd.ms-excel' }) - } else { - this.$message({ showClose: true, type: 'error', message: '请至少选择一条记录进行导出操作' }) - return - } + const fileName = '车辆销售台账表' + '.xls' + const elink = document.createElement('a') + elink.download = fileName + elink.style.display = 'nonde' + elink.href = URL.createObjectURL(blob) + document.body.appendChild(elink) + elink.click() + URL.revokeObjectURL(elink.href) + document.body.removeChild(elink) + }).catch(() => { + loading.close() + }) }, resetState() { this.viewState = 1 From b4014249328c30394ea8ffc8fe4aabc72efa854b Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 27 Feb 2023 09:47:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=BE=85=E4=BB=98?= =?UTF-8?q?=E6=AC=BE--=E6=94=B9=E4=B8=BA=E4=BB=98=E6=AC=BE=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui-finmanage-ui/src/router/modules/codemenu.js | 2 +- .../chunafukuan/daifukuanguanli/obligation.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 6b1604f483..a560f92493 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js +++ b/anrui-buscenter/anrui-finmanage-ui/src/router/modules/codemenu.js @@ -166,7 +166,7 @@ const codemenu = [ path: '/chunafukuan/daifukuanguanli', component: () => import('@/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue'), name: 'DaiFuKuan', - meta: { title: '待付款', noCache: true } + meta: { title: '付款查询', noCache: true } } ] }, diff --git a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue index f23d6ad1f8..d30878b763 100644 --- a/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue +++ b/anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/daifukuanguanli/obligation.vue @@ -2,7 +2,7 @@