修改商品价格

src/views/goods/goods/components/Form.vue

@@ -160,14 +160,14 @@ export default {
         callback();
       }
     };    
-    var validateDiscount = (rule, value, callback) => {
-      let discountValue=this.form.discount;
-      if (discountValue == undefined || discountValue === '') {        
+    var validateDiscount = (rule, value, callback) => {  
+      let regular = /^[+]{0,1}([1-9]+)$|^[+]{0,1}(\d+\.\d{2})$/   //正数（保留2位小数)    
+      if (value == undefined || value === '') {        
         callback(new Error('不能为空'));
-      }else if(!Number.isInteger(discountValue)){
-        callback(new Error('请输入数字值'));
+      }else if(!regular.test(value)){     
+        callback(new Error('请输入大于0的正数,保留2位小数'));     
       }else if(this.form.price){
-        if(discountValue >= this.form.price){
+        if(value >= this.form.price){
           callback(new Error('折扣价不能大于等于原价'));
         }else {
           callback();
@@ -176,14 +176,14 @@ export default {
         callback();
       }
     };
-    var validatePrice = (rule, value, callback) => {
-      let priceValue=this.form.price;     
-      if (priceValue == undefined || priceValue === '') {        
+    var validatePrice = (rule, value, callback) => {   
+      let regular = /^[+]{0,1}([1-9]+)$|^[+]{0,1}(\d+\.\d{2})$/   //正数（保留2位小数)      
+      if (value == undefined || value === '') {        
         callback(new Error('不能为空'));
-      }else if(!Number.isInteger(priceValue)){
-        callback(new Error('请输入数字值'));
+      }else if(!regular.test(value)){     
+        callback(new Error('请输入大于0的正数,保留2位小数'));     
       }else if(this.form.discount){
-        if(priceValue<=this.form.discount){
+        if(value<=this.form.discount){
           callback(new Error('原价不能小于等于折扣价'));
         }else {
           callback();