Merge branch 'dev-learning-report-0507' into 'dev-edu-lern-20190621'

暂存问题



See merge request !52

src/views/education/add-manager.vue

@@ -1072,9 +1072,21 @@ export default {
         this.formComponent.certificate =
           editData.certificateData[0].relevanceId;
       }
+      if (editData.certificateRule.length > 0) {
+        this.formComponent.configure = 1;
+      }
       //初始化考试平均分配置数据
       this.formExam.certificateType = editData.projectData.certificateType;
       this.formExam.exam = editData.certificateRule;
+      if(this.formExam.exam.length == 0) {
+        this.formExam.exam = [{
+          examCount: 1,
+          rangeMin: '',
+          rangeMax: '',
+          certificateId: '',
+          certificateName: '',
+        }]
+      }
     },
     //编辑管理
     editManager(data) {
@@ -1260,7 +1272,9 @@ export default {
       if(this.formExam.certificateType == 2) {
         let ruleData = vm.formExam.exam;
         for(let o=0;o<ruleData.length;o++) {
-          param.certificateId[o] = ruleData[o].certificateId,
+          if(ruleData[o].certificateId != '' && ruleData[o].certificateId != null) {
+            param.certificateId[o] = ruleData[o].certificateId;
+          }
           param.getCertificateRule[o] = {
             certificateId: ruleData[o].certificateId,
             certificateName: ruleData[o].certificateName,
@@ -1273,7 +1287,9 @@ export default {
       } 
       // 1.单证书无规则
       else {
-        param.certificateId[0] = this.formComponent.certificate;
+        if(this.formComponent.certificate != '' && this.formComponent.certificate != null) {
+          param.certificateId[0] = this.formComponent.certificate;
+        }
       }
       vm.POST("portal/portalInfo/componentDraft", param).then(res => {
         console.log(res);