From ff0894553192277e8d7c354948b2ca9a90562e4d Mon Sep 17 00:00:00 2001 From: woody Date: Tue, 19 Aug 2025 11:03:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(unhandeled):=20=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=99=9A=E6=8B=9F=E8=A1=A8=E6=A0=BC=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=A4=A7=E6=95=B0=E6=8D=AE=E9=87=8F=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 +- src/components/Delivery/unhandeled.vue | 194 +++++++------------------ src/main.js | 5 +- vue.config.js | 10 +- 4 files changed, 59 insertions(+), 153 deletions(-) diff --git a/package.json b/package.json index 084a967..34b524f 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "vue-quill-editor": "^3.0.6", "vue-router": "3.0.6", "vue-tree-color": "^2.3.2", - "vuex": "3.1.0" + "vuex": "3.1.0", + "vxe-table": "^3.17.11" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.4", diff --git a/src/components/Delivery/unhandeled.vue b/src/components/Delivery/unhandeled.vue index a23e93f..b146c7f 100644 --- a/src/components/Delivery/unhandeled.vue +++ b/src/components/Delivery/unhandeled.vue @@ -49,161 +49,63 @@ show-icon /> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + - - - - - - - + + + + + + + + + + + + - - - - - item.pkId) this.orderIdList = selection.map((item) => item.pkOrder) this.multiple = !selection.length diff --git a/src/main.js b/src/main.js index 3b06015..b929a1c 100644 --- a/src/main.js +++ b/src/main.js @@ -15,13 +15,14 @@ import 'element-ui/lib/theme-chalk/index.css' import '../theme/index.css' import locale from 'element-ui/lib/locale/lang/en' // lang i18n ElementUI.Dialog.props.closeOnClickModal.default = false - +import VxeUITable from 'vxe-table' +import 'vxe-table/lib/style.css' import '@/styles/index.scss' // global css import dataV from '@jiaminghi/data-view' Vue.use(dataV) - +Vue.use(VxeUITable) import App from './App' import store from './store' import router from './router' diff --git a/vue.config.js b/vue.config.js index 788cbd7..d01c273 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,11 +44,11 @@ module.exports = { }, proxy: { '/prod-api': { - target: 'http://localhost:8080/', - changeOrigin: true, - pathRewrite: { - '^/prod-api': '' - } + target: 'https://t-mana.beida666.com/', + changeOrigin: true + // pathRewrite: { + // '^/prod-api': '' + // } } } // proxy: { From c48e4d477ace363a875f29281b70c903b4e02066 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 20 Aug 2025 10:09:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(CashDetail):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E8=A1=8C=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/financial/cashDetails/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue index b26bc0e..c295431 100644 --- a/src/views/financial/cashDetails/index.vue +++ b/src/views/financial/cashDetails/index.vue @@ -987,7 +987,7 @@ export default { // this.$nextTick(() => { if (this.lastData) { const obj = this.lastData - + console.log(obj, '....obj') return [ '', '合计', @@ -1000,10 +1000,10 @@ export default { numberToCurrencyNo(obj.serviceCharge), numberToCurrencyNo(obj.incomeTax), numberToCurrencyNo(obj.issuedAmount), - numberToCurrencyNo(obj.settleCashAmount), - numberToCurrencyNo(obj.settleServiceCharge), - numberToCurrencyNo(obj.settleIncomeTax), - numberToCurrencyNo(obj.settleIssuedAmount), + '', + '', + '', + '', '', '', '', From e2bd45c29de5448dd669315252a29956dd984b12 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 20 Aug 2025 10:16:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(cashDetail):=20=E9=94=99=E8=A1=8C?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/financial/cashDetails/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue index c295431..cd9fe55 100644 --- a/src/views/financial/cashDetails/index.vue +++ b/src/views/financial/cashDetails/index.vue @@ -1020,7 +1020,6 @@ export default { '', '', '', - '', '' ] } else { From 9f9c2167d6e4952040dde0e79974f833ae8ab256 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 20 Aug 2025 11:40:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(cashDetails):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/financialCase.js | 7 +++++++ src/views/financial/onlinePayDetails/index.vue | 16 ++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/api/financialCase.js b/src/api/financialCase.js index 984caa2..67e8ef4 100644 --- a/src/api/financialCase.js +++ b/src/api/financialCase.js @@ -272,3 +272,10 @@ export function batchReject(data) { }) } +export function refreshPayStatus(params) { + return request({ + url: '/pay/manage/online-payment/compensationCallBack', + method: 'get', + params + }) +} diff --git a/src/views/financial/onlinePayDetails/index.vue b/src/views/financial/onlinePayDetails/index.vue index 1c0d41c..a513142 100644 --- a/src/views/financial/onlinePayDetails/index.vue +++ b/src/views/financial/onlinePayDetails/index.vue @@ -293,12 +293,14 @@ > @@ -474,6 +476,16 @@ export default { return 'success-row' } return '' + }, + refreshStatus({ businessCode }) { + api.refreshPayStatus({ businessCode }).then((res) => { + if (res.code === 200) { + this.$message.success('刷新成功') + this.getDataList() + } else { + this.$message.error(res.msg) + } + }) } } }