no message

src/utils/followup/followupUtils/checkField.js

@@ -15,7 +15,7 @@ export const checkRange = (rule, value, callback) => {
   let val = parseFloat(value);
   let res;
   // 处理 诸如 01 这种情况
-  if(value.length>1 && value.indexOf('.')<0){
+  if(value && value.length>1 && value.indexOf('.')<0){
     res = (new RegExp(/^[1-9]\d*$/g)).test(value);
   }else{
     res = true;
@@ -28,7 +28,8 @@ export const checkRange = (rule, value, callback) => {
     }
   })
   const ruless = ( (val >= min) && (val <= max) && res )
-  if(ruless || checkNeedRule(val)){
+  // if(ruless || checkNeedRule(val)){
+  if( !value || ruless ){
     callback()
   }else{
     callback(new Error(`输入范围${min}~${max}`))
@@ -53,7 +54,8 @@ export const checkIsInteger = (rule, value, callback) => {
 
   // const val = Number.parseInt(value);
   // const num =  /^[0-9]*[1-9][0-9]*$/.test(value);
-  if(num || checkNeedRule(val)){
+  // if(num || checkNeedRule(val)){
+  if( !value || num ){
     callback()
   }else{
     callback(new Error(`输入整数`))
@@ -64,7 +66,8 @@ export const checkIsInteger = (rule, value, callback) => {
 export const checkNumberIsToFixed = (rule, value, callback) => {
   const isNum = /^(([1-9][0-9]*)|(([0]\.\d{1,1}|[1-9][0-9]*\.\d{1,1})))$/;
   const val = Number(value);
-  if(isNum.test(val)  || checkNeedRule(val)){
+  // if(isNum.test(val)  || checkNeedRule(val)){
+  if( !value || isNum.test(val) ){
     callback()
   }else{
     callback(new Error(`最多输入1位小数`))
@@ -75,7 +78,8 @@ export const checkNumberIsToFixed = (rule, value, callback) => {
 export const checkNormalInt = (rule, value, callback) => {
   const val = parseFloat(value);
   const isInteger = Number.isInteger(val);
-  if((isInteger && val > 0) || checkNeedRule(val)){
+  // if((isInteger && val > 0) || checkNeedRule(val)){
+  if( !value || (isInteger && val > 0) ){
     callback()
   }else{
     callback(new Error(`请输入大于0的正整数`))
@@ -86,7 +90,8 @@ export const checkNormalInt = (rule, value, callback) => {
 export const checkNumberIsToFixedTwo = (rule, value, callback) => {
   const isNum = /^(-)?(0|[1-9]\d*)(\s|$|\.\d{1,2}\b)/;
   const val = Number(value);
-  if(isNum.test(val)  || checkNeedRule(val)){
+  // if(isNum.test(val)  || checkNeedRule(val)){
+  if( !value || isNum.test(val)  ){
     callback()
   }else{
     callback(new Error(`最多输入2位小数`))

src/views/followup/record-manage/models/stroke/dataSourceBaseInfo.js

@@ -50,16 +50,39 @@ export default ($this) => {
       rules: [{ required: true, message: '请选择随访轮次', trigger: ['submit','change'] }],
       changeFun: (e)=>{
         // console.log(e)
-        if(e == '12个月'){
-          $this.needRule = false;
-          sessionStorage.setItem('needRule',false);
-        }else{
-          $this.needRule = true;
-          sessionStorage.setItem('needRule',true);
-        }
+        // if(e == '12个月'){
+        //   $this.needRule = false;
+        //   sessionStorage.setItem('needRule',false);
+        // }else{
+        //   $this.needRule = true;
+        //   sessionStorage.setItem('needRule',true);
+        // }
+
+
+        $this.addComponents.forEach((item,index)=>{
+          if(item.name == 'CheckBody'){
+            item.dataSource.forEach((item2,index2)=>{
+              if(e == '12个月'){
+                $this.needRule = false;
+                sessionStorage.setItem('needRule',false);
+                if(item2.rules){
+                  $this.addComponents[index].dataSource[index2].rules[0].required = true
+                }
+              }else{
+                $this.needRule = true;
+                sessionStorage.setItem('needRule',true);
+                if(item2.rules){
+                  $this.addComponents[index].dataSource[index2].rules[0].required = false
+                }
+              }
+            })
+          }
+
+        })
+
+
       }
     },
-
   ]
 }