jufubao-admin-library 1.1.39 → 1.1.41

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.
Files changed (12) hide show
  1. package/library/pageComponents/modules/JfbRuleCreate.vue +64 -63
  2. package/library/viewModules/viewCardsGift/viewCardsGift/config.vue +0 -2
  3. package/library/viewModules/viewsCompany/viewsCompany/list.vue +1 -1
  4. package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/detail.vue +3 -5
  5. package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/set_create.vue +3 -3
  6. package/library/viewModules/viewsFinance/viewsFinance/balance/detail_channel.vue +2 -3
  7. package/library/viewModules/viewsFinance/viewsFinance/balance/detail_openapi.vue +2 -3
  8. package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue +0 -2
  9. package/library/viewModules/viewsFinance/viewsFinance/balance/detail_supplier.vue +2 -3
  10. package/library/viewModules/viewsFlashSale/viewsFlashSale/product.vue +0 -2
  11. package/library/viewModules/viewsFreightSet/viewsFreightSet/freight_set.vue +2 -3
  12. package/package.json +1 -1
package/library/pageComponents/modules/JfbRuleCreate.vue CHANGED
@@ -29,20 +29,20 @@
29
29
  <template slot="tag">
30
30
  <el-form ref="tagForm" :model="tagForm" :rules="tagRules" label-width="140px">
31
31
  <el-form-item label="按标签:" prop="zTag">
32
- <el-checkbox-group
32
+ <el-checkbox-group
33
33
  v-model="tagForm.zTag"
34
34
  >
35
35
  <el-checkbox :disabled="zChooseData.includes(item.value)" v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
36
36
  </el-checkbox-group>
37
37
  <!-- <div style="display:flex">
38
38
  <div class="mr10">反选标签</div>
39
- <el-checkbox-group
39
+ <el-checkbox-group
40
40
  v-model="tagForm.fTag"
41
41
  >
42
42
  <el-checkbox :disabled="tagForm.zTag.includes(item.value)||fChooseData.includes(item.value)" v-for="(item,index) in tagData" :label="item.value" :key="index">{{item.label}}</el-checkbox>
43
43
  </el-checkbox-group>
44
44
  </div> -->
45
- </el-form-item>
45
+ </el-form-item>
46
46
  </el-form>
47
47
  </template>
48
48
  <template slot="time">
@@ -76,7 +76,7 @@
76
76
  <i v-if="(index + 1) === handTimeOptions.length" class="el-icon-circle-plus ml5" @click="add(item)" ></i>
77
77
  <i v-if="handTimeOptions.length > 1" class="el-icon-remove ml5" @click="remove(index)"></i>
78
78
  </div>
79
- </el-form-item>
79
+ </el-form-item>
80
80
  </template>
81
81
  </xd-base-dynamic-field>
82
82
  <div class="adjust-btn" style="margin-left: 140px">
@@ -85,14 +85,14 @@
85
85
  </div>
86
86
  </div>
87
87
  </div>
88
-
88
+
89
89
  </template>
90
90
 
91
91
  <script>
92
92
  import JfbRuleCreate from "./lib/JfbRuleCreate";
93
93
  import XdBaseDynamicField from "@/components/XdBaseDynamicField";
94
94
  import {mapState} from 'vuex';
95
-
95
+
96
96
  export default {
97
97
  name: "JfbRuleCreate",
98
98
  components:{
@@ -106,12 +106,12 @@
106
106
  //渠道
107
107
  channelActiveName: '',
108
108
  channelTabList: [],
109
-
109
+
110
110
  //提交对象
111
111
  listForm: [],
112
112
  listValue: {},
113
113
  renderFormKey: 'renderFormKey',
114
-
114
+
115
115
  policySettingObj : {},
116
116
  tagForm:{
117
117
  zTag:[],
@@ -130,73 +130,73 @@
130
130
  handTimeOptions:[{start:'',end:''}],
131
131
  timeList:[
132
132
  {
133
- lebel:'1',
133
+ label:'1',
134
134
  value:'1',
135
135
  },{
136
- lebel:'2',
136
+ label:'2',
137
137
  value:'2',
138
138
  },{
139
- lebel:'3',
139
+ label:'3',
140
140
  value:'3',
141
141
  },{
142
- lebel:'4',
142
+ label:'4',
143
143
  value:'4',
144
144
  },{
145
- lebel:'5',
145
+ label:'5',
146
146
  value:'5',
147
147
  },{
148
- lebel:'6',
148
+ label:'6',
149
149
  value:'6',
150
150
  },{
151
- lebel:'7',
151
+ label:'7',
152
152
  value:'7',
153
153
  },{
154
- lebel:'8',
154
+ label:'8',
155
155
  value:'8',
156
156
  },{
157
- lebel:'9',
157
+ label:'9',
158
158
  value:'9',
159
159
  },{
160
- lebel:'10',
160
+ label:'10',
161
161
  value:'10',
162
162
  },{
163
- lebel:'11',
163
+ label:'11',
164
164
  value:'11',
165
165
  },{
166
- lebel:'12',
166
+ label:'12',
167
167
  value:'12',
168
168
  },{
169
- lebel:'13',
169
+ label:'13',
170
170
  value:'13',
171
171
  },{
172
- lebel:'14',
172
+ label:'14',
173
173
  value:'14',
174
174
  },{
175
- lebel:'15',
175
+ label:'15',
176
176
  value:'15',
177
177
  },{
178
- lebel:'16',
178
+ label:'16',
179
179
  value:'16',
180
180
  },{
181
- lebel:'17',
181
+ label:'17',
182
182
  value:'17',
183
183
  },{
184
- lebel:'18',
184
+ label:'18',
185
185
  value:'18',
186
186
  },{
187
- lebel:'19',
187
+ label:'19',
188
188
  value:'19',
189
189
  },{
190
- lebel:'20',
190
+ label:'20',
191
191
  value:'20',
192
192
  },{
193
- lebel:'21',
193
+ label:'21',
194
194
  value:'21',
195
195
  },{
196
- lebel:'22',
196
+ label:'22',
197
197
  value:'22',
198
198
  },{
199
- lebel:'23',
199
+ label:'23',
200
200
  value:'23',
201
201
  },
202
202
  ]
@@ -210,13 +210,14 @@
210
210
  btnName(){
211
211
  return this.select_policy_id ? '更新': '提交';
212
212
  },
213
-
213
+
214
214
  isMovie(){
215
+ let isOldMovie = /^(\/movies\/).+$/.test(this.$route.path);
215
216
  let scene = false;
216
217
  if(this.channelParams && this.channelParams.scene && this.channelParams.scene === 'modifyprice'){
217
218
  scene = true;
218
- }
219
- return this.commonParams.xnamespace === 'movie' && scene;
219
+ }
220
+ return this.commonParams.xnamespace === 'movie' && scene && isOldMovie ;
220
221
  },
221
222
  select_policy_setting_params() {
222
223
  return {
@@ -225,11 +226,11 @@
225
226
  }
226
227
  }
227
228
  },
228
-
229
+
229
230
  async created(){
230
-
231
+
231
232
  },
232
-
233
+
233
234
  methods:{
234
235
  /**
235
236
  * @description 获取编辑数据
@@ -254,7 +255,7 @@
254
255
  }
255
256
  }
256
257
  }
257
-
258
+
258
259
  //非电影初始化
259
260
  else{
260
261
  let {conditions, options, agg_channel_code,formula, ...other} = res.data;
@@ -280,7 +281,7 @@
280
281
  this.$xdHelper.divisionFloatNumber(conditions.discount_ratio.max, 100) : ""
281
282
  }
282
283
  }
283
-
284
+
284
285
  //折扣设置
285
286
  let formulaData = {};
286
287
  if(formula && formula.sale_price) {
@@ -308,10 +309,10 @@
308
309
  //非电影设置渠道选择值
309
310
  if (!this.isMovie) this.channelActiveName = this.channelTabList[0]['value'];
310
311
  }
311
-
312
+
312
313
  //初始化表单
313
314
  this.handleTabClick(formData);
314
-
315
+
315
316
  },
316
317
  /**
317
318
  * @description 初始化表单
@@ -327,7 +328,7 @@
327
328
  this.initForm(params);
328
329
  return
329
330
  }
330
-
331
+
331
332
  //设置公共参数
332
333
  let commonConfig = {sort: {"enabled": true}};
333
334
  if(this.channelParams.scene === 'modifyprice') {
@@ -352,11 +353,11 @@
352
353
  }
353
354
  }
354
355
  }
355
-
356
+
356
357
  let loading = this.$loading({});
357
358
  try {
358
359
  let policySettingObj = await this.getRoleSetting(this.select_policy_setting_params);
359
-
360
+
360
361
  //售价选项卡设置
361
362
  if(policySettingObj.data && policySettingObj.data.formula
362
363
  && policySettingObj.data.formula.options
@@ -364,7 +365,7 @@
364
365
  ) {
365
366
  commonConfig['sale_price_base'] = policySettingObj.data.formula;
366
367
  }
367
-
368
+
368
369
  this.policySettingObj = Object.assign({},commonConfig,policySettingObj.data.conditions) ;
369
370
  console.log('aaaaaa')
370
371
  if(this.policySettingObj['partner_product_tags']){
@@ -399,10 +400,10 @@
399
400
  this.policySettingObj = Object.assign({}, commonConfig);
400
401
  console.error(e)
401
402
  throw Error(`获取配置错误：policySetting`);
402
-
403
+
403
404
  }
404
405
  this.initForm(params);
405
-
406
+
406
407
  },
407
408
 
408
409
  /**
@@ -433,7 +434,7 @@
433
434
  postData.valid_week_hours = JSON.stringify(noData)
434
435
  }
435
436
  }
436
-
437
+
437
438
  let fn = 'createRole';
438
439
  let params = {
439
440
  item: postData,
@@ -456,10 +457,10 @@
456
457
  }
457
458
  }
458
459
  }
459
-
460
+
460
461
  // console.log(params)
461
462
  // return;
462
-
463
+
463
464
  let loading = this.$loading({});
464
465
  this[fn](params)
465
466
  .then(res => {
@@ -469,12 +470,12 @@
469
470
  this.$bus.$emit('delTags', this.$route)
470
471
  }, 500);
471
472
  }
472
-
473
+
473
474
  //创建与不跳转到首页
474
475
  if(!select_policy_id && isBack === false) {
475
476
  this.initForm({})
476
477
  }
477
-
478
+
478
479
  loading.close()
479
480
  })
480
481
  .catch(err => {
@@ -504,7 +505,7 @@
504
505
  remove(index) {
505
506
  this.handTimeOptions.splice(index, 1);
506
507
  },
507
-
508
+
508
509
  }
509
510
  }
510
511
  </script>
@@ -515,52 +516,52 @@
515
516
  ::v-deep .el-tabs__nav-wrap {
516
517
  margin-right: 81px;
517
518
  }
518
-
519
+
519
520
  &-back {
520
521
  position: absolute;
521
522
  right: 0;
522
523
  bottom: 23px
523
524
  }
524
525
  }
525
-
526
+
526
527
  ::v-deep {
527
528
  .el-tabs--card > .el-tabs__header .el-tabs__item {
528
529
  background: #f8f8f8;
529
530
  border-bottom: 1px solid #dfe4ed !important;
530
-
531
+
531
532
  &.is-top.is-active {
532
533
  &:first-child {
533
534
  border-radius: 2px 0 0 0;
534
535
  }
535
-
536
+
536
537
  &:last-child {
537
538
  border-radius: 0 2px 0 0;
538
539
  }
539
-
540
+
540
541
  background: $blue;
541
542
  border-bottom: 1px solid $blue !important;
542
543
  color: #fff !important;
543
544
  }
544
545
  }
545
546
  }
546
-
547
+
547
548
  @media screen and (max-width: 768px) {
548
549
  ::v-deep {
549
550
  & .el-tabs__item {
550
551
  height: 30px;
551
552
  line-height: 30px;
552
553
  }
553
-
554
+
554
555
  & .el-tabs__nav-next, .el-tabs__nav-prev {
555
556
  line-height: 30px;
556
557
  }
557
-
558
+
558
559
  }
559
-
560
+
560
561
  ::v-deep .el-tabs__nav-wrap {
561
562
  margin-right: 61px!important;
562
563
  }
563
-
564
+
564
565
  .app-tab {
565
566
  &-back {
566
567
  bottom: 18px
package/library/viewModules/viewCardsGift/viewCardsGift/config.vue CHANGED
@@ -775,7 +775,6 @@ export default {
775
775
  ele: 'xd-color',
776
776
  valueKey: 'material_color',
777
777
  value: params['material_color'] || colorValue,
778
- disabled: false,
779
778
  setting: {
780
779
  showAlpha: false,
781
780
  isAlpha: false,
@@ -787,7 +786,6 @@ export default {
787
786
  ele: 'xd-margin-padding',
788
787
  valueKey: 'material_margin',
789
788
  value: params['material_margin'] || {top: defaultTop, left: leftValue, right: leftValue, bottom:0},
790
- disabled: false,
791
789
  setting: {
792
790
  type: 'margin',
793
791
  },
package/library/viewModules/viewsCompany/viewsCompany/list.vue CHANGED
@@ -199,7 +199,7 @@ export default {
199
199
  placeholder: '请选择指定站点：',
200
200
  setting: { multiple: false,},
201
201
  className: 'input80',
202
- disabled: true,
202
+ disabled: !!params.company_id,
203
203
  handleCustom:({action, data}) =>{
204
204
  this.getSaasSiteList()
205
205
  .then(res=>{
package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/detail.vue CHANGED
@@ -298,8 +298,7 @@ export default {
298
298
  valueKey: 'product_name', //form[valueKey]
299
299
  value: row.product_name, //v-model
300
300
  placeholder: '输入商品名称',
301
- classNmae: 'input40',
302
- disabled:true,
301
+ className: 'input40',
303
302
  rules: [
304
303
  {
305
304
  required: true,
@@ -315,7 +314,7 @@ export default {
315
314
  valueKey: 'sale_price', //form[valueKey]
316
315
  value: row.sale_price, //v-model
317
316
  placeholder: '输入单价',
318
- classNmae: 'input40',
317
+ className: 'input40',
319
318
  rules: [
320
319
  {
321
320
  required: true,
@@ -331,7 +330,6 @@ export default {
331
330
  },
332
331
  //修改价格确认
333
332
  handlePrice(){
334
- console.log(this.changeRow,'ddddd')
335
333
  let data = {
336
334
  purchase_main_order_id:this.id,
337
335
  items:[
@@ -368,7 +366,7 @@ export default {
368
366
  specific: value.product_sku_name, params: { width: 150, height: 150 },
369
367
  }
370
368
  },
371
-
369
+
372
370
  handleInCustom ({ action, data }, row) {
373
371
  if (action === 'merge') {
374
372
  let mergeRow = 1
package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/set_create.vue CHANGED
@@ -96,8 +96,8 @@ export default {
96
96
  multiple: false,
97
97
  collapseTags: false,
98
98
  list: partnerData,
99
- classNmae: 'input40',
100
- disabled: this.id ? true : false,
99
+ className: 'input40',
100
+ disabled: !!this.id,
101
101
  rules: [
102
102
  {
103
103
  required: true,
@@ -113,7 +113,7 @@ export default {
113
113
  valueKey: 'tax_ratio', //form[valueKey]
114
114
  value: params.tax_ratio || '', //v-model
115
115
  placeholder: '输入集采税点',
116
- classNmae: 'input40',
116
+ className: 'input40',
117
117
  rules: [
118
118
  {
119
119
  required: true,
package/library/viewModules/viewsFinance/viewsFinance/balance/detail_channel.vue CHANGED
@@ -144,7 +144,7 @@ export default {
144
144
  //列表对象
145
145
  tables: [],
146
146
  headers: [
147
- { "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
147
+ { "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
148
148
  { "type": "normal", "prop": "sub_order_id", "align": "center", "minWidth": 200, "label": "拆单号" },
149
149
  { "type": "normal", "prop": "address", "align": "center", "minWidth": 200, "label": "收货信息" },
150
150
  { "type": "normal", "prop": "products", "align": "center", "minWidth": 300, "label": "商品图片/名称/ID" },
@@ -277,7 +277,7 @@ export default {
277
277
  loading.close();
278
278
  })
279
279
  },
280
-
280
+
281
281
  /**
282
282
  * @description 点击搜索进行搜索操作
283
283
  * @param action 动作
@@ -298,7 +298,6 @@ export default {
298
298
  valueKey: "channel_code",
299
299
  value: this.channel_code,
300
300
  placeholder: "请输入名称",
301
- disabled: true,
302
301
  },
303
302
  {
304
303
  label: "主单号",
package/library/viewModules/viewsFinance/viewsFinance/balance/detail_openapi.vue CHANGED
@@ -126,7 +126,7 @@ export default {
126
126
  //列表对象
127
127
  tables: [],
128
128
  headers: [
129
- { "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
129
+ { "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
130
130
  { "type": "normal", "prop": "sub_order_id", "align": "center", "minWidth": 200, "label": "拆单号" },
131
131
  { "type": "normal", "prop": "address", "align": "center", "minWidth": 200, "label": "收货信息" },
132
132
  { "type": "normal", "prop": "products", "align": "center", "minWidth": 300, "label": "商品图片/名称/ID" },
@@ -240,7 +240,7 @@ export default {
240
240
  loading.close();
241
241
  })
242
242
  },
243
-
243
+
244
244
  /**
245
245
  * @description 点击搜索进行搜索操作
246
246
  * @param action 动作
@@ -261,7 +261,6 @@ export default {
261
261
  valueKey: "open_user_name",
262
262
  value: this.open_user_name,
263
263
  placeholder: "请输入名称",
264
- disabled: true,
265
264
  },
266
265
  {
267
266
  label: "主单号",
package/library/viewModules/viewsFinance/viewsFinance/balance/detail_partner.vue CHANGED
@@ -524,7 +524,6 @@ export default {
524
524
  valueKey: "p_id",
525
525
  value: this.partner_name || this.partner_id,
526
526
  placeholder: "请输入名称",
527
- disabled: true,
528
527
  },
529
528
  {
530
529
  label: "账户类型",
@@ -532,7 +531,6 @@ export default {
532
531
  valueKey: "wallet_type",
533
532
  value: this.wallet_type,
534
533
  placeholder: "请输入渠道ID",
535
- disabled: true,
536
534
  list: res[1].data.list_wallet_type,
537
535
  },
538
536
  {
package/library/viewModules/viewsFinance/viewsFinance/balance/detail_supplier.vue CHANGED
@@ -159,7 +159,7 @@ export default {
159
159
  //列表对象
160
160
  tables: [],
161
161
  headers: [
162
- { "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
162
+ { "type": "normal", "prop": "main_order_id", "align": "center", "width": 200, "label": "主单号" },
163
163
  { "type": "normal", "prop": "sub_order_id", "align": "center", "minWidth": 200, "label": "拆单号" },
164
164
  { "type": "normal", "prop": "address", "align": "center", "minWidth": 200, "label": "收货信息" },
165
165
  { "type": "normal", "prop": "products", "align": "center", "minWidth": 500, "label": "商品图片/名称/ID/金额&数量" },
@@ -294,7 +294,7 @@ export default {
294
294
  loading.close();
295
295
  })
296
296
  },
297
-
297
+
298
298
  /**
299
299
  * @description 点击搜索进行搜索操作
300
300
  * @param action 动作
@@ -315,7 +315,6 @@ export default {
315
315
  valueKey: "s_name",
316
316
  value: this.supplier_name,
317
317
  placeholder: "请输入名称",
318
- disabled: true,
319
318
  },
320
319
  // {
321
320
  // label: "账户类型",
package/library/viewModules/viewsFlashSale/viewsFlashSale/product.vue CHANGED
@@ -456,7 +456,6 @@ export default {
456
456
  ele: "xd-input-range", //package 名称
457
457
  valueKey: "price_range", //form[valueKey]
458
458
  value: null,
459
- disabled: false,
460
459
  setting: {
461
460
  /**单位显示**/
462
461
  //图标优先于文字单位
@@ -498,7 +497,6 @@ export default {
498
497
  ele: "xd-input-range",
499
498
  valueKey: "discount_ratio",
500
499
  value: null,
501
- disabled: false,
502
500
  setting: {
503
501
  unit: "%",
504
502
  /**选择条件显示**/
package/library/viewModules/viewsFreightSet/viewsFreightSet/freight_set.vue CHANGED
@@ -134,7 +134,7 @@
134
134
  server: 'supplier',
135
135
  fn: 'postage-change',
136
136
  path: 'p1',
137
- }
137
+ }
138
138
  // #endif
139
139
  )
140
140
  .then(res => {
@@ -200,7 +200,6 @@
200
200
  format: "yyyy/MM/dd HH:mm:ss",
201
201
  formatValue: "timestamp",
202
202
  placeholder: ["生效开始时间", "生效截止时间"],
203
- disabled: false,
204
203
  className: "input40",
205
204
  rules: [
206
205
  {required: true, message:'请选择生效时间', trigger: 'blur'},
@@ -275,7 +274,7 @@
275
274
  .catch(err=>{
276
275
  console.log(err,'err')
277
276
  })
278
-
277
+
279
278
  },
280
279
  }
281
280
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.39",
3
+ "version": "1.1.41",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {