diff --git a/.env.development b/.env.development index 6b724c6..d259db0 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.109:7201" +VUE_APP_URL = "http://192.168.2.104: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 b9dafb1..39097c6 100644 --- a/src/api/marketingCard/marketingCard.js +++ b/src/api/marketingCard/marketingCard.js @@ -45,6 +45,27 @@ export default { // 提货卡设置 + // 提货卡发行记录 + recordListPage: function(data) { + return request({ + url: '/lpkcardbuildrecord/recordListPage', + method: 'post', + data: data + }); + }, + + // 发行记录详细 + recordDetails: function(data) { + return request({ + url: '/lpkgiftcard/recordDetails', + method: 'post', + data: data + }); + }, + + + + // 获取提货卡页面 礼包列表 giftBagList: function(data) { return request({ @@ -54,5 +75,14 @@ export default { }); }, + // 发行提货卡 + generateCard: function(data) { + return request({ + url: '/lpkgiftcard/generateCard', + method: 'post', + data: data + }); + }, + } diff --git a/src/views/marketingCard/pickupCardSet - 副本.vue b/src/views/marketingCard/pickupCardSet - 副本.vue new file mode 100644 index 0000000..4c3b597 --- /dev/null +++ b/src/views/marketingCard/pickupCardSet - 副本.vue @@ -0,0 +1,162 @@ + + + + \ No newline at end of file diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue index c35e409..d4b4312 100644 --- a/src/views/marketingCard/pickupCardSet.vue +++ b/src/views/marketingCard/pickupCardSet.vue @@ -1,39 +1,141 @@ @@ -44,32 +146,131 @@ export default { data() { return { - submitdisabled: false, + viewState: 1, + page: { + total: 0, // 默认数据总数 + current: 1, // 默认开始页面 + size: 10, // 每页的数据条数 + params: { + startDate: '', + endDate: '', + }, + }, + tableData: [], + tableData2: [], + listQuery: { + total: 0, // 默认数据总数 + current: 1, // 默认开始页面 + size: 10, // 每页的数据条数 + params: { + sid:"", + seriaNumber: '', + state: '', + }, + }, + + activeName: 'roleList', formobj: { num: '', - giftPack: "" + bagSid: "" }, - giftPackList: [] + giftPackList: [], + stateList:[ + { + name:"未绑定用户", + sid:"2" + }, + { + name:"未提货", + sid:"3" + }, + { + name:"部分提货", + sid:"4" + }, + { + name:"提货完成", + sid:"5" + } + ] } }, created() { - this.giftBagList() + this.getPageList() }, methods: { - giftBagList(){ + + handleClick(tab, event) { + this.viewState=1 + if (tab.name == 'addrole') { + this.giftBagList() + } else { + this.getPageList() + } + }, + pagination(val) { // 分页 + this.page.current = val.pageNum + this.page.size = val.pageSize + this.getPageList(this.page) + }, + selectTime1(val) { + + console.log('selectTime1:', val) + this.page.params.startDate = val + + }, + selectTime2(val) { + + console.log('selectTime2:', val) + this.page.params.endDate = val + + }, + + getPageList() { + req.recordListPage(this.page) + .then(resp => { + console.log('>>>>>>>>>getPageList', resp.data) + this.tableData = resp.data.records + this.page.total = res.data.total + }) + .catch(() => {}) + }, + + showRow(){ + + this.viewState=2 + req.recordDetails(this.listQuery) + .then(resp => { + console.log('>>>>>>>>>recordDetails', resp.data) + this.tableData2 = resp.data.records + this.listQuery.total = res.data.total + this.viewState=2 + }) + .catch(() => { + + }) + + }, + + returnView(){ + this.viewState=1 + }, + giftBagList() { req.giftBagList() .then(resp => { console.log('>>>>>>>>>giftBagList', resp.data) this.giftPackList = resp.data + }) .catch(() => {}) }, giftPackSelect(val) { console.log('>>>>>>>>>giftPackSelect', val) + this.formobj.bagSid = val }, saveOrUpdate() { console.log('>>>>>>>>>saveOrUpdate', this.formobj) - req.saveGoods(this.formobj) + req.generateCard(this.formobj) .then(resp => { if (resp.success) { this.$message({ @@ -88,40 +289,12 @@ if (isreload === 'true') this.$emit('reloadlist') this.imgList = [] this.formobj = { - sid: "", - name: '', - code: '', - barcode: '', - price: "", - unitName: "", - picUrl: "" + num: '', + bagSid: "" } this.$emit('doback') }, - showAdd() { - console.log(this.imgList, 88888888) - }, - showEdit(row) { - req.goodsInit(row.sid) - .then(resp => { - if (resp.success) { - this.formobj = resp.data - this.imgList = [] - this.imgList.push({ - url: resp.data.picUrl - }) - - } - }) - .catch(e => { - this.formobj = row - this.imgList = [] - this.imgList.push({ - url: formobj.picUrl - }) - }) - } } }