jufubao-admin-library 1.1.9 → 1.1.11
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.
|
@@ -21,7 +21,13 @@ module.exports = {
|
|
|
21
21
|
partner_id: ['加盟商id', 'Number', '非必选'],
|
|
22
22
|
},
|
|
23
23
|
disabled: true,
|
|
24
|
+
// #ifdef admin
|
|
25
|
+
role: 'ROLE_ADMIN_SYSTEM_TASKS_LIST',
|
|
26
|
+
// #endif
|
|
27
|
+
// #ifndef admin
|
|
24
28
|
role: '@@@@.@@@@@.SYSTEM_TASKS_LIST',
|
|
29
|
+
// #endif
|
|
30
|
+
|
|
25
31
|
},
|
|
26
32
|
{
|
|
27
33
|
mapFn: 'asyncRetry',
|
|
@@ -37,12 +43,7 @@ module.exports = {
|
|
|
37
43
|
serial_no: ['id', 'String', '必选'],
|
|
38
44
|
},
|
|
39
45
|
disabled: true,
|
|
40
|
-
// #ifdef admin
|
|
41
|
-
role: 'ROLE_ADMIN_SYSTEM_TASKS_AGAIN',
|
|
42
|
-
// #endif
|
|
43
|
-
// #ifndef admin
|
|
44
46
|
role: '',
|
|
45
|
-
// #endif
|
|
46
47
|
|
|
47
48
|
},
|
|
48
49
|
{
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
this.formData = {};
|
|
109
109
|
this.formData.formula_unit = res.data.change_json.method;
|
|
110
110
|
this.formData.formula_value = res.data.change_json.value;
|
|
111
|
-
this.initFormList(this.formData,false)
|
|
111
|
+
this.initFormList({...res.data,...this.formData},false)
|
|
112
112
|
} else {
|
|
113
113
|
this.initFormList({},false)
|
|
114
114
|
}
|
|
@@ -180,7 +180,7 @@
|
|
|
180
180
|
valueKey: 'formula_value',
|
|
181
181
|
value: params.formula_unit===this.formData.formula_unit?this.formData.formula_value:'',
|
|
182
182
|
setting: {
|
|
183
|
-
unit: params.formula_unit == '
|
|
183
|
+
unit: params.formula_unit == 'discount' ? '%' : '元',
|
|
184
184
|
tips: params.formula_unit == 'money' ? '可设置正负值' : '可设置正负值',
|
|
185
185
|
pos: 'append'
|
|
186
186
|
},
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
valueKey: ["start_time", "end_time"],
|
|
196
196
|
value:
|
|
197
197
|
params.start_time && params.end_time
|
|
198
|
-
? [params.start_time * 1000, params.end_time * 1000]
|
|
198
|
+
? [params.start_time.toString().length===10? params.start_time* 1000:params.start_time, params.end_time.toString().length===10? params.end_time* 1000:params.end_time]
|
|
199
199
|
: [],
|
|
200
200
|
format: "yyyy/MM/dd HH:mm:ss",
|
|
201
201
|
formatValue: "timestamp",
|
|
@@ -220,9 +220,17 @@
|
|
|
220
220
|
handleSearch({action, form}) {
|
|
221
221
|
console.log(action, 'action')
|
|
222
222
|
},
|
|
223
|
+
isInter(num){
|
|
224
|
+
return num%1===0
|
|
225
|
+
},
|
|
223
226
|
/**保存**/
|
|
224
227
|
handleConfirm() {
|
|
225
|
-
|
|
228
|
+
this.$refs.form.submit().then(res => {
|
|
229
|
+
console.log(this.formParams, 'this.formParams')
|
|
230
|
+
if(this.formParams.formula_unit==='money'&&!this.isInter(this.formParams.formula_value)){
|
|
231
|
+
this.$message.error('金额必须是整数')
|
|
232
|
+
return
|
|
233
|
+
}
|
|
226
234
|
let data = {
|
|
227
235
|
change_json:{
|
|
228
236
|
method:'',
|
|
@@ -263,6 +271,11 @@
|
|
|
263
271
|
|
|
264
272
|
})
|
|
265
273
|
}
|
|
274
|
+
})
|
|
275
|
+
.catch(err=>{
|
|
276
|
+
console.log(err,'err')
|
|
277
|
+
})
|
|
278
|
+
|
|
266
279
|
},
|
|
267
280
|
}
|
|
268
281
|
}
|