jufubao-admin-library 1.1.110 → 1.1.111

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -81,6 +81,20 @@
81
81
  <template slot="resource_shop_name" slot-scope="scope">
82
82
  <div>{{scope.row.resource_shop_name?scope.row.resource_shop_name:'-'}}</div>
83
83
  </template>
84
+ <template slot="discount" slot-scope="scope">
85
+ <div>
86
+ <div v-if="scope.row.max_discount!=='-1'&&scope.row.min_discount!=='-1'">
87
+ <div>平台折扣:</div>
88
+ <div>最高:{{scope.row.max_discount/100}}%</div>
89
+ <div>最低:{{scope.row.min_discount/100}}%</div>
90
+ </div>
91
+ <div v-if="scope.row.purchase_max_discount!=='-1'&&scope.row.purchase_min_discount!=='-1'">
92
+ <div>货源折扣:</div>
93
+ <div>最高:{{scope.row.purchase_max_discount/100}}%</div>
94
+ <div>最低:{{scope.row.purchase_min_discount/100}}%</div>
95
+ </div>
96
+ </div>
97
+ </template>
84
98
  </xd-table>
85
99
  </div>
86
100
  <div class="app-container__list-pagination">
@@ -216,6 +230,7 @@ export default {
216
230
  // #ifndef partner-movie
217
231
  { "type": "image", "prop": "shop_icon", "align": "center", "width": 100, "height": 100, "label": "门店logo" },
218
232
  // #endif
233
+ { "type": "normal", "prop": "discount", "align": "center","width": 150, "label": "门店折扣" },
219
234
  { "type": "normal", "prop": "brand_type_name", "align": "center", "label": "门店类型" },
220
235
  { "type": "normal", "prop": "business_status_name", "align": "center", "label": "营业状态" },
221
236
  { "type": "normal", "prop": "brand_name", "align": "center", "label": "门店品牌" },
@@ -333,6 +348,11 @@ export default {
333
348
  page_token: this.currentPage,
334
349
  page_size: this.limit
335
350
  }
351
+ if (params.filters['discount']) {
352
+ if (!params.filters['discount']['type'] || (!params.filters['discount']['max']&&params.filters['discount']['max']!==0) || (!params.filters['discount']['min']&&params.filters['discount']['min']!==0)) {
353
+ delete params.filters['discount']
354
+ }
355
+ }
336
356
  if(type==='count'){
337
357
  params.data_type = type
338
358
  }
@@ -386,6 +406,36 @@ export default {
386
406
  value: '',
387
407
  placeholder: '请输入门店名称'
388
408
  },
409
+ this.checkEnabled(options,'discount')&&{
410
+ label: "门店折扣:", //label
411
+ ele: "xd-input-range", //package 名称
412
+ valueKey: "discount", //form[valueKey]
413
+ labelSlot:'按大于等于最低折扣,小于最高折扣(不含)进行搜索',
414
+ value: {},
415
+ disabled: false,
416
+ setting: {
417
+ /**单位显示**/
418
+ //图标优先于文字单位
419
+ unit: "%",
420
+
421
+ //图标参考element ui 或者 iconfont库
422
+ // icon: "xd_admin_iconfont xdicon_jiage",
423
+
424
+ /**选择条件显示**/
425
+ selectWidth: "110px",
426
+ selectMultiple: false,
427
+ selectPlaceholder: "请选择",
428
+ className: "input60",
429
+ //是否启动条件选择
430
+ select: options['discount_type']['options'],
431
+ isPrice:true,
432
+ },
433
+ maps: {
434
+ start: "min",
435
+ end: "max",
436
+ select: "type",
437
+ },
438
+ },
389
439
  this.checkEnabled(options,'brand_type')&&{
390
440
  label: "门店类型:",
391
441
  ele: "xd-select-list",
@@ -82,6 +82,20 @@
82
82
  <div v-for="(item,index) in scope.row.down_consume_mode_name" :key="index">{{item}}<span style="color:red">(已下架)</span></div>
83
83
  </div>
84
84
  </template>
85
+ <template slot="discount" slot-scope="scope">
86
+ <div>
87
+ <div v-if="scope.row.max_discount!=='-1'&&scope.row.min_discount!=='-1'">
88
+ <div>平台折扣:</div>
89
+ <div>最高:{{scope.row.max_discount/100}}%</div>
90
+ <div>最低:{{scope.row.min_discount/100}}%</div>
91
+ </div>
92
+ <div v-if="scope.row.purchase_max_discount!=='-1'&&scope.row.purchase_min_discount!=='-1'">
93
+ <div>货源折扣:</div>
94
+ <div>最高:{{scope.row.purchase_max_discount/100}}%</div>
95
+ <div>最低:{{scope.row.purchase_min_discount/100}}%</div>
96
+ </div>
97
+ </div>
98
+ </template>
85
99
  </xd-table>
86
100
  </div>
87
101
  <div class="app-container__list-pagination">
@@ -309,6 +323,7 @@ export default {
309
323
  // #ifndef partner-movie
310
324
  { "type": "image", "prop": "shop_icon", "align": "center", "width": 100, "height": 100, "label": "门店logo" },
311
325
  // #endif
326
+ this.storeType==='SELL'&&{ "type": "normal", "prop": "discount", "align": "center","width": 150, "label": "门店折扣" },
312
327
  { "type": "normal", "prop": "brand_type_name", "align": "center", "label": "门店类型" },
313
328
  this.storeType!=='AGG'&&{ "type": "normal", "prop": "select_from_name", "align": "center", "label": "选店来源" },
314
329
  this.storeType!=='AGG'&&this.storeType!=='SEAT'&&{ "type": "normal", "prop": "business_status_name", "align": "center", "label": "营业状态" },
@@ -456,6 +471,11 @@ export default {
456
471
  page_token: this.currentPage,
457
472
  page_size: this.limit
458
473
  }
474
+ if (params.filters['discount']) {
475
+ if (!params.filters['discount']['type'] || (!params.filters['discount']['max']&&params.filters['discount']['max']!==0) || (!params.filters['discount']['min']&&params.filters['discount']['min']!==0)) {
476
+ delete params.filters['discount']
477
+ }
478
+ }
459
479
  if(type==='count'){
460
480
  params.data_type = type
461
481
  }
@@ -511,6 +531,36 @@ export default {
511
531
  value: '',
512
532
  placeholder: '请输入门店名称'
513
533
  },
534
+ this.checkEnabled(options,'discount')&&{
535
+ label: "门店折扣:", //label
536
+ ele: "xd-input-range", //package 名称
537
+ valueKey: "discount", //form[valueKey]
538
+ labelSlot:'按大于等于最低折扣,小于最高折扣(不含)进行搜索',
539
+ value: {},
540
+ disabled: false,
541
+ setting: {
542
+ /**单位显示**/
543
+ //图标优先于文字单位
544
+ unit: "%",
545
+
546
+ //图标参考element ui 或者 iconfont库
547
+ // icon: "xd_admin_iconfont xdicon_jiage",
548
+
549
+ /**选择条件显示**/
550
+ selectWidth: "110px",
551
+ selectMultiple: false,
552
+ selectPlaceholder: "请选择",
553
+ className: "input60",
554
+ //是否启动条件选择
555
+ select: options['discount_type']['options'],
556
+ isPrice:true,
557
+ },
558
+ maps: {
559
+ start: "min",
560
+ end: "max",
561
+ select: "type",
562
+ },
563
+ },
514
564
  (this.storeType==='AGG'||this.storeType==='SEAT'||this.storeType==='PRODUCT')&&{
515
565
  label: '关联后门店名称:',
516
566
  ele: 'el-input',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.110",
3
+ "version": "1.1.111",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {