Home Explore Help
Register Sign In
xiuli.gao
/
playlet
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 1777 Releases 0 Wiki
Browse Source

区分展示补单回传以及自动回传

shensong00 3 months ago
parent
7f99506a9a
commit
b66d9079da
32 changed files with 76 additions and 36 deletions
Unified View Show Diff Stats
  1. 1 1
      index.html
  2. 21 0
      project/src/assets/js/staticTypes.js
  3. 4 0
      project/src/components/assembly/screen/channel.vue
  4. 5 0
      project/src/components/assembly/screen/channelMultiple.vue
  5. 20 10
      project/src/components/dataBoard/yxOrderData.vue
  6. 1 1
      static/css/app.c6d00a69023cce0c05c8c22c748bc48a.css
  7. 0 15
      static/js/0.42fdb3e0ecf7fa86272b.js
  8. 15 0
      static/js/0.60669f6f2d3c3ba5b00d.js
  9. 0 0
      static/js/18.1986394a549164e3f40c.js
  10. 0 0
      static/js/20.6580d8df017a0520292b.js
  11. 0 0
      static/js/35.bfac29632c1a7bfad34f.js
  12. 0 0
      static/js/51.670e6e50c6b56733981d.js
  13. 0 0
      static/js/52.b6bfb8084f4a295cf594.js
  14. 0 0
      static/js/59.27407a7dd5a247e468a5.js
  15. 0 0
      static/js/6.f5d777d06e2b35638cf1.js
  16. 0 0
      static/js/60.f7af024cb8943b26ef88.js
  17. 0 0
      static/js/63.0cd54484e1b6ee51b599.js
  18. 0 0
      static/js/66.e2d7429748d8bd202328.js
  19. 0 0
      static/js/68.e876d223e9758a79dba3.js
  20. 0 0
      static/js/73.a79a63b04fa67be52ba9.js
  21. 0 0
      static/js/79.0387420ca53867ada3fa.js
  22. 0 0
      static/js/82.9b38c90a248507658e4f.js
  23. 1 1
      static/js/93.2d0430e3763ecef9cb9d.js
  24. 0 1
      static/js/92.fcf09058c2309192b983.js
  25. 1 1
      static/js/94.b142b3de812029064223.js
  26. 1 1
      static/js/95.9dc4658147da56b697ce.js
  27. 1 1
      static/js/96.bea8540b3114ab21454c.js
  28. 1 1
      static/js/97.5c07331a85d5c4e82f84.js
  29. 1 1
      static/js/98.40aa3785df4027a47887.js
  30. 1 0
      static/js/98.470e4344a266f86165fc.js
  31. 1 1
      static/js/app.37473eca8c660f77cc1f.js
  32. 1 1
      static/js/manifest.eb5a9fbd7cce77316d19.js

+ 1 - 1
index.html
View File

7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
 7 
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 
         var s = document.getElementsByTagName("script")[0];
 8 
         var s = document.getElementsByTagName("script")[0];
9 
         s.parentNode.insertBefore(hm, s);
 9 
         s.parentNode.insertBefore(hm, s);
10 
-      })();</script><link href=./static/css/app.c6d00a69023cce0c05c8c22c748bc48a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.eb5a9fbd7cce77316d19.js></script><script type=text/javascript src=./static/js/app.37473eca8c660f77cc1f.js></script></body></html>
10 
+      })();</script><link href=./static/css/app.ca009f070d0aad976e5e22c3ec99e374.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.2fb41d4db38039a29919.js></script><script type=text/javascript src=./static/js/app.01e94bcf40983c62e452.js></script></body></html>

+ 21 - 0
project/src/assets/js/staticTypes.js
View File

261 
   { key: 1, val: '是' },
 261 
   { key: 1, val: '是' },
262 
   { key: 0, val: '否' },
 262 
   { key: 0, val: '否' },
263 
 ]
 263 
 ]
264 
+
265 
+export const yxOrderStatus = [
266 
+  { key: 0, val: '待付款（已下单）' },
267 
+  { key: 1, val: '待发货（已付款）'},
268 
+  { key: 2, val: '待收货（已发货）'},
269 
+  { key: 3, val: '交易完成（确认收货）'},
270 
+  { key: 4, val: '已取消' }
271 
+]
272 
+
273 
+export const yxOrderReportStatus = [
274 
+  { key: -2, val: '缺少回传数据项' },
275 
+  { key: -1, val: '未开启回传' },
276 
+  { key: 0, val: '回传未处理' },
277 
+  { key: 1, val: '成功' },
278 
+  { key: 2, val: '失败' },
279 
+  { key: 5, val: '漏单' },
280 
+  { key: 6, val: '订单金额配置全部不回传' },
281 
+  { key: 7, val: '未匹配到金额区间回传规则,不回传' },
282 
+  { val: 8, val: '订单时间配置全部不回传' },
283 
+  { val: 9, val: '未匹配到时间区间回传规则,不回传' }
284 
+]

+ 4 - 0
project/src/components/assembly/screen/channel.vue
View File

45 
   groupUserStatus,
 45 
   groupUserStatus,
46 
   isNewCustomerNoLoss,
 46 
   isNewCustomerNoLoss,
47 
   promotionData,
 47 
   promotionData,
48 
+  yxOrderStatus,
48 
 } from '@/assets/js/staticTypes'
 49 
 } from '@/assets/js/staticTypes'
49 
 export default {
 50 
 export default {
50 
   props: {
 51 
   props: {
227 
     } else if (this.type == 'canReceive') { // 可否接收消息
 228 
     } else if (this.type == 'canReceive') { // 可否接收消息
228 
       this.options = [...canReceive]
 229 
       this.options = [...canReceive]
229 
       this.placeholderVal = '请选择'
 230 
       this.placeholderVal = '请选择'
231 
+    } else if(this.type == 'yxOrderStatus') {
232 
+      this.options = [...yxOrderStatus]
233 
+      this.placeholderVal = '支付状态'
230 
     } else {
 234 
     } else {
231 
       this.init()
 235 
       this.init()
232 
     }
 236 
     }

+ 5 - 0
project/src/components/assembly/screen/channelMultiple.vue
View File

48 
   isNewCustomerNoLoss,
 48 
   isNewCustomerNoLoss,
49 
   promotionData,
 49 
   promotionData,
50 
   canReceive,
 50 
   canReceive,
51 
+  yxOrderReportStatus
51 
 } from '@/assets/js/staticTypes'
 52 
 } from '@/assets/js/staticTypes'
53 
+
52 
 export default {
 54 
 export default {
53 
   props: {
 55 
   props: {
54 
     afferent_value: '',
 56 
     afferent_value: '',
225 
     }else if (this.type == 'canReceive') { // 可否接收消息
 227 
     }else if (this.type == 'canReceive') { // 可否接收消息
226 
       this.options = [...canReceive]
 228 
       this.options = [...canReceive]
227 
       this.placeholderVal = '请选择'
 229 
       this.placeholderVal = '请选择'
230 
+    }else if (this.type == 'yxOrderReportStatus') {
231 
+      this.options = [...yxOrderReportStatus]
232 
+      this.placeholderVal = '请选择回传状态'
228 
     } else {
 233 
     } else {
229 
       this.init()
 234 
       this.init()
230 
     }
 235 
     }

+ 20 - 10
project/src/components/dataBoard/yxOrderData.vue
View File

6 
         <selfInput style="margin-right: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="订单ID" @inputChange='onInputOrderId' @onChange="onChangeOrderId" />
 6 
         <selfInput style="margin-right: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="订单ID" @inputChange='onInputOrderId' @onChange="onChangeOrderId" />
7 
         <selfChannelMultiple style="margin-right: 10px;" title="" type='adqAccount' :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeAccountId" />
 7 
         <selfChannelMultiple style="margin-right: 10px;" title="" type='adqAccount' :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeAccountId" />
8 
         <selfInput style="margin-right: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="自定义参数" @inputChange="onInputCpsId" @onChange="onChangeCpsId" />
 8 
         <selfInput style="margin-right: 10px;" width="220px" :hasLabel="false" :reset="resetFlag" label_name="自定义参数" @inputChange="onInputCpsId" @onChange="onChangeCpsId" />
9 
-        <!-- <selfChannel style="margin-right: 10px;" title="" type="" :reset="resetFlag" :labelWidth="true" @onChange="onChangeOrderStatus"/> -->
9 
+        <!-- <selfChannel style="margin-right: 10px;" title="" type="yxOrderStatus" :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeOrderStatus"/>
10 
+        <selfChannelMultiple style="margin-right: 10px;" title="" type='yxOrderReportStatus' :reset="resetFlag" :labelWidth="true" @channelDefine="onChangeReportStatus" />
11 
+        <inputRange style="margin-right: 10px;" v-model="filter.money" label="预估佣金"/>
12 
+        <el-button size="mini" type="primary" plain @click="init(1)">确定</el-button> -->
10 
       </div>
 13 
       </div>
11 
       <div class="reset" @click="resetEvent">重置</div>
 14 
       <div class="reset" @click="resetEvent">重置</div>
12 
       <!-- <el-button v-if="isCanExport" class="export-btn" type="primary" size="mini" @click="onClickExport">导出Excel</el-button> -->
 15 
       <!-- <el-button v-if="isCanExport" class="export-btn" type="primary" size="mini" @click="onClickExport">导出Excel</el-button> -->
28 
           <template v-slot="{ row, $index }">
 31 
           <template v-slot="{ row, $index }">
29 
             <div v-if="item.prop == 'actionBtn'">
 32 
             <div v-if="item.prop == 'actionBtn'">
30 
               <template>
 33 
               <template>
31 
-                <span v-if="row.ad_report_order_status == '成功'" class="c-A5A5A5 pointer fWeight600 disabled">已回传</span>
34 
+                <span v-if="row.ad_report_order_status == '成功' && row.supplement_status == 0" class="c-A5A5A5 pointer fWeight600 disabled">已回传</span>
35 
+                <span v-else-if="row.ad_report_order_status == '成功' && row.supplement_status == 1" class="c-A5A5A5 pointer fWeight600 disabled">已补单</span>
32 
                 <span v-else-if="row.order_status != 4 && row.predict_commission_fee > 0" class="c-00B38A pointer fWeight600" @click="onClickReport(row)">回传</span>
 36 
                 <span v-else-if="row.order_status != 4 && row.predict_commission_fee > 0" class="c-00B38A pointer fWeight600" @click="onClickReport(row)">回传</span>
33 
               </template>
 37 
               </template>
34 
             </div>
 38 
             </div>
68 
 import selfInput from '@/components/assembly/screen/input.vue'
 72 
 import selfInput from '@/components/assembly/screen/input.vue'
69 
 import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
 73 
 import selfChannelV2 from '@/components/assembly/screen/channelV2.vue'
70 
 import selfChannelMultiple from '@/components/assembly/screen/channelMultiple.vue'
 74 
 import selfChannelMultiple from '@/components/assembly/screen/channelMultiple.vue'
75 
+import inputRange from '@/components/dataBoard/inputRange.vue'
71
76
72 
 import { incomeSourceDesc, launchTypeDesc } from '@/assets/js/staticTypes'
 77 
 import { incomeSourceDesc, launchTypeDesc } from '@/assets/js/staticTypes'
73 
 export default {
 78 
 export default {
78 
     selfInput,
 83 
     selfInput,
79 
     selfChannelV2,
 84 
     selfChannelV2,
80 
     selfChannelMultiple,
 85 
     selfChannelMultiple,
86 
+    inputRange,
81 
   },
 87 
   },
82 
   data () {
 88 
   data () {
83 
     return {
 89 
     return {
121 
         account_id: [], // ADQ账号
 127 
         account_id: [], // ADQ账号
122 
         money: [], // 预估佣金
 128 
         money: [], // 预估佣金
123 
         cps_id: '',// 自定义参数
 129 
         cps_id: '',// 自定义参数
130 
+        report_status: [], // 回传状态
124 
       },
 131 
       },
125 
     }
 132 
     }
126 
   },
 133 
   },
229 
         account_id: this.filter.account_id.join(','),
 236 
         account_id: this.filter.account_id.join(','),
230 
         order_status: this.filter.order_status,
 237 
         order_status: this.filter.order_status,
231 
         tx_cps_id: this.filter.cps_id,
 238 
         tx_cps_id: this.filter.cps_id,
239 
+        money_min: this.filter.money[0],
240 
+        money_max: this.filter.money[1],
241 
+        report_status: this.filter.report_status.join(','),
232 
         sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
 242 
         sys_group_id: this.$cookie.getCookie('isSuperManage') == 1 ? sessionStorage.getItem('company_session_defaultCorp_level_1').toString() : '',
233 
         page: this.page,
 243 
         page: this.page,
234 
         page_size: this.page_size,
 244 
         page_size: this.page_size,
236 
       try {
 246 
       try {
237 
         const { data: res = {} } = await this.$axios.get(url, { params })
 247 
         const { data: res = {} } = await this.$axios.get(url, { params })
238 
         if (res && res.errno == 0) {
 248 
         if (res && res.errno == 0) {
239 
-          this.datas = res.rst.data // 知道为啥datas不在 data()方法里面定义吗？嘻嘻
249 
+          this.datas = res.rst.data
240 
           this.$refs.plxTable.reloadData(this.datas)
 250 
           this.$refs.plxTable.reloadData(this.datas)
241 
           this.total = res.rst.pageInfo.total;
 251 
           this.total = res.rst.pageInfo.total;
242 
           this.pages = res.rst.pageInfo.pages;
 252 
           this.pages = res.rst.pageInfo.pages;
280 
     onChangeCpsId(val) {
 290 
     onChangeCpsId(val) {
281 
       this.filter.cps_id = val
 291 
       this.filter.cps_id = val
282 
     },
 292 
     },
283 
-    onChangePlatOrderType(val) {
284 
-      this.filter.plat_order_type = val;
285 
-      this.init(1);
286 
-      // this.init_predata()
287 
-    },
288 
     onChangeAccountId(val) {
 293 
     onChangeAccountId(val) {
289 
       this.filter.account_id = val;
 294 
       this.filter.account_id = val;
290 
       this.init(1);
 295 
       this.init(1);
291 
       // this.init_predata();
 296 
       // this.init_predata();
292 
     },
 297 
     },
298 
+    onChangeReportStatus(val) {
299 
+      this.filter.report_status = val;
300 
+      this.init(1);
301 
+    },
293 
     handleCurrentChange (val) {
 302 
     handleCurrentChange (val) {
294 
       this.init(val)
 303 
       this.init(val)
295 
     },
 304 
     },
299 
     },
 308 
     },
300 
     resetEvent () {//重置
 309 
     resetEvent () {//重置
301 
       this.resetFlag = !this.resetFlag
 310 
       this.resetFlag = !this.resetFlag
302 
-      this.system_enterprise = []
303 
-      this.enterprise = {}
304 
       this.filter.time = [this.$getDay(-30, false), this.$getDay(0, false)]
311 
       this.filter.time = [this.$getDay(-30, false), this.$getDay(0, false)]
305 
       this.filter.order_id = ''
 312 
       this.filter.order_id = ''
306 
       this.filter.account_id = []
 313 
       this.filter.account_id = []
314 
+      this.filter.money = []
315 
+      this.filter.order_status = ''
316 
+      this.filter.report_status = []
307 
       // this.init_predata()
 317 
       // this.init_predata()
308 
       this.init(1)
 318 
       this.init(1)
309 
     },
 319 
     },

File diff suppressed because it is too large
+ 1 - 1
static/css/app.c6d00a69023cce0c05c8c22c748bc48a.css


File diff suppressed because it is too large
+ 0 - 15
static/js/0.42fdb3e0ecf7fa86272b.js


File diff suppressed because it is too large
+ 15 - 0
static/js/0.60669f6f2d3c3ba5b00d.js


static/js/18.875a2c5c2662aa8e432a.js → static/js/18.1986394a549164e3f40c.js
View File


static/js/20.94151d635eca27b428fd.js → static/js/20.6580d8df017a0520292b.js
View File


static/js/35.98894bf2abee6183f74c.js → static/js/35.bfac29632c1a7bfad34f.js
View File


static/js/51.314c2986f7966528cc1c.js → static/js/51.670e6e50c6b56733981d.js
View File


static/js/52.5edf97a9a4fa1d2bfdfb.js → static/js/52.b6bfb8084f4a295cf594.js
View File


static/js/59.15c77d2beb7d67e060d4.js → static/js/59.27407a7dd5a247e468a5.js
View File


static/js/6.fa054ee5dc91f804dcf5.js → static/js/6.f5d777d06e2b35638cf1.js
View File


static/js/60.fc62b2443f5a5b20640a.js → static/js/60.f7af024cb8943b26ef88.js
View File


static/js/63.395278df46475bf16ac7.js → static/js/63.0cd54484e1b6ee51b599.js
View File


static/js/66.916c1d4d29fdb484be43.js → static/js/66.e2d7429748d8bd202328.js
View File


static/js/68.bda7446254db0d565d30.js → static/js/68.e876d223e9758a79dba3.js
View File


static/js/73.436b77e51ed729a8a3ed.js → static/js/73.a79a63b04fa67be52ba9.js
View File


static/js/79.2d401f082018e6753bc0.js → static/js/79.0387420ca53867ada3fa.js
View File


static/js/82.886c1a315f7ef41fc81c.js → static/js/82.9b38c90a248507658e4f.js
View File


File diff suppressed because it is too large
+ 1 - 1
static/js/93.2d0430e3763ecef9cb9d.js


File diff suppressed because it is too large
+ 0 - 1
static/js/92.fcf09058c2309192b983.js


File diff suppressed because it is too large
+ 1 - 1
static/js/94.b142b3de812029064223.js


File diff suppressed because it is too large
+ 1 - 1
static/js/95.9dc4658147da56b697ce.js


File diff suppressed because it is too large
+ 1 - 1
static/js/96.bea8540b3114ab21454c.js


File diff suppressed because it is too large
+ 1 - 1
static/js/97.5c07331a85d5c4e82f84.js


File diff suppressed because it is too large
+ 1 - 1
static/js/98.40aa3785df4027a47887.js


File diff suppressed because it is too large
+ 1 - 0
static/js/98.470e4344a266f86165fc.js


File diff suppressed because it is too large
+ 1 - 1
static/js/app.37473eca8c660f77cc1f.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.eb5a9fbd7cce77316d19.js