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/utils/operation.js

@@ -779,7 +779,7 @@ export function getCreditList(data) {
   let list = [];
   for(let i = 0;i < data.length ; i++) {
     let obj =  data[i];
-    obj.value = data[i].id;
+    obj.id = data[i].id;
     obj.label = data[i].name;
     list.push(obj);
   }

src/views/education/edit-cme.vue

@@ -246,17 +246,18 @@
             </el-form-item>
             <p class="upload-message" v-if="uploadImgMessage2">请选择封面</p>
           </div>
-          <el-form-item label="学习需知：" prop="mustKnow" v-show="projectType == 2">
+          <el-form-item label="学习须知：" prop="mustKnow" v-show="projectType == 2">
             <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'"
               ></el-input>
+              <span class="word-num">{{(formData.mustKnow).replace(/\s+/g,"").length}}/200</span>
             </el-col>
           </el-form-item>
           <el-form-item label="配置学分：" v-show="projectType == 2">
@@ -274,9 +275,9 @@
               <el-select size="small" v-model="formData.creditId" placeholder="请选择学分名称" style="width:100%;" @change="changeCredit">
                 <el-option
                   v-for="item in creditList"
-                  :key="item.value"
+                  :key="item.id"
                   :label="item.label"
-                  :value="item.value"
+                  :value="item.id"
                 ></el-option>
               </el-select>
             </el-col>
@@ -1539,7 +1540,8 @@ export default {
           { required: true, message: "请输入项目所属学科", trigger: "blur" },
         ],
         mustKnow: [
-          { required: true, message: "请输入学习需知", trigger: "blur" },
+          { required: true, message: "请输入学习须知", trigger: "blur" },
+          { min: 1, max: 200, message: "超出可输入的最大长度", trigger: "blur" },
         ],
         creditId: [
           { required: true, message: "请选择学分名称", trigger: "change" },
@@ -1668,6 +1670,15 @@ export default {
         vm.creditList = operationData.getCreditList(res.data);
       });
     },
+    initCreditTip() {
+      let value = vm.formData.creditId;
+      vm.creditTip = "";
+      for(let i=0 ; i < vm.creditList.length ; i++) {
+        if(value === vm.creditList[i].id) {
+          vm.creditTip = vm.creditList[i].gradeText + '学分' + vm.creditList[i].value + '分';
+        }
+      }
+    },
     changeCredit(value) {
       // console.log(value,vm.creditList);
       vm.creditTip = "";
@@ -1730,6 +1741,9 @@ export default {
         creditId: editData.projectData.creditId,
 
       };
+      if(vm.projectType == 2) {
+        vm.initCreditTip();
+      }
       this.beforeCreditId = editData.projectData.creditId;
       this.organizationContent = editData.projectData.creatorOrganizationName;
       if (editData.attachmentData.length > 2) {