fix bug 15:08

src/utils/filter.js

@@ -148,7 +148,7 @@ const vueFilter = {
         return '项目负责人'
     }else if(value == "L3") {
         return '次级负责人'
-    } else if(value == "L4") {
+    } else if(value == "L0") {
         return '普通用户'
     }
   },

src/views/education/add-manager.vue

@@ -512,9 +512,9 @@ export default {
       },
       pickerOptions0: {
         disabledDate: time => {
-          if (this.formData.projectEndtime != "") {
+          if (this.formData.projectEndtime != "" && this.formData.projectEndtime !=null) {
             return (
-              time.getTime() > new Date(this.formData.projectEndtime).getTime()
+              time.getTime() > new Date(this.formData.projectEndtime).getTime() 
             );
           }
         }
@@ -522,7 +522,7 @@ export default {
       pickerOptions1: {
         disabledDate: time => {
           return (
-            time.getTime() < new Date(this.formData.projectBegintime).getTime()
+            time.getTime() < new Date(this.formData.projectBegintime).getTime() 
           ); //减去一天的时间代表可以选择同一天;
         }
       },
@@ -665,12 +665,7 @@ export default {
         ],
         projectIntro: [
           { required: true, message: "请填写项目简介", trigger: "blur" },
-          {
-            min: 1,
-            max: 500,
-            message: "输入长度为1-500的内容，可包含中英文、数字及特殊符号",
-            trigger: "blur"
-          }
+          { min: 1, max: 150, message: '超出可输入的最大长度', trigger: 'blur' }
         ],
         attachmentUrl1: [
           { required: true, message: "请选择列表图片", trigger: "blur" }
@@ -950,16 +945,19 @@ export default {
       console.log("暂存步骤" + (this.active + 1));
       if (this.active == 0) {
         if (this.formData.projectName != "") {
+          if(this.formData.projectName.length < 2 || this.formData.projectName.length > 20) {
+            this.$message.error("输入长度为2-20的内容");
+            return;
+          }
           let param = {
             projectName: this.formData.projectName
           };
           vm.GET("portal/portalInfo/checkProjectName", param).then(res => {
             //console.log(res);
+            this.$message.info(res.message);
             if (res.code == "000000") {
               //移动到第二页 选择范围
               this.insertOrUpdate("storage");
-            } else {
-              this.$message.error(res.message);
             }
           });
         } else {
@@ -1029,6 +1027,7 @@ export default {
               projectName: this.formData.projectName
             };
             vm.GET("portal/portalInfo/checkProjectName", param).then(res => {
+              this.$message.info(res.message);
               if (res.code == "000000") {
                 //移动到第二页 选择范围
                 this.insertOrUpdate("add");
@@ -1036,16 +1035,19 @@ export default {
                 // this.stepData = [false, true, false];
                 //this.initRange();
                 //this.checkAllTable();
-              } else {
-                this.$message.error("项目名称" + res.message);
               }
             });
           } else {
             //编辑
-            this.insertOrUpdate("edit");
-            // this.active++;
-            // this.stepData = [false, true, false];
-            //this.initRange();
+            let param = {
+              projectName: this.formData.projectName
+            };
+            vm.GET("portal/portalInfo/checkProjectName", param).then(res => {
+              this.$message.info(res.message);
+              if (res.code == "000000") {
+                this.insertOrUpdate("edit");
+              }
+            });
           }
         }
       } else if (this.active == 1) {

src/views/education/item-manager.vue

@@ -78,7 +78,13 @@
         <el-table-column prop="id" label="ID编号" min-width="100" align="center"></el-table-column>
         <el-table-column prop="projectName" label="项目名称" min-width="100" align="center"></el-table-column>
         <el-table-column prop="createdName" label="创建人" align="center"></el-table-column>
-        <el-table-column prop="projectIntro" label="项目简介" align="center" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column
+          prop="projectIntro"
+          label="项目简介"
+          align="center"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column prop="projectBegintime" label="项目开始时间" align="center"></el-table-column>
         <el-table-column prop="projectEndtime" label="项目结束时间" align="center"></el-table-column>
         <el-table-column prop="projectStatus" label="状态" align="center">
@@ -234,10 +240,10 @@ export default {
       },
       pickerOptions0: {
         disabledDate: time => {
-          if (this.formInline.projectEndtime != "") {
+          if (this.formInline.projectEndtime != "" && this.formInline.projectEndtime !=null) {
             return (
               time.getTime() >
-              new Date(this.formInline.projectEndtime).getTime()
+              new Date(this.formInline.projectEndtime).getTime() 
             );
           }
         }
@@ -246,7 +252,7 @@ export default {
         disabledDate: time => {
           return (
             time.getTime() <
-            new Date(this.formInline.projectBegintime).getTime()
+            new Date(this.formInline.projectBegintime).getTime() 
           ); //减去一天的时间代表可以选择同一天;
         }
       }
@@ -322,9 +328,9 @@ export default {
           warnType: 1
         };
         vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
+          vm.$message.info(res.message);
           if (res.code == "000000") {
             console.log(res);
-            vm.$message.info(res.message);
           }
         });
       } else {
@@ -345,9 +351,9 @@ export default {
             warnType: warnType
           };
           vm.GET("portal/portalCheck/remindPortalCheck", req).then(res => {
+            vm.$message.info(res.message);
             if (res.code == "000000") {
               console.log(res);
-              vm.$message.info(res.message);
             }
           });
         }
@@ -356,9 +362,9 @@ export default {
           changeStatus: type
         };
         vm.POST("portal/portalInfo/changeStatus", req).then(res => {
+          vm.$message.info(res.message);
           if (res.code == "000000") {
             console.log(res);
-            vm.$message.info(res.message);
             this.getProjectList();
           }
         });
@@ -369,12 +375,9 @@ export default {
       let req = {};
       console.log(row);
       vm.DELETE("portal/portalInfo/delete/" + row.id, req).then(res => {
+        vm.$message.info(res.message);
         if (res.code == "000000") {
           console.log(res);
-          vm.$message({
-              type: 'success',
-              message: '删除成功!'
-          });
           vm.getProjectList();
         }
       });

src/views/system/item-role.vue

@@ -7,7 +7,7 @@
         <el-form :model="formInline" ref="formInline" label-width="75px" class="form-inline">
           <el-col :span="5">
             <el-form-item label="姓名：">
-              <el-input size="mini" v-model="formInline.name" placeholder="请输入名称"></el-input>
+              <el-input size="mini" v-model="formInline.userName" placeholder="请输入名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="5">

src/views/system/role.vue

@@ -110,10 +110,10 @@ export default {
       },
       pickerOptions0: {
         disabledDate: time => {
-          if (this.formInline.projectEndtime != "") {
+          if (this.formInline.projectEndtime != "" && this.formInline.projectEndtime !=null) {
             return (
               time.getTime() >
-              new Date(this.formInline.projectEndtime).getTime()
+              new Date(this.formInline.projectEndtime).getTime() 
             );
           }
         }
@@ -122,7 +122,7 @@ export default {
         disabledDate: time => {
           return (
             time.getTime() <
-            new Date(this.formInline.projectBegintime).getTime()
+            new Date(this.formInline.projectBegintime).getTime() 
           ); //减去一天的时间代表可以选择同一天;
         }
       }