From 8fc32205c4ea8d5da6ffb348923562b9a3e7ab35 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Fri, 8 Dec 2023 18:33:08 +0800 Subject: [PATCH] 2023-12-8 --- src/api/corporateCardSet/corporateCardSet.js | 117 ++++ src/layout/components/Sidebar/index.vue | 21 +- src/router/index.js | 19 +- src/views/marketingCard/corporateCardSet.vue | 563 +++++++++++++++++++ src/views/marketingCard/packageDetails.vue | 8 - src/views/marketingCard/pickupCardSet.vue | 4 +- src/views/order/index.vue | 53 +- 7 files changed, 737 insertions(+), 48 deletions(-) create mode 100644 src/api/corporateCardSet/corporateCardSet.js create mode 100644 src/views/marketingCard/corporateCardSet.vue delete mode 100644 src/views/marketingCard/packageDetails.vue diff --git a/src/api/corporateCardSet/corporateCardSet.js b/src/api/corporateCardSet/corporateCardSet.js new file mode 100644 index 0000000..ce4bb54 --- /dev/null +++ b/src/api/corporateCardSet/corporateCardSet.js @@ -0,0 +1,117 @@ +import request from '@/utils/request' + +export default { + + // 礼包设置 + + // 获取礼包列表 + giftBagListPage: function(data) { + return request({ + url: '/lpkgiftbag/giftBagListPage', + method: 'post', + data: data + }); + }, + + // 获取发放网点列表 + bankList: function(data) { + return request({ + url: '/lpkbank/listAll', + method: 'get', + data: data + }); + }, + + + // 礼包选择商品时，返回的商品列表 + getGoods: function(data) { + return request({ + url: '/lpkgoods/getGoods', + method: 'post', + data: data + }); + }, + + + // 新增、保存礼包 + saveGiftBag: function(data) { + return request({ + url: '/lpkgiftbag/saveGiftBag', + method: 'post', + data: data + }); + }, + + // 初始化礼包 + giftBagInit: function(data) { + return request({ + url: '/lpkgiftbag/giftBagInit/'+data, + method: 'get' + }); + }, + + + + + // 企业卡设置 + + // 企业卡发行记录 + recordListPage: function(data) { + return request({ + url: '/empcardbuildrecord/recordListPage', + method: 'post', + data: data + }); + }, + + // 发行记录详细 + recordDetails: function(data) { + return request({ + url: '/empcard/recordDetails', + method: 'post', + data: data + }); + }, + + + // 导出 + exportExcel: function(data) { + return request({ + url: '/empcard/exportExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + + + // 获取提货卡页面 礼包列表 + giftBagList: function(data) { + return request({ + url: '/lpkgiftbag/giftBagList', + method: 'get', + data: data + }); + }, + + // 发行企业卡 + generateCard: function(data) { + return request({ + url: '/empcard/generateCard', + method: 'post', + data: data + }); + }, + + // 发放提货卡 + cardGrant: function(data) { + return request({ + url: '/lpkgiftcard/cardGrant', + method: 'post', + data: data + }); + }, + +} + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index bcbba27..acad6b7 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -69,16 +69,7 @@ name: "/marketingCard/index", path: "/marketingCard/index", }, - // { - // alwaysShow: true, - // component: "packageDetails", - // meta: { - // icon: "el-icon-help", - // title: "礼包奖品明细", - // }, - // name: "/marketingCard/packageDetails", - // path: "/marketingCard/packageDetails", - // }, + { alwaysShow: true, component: "pickupCardSet", @@ -89,6 +80,16 @@ name: "/marketingCard/pickupCardSet", path: "/marketingCard/pickupCardSet", }, + { + alwaysShow: true, + component: "corporateCardSet", + meta: { + icon: "el-icon-help", + title: "企业卡设置", + }, + name: "/marketingCard/corporateCardSet", + path: "/marketingCard/corporateCardSet", + }, // { // alwaysShow: true, // component: "grantRecords", diff --git a/src/router/index.js b/src/router/index.js index fe8ca42..cfb0f66 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -81,15 +81,7 @@ export const constantRoutes = [ noCache: true } }, - // { - // path: '/marketingCard/packageDetails', - // component: () => import('@/views/marketingCard/packageDetails.vue'), - // name: 'packageDetails', - // meta: { - // title: '礼包奖品明细', - // noCache: true - // } - // }, + { path: '/marketingCard/pickupCardSet', component: () => import('@/views/marketingCard/pickupCardSet.vue'), @@ -99,6 +91,15 @@ export const constantRoutes = [ noCache: true } }, + { + path: '/marketingCard/corporateCardSet', + component: () => import('@/views/marketingCard/corporateCardSet.vue'), + name: 'corporateCardSet', + meta: { + title: '企业卡设置', + noCache: true + } + }, // { // path: '/marketingCard/grantRecords', // component: () => import('@/views/marketingCard/grantRecords.vue'), diff --git a/src/views/marketingCard/corporateCardSet.vue b/src/views/marketingCard/corporateCardSet.vue new file mode 100644 index 0000000..0b7d89e --- /dev/null +++ b/src/views/marketingCard/corporateCardSet.vue @@ -0,0 +1,563 @@ + + + + \ No newline at end of file diff --git a/src/views/marketingCard/packageDetails.vue b/src/views/marketingCard/packageDetails.vue deleted file mode 100644 index 02409e3..0000000 --- a/src/views/marketingCard/packageDetails.vue +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue index 7e61719..7307e5f 100644 --- a/src/views/marketingCard/pickupCardSet.vue +++ b/src/views/marketingCard/pickupCardSet.vue @@ -53,8 +53,8 @@ - - +
- + + + + + + @@ -118,7 +125,8 @@ current: 1, // 默认开始页面 size: 10, // 每页的数据条数 params: { - startDate:getBeforeDate(-2), + startDate: "", + endDate: "", store: "" }, }, @@ -159,6 +167,12 @@ console.log('selectTime1:', val) this.page.params.startDate = val + }, + selectTime2(val) { + + console.log('selectTime2:', val) + this.page.params.endDate = val + }, giftPackSelect(val) { @@ -208,7 +222,8 @@ size: 10, total: 0, params: { - startDate: etBeforeDate(-2), + startDate: "", + endDate: "", store: "" }, } @@ -237,23 +252,23 @@ }) - req.exportExcel(this.page).then((resp) => { - loading.close() - const blob = new Blob([resp], { - type: 'application/vnd.ms-excel' - }) - const fileName = '订单明细_' + this.page.params.startDate + '.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() + req.exportExcel(this.page).then((resp) => { + loading.close() + const blob = new Blob([resp], { + type: 'application/vnd.ms-excel' }) + const fileName = '订单明细_' + this.page.params.startDate + '.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() + }) },