diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue index 545e408..31bde68 100644 --- a/src/pages/shop/IncreaseDataCompany.vue +++ b/src/pages/shop/IncreaseDataCompany.vue @@ -199,8 +199,8 @@ userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId }; let that = this; - that.data1 = []; IncreaseData.generalizeOfRetail(request, function (data) { + that.data1 = []; that.tableLoading = false; data = data.data; if (data.code === '0001') { @@ -257,7 +257,7 @@ entity.index = i+1; originAllData.push(entity); } - let title = "零售公司推广情况"+ that.$moment(new Date()).format("YYYY-MM-DD"); + let title = "零售公司推广情况"+ that.selectDate[0] + '-' + that.selectDate[1]; require.ensure([], () => { const { export_json_to_excel } = require('../../excel/Export2Excel'); const tHeader = ['序号', '零售公司名称', '总好友数', '总好友数(去重)', '新增好友数', '新增好友数(去重)','日增好友平均','日增好友平均(去重)','删除/拉黑成员客户数(累计)','拉黑率(累计)']; diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue index cd48d5f..54d36cf 100644 --- a/src/pages/shop/IncreaseDataStaff.vue +++ b/src/pages/shop/IncreaseDataStaff.vue @@ -308,6 +308,7 @@ }; this.data1 = []; IncreaseData.generalizeOfSeller(request,function (data) { + that.data1 = []; that.tableLoading = false; data = data.data; if (data.code === '0001') { @@ -354,7 +355,7 @@ orgId:orgId, shopId:shopId, sellerId:sellerId, - pageNum:this.pageNum, + pageNum:1, pageSize:this.totalSize, userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId }; @@ -371,10 +372,10 @@ entity.index = i+1; originAllData.push(entity); } - let title = "导购推广情况" + that.$moment(new Date()).format("YYYY-MM-DD"); + let title = "导购推广情况" + that.selectDate[0] + '-' + that.selectDate[1]; require.ensure([], () => { const { export_json_to_excel } = require('../../excel/Export2Excel'); - const tHeader = ['序号', '导购名称', '工号', '所属店铺', '编码', '所属零售公司','总好友数','总好友数(去重)','新增好友数','新增好友数(去重)','日增好友平均(去重)']; + const tHeader = ['序号', '导购名称', '工号', '所属店铺', '店铺编码', '所属零售公司','总好友数','总好友数(去重)','新增好友数','新增好友数(去重)','日增好友平均(去重)']; // 属性名 const filterVal = ['index', 'sellerName', 'sellerCode', 'shopName', 'shopCode', 'companyName','allCustomer','effectiveCustomer','newCustomer','newEffectiveCustomer','avgNewCustomer']; // 数据 diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue index 7c76807..9a828b1 100644 --- a/src/pages/shop/IncreaseDataStore.vue +++ b/src/pages/shop/IncreaseDataStore.vue @@ -225,8 +225,8 @@ userId:JSON.parse(sessionStorage.getItem("loginInfo")).userId }; let that = this; - that.data1 = []; IncreaseData.generalizeOfStore(request, function (data) { + that.data1 = []; that.tableLoading = false; data = data.data; if (data.code === '0001') { @@ -288,7 +288,7 @@ entity.index = i + 1; originAllData.push(entity); } - let title = "店铺推广情况" + that.$moment(new Date()).format("YYYY-MM-DD"); + let title = "店铺推广情况" + that.selectDate[0] + '-' + that.selectDate[1]; require.ensure([], () => { const {export_json_to_excel} = require('../../excel/Export2Excel'); const tHeader = ['序号','店铺', '店铺编号', '所属零售公司', '总好友数', '总好友数(去重)', '新增好友数', '新增好友数(去重)','日增好友平均', '日增好友平均(去重)', '删除/拉黑成员客户数(累计)', '拉黑率(累计)']; diff --git a/src/pages/user/AccountManager.vue b/src/pages/user/AccountManager.vue index 00d13f1..fc3c000 100644 --- a/src/pages/user/AccountManager.vue +++ b/src/pages/user/AccountManager.vue @@ -192,7 +192,6 @@ mounted: function () { this.listRoleInfo(); this.listOfShop(); - this.listAccountInfoFunction(); // 绑定enter事件 this.enterKeyup(); }, @@ -208,10 +207,6 @@ path: '/account/management/add', }); }, - //导入账户 - // uploadAccount() { - // this.$router.push({path: '/account/upload'}); - // }, //查询所有角色 listRoleInfo() { let that = this; @@ -237,8 +232,8 @@ that.item = that.$route.query; //别的页面跳转过来 that.changeRoleId = that.item.id; - that.bus.$emit('callBack'); } + that.listAccountInfoFunction(); } }) }, @@ -271,13 +266,7 @@ }, //搜索账号内容 listAccountInfoFunction: function () { - if (this.$route.query != null) { - this.item = this.$route.query; - //别的页面跳转过来 - this.changeRoleId = this.item.id; - } let that = this; - that.data1 = []; let roleId = that.changeRoleId; if(that.changeRoleId === "0"){ roleId = null; @@ -294,6 +283,7 @@ shopId: shopId }; accountManagement.listAccountInfoApi(request, function (data) { + that.data1 = []; data = data.data; if (data.code === '0001') { that.$Message.error("系统繁忙!");