|
@@ -12,6 +12,7 @@
|
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
|
13
|
<self-channel style="margin-right: 10px;" title="" type='adqAccount' :reset="resetFlag" :labelWidth="true" @channelDefine="(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
|
+ <selfChannelV2 style="margin-right: 10px;" v-model="order_pay_type" type='orderPayType' title="" :labelWidth="true" @change="onChangeOrderPayType" />
|
15
|
16
|
</div>
|
16
|
17
|
<div class="reset" @click="resetEvent">重置</div>
|
17
|
18
|
<el-button class="export-btn" type="primary" size="mini" @click="init(1, 'export')">导出Excel</el-button>
|
|
@@ -164,9 +165,11 @@ import datePicker from '@/components/assembly/screen/datePicker.vue'
|
164
|
165
|
import selfChannel from '@/components/assembly/screen/channel.vue'
|
165
|
166
|
import selfInput from '@/components/assembly/screen/input.vue'
|
166
|
167
|
import { promotionTypeDesc, incomeSourceDesc, launchTypeDesc } from '@/assets/js/staticTypes'
|
|
168
|
+import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
|
|
169
|
+
|
167
|
170
|
export default {
|
168
|
171
|
name: 'charge',
|
169
|
|
- components: { datePicker, selfChannel, selfInput, detial },
|
|
172
|
+ components: { datePicker, selfChannel, selfInput, detial, selfChannelV2, },
|
170
|
173
|
data () {
|
171
|
174
|
return {
|
172
|
175
|
time: [],
|
|
@@ -228,6 +231,7 @@ export default {
|
228
|
231
|
order_type: '',
|
229
|
232
|
plat_order_type: '',
|
230
|
233
|
is_ad_user: '',
|
|
234
|
+ order_pay_type: '',
|
231
|
235
|
}
|
232
|
236
|
},
|
233
|
237
|
created () {
|
|
@@ -328,6 +332,7 @@ export default {
|
328
|
332
|
this.order_type = ''
|
329
|
333
|
this.plat_order_type = ''
|
330
|
334
|
this.is_ad_user = ''
|
|
335
|
+ this.order_pay_type = ''
|
331
|
336
|
this.init_predata()
|
332
|
337
|
this.init(1)
|
333
|
338
|
},
|
|
@@ -352,6 +357,11 @@ export default {
|
352
|
357
|
this.init_predata()
|
353
|
358
|
this.init(1)
|
354
|
359
|
},
|
|
360
|
+ onChangeOrderPayType (val) {
|
|
361
|
+ this.order_pay_type = val || ''
|
|
362
|
+ this.init_predata()
|
|
363
|
+ this.init(1)
|
|
364
|
+ },
|
355
|
365
|
init_predata () {
|
356
|
366
|
this.dataLoading = true
|
357
|
367
|
this.$axios.post(this.URL.BASEURL + this.URL.charge_pre_data, {
|
|
@@ -365,6 +375,7 @@ export default {
|
365
|
375
|
order_type: this.order_type,
|
366
|
376
|
plat_order_type: this.plat_order_type,
|
367
|
377
|
is_ad_user: this.is_ad_user,
|
|
378
|
+ order_pay_type: this.order_pay_type || 0, // 全部0
|
368
|
379
|
type: 1, // "猎羽-充值订单管理"传1、"数据看板-订单数据统计"传2
|
369
|
380
|
})
|
370
|
381
|
.then((res) => {
|
|
@@ -413,6 +424,7 @@ export default {
|
413
|
424
|
order_type: this.order_type,
|
414
|
425
|
plat_order_type: this.plat_order_type,
|
415
|
426
|
is_ad_user: this.is_ad_user,
|
|
427
|
+ order_pay_type: this.order_pay_type || 0, // 全部0
|
416
|
428
|
appid: this.appid,
|
417
|
429
|
account_id: this.account_id,
|
418
|
430
|
order_source: this.paySource_val,
|