Browse Source

feat: 充值订单管理 - 新增"回传类型"筛选

zhengxy 1 year ago
parent
commit
dd4c60630b

+ 12 - 0
project/src/components/assembly/screen/channel.vue

@@ -262,6 +262,18 @@ export default {
262 262
       this.options = [
263 263
         ...licenseTaskStatusOptions
264 264
       ]
265
+    }  else if (this.type == 'enableStatus') { // 启用 禁用
266
+      this.options = [
267
+        { key: 1, val: '启用' },
268
+        { key: 0, val: '禁用' },
269
+      ]
270
+      this.placeholderVal = '请选择'
271
+    } else if (this.type == 'adReportType') { // 回传类型
272
+      this.options = [
273
+        { key: 1, val: '下单' },
274
+        { key: 2, val: '付费' },
275
+      ]
276
+      this.placeholderVal = '回传类型'
265 277
     } else {
266 278
       this.init()
267 279
     }

+ 12 - 0
project/src/components/assembly/screen/channelMultiple.vue

@@ -242,6 +242,18 @@ export default {
242 242
       this.options = [
243 243
         ...licenseTaskStatusOptions
244 244
       ]
245
+    } else if (this.type == 'enableStatus') { // 启用 禁用
246
+      this.options = [
247
+        { key: 1, val: '启用' },
248
+        { key: 0, val: '禁用' },
249
+      ]
250
+      this.placeholderVal = '请选择'
251
+    }  else if (this.type == 'adReportType') { // 回传类型
252
+      this.options = [
253
+        { key: 1, val: '下单' },
254
+        { key: 2, val: '付费' },
255
+      ]
256
+      this.placeholderVal = '回传类型'
245 257
     } else {
246 258
       this.init()
247 259
     }

+ 7 - 2
project/src/components/assembly/screen/channelV2.vue

@@ -511,8 +511,13 @@ export default {
511 511
           { key: 0, val: '禁用' },
512 512
         ]
513 513
         this.placeholderVal = '请选择'
514
-      }
515
-      else {
514
+      } else if (this.type == 'adReportType') { // 回传类型
515
+        this.options = [
516
+          { key: 1, val: '下单' },
517
+          { key: 2, val: '付费' },
518
+        ]
519
+        this.placeholderVal = '回传类型'
520
+      } else {
516 521
         this.init()
517 522
       }
518 523
     },

+ 10 - 0
project/src/components/orderManage/charge.vue

@@ -13,6 +13,7 @@
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 15
         <selfChannelV2 style="margin-right: 10px;" v-model="order_pay_type" type='orderPayType' title="" :labelWidth="true" @change="onChangeOrderPayType" />
16
+        <selfChannelV2 style="margin-right: 10px;" v-model="ad_report_action_type" type='adReportType' title="" :labelWidth="true" @change="onChangeAdReportActionType" />
16 17
       </div>
17 18
       <div class="reset" @click="resetEvent">重置</div>
18 19
       <el-button class="export-btn" type="primary" size="mini" @click="init(1, 'export')">导出Excel</el-button>
@@ -232,6 +233,7 @@ export default {
232 233
       plat_order_type: '',
233 234
       is_ad_user: '',
234 235
       order_pay_type: '',
236
+      ad_report_action_type: '',
235 237
     }
236 238
   },
237 239
   created () {
@@ -333,6 +335,7 @@ export default {
333 335
       this.plat_order_type = ''
334 336
       this.is_ad_user = ''
335 337
       this.order_pay_type = ''
338
+      this.ad_report_action_type = ''
336 339
       this.init_predata()
337 340
       this.init(1)
338 341
     },
@@ -362,6 +365,11 @@ export default {
362 365
       this.init_predata()
363 366
       this.init(1)
364 367
     },
368
+    onChangeAdReportActionType(val) {
369
+      this.ad_report_action_type = val || ''
370
+      this.init_predata()
371
+      this.init(1)
372
+    },
365 373
     init_predata () {
366 374
       this.dataLoading = true
367 375
       this.$axios.post(this.URL.BASEURL + this.URL.charge_pre_data, {
@@ -376,6 +384,7 @@ export default {
376 384
         plat_order_type: this.plat_order_type,
377 385
         is_ad_user: this.is_ad_user,
378 386
         order_pay_type: this.order_pay_type || 0, // 全部0
387
+        ad_report_action_type: this.ad_report_action_type || 0, // 全部0
379 388
         type: 1, // "猎羽-充值订单管理"传1、"数据看板-订单数据统计"传2
380 389
       })
381 390
         .then((res) => {
@@ -425,6 +434,7 @@ export default {
425 434
         plat_order_type: this.plat_order_type,
426 435
         is_ad_user: this.is_ad_user,
427 436
         order_pay_type: this.order_pay_type || 0, // 全部0
437
+        ad_report_action_type: this.ad_report_action_type || 0, // 全部0
428 438
         appid: this.appid,
429 439
         account_id: this.account_id,
430 440
         order_source: this.paySource_val,