diff --git a/.env.development b/.env.development index 0636b47..774edf3 100644 --- a/.env.development +++ b/.env.development @@ -8,5 +8,5 @@ VUE_APP_BASE_API = '/api' # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi" -VUE_APP_URL = "http://192.168.2.110:7201" +VUE_APP_URL = "http://192.168.2.113:7201" ##VUE_APP_URL = "http://8.130.39.13:8112" diff --git a/src/api/marketingCard/marketingCard.js b/src/api/marketingCard/marketingCard.js index 30fa01e..c6e3b86 100644 --- a/src/api/marketingCard/marketingCard.js +++ b/src/api/marketingCard/marketingCard.js @@ -13,6 +13,16 @@ export default { }); }, + // 获取发放网点列表 + bankList: function(data) { + return request({ + url: '/lpkbank/listAll', + method: 'get', + data: data + }); + }, + + // 礼包选择商品时，返回的商品列表 getGoods: function(data) { return request({ @@ -94,5 +104,14 @@ export default { }); }, + // 发放提货卡 + cardGrant: function(data) { + return request({ + url: '/lpkgiftcard/cardGrant', + method: 'post', + data: data + }); + }, + } diff --git a/src/api/network/network.js b/src/api/network/network.js new file mode 100644 index 0000000..38d759c --- /dev/null +++ b/src/api/network/network.js @@ -0,0 +1,50 @@ +import request from '@/utils/request' + +export default { + + // 获取网点列表 + bankListPage: function(data) { + return request({ + url: '/lpkbank/listPage', + method: 'post', + data: data + }); + }, + + // 新增网点 + saveBank: function(data) { + return request({ + url: '/lpkbank/save', + method: 'post', + data: data + }); + }, + + // 修改网点 + updateBank: function(data) { + return request({ + url: '/lpkbank/update', + method: 'post', + data: data + }); + }, + + // 初始化网点 + bankInit: function(data) { + return request({ + url: '/lpkbank/getLpkBankBySid/'+data, + method: 'get' + }); + }, + + // 删除网点 + deleteBank: function(data) { + return request({ + url: '/lpkbank/delete/'+data, + method: 'delete' + }); + }, + + +} + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 3f18321..195a56a 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -89,6 +89,26 @@ name: "/marketingCard/pickupCardSet", path: "/marketingCard/pickupCardSet", }, + // { + // alwaysShow: true, + // component: "grantRecords", + // meta: { + // icon: "el-icon-help", + // title: "发放记录", + // }, + // name: "/marketingCard/grantRecords", + // path: "/marketingCard/grantRecords", + // }, + // { + // alwaysShow: true, + // component: "carList", + // meta: { + // icon: "el-icon-help", + // title: "提货卡列表", + // }, + // name: "/marketingCard/carList", + // path: "/marketingCard/carList", + // }, ] }, { @@ -123,6 +143,16 @@ }, // { // alwaysShow: true, + // component: "network", + // meta: { + // icon: "el-icon-menu", + // title: "网点管理", + // }, + // name: "/network/index", + // path: "/network/index" + // }, + // { + // alwaysShow: true, // component: "statisticalReport", // meta: { // icon: "el-icon-menu", diff --git a/src/router/index.js b/src/router/index.js index 5ba88f8..34658fc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -99,6 +99,24 @@ export const constantRoutes = [ noCache: true } }, + // { + // path: '/marketingCard/grantRecords', + // component: () => import('@/views/marketingCard/grantRecords.vue'), + // name: 'grantRecords', + // meta: { + // title: '发放记录', + // noCache: true + // } + // }, + // { + // path: '/marketingCard/carList', + // component: () => import('@/views/marketingCard/carList.vue'), + // name: 'carList', + // meta: { + // title: '提货卡列表', + // noCache: true + // } + // }, ] },{ path: '/pickupPoint', @@ -173,6 +191,21 @@ export const constantRoutes = [ } }] }, + // { + // path: '/network', + // component: Layout, + // redirect: '/network/index', + // children: [{ + // path: '/network/index', + // component: () => + // import('@/views/network/index.vue'), + // name: 'index', + // meta: { + // title: '网点管理' + // } + // },] + // }, + ...codemenu, { path: '/404', diff --git a/src/views/commodity/commodityAdd.vue b/src/views/commodity/commodityAdd.vue index 35245b9..a7747be 100644 --- a/src/views/commodity/commodityAdd.vue +++ b/src/views/commodity/commodityAdd.vue @@ -39,6 +39,10 @@ 单位： +
+ 备注： + +
图片： @@ -75,6 +79,7 @@ barcode: '', price: "", unitName: "", + remarks:"", picUrl: "" } } @@ -115,6 +120,7 @@ barcode: '', price: "", unitName: "", + remarks:"", picUrl: "" } this.$emit('doback') diff --git a/src/views/marketingCard/carList.vue b/src/views/marketingCard/carList.vue new file mode 100644 index 0000000..3eb9fac --- /dev/null +++ b/src/views/marketingCard/carList.vue @@ -0,0 +1,231 @@ + + + + \ No newline at end of file diff --git a/src/views/marketingCard/grantRecords.vue b/src/views/marketingCard/grantRecords.vue new file mode 100644 index 0000000..a910b9d --- /dev/null +++ b/src/views/marketingCard/grantRecords.vue @@ -0,0 +1,237 @@ + + + + \ No newline at end of file diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue index f2d5a46..7e61719 100644 --- a/src/views/marketingCard/pickupCardSet.vue +++ b/src/views/marketingCard/pickupCardSet.vue @@ -35,6 +35,9 @@ @@ -221,10 +262,18 @@ } ], recordId: '', + editDialog: false, + from: { + start: "", + end: "", + bankSid: "" + }, + bankList: [] } }, created() { this.getPageList() + this.getBankList() }, methods: { @@ -294,7 +343,9 @@ }) }, - + editRow(row) { + this.editDialog = true + }, showRow(row) { this.listQuery.params.sid = row.sid this.viewState = 2 @@ -397,7 +448,6 @@ }, handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') - this.imgList = [] this.formobj = { cardArea: "", num: '', @@ -405,6 +455,56 @@ } this.$emit('doback') }, + getBankList() { + req.bankList() + .then(resp => { + console.log('>>>>>>>>>getBankList', resp.data) + this.bankList = resp.data + + }) + .catch(() => {}) + }, + input1(val) { + console.log("input1》》》》", val) + }, + input2(val) { + console.log("input2》》》》", val) + }, + bankSelect(val) { + console.log("bankSelect》》》》", val) + const choose = this.bankList.filter((item) => item.sid === val) + this.from.bankSid = choose[0].sid + }, + save() { + console.log("save》》》》", this.from) + + req.cardGrant(this.from) + .then(resp => { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.editDialog = false + this.from = { + start: "", + end: "", + bankSid: "" + } + this.getPageList() + }) + .catch(() => {}) + + + }, + banClose() { + this.from = { + start: "", + end: "", + bankSid: "" + } + this.editDialog = false + }, } } diff --git a/src/views/network/index.vue b/src/views/network/index.vue new file mode 100644 index 0000000..286e8cd --- /dev/null +++ b/src/views/network/index.vue @@ -0,0 +1,230 @@ + + + + \ No newline at end of file diff --git a/src/views/network/indexAdd.vue b/src/views/network/indexAdd.vue new file mode 100644 index 0000000..d0b505a --- /dev/null +++ b/src/views/network/indexAdd.vue @@ -0,0 +1,197 @@ + + + + \ No newline at end of file diff --git a/src/views/pickupPoint/index.vue b/src/views/pickupPoint/index.vue index 0680c12..60e256c 100644 --- a/src/views/pickupPoint/index.vue +++ b/src/views/pickupPoint/index.vue @@ -102,8 +102,7 @@ size: 10, total: 0, params: { - realName: '', - mobile: '', + name: '', } },