Merge branch 'dev-cme-20191227' of...

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

src/views/education/edit-cme.vue

@@ -41,7 +41,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="项目编号：" prop="projectName">
+              <el-form-item label="项目编号：" prop="projectNo">
               <el-input
                   size="small"
                   v-model="formData.projectNo"
@@ -76,7 +76,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="10">
-              <el-form-item label="项目等级：" prop="projectName">
+              <el-form-item label="项目等级：" prop="projectLevel">
                 <el-select size="small" v-model="formData.projectLevel" placeholder="请选择项目等级">
                   <el-option
                     v-for="item in projectLevelList"
@@ -134,9 +134,9 @@
               <span class="word-num">{{(formData.projectIntro).replace(/\s+/g,"").length}}/200</span>
             </el-col>
           </el-form-item>
-          <el-form-item label="项目负责人：" prop="projectName">
+          <el-form-item label="项目负责人：" prop="projectLeaderId">
             <el-col :span="6">
-            <el-select size="small" v-model="formData.projectLeaderId" placeholder="请选择项目等级" style="width:100%;">
+            <el-select size="small" v-model="formData.projectLeaderId" placeholder="请选择负责人" style="width:100%;">
               <el-option
                 v-for="item in projectLeaderList"
                 :key="item.value"
@@ -146,7 +146,7 @@
             </el-select>
             </el-col>
           </el-form-item>
-          <el-form-item label="项目所属学科：" prop="projectName">
+          <el-form-item label="项目所属学科：" prop="projectSubject">
             <el-col :span="6">
               <!-- style="width:200px;" -->
               <el-input
@@ -246,13 +246,13 @@
             </el-form-item>
             <p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
           </div>
-          <el-form-item label="学习需知：" prop="projectIntro">
+          <el-form-item label="学习需知：" prop="mustKnow">
             <el-col :span="13">
               <el-input
                 size="small"
                 type="textarea"
                 :autosize="{ minRows: 5}"
-                placeholder="请输入项目简介"
+                placeholder="请输入学习需知"
                 v-model="formData.mustKnow"
                 style="width:83%;"
                 :disabled="peopleLevel == 'L3'"
@@ -269,7 +269,7 @@
               <el-radio :label="2">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="学分名称：" prop="projectName">
+          <el-form-item label="学分名称：" prop="creditId">
             <el-col :span="6">
               <el-select size="small" v-model="formData.creditId" placeholder="请选择学分名称" style="width:100%;" @change="changeCredit">
                 <el-option
@@ -1456,7 +1456,25 @@ export default {
         ],
         attachmentUrl2: [
           { required: true, message: "请选择封面", trigger: "blur" }
-        ]
+        ],
+        projectNo: [
+          { required: true, message: "请输入项目编号", trigger: "blur" },
+        ],
+        projectLevel: [
+          { required: true, message: "请选择项目等级", trigger: "blur" },
+        ],
+        projectLeaderId: [
+          { required: true, message: "请选择项目负责人", trigger: "blur" },
+        ],
+        projectSubject: [
+          { required: true, message: "请输入项目所属学科", trigger: "blur" },
+        ],
+        mustKnow: [
+          { required: true, message: "请输入学习需知", trigger: "blur" },
+        ],
+        creditId: [
+          { required: true, message: "请选择学分名称", trigger: "blur" },
+        ],
       }
     };
   },
@@ -1747,7 +1765,7 @@ export default {
         allowLearn:this.formData.allowLearn,
         //cme新增
         projectType: 2,
-        projectNo: this.formData.allowLearn,
+        projectNo: this.formData.projectNo,
         projectLevel: this.formData.projectLevel,
         projectLeaderId: this.formData.projectLeaderId,
         projectSubject: this.formData.projectSubject,

src/views/education/item-manager.vue

@@ -158,7 +158,7 @@
               type="primary"
               size="small"
             >删除</el-button>
-            <!-- CME按钮 -->
+
             <el-button
               @click="hanldeCmeClick(scope.row)"
               v-show="showCMEButton(scope.row)"
@@ -542,6 +542,9 @@ export default {
         //外部项目
         buttonStatus = returnData().buttonStatusOut;
       }
+      if(projectStatus == null) {
+        return false;
+      }
       if (level != null) {
         let tempStatus = JSON.parse(JSON.stringify(projectStatus));
         if (tempStatus > 6) {