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

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

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

@@ -222,7 +222,7 @@
         this.$router.push({path: '/followup/plan-manage/plan-modify', query: {planId:row.id}})
       },
       deleteRow(row){
-        this.$confirm('此操作将删除该条计划, 是否继续?', '提示', {
+        this.$confirm(`是否确定删除${row.name}, 删除后计划将无法恢复!`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
         }).then(() => {
@@ -234,10 +234,10 @@
             message: '删除成功!'
           });
         }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          });
+          // this.$message({
+          //   type: 'info',
+          //   message: '已取消删除'
+          // });
         });
       },