对接cme职称考接口

src/views/education/edit-professional-exam.vue

@@ -376,7 +376,7 @@
               <el-radio :label="1">使用小生态范围</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="人员权限设定" v-show="projectType != 5">
+          <el-form-item label="人员权限设定" v-show="projectType != 2">
             <el-radio-group
               size="small"
               v-model="formData.authorityType"
@@ -1101,7 +1101,7 @@
             </div>
           </div>
 
-          <el-form-item required label="配置证书：" v-show="projectType != 5">
+          <el-form-item required label="配置证书：" v-show="projectType != 2">
             <el-col :span="10">
               <el-radio-group
                 class="el-configure"
@@ -1598,7 +1598,11 @@ export default {
       uploadType: "",
       //cme新增
       projectLevelList: [],
-      cardTypeList: [],
+      cardTypeList: [
+        { label: 'I类', value: 1 },
+        { label: 'II类', value: 2 },
+        { label: '职称考', value: 3 },
+      ],
       projectLeaderList: [],
       creditList: [],
       creditTip: "",
@@ -1818,7 +1822,7 @@ export default {
     (this.projectId = vm.getUrlSearch(window.location.href, "projectId")),
       (this.peopleLevel = vm.getUrlSearch(window.location.href, "level"));
 
-    if (this.projectType == 5) {
+    if (this.projectType == 2) {
       //CME情况下
       this.rules = this.rules2;
       this.formData.learnableFlag = 1;
@@ -1999,13 +2003,13 @@ export default {
         cardType: editData.projectData.cardType,
         projectLeaderId: editData.projectData.projectLeaderId,
         projectSubject: editData.projectData.projectSubject,
-        mustKnow: editData.projectData.mustKnow,
+        mustKnow: editData.projectData.mustKnow || '',
         creditId: editData.projectData.creditId,
         cmeType: editData.projectData.cmeType,
         cmeCredit: editData.projectData.cmeCredit || '',
         examBtnUrl: editData.projectData.examBtnUrl || '',
       };
-      if (vm.projectType == 5) {
+      if (vm.projectType == 2) {
         vm.formData.learnableFlag = 1;
         vm.initCreditTip();
       }
@@ -2138,7 +2142,7 @@ export default {
         cardType: this.formData.cardType,
         projectLeaderId: this.formData.projectLeaderId,
         projectSubject: this.formData.projectSubject,
-        mustKnow: this.formData.mustKnow,
+        mustKnow: this.formData.mustKnow || '',
         editCreditId: this.formData.creditId,
         cmeType: this.formData.cmeType,
         cmeCredit: this.formData.cmeCredit,
@@ -2179,13 +2183,13 @@ export default {
       }
       //}
       //creditId学分id的特殊处理
-      if (this.projectType == 5) {
+      if (this.projectType == 2) {
         if (option == "add" || option == "storage") {
           projectModel.creditId = this.formData.creditId;
         }
       }
       if (option == "edit" || option == "storageEdit") {
-        if (this.projectType == 5) {
+        if (this.projectType == 2) {
           projectModel.creditId = this.beforeCreditId;
         }
         //编辑
@@ -2528,9 +2532,9 @@ export default {
     },
     //点击下一步
     nextStep(moveType) {
-      // if(this.formData.cmeType == 2) {
-      //   moveType = 2;
-      // }
+      if(this.formData.cmeType == 2) {
+        moveType = 2;
+      }
       if (this.active == 0) {
         let formName = "formData";
         let removeState = this.submitForm(formName);
@@ -2561,7 +2565,7 @@ export default {
               if (res.code == "000000") {
                 //移动到第二页 选择范围
                 // this.operationLast();
-                if (moveType == 1 && vm.projectType == 5) {
+                if (moveType == 1 && vm.projectType == 2) {
                   this.dialogCme = true;
                   return;
                 }
@@ -3716,7 +3720,7 @@ export default {
     },
     showScopeTypeCME() {
       if (this.projectStatus == "" || this.projectStatus == 1) {
-        if (this.peopleLevel != "L3" && this.projectType != 5) {
+        if (this.peopleLevel != "L3" && this.projectType != 2) {
           return false;
         }
       }
@@ -3742,7 +3746,7 @@ export default {
         this.projectStatus == 1 ||
         this.projectStatus == 2
       ) {
-        if (this.peopleLevel != "L3" && this.projectType != 5) {
+        if (this.peopleLevel != "L3" && this.projectType != 2) {
           return false;
         }
       }
@@ -3753,7 +3757,7 @@ export default {
       if (this.peopleLevel == "L3" || this.peopleLevel == "L0") {
         return true;
       }
-      if (this.projectType == 5) {
+      if (this.projectType == 2) {
         return true;
       }
       return false;

src/views/education/edit-subject.vue

@@ -291,6 +291,9 @@ export default {
           closeLoading(this);
           if (res.code == "000000") {
             this.$message.success('提交成功')
+            setTimeout(() => {
+              this.$router.back();
+            }, 2000)
           }
         });
       });

src/views/education/item-manager.vue

@@ -467,7 +467,7 @@ export default {
       this.$router.push("template-open?projectType=3&isPreview=" + isPreview);
     },
     toProfessionalExamPage(isPreview = 0) {
-      this.$router.push("edit-professional-exam?projectType=5&isPreview=" + isPreview);
+      this.$router.push("edit-professional-exam?projectType=2&isPreview=" + isPreview);
     },
     toEditCustomPage(isPreview = 0) {
       this.setKind(0);
@@ -481,8 +481,8 @@ export default {
       this.newProjectType = 1;
     },
     handleCreateProject() {
+      // 1 普通项目 2 CME项目 5 职称考试（对应的projectType仍为2）
       if (this.newProjectType == 1) {
-        // 1 普通项目 2 CME项目 5 职称考试
         this.toPage();
       } else if (this.newProjectType == 2) {
         this.toCmePage();
@@ -699,6 +699,17 @@ export default {
               this.formInline.pageNo
           );
         } else if (row.projectType === 2) {
+          // cmeType：3为职称考，其他为原cme
+          if (row.cmeType === 3) {
+            this.$router.push(
+            "edit-professional-exam?projectType=2&projectId=" +
+            projectId +
+            "&level=" +
+            level +
+            "&pageNum=" +
+            this.formInline.pageNo
+          );
+          } else {
             this.$router.push(
               "edit-cme?projectType=2&projectId=" +
               projectId +
@@ -707,6 +718,7 @@ export default {
               "&pageNum=" +
               this.formInline.pageNo
             );
+          }
         } else if (row.projectType === 3) {
           this.$router.push(
             "template-open?projectType=3&projectId=" +
@@ -722,15 +734,6 @@ export default {
               projectId + "&level=" + level + "&pageNum=" + this.formInline.pageNo +
               "&projectStatus=" + row.projectStatus
           );
-        } else if (row.projectType === 5) {
-          this.$router.push(
-            "edit-professional-exam?projectType=5&projectId=" +
-              projectId +
-              "&level=" +
-              level +
-              "&pageNum=" +
-              this.formInline.pageNo
-          );
         }
       } else if (type === 7) {
         //提醒审核