|
|
@@ -10,10 +10,11 @@
|
|
10
|
10
|
<self-channel style="margin-right: 10px;" title="" type='launchType' :reset="resetFlag" :labelWidth="true" @channelDefine="(val) => { order_type = val; init(1); init_predata() }" />
|
|
11
|
11
|
<self-channel style="margin-right: 10px;" title="" type='promotionType' :reset="resetFlag" :labelWidth="true" @channelDefine="(val) => { plat_order_type = val; init(1); init_predata() }" />
|
|
12
|
12
|
<self-channel style="margin-right: 10px;" title="" type='incomeSource' :reset="resetFlag" :labelWidth="true" @channelDefine="(val) => { is_ad_user = val; init(1); init_predata() }" />
|
|
13
|
|
- <self-channel style="margin-right: 10px;" title="" type='adqAccount' :reset="resetFlag" :labelWidth="true" @channelDefine="(val) => { account_id = val; init(1); init_predata() }" />
|
|
|
13
|
+ <selfChannelV2 style="margin-right: 10px;" v-model="account_id" type='adqAccount' title="" :labelWidth="true" @change="(val) => { account_id = val; init(1); init_predata() }" />
|
|
14
|
14
|
<date-picker title="" :quickFlag="false" :clearFlag='true' :timeFlag="true" :reset="resetFlag" placeholder="用户注册时间" :defaultTime="['00:00:00', '23:59:59']" :pickerOptions="pickerOptions" @changeTime="changeTimeUserReg" style="margin-right: 10px;" />
|
|
15
|
15
|
<selfChannelV2 style="margin-right: 10px;" v-model="order_pay_type" type='orderPayType' title="" :labelWidth="true" @change="onChangeOrderPayType" />
|
|
16
|
16
|
<selfChannelV2 style="margin-right: 10px;" v-model="ad_report_action_type" type='adReportType' title="" :labelWidth="true" @change="onChangeAdReportActionType" />
|
|
|
17
|
+ <selfSelectCorp style="margin-right: 10px;" v-model="corp_id" labelName="" placeholder="企微主体" @change="onChangeCorpid" />
|
|
17
|
18
|
</div>
|
|
18
|
19
|
<div class="reset" @click="resetEvent">重置</div>
|
|
19
|
20
|
<el-button class="export-btn" type="primary" size="mini" @click="init(1, 'export')">导出Excel</el-button>
|
|
|
@@ -147,8 +148,7 @@
|
|
147
|
148
|
</ux-grid>
|
|
148
|
149
|
<div class="pagination" v-show="total > 0">
|
|
149
|
150
|
<el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next"
|
|
150
|
|
- :page-count='Number(pages)'>
|
|
151
|
|
- </el-pagination>
|
|
|
151
|
+ :page-count='Number(pages)' />
|
|
152
|
152
|
</div>
|
|
153
|
153
|
</div>
|
|
154
|
154
|
<!--详情-->
|
|
|
@@ -167,10 +167,18 @@ import selfChannel from '@/components/assembly/screen/channel.vue'
|
|
167
|
167
|
import selfInput from '@/components/assembly/screen/input.vue'
|
|
168
|
168
|
import { promotionTypeDesc, incomeSourceDesc, launchTypeDesc } from '@/assets/js/staticTypes'
|
|
169
|
169
|
import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
|
|
|
170
|
+import selfSelectCorp from '@/components/assembly/screen/selectCorp.vue'
|
|
170
|
171
|
|
|
171
|
172
|
export default {
|
|
172
|
173
|
name: 'charge',
|
|
173
|
|
- components: { datePicker, selfChannel, selfInput, detial, selfChannelV2, },
|
|
|
174
|
+ components: {
|
|
|
175
|
+ datePicker,
|
|
|
176
|
+ selfChannel,
|
|
|
177
|
+ selfInput,
|
|
|
178
|
+ detial,
|
|
|
179
|
+ selfChannelV2,
|
|
|
180
|
+ selfSelectCorp,
|
|
|
181
|
+ },
|
|
174
|
182
|
data () {
|
|
175
|
183
|
return {
|
|
176
|
184
|
time: [],
|
|
|
@@ -234,10 +242,19 @@ export default {
|
|
234
|
242
|
is_ad_user: '',
|
|
235
|
243
|
order_pay_type: '',
|
|
236
|
244
|
ad_report_action_type: '',
|
|
|
245
|
+ corp_id: '', // 企微筛选(非header全局筛选)
|
|
237
|
246
|
}
|
|
238
|
247
|
},
|
|
239
|
248
|
created () {
|
|
240
|
249
|
this.height = document.documentElement.clientHeight - 280 > 400 ? document.documentElement.clientHeight - 280 : 400
|
|
|
250
|
+ const { query: { account = '' } } = this.$route
|
|
|
251
|
+ if (account) { // 默认筛选ADQ账号
|
|
|
252
|
+ this.account_id = account
|
|
|
253
|
+ this.default_time = [this.$getDay(0, false), this.$getDay(0, false)]
|
|
|
254
|
+ }
|
|
|
255
|
+ },
|
|
|
256
|
+ mounted() {
|
|
|
257
|
+ this.corp_id = this.$route.query.corpid || '' // 默认筛选企微
|
|
241
|
258
|
this.time = this.default_time
|
|
242
|
259
|
this.init(1)
|
|
243
|
260
|
this.init_predata()
|
|
|
@@ -324,7 +341,8 @@ export default {
|
|
324
|
341
|
},
|
|
325
|
342
|
resetEvent () {//重置
|
|
326
|
343
|
this.resetFlag = !this.resetFlag
|
|
327
|
|
- this.time = [this.$getDay(-30, false), this.$getDay(0, false)]
|
|
|
344
|
+ this.default_time = [this.$getDay(-30, false), this.$getDay(0, false)]
|
|
|
345
|
+ this.time = this.default_time
|
|
328
|
346
|
this.userRegTime = []
|
|
329
|
347
|
this.chargePay_val = ''
|
|
330
|
348
|
this.paySource_val = ''
|
|
|
@@ -336,6 +354,8 @@ export default {
|
|
336
|
354
|
this.is_ad_user = ''
|
|
337
|
355
|
this.order_pay_type = ''
|
|
338
|
356
|
this.ad_report_action_type = ''
|
|
|
357
|
+ this.corp_id = ''
|
|
|
358
|
+ if (this.$route.query.account) { this.$router.replace({ query: {} }) } // 清除url参数
|
|
339
|
359
|
this.init_predata()
|
|
340
|
360
|
this.init(1)
|
|
341
|
361
|
},
|
|
|
@@ -370,6 +390,12 @@ export default {
|
|
370
|
390
|
this.init_predata()
|
|
371
|
391
|
this.init(1)
|
|
372
|
392
|
},
|
|
|
393
|
+ // 监听企微主体筛选变化
|
|
|
394
|
+ onChangeCorpid(corp) {
|
|
|
395
|
+ this.corp_id = corp ? corp.corpid : ''
|
|
|
396
|
+ this.init_predata()
|
|
|
397
|
+ this.init(1)
|
|
|
398
|
+ },
|
|
373
|
399
|
init_predata () {
|
|
374
|
400
|
this.dataLoading = true
|
|
375
|
401
|
this.$axios.post(this.URL.BASEURL + this.URL.charge_pre_data, {
|
|
|
@@ -386,6 +412,7 @@ export default {
|
|
386
|
412
|
order_pay_type: this.order_pay_type || 0, // 全部0
|
|
387
|
413
|
ad_report_action_type: this.ad_report_action_type || 0, // 全部0
|
|
388
|
414
|
type: 1, // "猎羽-充值订单管理"传1、"数据看板-订单数据统计"传2
|
|
|
415
|
+ corp_id: this.corp_id || '',
|
|
389
|
416
|
})
|
|
390
|
417
|
.then((res) => {
|
|
391
|
418
|
var res = res.data
|
|
|
@@ -444,6 +471,7 @@ export default {
|
|
444
|
471
|
user_reg_st: this.userRegTime[0] || '',
|
|
445
|
472
|
user_reg_et: this.userRegTime[1] || '',
|
|
446
|
473
|
pay_status: this.chargePay_val,
|
|
|
474
|
+ corp_id: this.corp_id || '',
|
|
447
|
475
|
page: type == 'export' ? 1 : this.page,
|
|
448
|
476
|
page_size: type == 'export' ? this.$store.state.exportNumber : this.page_size,
|
|
449
|
477
|
}).then((res) => {
|
