Browse Source

feat: 订单数据统计&充值订单管理 - 新增"支付类型"筛选

zhengxy 1 year ago
parent
commit
ab3d09645a

+ 6 - 1
project/src/components/assembly/screen/channel.vue

@@ -251,10 +251,15 @@ export default {
251 251
     } else if (this.type == 'chatGroupOwner') { // 群主
252 252
       this.getChatGroupOwner()
253 253
       this.placeholderVal = '请选择群主'
254
+    } else if (this.type == 'orderPayType') { // 支付类型
255
+      this.options = [
256
+        { key: 1, val: '小程序虚拟支付' },
257
+        { key: 2, val: '其他类型支付' },
258
+      ]
259
+      this.placeholderVal = '支付类型'
254 260
     } else {
255 261
       this.init()
256 262
     }
257
-
258 263
   },
259 264
   methods: {
260 265
     onVisibleChange(val) {

+ 6 - 1
project/src/components/assembly/screen/channelMultiple.vue

@@ -231,10 +231,15 @@ export default {
231 231
     } else if (this.type == 'chatGroupOwner') { // 群主
232 232
       this.getChatGroupOwner()
233 233
       this.placeholderVal = '请选择群主'
234
+    } else if (this.type == 'orderPayType') { // 支付类型
235
+      this.options = [
236
+        { key: 1, val: '小程序虚拟支付' },
237
+        { key: 2, val: '其他类型支付' },
238
+      ]
239
+      this.placeholderVal = '支付类型'
234 240
     } else {
235 241
       this.init()
236 242
     }
237
-
238 243
   },
239 244
   methods: {
240 245
     onVisibleChange(val) {

+ 6 - 0
project/src/components/assembly/screen/channelV2.vue

@@ -494,6 +494,12 @@ export default {
494 494
       } else if (this.type == 'chatGroupOwner') { // 群主
495 495
         this.getChatGroupOwner()
496 496
         this.placeholderVal = '请选择群主'
497
+      } else if (this.type == 'orderPayType') { // 支付类型
498
+        this.options = [
499
+          { key: 1, val: '小程序虚拟支付' },
500
+          { key: 2, val: '其他类型支付' },
501
+        ]
502
+        this.placeholderVal = '支付类型'
497 503
       } else {
498 504
         this.init()
499 505
       }

File diff suppressed because it is too large
+ 15 - 2
project/src/components/dataBoard/orderData.vue


+ 13 - 1
project/src/components/orderManage/charge.vue

@@ -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,