Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/HManagement/salesForecastTemplate/modules/add.vue

@@ -128,7 +128,7 @@ export default {
           { required: true, message: '请选择开始日期', trigger: 'change' }
         ],
         enddate: [
-          { required: true, message: '请选择结束日期', trigger: 'change' }
+          { validator:this.validateEndDate, required: true, trigger: 'change' }
         ],
         taskdays:[
           { required: true, message: '请输提醒天数', trigger: 'blur' },
@@ -205,6 +205,20 @@ export default {
         }
       })
       this.rolelist = res.data
+    },
+    validateEndDate(rule, value, callback){
+      let start = (new Date(this.form.begdate)).getTime()
+      let end = (new Date(this.form.enddate)).getTime()
+      if (value === '') {
+        callback(new Error('请选择结束日期'));
+      } else if (end < start) {
+        callback(new Error('结束日期不能小于开始日期'));
+      } else {
+        // if (this.form.enddate !== '') {
+        //   this.$refs['form'].validateField('enddate');
+        // }
+        callback();
+      }
     }
   },
   mounted () {