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

@@ -15,7 +15,7 @@
         </el-col>
         <el-col :span="5" :offset="5">
           <el-button v-if="showStorage" size="small" @click="storage">暂存</el-button>
-          <el-button v-if="active<2" size="small" type="primary" @click="nextStep">下一步</el-button>
+          <el-button v-if="active<2" size="small" type="primary" @click="nextStep(1)">下一步</el-button>
           <el-button v-if="active>=2" size="small" type="primary" @click="complete">完成</el-button>
         </el-col>
       </el-row>
@@ -75,8 +75,8 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :span="10">
-              <el-form-item label="项目等级：" prop="projectLevel" v-show="projectType == 2">
+            <el-col :span="10" v-show="projectType == 2">
+              <el-form-item label="项目等级：" prop="projectLevel">
                 <el-select size="small" v-model="formData.projectLevel" placeholder="请选择项目等级">
                   <el-option
                     v-for="item in projectLevelList"
@@ -378,6 +378,14 @@
             </el-col>
           </el-form-item>
         </el-form>
+        <el-dialog title="请确认如下信息" :visible.sync="dialogCme" width="40%" center>
+          <p class="dialog-p">1、项目所属学科请务必按照学分开放地区的学科体系填写，否则将导致用户无法获取学分。</p>
+          <p class="dialog-p">2、学分关联并发布成功后，无法再次编辑。</p>
+          <span slot="footer" class="dialog-footer">
+            <el-button type="default" size="small" @click="dialogCme = false">取消</el-button>
+            <el-button type="primary" size="small" @click="nextStep(2)">确定</el-button>
+          </span>
+        </el-dialog>
       </div>
       <div class="second-step" v-else-if="active === 1">
         <div v-if='formData.scopeType != 1'>
@@ -1352,6 +1360,7 @@ export default {
       creditTip: '',
       projectType: '',
       beforeCreditId: '',
+      dialogCme: false,
       props: {
         lazy: true,
         lazyLoad(node, resolve) {
@@ -1400,7 +1409,6 @@ export default {
         ],
 
       },
-
       rules: {
         projectName: [
           { required: true, message: "请输入项目名称", trigger: "blur" },
@@ -1458,14 +1466,74 @@ export default {
         attachmentUrl2: [
           { required: true, message: "请选择封面", trigger: "blur" }
         ],
+      },
+      //cme的rules
+      rules2: {
+        projectName: [
+          { required: true, message: "请输入项目名称", trigger: "blur" },
+          {
+            min: 2,
+            max: 24,
+            message: "输入长度为2-24的内容，可包含中英文、数字及特殊符号",
+            trigger: "blur"
+          },
+          { validator: checkProjectStr, trigger: 'blur' }
+        ],
+        organizationName: [
+          { required: true, message: "请填写发起机构名称", trigger: "blur" },
+          { min: 1, max: 12, message: "超过12个最大字数限制，请精简字数或使用简称", trigger: "blur" }
+        ],
+        duringTime: [
+          {
+            required: true,
+            message: "请选择时间",
+            trigger: "change"
+          }
+        ],
+        projectBegintime: [
+          {
+            required: true,
+            message: "请选择时间",
+            trigger: "change"
+          }
+        ],
+        projectEndtime: [
+          {
+            required: true,
+            message: "请选择时间",
+            trigger: "change"
+          }
+        ],
+        type: [
+          {
+            type: "array",
+            required: true,
+            message: "请至少选择一个活动性质",
+            trigger: "change"
+          }
+        ],
+        resource: [
+          { required: true, message: "请选择活动资源", trigger: "change" }
+        ],
+        projectIntro: [
+          { required: true, message: "请填写项目简介", trigger: "blur" },
+          { min: 1, max: 200, message: "超出可输入的最大长度", trigger: "blur" }
+        ],
+        attachmentUrl1: [
+          { required: true, message: "请选择列表图片", trigger: "blur" }
+        ],
+        attachmentUrl2: [
+          { required: true, message: "请选择封面", trigger: "blur" }
+        ],
+        //cme新增
         projectNo: [
           { required: true, message: "请输入项目编号", trigger: "blur" },
         ],
         projectLevel: [
-          { required: true, message: "请选择项目等级", trigger: "blur" },
+          { required: true, message: "请选择项目等级", trigger: "change" },
         ],
         projectLeaderId: [
-          { required: true, message: "请选择项目负责人", trigger: "blur" },
+          { required: true, message: "请选择项目负责人", trigger: "change" },
         ],
         projectSubject: [
           { required: true, message: "请输入项目所属学科", trigger: "blur" },
@@ -1474,7 +1542,7 @@ export default {
           { required: true, message: "请输入学习需知", trigger: "blur" },
         ],
         creditId: [
-          { required: true, message: "请选择学分名称", trigger: "blur" },
+          { required: true, message: "请选择学分名称", trigger: "change" },
         ],
       }
     };
@@ -1488,6 +1556,10 @@ export default {
     (this.projectId = vm.getUrlSearch(window.location.href, "projectId")),
       (this.peopleLevel = vm.getUrlSearch(window.location.href, "level"));
 
+    if(this.projectType == 2) {
+      //用cme的rules
+      this.rules = this.rules2;
+    }
     this.changeOnStep(this.active);
     this.getComponentInfo();
     this.getConstantsList();
@@ -1755,6 +1827,7 @@ export default {
     //编辑/更新 基础信息
     insertOrUpdate(option) {
       //console.log(this.formData);
+      vm.dialogCme = false;
       let projectModel = {
         projectName: this.formData.projectName,
         projectBegintime: this.formData.projectBegintime,
@@ -2139,7 +2212,7 @@ export default {
       this.nextStep();
     },
     //点击下一步
-    nextStep() {
+    nextStep(moveType) {
       if (this.active == 0) {
         let formName = "formData";
         let removeState = this.submitForm(formName);
@@ -2166,6 +2239,10 @@ export default {
               if (res.code == "000000") {
                 //移动到第二页 选择范围
                 // this.operationLast();
+                if(moveType == 1 && vm.projectType == 2) {
+                  this.dialogCme = true;
+                  return;
+                }
                 this.insertOrUpdate("add");
                 // this.active++;
                 // this.stepData = [false, true, false];

src/views/education/item-manager.vue

@@ -71,7 +71,7 @@
       </el-row>
       <el-form :model="formInline" class="demo-form-inline">
         <el-form-item>
-          <el-button class="add-button" :disabled="idType == 2 && masterAdministratorFlag == 'false'" size="small" type="primary" @click="centerDialogVisible = true">新建项目</el-button>
+          <el-button class="add-button" :disabled="idType == 2 && masterAdministratorFlag == 'false'" size="small" type="primary" @click="openProject()">新建项目</el-button>
         </el-form-item>
       </el-form>
       <el-table :data="tableData" style="width: 100%">
@@ -388,6 +388,13 @@ export default {
     ...mapActions([
     	'updateItemManager'
     ]),
+    openProject() {
+      if(vm.masterAdministratorFlag == 'true') {
+        this.centerDialogVisible = true;
+      } else {
+        this.toPage();
+      }
+    },
     toPage() {
       this.$router.push("edit-manager?projectType=1");
     },