提示信息展示修复

src/views/education/edit-manager.vue

@@ -1364,6 +1364,7 @@ export default {
   },
   methods: {
     focusFun(ev,parm,index){
+
       if(index != undefined){
         if(parseInt(ev) < 0 || !this.checkIntFun(ev)){
           console.log(typeof index)
@@ -1538,6 +1539,7 @@ export default {
             closeLoading(vm);
             if (res.code == "000000" && res.data.projectData != null) {
               let editData = res.data;
+              console.log(editData)
               this.status4Flag = res.data.projectData.status4Flag;
               this.setEditData(editData);
               this.idTypeProject = res.data.projectData.idType;
@@ -2558,10 +2560,7 @@ export default {
         this.changedPerson2
       );
     },
-    selectionChangeDepartment(val) {
-      this.multipleSelectionDepartment = val;
-      //console.log(this.multipleSelectionDepartment);
-    },
+
     //改变小生态 table check
     selectionChangeEcology(rows) {
       this.changedEcology = [];
@@ -3435,7 +3434,7 @@ export default {
       if( d.length > 0 ){
         for(let i = 1;i < d.length;i++){
          // console.log(d[i])
-          if(d[i].rangeMin < d[i-1].rangeMax && d[i].rangeMin > d[i-1].rangeMin || d[i-1].rangeMax > d[i].rangeMin && d[i-1].rangeMax < d[i].rangeMax || d[i].rangeMax > d[i-1].rangeMin && d[i].rangeMax < d[i-1].rangeMax){
+          if(d[i].rangeMin < d[i-1].rangeMax && d[i].rangeMin > d[i-1].rangeMin || d[i-1].rangeMax >= d[i].rangeMin && d[i-1].rangeMax < d[i].rangeMax || d[i].rangeMax > d[i-1].rangeMin && d[i].rangeMax < d[i-1].rangeMax){
             isRepart = true;
             index = i;
             //alert(isRepart)
@@ -3469,7 +3468,7 @@ export default {
       // if(vm.formComponent.configure == 2) {
       //   return true;
       // }
-
+       console.log(vm.formExam.exam)
       if(vm.formExam.passType == 2) {
 
         if(vm.formComponent.passExamCount == ''){
@@ -3500,13 +3499,6 @@ export default {
           }
           return
         }
-       // this.hideErrorInfo('learnTime')
-
-
-
-        // if(vm.formComponent.passTotalLearnTime == 0){
-        //   return vm.dioErrorPop('学习时长必须大于')
-        // }
       }
       console.log(vm.formExam.exam)
       //空判断
@@ -3518,31 +3510,22 @@ export default {
           if(isCross){
             let l = vm.checkCrossFun(vm.formExam.exam).index
             vm.formExam.exam[l].minClass = 'is-error'
-            vm.formExam.exam[l].minError = '分数段之间不能有交叉重合分数'
-            vm.formExam.exam[l-1].minClass = 'is-error'
-            vm.formExam.exam[l-1].minError = '分数段之间不能有交叉重合分数'
+            vm.formExam.exam[l].minError = '请重新输入，不能出现重合分数'
+            if(l > 0){
+              vm.formExam.exam[l-1].minClass = 'is-error'
+              vm.formExam.exam[l-1].minError = '请重新输入，不能出现重合分数'
+            }
+
             this.$set(vm.formExam.exam, l, vm.formExam.exam[l])
             return
           }
           for(let i=0;i<vm.formExam.exam.length;i++) {
-            checkIdList[i] = vm.formExam.exam[i].certificateId;
-
-            // if(vm.formExam.exam[i].examCount == ''){
-            //  // vm.$message('考试门数不能为空');
-            //   this.$message({
-            //     message: '考试门数不能为空',
-            //     type: 'warning'
-            //   });
-            //   return false;
-            // }
-            // if(!vm.checkIntFun(vm.formExam.exam[i].rangeMax) || !vm.checkIntFun(vm.formExam.exam[i].rangeMin)){
-            //    return vm.dioErrorPop('分数只能是整数')
-            // }
+            
 
             if(vm.formExam.exam[i].rangeMin === '' ){
               vm.formExam.exam[i].minClass = 'is-error'
-              vm.formExam.exam[i].minError = '请输入分数'
-              this.$set(vm.formExam.exam, i, vm.formExam[i])
+              vm.formExam.exam[i].minError = '请输入平均分'
+              this.$set(vm.formExam.exam, i, vm.formExam.exam[i])
               return
             }
             vm.formExam.exam[i].minClass = ''
@@ -3550,8 +3533,8 @@ export default {
 
             if(vm.formExam.exam[i].rangeMax === '' ){
               vm.formExam.exam[i].maxClass = 'is-error'
-              vm.formExam.exam[i].maxError = '请输入分数'
-              this.$set(vm.formExam.exam, i, vm.formExam[i])
+              vm.formExam.exam[i].maxError = '请输入平均分'
+              this.$set(vm.formExam.exam, i, vm.formExam.exam[i])
               return
             }
             vm.formExam.exam[i].maxClass = ''
@@ -3560,13 +3543,13 @@ export default {
             if(parseInt(vm.formExam.exam[i].rangeMin) > parseInt(vm.formExam.exam[i].rangeMax)){
               vm.formExam.exam[i].minClass = 'is-error'
               vm.formExam.exam[i].minError = '分数最小值不能大于最大值'
-               this.$set(vm.formExam.exam, i, vm.formExam[i])
+               this.$set(vm.formExam.exam, i, vm.formExam.exam[i])
               return
             }
             if(vm.formExam.exam[i].certificateId == ''){
               vm.formExam.exam[i].certClass = 'is-error'
               vm.formExam.exam[i].certError = '请选择证书'
-              this.$set(vm.formExam.exam, i, vm.formExam[i])
+              this.$set(vm.formExam.exam, i, vm.formExam.exam[i])
               return
             }
             vm.formExam.exam[i].certClass = ''
@@ -3574,13 +3557,23 @@ export default {
 
             if(parseInt(vm.formComponent.passAverageScore) > parseInt(vm.formExam.exam[i].rangeMin)){
                 vm.formExam.exam[i].minClass = 'is-error'
-                vm.formExam.exam[i].minError = '项目通过分数不能大于平均分'
+                vm.formExam.exam[i].minError = '平均分不能低于考试通过分数'
                 vm.customError.passAverageScore = {
                   className :'is-error',
-                  error:'项目通过分数不能大于平均分'
+                  error:'平均分不能低于考试通过分数'
                 }
               return
             }
+            if(checkIdList.indexOf(vm.formExam.exam[i].certificateId) == -1){
+              checkIdList.push(vm.formExam.exam[i].certificateId)
+            }else{
+              vm.formExam.exam[i].certClass = 'is-error'
+              vm.formExam.exam[i].certError = '请重新选择，不能出现重复证书'
+               this.$set(vm.formExam.exam, i, vm.formExam.exam[i])
+               return;
+            }
+            //checkIdList[i] = vm.formExam.exam[i].certificateId;
+            this.$set(vm.formExam.exam, i, vm.formExam.exam[i])
           }
           // 判断证书不能重复
           checkIdList = checkIdList.sort();
@@ -3588,7 +3581,7 @@ export default {
             if (checkIdList[j] == checkIdList[j+1]) {
               //vm.$message('证书不能重复选择');
               this.$message({
-                message: '证书不能重复选择',
+                message: '请重新选择，不能出现重复证书',
                 type: 'warning'
               });
               return false;