jufubao-admin-library 1.1.40 → 1.1.42

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.
@@ -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
  },
@@ -120,7 +120,10 @@ export default {
120
120
  listForm: [],
121
121
  status: false,
122
122
  id:null, //客户记录ID
123
- key: Date.now()
123
+ key: Date.now(),
124
+
125
+ //是否为编辑
126
+ isEdit: false,
124
127
  }
125
128
  },
126
129
 
@@ -159,6 +162,7 @@ export default {
159
162
  this.clearDialog();
160
163
  this.$message({message: '操作成功!', type:"success"});
161
164
  this.getList();
165
+ this.isEdit = false;
162
166
  })
163
167
  .catch(err=>{
164
168
  loading.close()
@@ -199,7 +203,7 @@ export default {
199
203
  placeholder: '请选择指定站点:',
200
204
  setting: { multiple: false,},
201
205
  className: 'input80',
202
- disabled: true,
206
+ disabled: this.isEdit && !!params['site_id'],
203
207
  handleCustom:({action, data}) =>{
204
208
  this.getSaasSiteList()
205
209
  .then(res=>{
@@ -296,6 +300,7 @@ export default {
296
300
  company_status: row.company_status,
297
301
  index_path:row.index_path
298
302
  };
303
+ this.isEdit = !!row.site_id;
299
304
  this.initForm(info);
300
305
  this.dialog = true;
301
306
  },
@@ -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
@@ -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,
@@ -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: "主单号",
@@ -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: "主单号",
@@ -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
  {
@@ -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: "账户类型",
@@ -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
  /**选择条件显示**/
@@ -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.40",
3
+ "version": "1.1.42",
4
4
  "description": "聚福宝福利后台管理系统公共模块",
5
5
  "author": "goashiyong <gaoshiyong1272@vip.163.com>",
6
6
  "scripts": {