|
|
@@ -343,15 +343,10 @@ export default {
|
|
|
precision: num_scale,
|
|
|
}).format()
|
|
|
).value;
|
|
|
-<<<<<<< HEAD
|
|
|
- if (num_minvalue && this.value < num_minvalue) this.value = num_minvalue - 0;
|
|
|
- if (num_maxvalue && this.value > num_maxvalue) this.value = num_maxvalue - 0;
|
|
|
-=======
|
|
|
if (num_minvalue != "" && this.value < num_minvalue)
|
|
|
this.value = num_minvalue - 0;
|
|
|
if (num_maxvalue != "" && this.value > num_maxvalue)
|
|
|
this.value = num_maxvalue - 0;
|
|
|
->>>>>>> MT01
|
|
|
this.stepIsCalculate = false;
|
|
|
if (this.stagingMethod) this.confirm();
|
|
|
},
|
|
|
@@ -374,11 +369,7 @@ export default {
|
|
|
value = "";
|
|
|
if (item.inputType == "int" || item.inputType == "step") {
|
|
|
value = this.value - 0;
|
|
|
-<<<<<<< HEAD
|
|
|
// if (value == 0) return this.submitBreak("还未输入值");
|
|
|
-=======
|
|
|
- if (String(value).length == 0) return this.submitBreak("还未输入值");
|
|
|
->>>>>>> MT01
|
|
|
if (params.num_scale != 0) value = value.toFixed(params.num_scale);
|
|
|
if (params.num_minvalue && value - 0 < params.num_minvalue - 0)
|
|
|
return this.submitBreak("输入值小于最低范围");
|
|
|
@@ -405,11 +396,7 @@ export default {
|
|
|
return this.submit(item.w_functionid, value);
|
|
|
} else if (item.inputType == "dayParting") {
|
|
|
value = this.value - 0;
|
|
|
-<<<<<<< HEAD
|
|
|
// if (value == 0) return this.submitBreak("还未输入值");
|
|
|
-=======
|
|
|
- if (String(value).length == 0) return this.submitBreak("还未输入值");
|
|
|
->>>>>>> MT01
|
|
|
let p = item.params[item.key + "P"];
|
|
|
if (p.num_scale != 0) value = value.toFixed(p.num_scale);
|
|
|
if (p.num_minvalue && value - 0 > p.num_minvalue - 0)
|
