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:
  优化显示暂存的代码逻辑
  修复设定机构的初始化问题
  将创建项目的下一步的projectStatus设置为1

src/components/education/template/setOrganization.vue

@@ -251,6 +251,12 @@ export default {
     vm.listLevels();
   },
   methods: {
+    init() {
+      vm.formOrganization.pageNum = 1;
+      vm.formOrganization.name = "";
+      vm.formOrganization.administrativeIdList = ["0"];
+      vm.formOrganization.level = "-1";
+    },
     //查询机构列表
     getOrganization(r) {
       vm.regio = r;
@@ -552,6 +558,9 @@ export default {
       let administrativeIdItem = operationData.setAdministrativeId(
         vm.formOrganization.administrativeIdList
       );
+      console.log('====================administrativeIdItem ================');
+      console.log(administrativeIdItem );
+      console.log('====================================');
       let req = {
         projectId: vm.projectId,
         administrativeId: administrativeIdItem,

src/components/education/template/templateMessage.vue

@@ -238,7 +238,7 @@ export default {
         projectIntro: "",   //开放模板简介
         projectType: 3, //类型 
         type: 1,               //封面类型 1图片2视频
-        projectStatus: 3, //1.草稿 2.未上架 3.审核中/待审核 4.已上架 5.已下架 6.已拒绝/未上架
+        projectStatus: 1, //1.草稿 2.未上架 3.审核中/待审核 4.已上架 5.已下架 6.已拒绝/未上架
         expireDay: 1, //模板有效期（天）
         status4Flag: 0, //0表示没有上过架，1表示上过架
         attachmentUrl1: "",
@@ -363,7 +363,7 @@ export default {
       vm.formData = Object.assign(vm.formData, data.projectData);
       vm.formData.attachmentUrl1 = data.attachmentData[0].attachmentUrl;
       vm.formData.attachmentMore1 = Object.assign(vm.formData.attachmentMore1, data.attachmentData[0]);
-             // 暂存为1   下一步为3
+      // 暂存为1   下一步为3
       vm.formData.projectType = vm.formData.projectType == 0 ? 3 : vm.formData.projectType;
       vm.formData.projectBegintime = vm.formData.projectBegintime ? new Date(vm.formData.projectBegintime) : '';
       vm.formData.projectEndtime = vm.formData.projectBegintime ? new Date(vm.formData.projectEndtime) : '';
@@ -382,6 +382,7 @@ export default {
         .then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
+            this.$emit('hideSave',res.data.projectData.projectStatus < 2)
             vm.setBaseMessage(res.data);
           } else {
             vm.$message.info(res.message);
@@ -399,6 +400,7 @@ export default {
         .then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
+            this.$emit('hideSave',res.data.projectData.projectStatus < 2)
             vm.setBaseMessage(res.data)
           } else {
             vm.$message.info(res.message);
@@ -590,7 +592,7 @@ export default {
         vm.uploadImgMessage2 = false;
       }
       if (vm.submitForm('formData') && flag) {
-        vm.insertOrupdate(3);
+        vm.insertOrupdate();
       }
     },
     // 暂存
@@ -603,8 +605,9 @@ export default {
     },
     // 新增或者更新基本信息
     insertOrupdate(status) {
-      // 暂存为1   下一步为3
-      vm.formData.projectStatus = status;
+      if (status) {
+        vm.formData.projectStatus = status;
+      }
       // 图片或者视频地址
       vm.formData.attachmentMore1.attachmentUrl = vm.formData.attachmentUrl1;
       vm.formData.attachmentMore2.attachmentUrl = vm.formData.attachmentUrl2;
@@ -622,7 +625,7 @@ export default {
       openLoading(vm);
       vm.POST("portal/portalInfo/insertOrUpdate", baseobj).then(res => {
         closeLoading(vm);
-        if (res.code == "000000" && status == 3) {
+        if (res.code == "000000") {
           // 下一步,并将项目id传递
           vm.$emit('next',res.data.id);
         } else if (res.code == "213061") {

src/views/education/template-open.vue

@@ -17,7 +17,7 @@
           </el-col>
           <el-col :span="5" :offset="5">
             <div v-if="!canNext" class="dis-btn">下一步</div>
-            <el-button v-if="active!=0" size="small" @click="save">暂存</el-button>
+            <el-button v-if="active!=0 && showSave" size="small" @click="save">暂存</el-button>
             <el-button v-if="active!==2 && canNext" size="small" type="primary" @click="nextStep">下一步</el-button>
             <el-button v-if="active==2" size="small" type="primary" @click="complete">完成</el-button>
           </el-col>
@@ -36,6 +36,7 @@
           :editor="editor"
           @next="next"
           @backSelectVue="backSelectVue"
+          @hideSave="hideSave"
         />
       
          <!-- 选择学员 -->
@@ -124,7 +125,8 @@ export default {
         message: '发布后，项目将进入审核中，待审核完成后学员可在云鹊医App上参加培训学习',
         confirmMsg: '取消',
         hideMsg: '确定发布'
-      }
+      },
+      showSave: false
     }
   },
   components: {
@@ -275,11 +277,16 @@ export default {
     },
     // 查询行政范围的设定机构列表
     getOrganizationList(r) {
+      vm.$refs.setOrganization.init();
       vm.$refs.setOrganization.getOrganization(r);
     },
     // 返回选择模板页
     backSelectVue() {
       vm.active = 0;
+    },
+    // 是否隐藏暂存按钮
+    hideSave(flag) {
+      this.showSave = flag;
     }
   }
 }