jufubao-admin-library 1.1.151 → 1.1.153

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.
@@ -267,6 +267,28 @@ export default {
267
267
  let flag = true,
268
268
  index = null,
269
269
  message = "";
270
+ let arr = value.map(item=>{
271
+ return JSON.stringify([Number(item.start_number),Number(item.end_number)])
272
+ });
273
+ let cloArr = [];
274
+ value.map(item=>{
275
+ if(Number(item.start_number)===Number(item.end_number)){
276
+ cloArr.push(Number(item.start_number))
277
+ }else{
278
+ cloArr.push(Number(item.start_number));
279
+ cloArr.push(Number(item.end_number))
280
+ }
281
+ })
282
+ let arrSet = new Set(arr);
283
+ if (arr.length !== arrSet.size) {
284
+ callback("卡号组不能重复");
285
+ return;
286
+ }
287
+ let cloArrSet = new Set(cloArr);
288
+ if (cloArr.length !== cloArrSet.size) {
289
+ callback("卡号组不能重复");
290
+ return;
291
+ }
270
292
  value.map((item, idx) => {
271
293
  if (index === null) {
272
294
  //检查卡号填写为空
@@ -280,23 +302,16 @@ export default {
280
302
 
281
303
  //检查开始卡号不能大于等于结束卡号
282
304
  if (index === null) {
283
- if (item["start_number"] >= item["end_number"]) {
305
+ if (item["start_number"] > item["end_number"]) {
284
306
  index = idx;
285
307
  flag = false;
286
- message = "输入开始卡号不能大于等于结束卡号";
308
+ message = "输入开始卡号不能大于结束卡号";
287
309
  }
288
310
  }
289
311
  }
290
312
  });
291
-
292
313
  if (flag) callback();
293
314
  else callback(`第【${index + 1}】条数据有误,错误:${message}`);
294
-
295
- // let temp = false;
296
- // if (!value['week_day'] || value['week_day'].length === 0) temp = true;
297
- // if (!value['week_start'] || !value['week_end']) temp = true;
298
- // if (temp) callback('请设置规则')
299
- // else callback();
300
315
  },
301
316
  trigger: ["blur", "change"],
302
317
  },
@@ -1143,7 +1143,7 @@ export default {
1143
1143
  },
1144
1144
  ],
1145
1145
  },
1146
- (this.$channelCode==='wenyu_dingdong'||this.$channelCode==='rt_mart')&&params.site_id&&{
1146
+ (this.$channelCode==='wenyu_dingdong'||this.$channelCode==='rt_mart'||this.$channelCode==='qxdaojia')&&params.site_id&&{
1147
1147
  label: "手机号收集页:",
1148
1148
  ele: "xd-select-site-path",
1149
1149
  className: "input100",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "jufubao-admin-library",
3
- "version": "1.1.151",
3
+ "version": "1.1.153",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {