Merge branch 'dev-mvp-20200331' of...

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

* 'dev-mvp-20200331' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin:
  查看模板项目的时候，点击下一步和完成不需要调用接口
  查看模板编辑详情时，发起机构将无法增减
  解决暂存，模板详情样式，完成按钮提示问题

src/components/education/template/baseMessage.vue

@@ -32,12 +32,13 @@
             maxlength=16
             @input="changeOrganizationName"
             @blur = "blurName"
+            
             @focus = "focusName(index)"
             :disabled="disabled"
           ></el-input>
           <span class="word-num">{{(formData.organizationNameList[index]).replace(/\s+/g,"").length}}/16</span>
-          <img @click="plusOrg(index)" class="edit-img" src="../../../assets/image/plus.png" />
-          <img @click="deleteOrg(index)" v-if="index >= 1" class="edit-img" src="../../../assets/image/trash.png" />
+          <img @click="plusOrg(index)" class="edit-img" src="../../../assets/image/plus.png" v-if="!disabled"/>
+          <img @click="deleteOrg(index)" v-if="index >= 1 && !disabled" class="edit-img" src="../../../assets/image/trash.png" />
         </el-col>
         <!-- <el-popover
           class="popover-content" :style="{'top': orgListIndex * 41 + 'px'}"

src/components/education/template/templateList.vue

@@ -50,40 +50,42 @@
     </div>
     <el-dialog title="项目详情" :visible.sync="dialogTableVisible" class="dialog-list-wrap">
       <div class="dialog-line"></div>
-      <div class="dialog-title">{{detailObj.openTemplateName}}</div>
-      <div class="dialog-message">
-        <div class="dm-title">
-          <div class="dm-line"></div>
-          <div class="dm-msg">基本信息</div>
-        </div>
-        <div class="dm-main">
-          <div class="mian-list" v-if="detailObj.openTemplateIntro">
-            <div class="dm-name">内容有效期:</div>
-            <div class="dm-nr">{{detailObj.openTemplateIntro}}天</div>
-          </div>
-          <div class="mian-list" v-if="detailObj.subjectName">
-            <div class="dm-name">项目学科:</div>
-            <div class="dm-nr">{{detailObj.subjectName}}</div>
+      <div class="dialog-main">
+        <div class="dialog-title">{{detailObj.openTemplateName}}</div>
+        <div class="dialog-message">
+          <div class="dm-title">
+            <div class="dm-line"></div>
+            <div class="dm-msg">基本信息</div>
           </div>
-          <div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length">
-            <div class="dm-name">已参加的机构:</div>
-            <div class="dm-nr">{{detailObj.organizationNameList.join(', ')}}</div>
+          <div class="dm-main">
+            <div class="mian-list" v-if="detailObj.openTemplateIntro">
+              <div class="dm-name">内容有效期:</div>
+              <div class="dm-nr">{{detailObj.openTemplateIntro}}天</div>
+            </div>
+            <div class="mian-list" v-if="detailObj.subjectName">
+              <div class="dm-name">项目学科:</div>
+              <div class="dm-nr">{{detailObj.subjectName}}</div>
+            </div>
+            <div class="mian-list" v-if="detailObj.organizationNameList && detailObj.organizationNameList.length">
+              <div class="dm-name">已参加的机构:</div>
+              <div class="dm-nr">{{detailObj.organizationNameList.join(', ')}}</div>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="dialog-jj">
-        <div class="dm-title">
-          <div class="dm-line"></div>
-          <div class="dm-msg">项目简介</div>
+        <div class="dialog-jj">
+          <div class="dm-title">
+            <div class="dm-line"></div>
+            <div class="dm-msg">项目简介</div>
+          </div>
+          <div class="jjs-main">{{detailObj.openTemplateIntro}}</div>
         </div>
-        <div class="jjs-main">{{detailObj.openTemplateIntro}}</div>
-      </div>
-      <div class="dialog-xq">
-        <div class="dm-title">
-          <div class="dm-line"></div>
-          <div class="dm-msg">项目详情</div>
+        <div class="dialog-xq">
+          <div class="dm-title">
+            <div class="dm-line"></div>
+            <div class="dm-msg">项目详情</div>
+          </div>
+          <div class="xq-main" v-html="detailObj.openTemplateDetail"></div>
         </div>
-        <div class="xq-main" v-html="detailObj.openTemplateDetail"></div>
       </div>
     </el-dialog>
 
@@ -334,7 +336,7 @@ export default {
     .el-dialog {
       width: 800px;
       max-height: 80%;
-      overflow: scroll;
+      overflow: hidden;
     }
     .dialog-line {
       width:750px;
@@ -342,6 +344,11 @@ export default {
       background:rgba(228,231,237,1);
       margin: 0 auto 12px;
     }
+    .dialog-main {
+      overflow: scroll;
+      background: #fff;
+      height: 60vh;
+    }
     .dialog-title {
       margin: 0 auto;
       width:752px;

src/components/education/template/templateMessage.vue

@@ -616,6 +616,10 @@ export default {
         vm.$message.warning('项目结束时间应在有效期内');
         return;
       }
+      if(new Date(vm.formData.projectEndtime).getTime() <= new Date(vm.formData.projectBegintime).getTime()) {
+        vm.$message.warning('项目结束时间应大于开始时间');
+        return;
+      }
      
       if (status) {
         vm.formData.projectStatus = status;
@@ -639,6 +643,11 @@ export default {
         .then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
+            // 暂存不会跳到下一页
+            if (status == 1) {
+              vm.$message.info('成功');
+              return;
+            }
             // 下一步,并将项目id传递给父组件
             vm.$emit('next',res.data.id);
           } else if (res.code == "213061") {

src/views/education/template-open.vue

@@ -129,7 +129,8 @@ export default {
         hideMsg: '确定发布'
       },
       projectStatus: 1,  //1.草稿 2.未上架 3.审核中/待审核 4.已上架 5.已下架 6.已拒绝/未上架
-      status4Flag: 0//0表示没有上过架，1表示上过架
+      status4Flag: 0,//0表示没有上过架，1表示上过架
+      isPreview: 0 // 1表示是查看信息
     }
   },
   components: {
@@ -162,6 +163,7 @@ export default {
     isPreviewFn() {
       if(vm.$route.query.isPreview == 1 && vm.$route.query.projectId) {
         vm.projectId = vm.$route.query.projectId;
+        vm.isPreview = vm.$route.query.isPreview;
         vm.active = 1;
         vm.canNext = true;
       }
@@ -173,6 +175,11 @@ export default {
         return;
       }
       if (vm.active == 1) {
+        // 查看时，点击下一步直接跳
+        if (vm.isPreview == 1) {
+          vm.active = 2;
+          return;
+        }
         // 调用项目信息中的下一步操作
         vm.$refs.templateMessage.nextStep();
         return;
@@ -197,15 +204,24 @@ export default {
     // 完成
     complete() {
       // 4不弹框
-      if (vm.projectStatus !=4) {
+      if (vm.projectStatus !=4 && vm.isPreview != 1) {
         vm.sendObj.visible = true;
       } else {
+        // 查看时,点击完成直接跳到列表页
+        if (vm.isPreview == 1) {
+          let query = {};
+          if (vm.$route.query.pageNum) {
+            query = { pageNum: vm.$route.query.pageNum };
+          }
+          vm.$router.push({ path: "item-manager", query: query });
+          return;
+        }
         vm.hidefn();
       }
     },
     // 完成触发的接口
     hidefn() {
-      vm.regionComplete(vm.changeStatus());
+      vm.regionComplete(vm.changeStatus);
     },
     // 选择学元范围暂存
     regionComplete(fishFn) {