jufubao-admin-library 1.1.162 → 1.1.163

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.
@@ -124,7 +124,7 @@
124
124
  >{{item.label}}</el-radio>
125
125
  </el-radio-group>
126
126
  </el-form-item>
127
- <el-form-item prop="partner_product_tags" label="商品标签">
127
+ <el-form-item prop="partner_product_tags" label="平台标签">
128
128
  <el-checkbox-group
129
129
  v-model="setForm.partner_product_tags"
130
130
  >
@@ -110,6 +110,7 @@ export default {
110
110
  cookieKey: '',
111
111
  cityData:[],
112
112
  marketTagsList:[],
113
+ productTagsList:[],
113
114
  }
114
115
  },
115
116
  computed: {
@@ -167,6 +168,10 @@ export default {
167
168
  server: "product-public", fn: "product", path: "p1", params: { market_tag: 1 },
168
169
  })
169
170
  this.marketTagsList = tagsOptions.data.market_tag
171
+ let productTagsOptions = await getOptions({
172
+ server: "product-partner", fn: "product", path: "p3",params: { partner_product_tag: 1 },
173
+ })
174
+ this.productTagsList = productTagsOptions.data.partner_product_tag
170
175
  this.initSearchForm()
171
176
  },
172
177
  methods: {
@@ -223,6 +228,18 @@ export default {
223
228
  if (this.custom_category_id && this.$xdHelper.checkVarType(this.custom_category_id) === 'array') {
224
229
  filters['custom_category_id'] = this.custom_category_id[this.custom_category_id.length - 1]
225
230
  }
231
+ //平台标签
232
+ let copyPartnerProductTags = this.$xdHelper.cloneDeep(filters['partner_product_tags_obj'])
233
+ let obj = {
234
+ partner_product_tags:{
235
+ includes:[],
236
+ }
237
+ }
238
+ if(copyPartnerProductTags && copyPartnerProductTags.length>0){
239
+ delete filters['partner_product_tags_obj']
240
+ obj['partner_product_tags']['includes'] = copyPartnerProductTags
241
+ filters = Object.assign({},filters,obj)
242
+ }
226
243
  return { tab: this.channelActiveName, filters: filters }
227
244
  },
228
245
 
@@ -382,6 +399,15 @@ export default {
382
399
  multiple: true, //多选
383
400
  list: this.marketTagsList,
384
401
  },
402
+ this.channelParams&&this.channelParams.scene === 'selected'&&{
403
+ label: "平台标签:", //label
404
+ ele: "xd-select-list", //package 名称
405
+ valueKey: "partner_product_tags_obj", //form[valueKey]
406
+ value: [], //v-model
407
+ placeholder: "请选择",
408
+ multiple: true, //多选
409
+ list: this.productTagsList,
410
+ },
385
411
  this.pagesType === 'special'&&{
386
412
  label: "状态:", //label
387
413
  ele: "xd-select-list", //package 名称
@@ -564,6 +564,9 @@ export default {
564
564
  trigger: ["blur", "change"],
565
565
  },
566
566
  ];
567
+ }else {
568
+ let key = item.valueKey;
569
+ item.value = params[key] || '';
567
570
  }
568
571
  });
569
572
  // #endif
@@ -1367,7 +1367,7 @@ export default {
1367
1367
  trigger: ["blur", "change"],
1368
1368
  },
1369
1369
  ];
1370
- }else if(item.ele === "el-input"){
1370
+ }else{
1371
1371
  let key = item.valueKey;
1372
1372
  item.value = params[key] || '';
1373
1373
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.162",
3
+ "version": "1.1.163",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {