优化合同折扣相关校验

src/HDrpManagement/contractManage/components/addContract.vue

@@ -630,7 +630,9 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (+value > 100 || +value < 0 ) {
+      if (isNaN(parseFloat(value))){
+        return callback(new Error('输入不合法，请输入数值'))
+      }else if (+value > 100 || +value < 0 ) {
         return callback(new Error('折扣范围(0-100%)'));
       }
       callback()
@@ -735,14 +737,14 @@ export default {
         ],
         productdiscount: [
         /*  { message: '必须为数字', type:'number', trigger: 'change' },*/
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change,blur'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
        /*   { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
          /* { message: '必须为数字', type:'number', trigger: 'change' },*/
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change,blur'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
         /*  { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
@@ -752,7 +754,7 @@ export default {
         ],
         discountrate: [
          /* { validator: checkNumber, trigger: 'blur'},*/
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change'},
           { validator: NumberSize, trigger: 'blur'}
         ],
       },
@@ -1183,30 +1185,21 @@ export default {
     },
     discountrateChange(){
       let discountrate = parseFloat(this.form.discountrate)
-      if (isNaN(discountrate)){
-        this.form.discountrate = ''
-      }else {
+      if (!isNaN(discountrate)){
         this.form.discountrate = Math.round(this.form.discountrate * 100)/100
       }
-
     },
     orderratioChange(){
       let orderratio = parseFloat(this.form.orderratio)
-      if (isNaN(orderratio)){
-        this.form.orderratio = ''
-      }else {
+      if (!isNaN(orderratio)){
         this.form.orderratio =  Math.round(this.form.orderratio * 100)/100
       }
-
     },
     productdiscountChange(){
       let productdiscount = parseFloat(this.form.productdiscount)
-      if (isNaN(productdiscount)){
-        this.form.productdiscount = ''
-      }else {
+      if (!isNaN(productdiscount)){
         this.form.productdiscount =  Math.round(this.form.productdiscount * 100)/100
       }
-
     },
 
     /*获取客户负责人*/

src/HDrpManagement/contractManage/components/editContract.vue

@@ -635,7 +635,9 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (+value > 100 || +value <= 0 && value) {
+      if (isNaN(parseFloat(value))){
+        return callback(new Error('输入不合法，请输入数值'))
+      }else if (+value > 100 || +value <= 0 && value) {
         return callback(new Error('折扣范围(1-100%)'));
       }
       callback()
@@ -731,14 +733,14 @@ export default {
         ],
         productdiscount: [
          /* { message: '必须为数字', type:'number', trigger: 'change' },*/
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
           /*{ validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
         ],
         orderratio: [
          /* { message: '必须为数字', type:'number', trigger: 'change' },*/
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change'},
           { required: true, message: '请填写折扣', trigger: 'blur' },
          /* { validator: checkNumber, trigger: 'blur'},*/
           { validator: NumberSize, trigger: 'blur'}
@@ -748,7 +750,7 @@ export default {
         ],
         discountrate: [
          /* { validator: checkNumber, trigger: 'blur'},*/
-          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '必须为数字',trigger: 'change'},
+          { pattern:/^[0-9]+\.{0,1}[0-9]{0,4}$/,message: '输入不合法，请输入数值',trigger: 'change'},
           { validator: NumberSize, trigger: 'blur'}
         ],
       },
@@ -1137,30 +1139,21 @@ export default {
     },
     discountrateChange(){
       let discountrate = parseFloat(this.form.discountrate)
-      if (isNaN(discountrate)){
-        this.form.discountrate = ''
-      }else {
+      if (!isNaN(discountrate)){
         this.form.discountrate = Math.round(this.form.discountrate * 100)/100
       }
-
     },
     orderratioChange(){
       let orderratio = parseFloat(this.form.orderratio)
-      if (isNaN(orderratio)){
-        this.form.orderratio = ''
-      }else {
+      if (!isNaN(orderratio)){
         this.form.orderratio =  Math.round(this.form.orderratio * 100)/100
       }
-
     },
     productdiscountChange(){
       let productdiscount = parseFloat(this.form.productdiscount)
-      if (isNaN(productdiscount)){
-        this.form.productdiscount = ''
-      }else {
+      if (!isNaN(productdiscount)){
         this.form.productdiscount =  Math.round(this.form.productdiscount * 100)/100
       }
-
     },
     /*获取客户负责人*/
     async queryCustomerLeader(id){