From cfba91182ed8c9095fc966696839e79417e71370 Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 9 Jul 2025 11:21:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat(CashDetail):=20=E6=8F=90=E7=8E=B0?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=B7=BB=E5=8A=A0=E9=A9=B3=E5=9B=9E=E6=93=8D?= =?UTF-8?q?=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/financialCase.js | 8 + src/router/index.js | 60 +- src/views/financial/cashDetails/index.vue | 77 +- .../productBasicInfo/productBasicAdd/jcsz.vue | 802 ----------------- .../productBasicAdd/productDetail.vue | 805 ------------------ .../productBasicList/index.vue | 531 ------------ vue.config.js | 6 +- 7 files changed, 112 insertions(+), 2177 deletions(-) delete mode 100644 src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue delete mode 100644 src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue delete mode 100644 src/views/goodsManage/productBasicInfo/productBasicList/index.vue diff --git a/src/api/financialCase.js b/src/api/financialCase.js index 19341a4..b6a7c61 100644 --- a/src/api/financialCase.js +++ b/src/api/financialCase.js @@ -271,3 +271,11 @@ export function getTreeType(params) { }) } +// 批量驳回 +export function batchReject(data) { + return request({ + url: '/member/manager/withdraw/reject', + method: 'post', + data + }) +} diff --git a/src/router/index.js b/src/router/index.js index 165d6ec..dea0544 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -939,37 +939,37 @@ export const constantRoutes = [ meta: { title: '邮费配置' } } ] - }, - { - path: 'productBasicInfo', - name: 'productBasicInfo', - meta: { title: '产品基本信息' }, - component: ParentView, - redirect: 'productBasicInfo/cpfl', - children: [ - { - path: 'productBasicList', - name: 'productBasicList', - component: () => import('@/views/goodsManage/productBasicInfo/productBasicList/index.vue'), - meta: { title: '产品列表' }, - hidden: true - }, - { - path: 'productBasicAdd', - name: 'productBasicAdd', - component: () => import('@/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue'), - meta: { title: '产品新增' }, - hidden: true - }, - { - path: 'productBasicDetail', - name: 'productBasicDetail', - component: () => import('@/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue'), - // meta: { title: '产品列表'}, - hidden: true - } - ] } + // { + // path: 'productBasicInfo', + // name: 'productBasicInfo', + // meta: { title: '产品基本信息' }, + // component: ParentView, + // redirect: 'productBasicInfo/cpfl', + // children: [ + // { + // path: 'productBasicList', + // name: 'productBasicList', + // component: () => import('@/views/goodsManage/productBasicInfo/productBasicList/index.vue'), + // meta: { title: '产品列表' }, + // hidden: true + // }, + // { + // path: 'productBasicAdd', + // name: 'productBasicAdd', + // component: () => import('@/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue'), + // meta: { title: '产品新增' }, + // hidden: true + // }, + // { + // path: 'productBasicDetail', + // name: 'productBasicDetail', + // component: () => import('@/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue'), + // // meta: { title: '产品列表'}, + // hidden: true + // } + // ] + // } ] }, diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue index 3a93d75..14e4479 100644 --- a/src/views/financial/cashDetails/index.vue +++ b/src/views/financial/cashDetails/index.vue @@ -221,7 +221,16 @@ @click="handleExport" > {{ '导出' }} + + 驳回 + +
@@ -457,12 +466,7 @@ prop="payerRemarks" :label="'打款备注'" /> - + + + + + + + + + + 取消 + 确认 + +
@@ -584,6 +617,10 @@ export default { // 折叠搜索框 isActive: false, moren: 'cashDetails', + rejectDialogVisible: false, + rejectForm: { + rejectRemark: '' + }, topList: [ { name: '提现明细', @@ -772,6 +809,34 @@ export default { methods: { isLocals, isLocalSymbol, + saveRejectForm() { + const data = { + idList: this.checkArr, + rejectRemark: this.rejectForm.rejectRemark + } + api.batchReject(data).then((res) => { + if (res.code == 200) { + this.$message({ + message: res.msg, + type: 'success' + }) + this.rejectDialogVisible = false + this.getDataList() + } + }) + }, + batchRejectHandle() { + const canReject = this.checkArrAll.every((item) => item.approveState == 1) + console.log(canReject) + if (!canReject) { + this.$message({ + message: '存在已审核单据，请重新选择', + type: 'warning' + }) + return false + } + this.rejectDialogVisible = true + }, getUserRole() { getRoleMenu('CashDetails').then((res) => { const obj = {} diff --git a/src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue b/src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue deleted file mode 100644 index e18491c..0000000 --- a/src/views/goodsManage/productBasicInfo/productBasicAdd/jcsz.vue +++ /dev/null @@ -1,802 +0,0 @@ - - - - diff --git a/src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue b/src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue deleted file mode 100644 index 2df6f9f..0000000 --- a/src/views/goodsManage/productBasicInfo/productBasicAdd/productDetail.vue +++ /dev/null @@ -1,805 +0,0 @@ - - - - diff --git a/src/views/goodsManage/productBasicInfo/productBasicList/index.vue b/src/views/goodsManage/productBasicInfo/productBasicList/index.vue deleted file mode 100644 index 5d4b544..0000000 --- a/src/views/goodsManage/productBasicInfo/productBasicList/index.vue +++ /dev/null @@ -1,531 +0,0 @@ - - - - - diff --git a/vue.config.js b/vue.config.js index 5204c5d..dd43aca 100644 --- a/vue.config.js +++ b/vue.config.js @@ -44,9 +44,9 @@ module.exports = { }, proxy: { '/prod-api': { - target: 'http://192.168.0.86:8080', - changeOrigin: true, - pathRewrite: { '^/prod-api': '' } + target: 'http://t-app.beida777.com', + changeOrigin: true + // pathRewrite: { '^/prod-api': '' } } } }, From 4b6c06c1cb406d37124e0b8e3c3cd6b9e424907a Mon Sep 17 00:00:00 2001 From: woody Date: Wed, 9 Jul 2025 15:13:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(bonus):=20=E5=A5=96=E9=87=91=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A4=8D=E8=B4=AD=E7=BA=A7?= =?UTF-8?q?=E5=B7=AE=E6=94=B6=E7=9B=8A=E6=94=B9=E4=B8=BA=E6=9C=88=E5=A4=8D?= =?UTF-8?q?=E8=B4=AD=E7=BA=A7=E5=B7=AE=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/settlementCenter/bonusDetail/index.vue | 9 ++++++++- src/views/settlementCenter/totalBonus/index.vue | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue index 529346b..2433a1e 100644 --- a/src/views/settlementCenter/bonusDetail/index.vue +++ b/src/views/settlementCenter/bonusDetail/index.vue @@ -211,11 +211,18 @@ /> + + Date: Thu, 10 Jul 2025 09:56:23 +0800 Subject: [PATCH 3/4] feat(CashDetail): add reject btn role --- src/views/financial/cashDetails/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/financial/cashDetails/index.vue b/src/views/financial/cashDetails/index.vue index 14e4479..112fee9 100644 --- a/src/views/financial/cashDetails/index.vue +++ b/src/views/financial/cashDetails/index.vue @@ -222,6 +222,7 @@ > {{ '导出' }} Date: Thu, 10 Jul 2025 13:41:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat(vertexAwardConfig):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BD=93=E7=B3=BB=E5=A5=96=E9=A1=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business.js | 7 +- src/api/enums.js | 8 + src/api/vertex.js | 24 ++ src/layout/components/Navbar.vue | 2 +- src/router/index.js | 6 + .../VertexAwardConfiguration.vue | 330 ++++++++++++++++++ .../systemconfiguration/mixins.js | 5 + 7 files changed, 375 insertions(+), 7 deletions(-) create mode 100644 src/api/enums.js create mode 100644 src/api/vertex.js create mode 100644 src/views/configManage/systemconfiguration/VertexAwardConfiguration.vue diff --git a/src/api/business.js b/src/api/business.js index 56643b0..fa056e9 100644 --- a/src/api/business.js +++ b/src/api/business.js @@ -1,9 +1,4 @@ -/* - * @Descripttion: - * @version: - * @Author: kBank - * @Date: 2023-03-21 09:00:28 - */ + import request from '@/utils/request' // 统计 export function getstaAmountBox(params) { diff --git a/src/api/enums.js b/src/api/enums.js new file mode 100644 index 0000000..0f02f8f --- /dev/null +++ b/src/api/enums.js @@ -0,0 +1,8 @@ +import request from '@/utils/request' + +export function getVertexAwardBonusOptions() { + return request({ + url: `/system/pub/enums/vertex-bonus-items`, + method: 'get' + }) +} diff --git a/src/api/vertex.js b/src/api/vertex.js new file mode 100644 index 0000000..9854be8 --- /dev/null +++ b/src/api/vertex.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function getVertexAwardConfiguration() { + return request({ + url: '/system/manage/vertex-bonus/list', + method: 'get' + }) +} + +export function saveVertexAwardConfiguration(data) { + return request({ + url: '/system/manage/vertex-bonus/save', + method: 'post', + data + }) +} + +export function delVertexAwardConfiguration(pkId) { + return request({ + url: `/system/manage/vertex-bonus/${pkId}`, + method: 'delete' + }) +} + diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d459c85..793bffe 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -96,7 +96,7 @@ export default { that.getJScountry() // 获取语言列表 that.getLanguages() - that.getSystem() + // that.getSystem() }, 10) this.systemItem = localStorage.getItem('systemItem') || 2 diff --git a/src/router/index.js b/src/router/index.js index dea0544..152adc1 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1681,6 +1681,12 @@ export const constantRoutes = [ name: 'GroupConfigurationList', component: () => import('@/views/configManage/systemconfiguration/groupConfiguration'), meta: { title: '区域体系分组' } + }, + { + path: 'vertexAwardConfiguration', + name: 'VertexAwardConfiguration', + component: () => import('@/views/configManage/systemconfiguration/VertexAwardConfiguration'), + meta: { title: '体系奖项配置' } } ] }, diff --git a/src/views/configManage/systemconfiguration/VertexAwardConfiguration.vue b/src/views/configManage/systemconfiguration/VertexAwardConfiguration.vue new file mode 100644 index 0000000..4a3d434 --- /dev/null +++ b/src/views/configManage/systemconfiguration/VertexAwardConfiguration.vue @@ -0,0 +1,330 @@ + + + + + diff --git a/src/views/configManage/systemconfiguration/mixins.js b/src/views/configManage/systemconfiguration/mixins.js index db82f2a..b3e32fa 100644 --- a/src/views/configManage/systemconfiguration/mixins.js +++ b/src/views/configManage/systemconfiguration/mixins.js @@ -8,5 +8,10 @@ export const topList = [ name: '区域体系分组', path: 'groupConfiguration', url: 'GroupConfigurationList' + }, + { + name: '体系奖项配置', + path: 'vertexAwardConfiguration', + url: 'VertexAwardConfiguration' } ]