lihongxiao 1 жил өмнө
parent
commit
aca7d448b1

+ 5 - 16
src/views/PeopleManage/Partner.vue

@@ -760,22 +760,17 @@ export default {
         oneProportion: [{ required: false, message: "请输入一级合伙人", trigger: "blur" },{
             validator: (rule, value, callback) => {
               const regex = /^(\d+)?(\.\d{1,2})?$/;
-              if (value === '') {
-                callback(new Error('请输入二级合伙人'));
-              } else if (!regex.test(value) || (value > 0.5)) {
+              if (value && !regex.test(value) || (value > 0.5)) {
                 callback(new Error('输入的数值不能超过0.5,且只保留两位小数'));
               } else {
                 callback();
               }
             },
-            trigger: 'blur'
           }],
         twoProportion: [{ required: false, message: "请输入二级合伙人", trigger: "blur" },{
             validator: (rule, value, callback) => {
               const regex = /^(\d+)?(\.\d{1,2})?$/;
-              if (value === '') {
-                callback(new Error('请输入二级合伙人'));
-              } else if (!regex.test(value) || (value > 0.5)) {
+               if (value && !regex.test(value) || (value > 0.5)) {
                 callback(new Error('输入的数值不能超过0.5,且只保留两位小数'));
               } else {
                 callback();
@@ -786,9 +781,7 @@ export default {
         threeProportion: [{ required: false, message: "请输入三级合伙人", trigger: "blur" },{
             validator: (rule, value, callback) => {
               const regex = /^(\d+)?(\.\d{1,2})?$/;
-              if (value === '') {
-                callback(new Error('请输入二级合伙人'));
-              } else if (!regex.test(value) || (value > 0.5)) {
+             if (value && !regex.test(value) || (value > 0.5)) {
                 callback(new Error('输入的数值不能超过0.5,且只保留两位小数'));
               } else {
                 callback();
@@ -799,9 +792,7 @@ export default {
         fourProportion: [{ required: false, message: "请输入四级合伙人", trigger: "blur" },{
             validator: (rule, value, callback) => {
               const regex = /^(\d+)?(\.\d{1,2})?$/;
-              if (value === '') {
-                callback(new Error('请输入二级合伙人'));
-              } else if (!regex.test(value) || (value > 0.5)) {
+              if (value && !regex.test(value) || (value > 0.5)) {
                 callback(new Error('输入的数值不能超过0.5,且只保留两位小数'));
               } else {
                 callback();
@@ -812,9 +803,7 @@ export default {
         fiveProportion: [{ required: false, message: "请输入五级合伙人", trigger: "blur" },{
             validator: (rule, value, callback) => {
               const regex = /^(\d+)?(\.\d{1,2})?$/;
-              if (value === '') {
-                callback(new Error('请输入二级合伙人'));
-              } else if (!regex.test(value) || (value > 0.5)) {
+              if (value &&!regex.test(value) || (value > 0.5)) {
                 callback(new Error('输入的数值不能超过0.5,且只保留两位小数'));
               } else {
                 callback();