Merge branch 'dev-followUp-20190312' of...

Merge branch 'dev-followUp-20190312' of http://192.168.110.53/com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-followUp-20190312

src/views/followup/plan-manage/dialog/set-time-node.vue

@@ -33,7 +33,7 @@
                       <el-input
                         style="width:200px;"
                         v-model="itemTimeForm.timeNo"
-                        type="number"
+                        type="text"
                         size="small"
                         placeholder="请输入"
                         :disabled="itemIsDisabled(itemTimeForm)"
@@ -152,11 +152,12 @@
     },
     data() {
       const checkDay = (rule, value, callback)=>{
+        console.log(value)
         const num = parseFloat(value);
         if(num < 0 || num > 100){
           return callback(new Error('数字范围0-99'));
         }
-        if(!Number.isInteger(num)){
+        if(!Number.isInteger(num) || String(value).indexOf('.') > 0){
           return callback(new Error('数字必须为整数'));
         }
         callback();

src/views/followup/plan-manage/new-plan.vue

@@ -200,10 +200,9 @@
            createFollowPlan(this.baseInfo).then(res=>{
              if(res.code=='000000'){
                //  各种校验通过后，提交编辑内容，toast提示
-               this.$notify.success({
-                 title: '',
+               this.$message({
                  message: '创建成功',
-                 showClose: false
+                 type: 'success'
                });
                setTimeout(()=>{
                  this.$router.push({
@@ -211,10 +210,9 @@
                  })
                },2000)
              }else{
-               this.$notify.success({
-                 title: '提交失败',
-                 message: res.message,
-                 showClose: false
+               this.$message({
+                 message: '创建失败,' + res.message,
+                 type: 'error'
                });
              }
            })

src/views/followup/plan-manage/plan-modify.vue

@@ -256,10 +256,9 @@
             createFollowPlan(this.planDetailData).then(res=>{
               if(res.code=='000000'){
                 //  各种校验通过后，提交编辑内容，toast提示
-                this.$notify.success({
-                  title: '',
+                this.$message({
                   message: '修改成功',
-                  showClose: false
+                  type: 'success'
                 });
                 setTimeout(()=>{
                   this.$router.push({
@@ -267,10 +266,9 @@
                   })
                 },2000)
               }else{
-                this.$notify.success({
-                  title: '修改失败',
-                  message: res.message,
-                  showClose: false
+                this.$message({
+                  message: '创建失败,' + res.message,
+                  type: 'error'
                 });
               }
             })