完成基本的联调

src/components/education/template/dialog.vue

@@ -9,8 +9,8 @@
       center>
       <p style="text-align: center;">{{dialogObj.message}}</p>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="confirm">确 定</el-button>
-        <el-button type="primary" @click="hide">取 消</el-button>
+        <el-button @click="confirm" v-if="dialogObj.confirmMsg">{{dialogObj.confirmMsg}}</el-button>
+        <el-button type="primary" @click="hide" v-if="dialogObj.hideMsg">{{dialogObj.hideMsg}}</el-button>
       </span>
     </el-dialog>
   </div>

src/components/education/template/selectRegion.vue

@@ -28,7 +28,7 @@
         </el-tree>
       </el-col>
       <el-col :span="11">
-        <p class="area-p" @click="getScope('administrative')">
+        <p class="area-p">
           项目范围包含下列区域所有机构和人员({{ tagsRegion.length }})
         </p>
         <el-tag
@@ -58,6 +58,12 @@ import {
 } from "@/utils/education/educationApi";
 import Sortable from "sortablejs";
 export default {
+  props: {
+    projectId: {
+      type: String | Number,
+      default: ''
+    }
+  },
   data() {
     return {
       scopeReq: {},     // 区域范围
@@ -69,8 +75,7 @@ export default {
         isLeaf: "isLeaf"
       },
       treeData: [],
-      tagsRegion: [],
-      projectId: 173
+      tagsRegion: []
     }
   },
   created() {
@@ -190,22 +195,6 @@ export default {
         }
       }
     },
-    //行政范围改变更新设定机构
-    // updateOrganizationAndPerson(allSelectedKeys) {
-    //   console.log('====================================');
-    //   console.log(allSelectedKeys);
-    //   console.log('====================================');
-    //   console.log('=========================updateOrganizationAndPerson')
-    //   this.tableOrganization = [];
-    //   this.tablePerson = [];
-    //   this.lookedOrganization = [];
-    //   this.changedOrganization = [];
-    //   this.changedOrganization2 = [];
-    // },
-    // getCheckedKeys() {
-    //   console.log('=========================getCheckedKeys')
-    //   console.log(this.$refs.tree.getCheckedKeys());
-    // },
      //添加子节点
     append(data, node) {
       console.log('=========================append')
@@ -267,15 +256,11 @@ export default {
       console.log(treeKeyList);
       this.$refs.tree.setCheckedKeys(treeKeyList);
     },
-     //设定的行政范围内容
+    //设定的行政范围内容(传给设定机构的范围)
     getScope(type) {
-      console.log('========================getScope');
-
       let scope = "";
-      let arr = [];
       for (let i = 0; i < this.tagsRegion.length; i++) {
         scope += this.tagsRegion[i].key;
-        arr.push(this.tagsRegion[i].key)
         if (i < this.tagsRegion.length - 1) {
           scope += "|";
         }
@@ -283,9 +268,53 @@ export default {
       if (scope == "") {
         return null;
       }
-      this.$emit('setRegion',arr);
       return scope;
-    }
+    },
+    //设定的行政范围内容(完成或是暂存时传给后台的数据格式)
+    setScope(type) {
+      let noChangeTree = this.getTreeCheck();
+      let scope = "";
+      if (this.allSelectedKeys.length > 0) {
+        for (let i = 0; i < this.allSelectedKeys.length; i++) {
+          scope +=
+            this.allSelectedKeys[i].key + ":" + this.allSelectedKeys[i].type;
+          if (i < this.allSelectedKeys.length - 1) {
+            scope += "|";
+          }
+        }
+      } else {
+        // let noChangeTree = this.getTreeCheck();
+        console.log('noChangeTree值',noChangeTree);
+        if(noChangeTree.length > 0) {
+          for (let i = 0; i < noChangeTree.length; i++) {
+            scope += noChangeTree[i].key + ":" + noChangeTree[i].type;
+            if (i < noChangeTree.length - 1) {
+              scope += "|";
+            }
+          }
+        } else {
+          //选全国项目
+          if(this.tagsRegion.length > 0 && this.tagsRegion[0].key == '000') {
+            scope = '000:1';
+            console.log(this.tagsRegion,'scope',scope);
+          }
+        }
+      }
+      //console.log(scope);
+      if(scope == "") {
+        return null;
+      }
+      return scope;
+    },
+    getTreeCheck() {
+      //重构归并树
+      let checkedTree = operationData.getSimpleCheckedNodes(this.$refs.tree.store);
+      let halfCheckedTree = this.$refs.tree.getHalfCheckedKeys()
+      let allSelectedKeys = operationData.setSelectedKeys(checkedTree,halfCheckedTree);
+      vm.allSelectedKeys = allSelectedKeys;
+      //重构内容
+      return allSelectedKeys;
+    },
   }
 }
 </script>

src/components/education/template/setOrganization.vue

@@ -177,8 +177,7 @@ export default {
       formOrganization: {
         name: "",
         administrativeId: "0",
-        // administrativeIdList: ["0"],
-        administrativeIdList:[110],
+        administrativeIdList: ["0"],
         level: "-1",
         chechAll: true,
         pageNum: 1,
@@ -240,21 +239,21 @@ export default {
   created() {
     vm = this;
     vm.idType = localStorage.getItem("storageIdType");
-    this.getOrganization();
+    // this.getOrganization();
     this.getRegionOption();
     this.listLevels();
   },
   methods: {
     //查询机构列表
-    getOrganization() {
+    getOrganization(r) {
        console.log('=========================getOrganization')
       let req = {
         projectId: this.projectId,
         administrativeId: "",
         hospitalLevel: "",
         hospitalLevel: "",
-        // scope: '000',: this.getScope("administrative"),
-        scope: '000',
+        // scope: this.regio == '' ? null : this.regio,
+        scope: r ? r : null, 
         pageNum: this.formOrganization.pageNum,
         pageSize: this.formOrganization.pageSize
       };
@@ -340,7 +339,6 @@ export default {
     },
      //获取地区select
     getRegionOption() {
-      console.log('=========================getRegionOption')
       let req = {};
       openLoading(vm);
       vm.GET("basic-data/position/provinces", req).then(res => {

src/components/education/template/templateList.vue

@@ -317,13 +317,12 @@ export default {
           }
         }
         .box-right {
-          margin-right: 24px;
-          width:100px;
+          text-align: center;
+          width:98px;
           height:50px;
           font-size:14px;
           font-family:PingFangSC-Regular,PingFang SC;
           font-weight:400;
-          text-align: right;
           color:rgba(68,146,132,1);
           line-height:50px;
 
@@ -334,6 +333,8 @@ export default {
   .dialog-list-wrap {
     .el-dialog {
       width: 800px;
+      max-height: 1000px;
+      overflow: scroll;
     }
     .dialog-line {
       width:750px;

src/views/education/template-editor.vue

 <template>
   <div class="template-editor-wrap">
       <bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond" :curmbThird="curmbThird"></bread-crumb>
+      
       <div class="add-content screenSet" id="screenSet" v-if="editor">
         <div class="top-lin"></div>
         <step-content
@@ -9,41 +10,46 @@
           @nextStep="nextStep"
           @complete="complete"
         />
-
         <!-- 基础组件 -->
         <base-message
           ref="baseMessage"
-          v-if="active == 0 && formData"
-          :projectManger="projectManger"
+          v-if="active == 0 && ((!newBuild && editor && messageObj.portalOpenTemplateModel) || newBuild)"
+          :isEditor="editor"
+          :messageObj="messageObj"
+          :newBuild="newBuild"
           @next="next"
         />
-
         <!-- 选择项目组件 -->
         <select-template
           ref="selectTemplate"
-          v-if="active == 1"
+          v-if="active == 1 && ((!newBuild && editor && messageObj.portalOpenTemplateModel) || newBuild)"
+          :isEditor="editor"
           :openTemplateId="openTemplateId"
+          :messageObj="messageObj"
+          :newBuild="newBuild"
         />
-        <!-- 选择行政区 -->
-        <!-- <select-region v-if="active == 1"></select-region> -->
-
-        
-        <!-- 设定机构 -->
-        <!-- <set-Organization v-if="active == 0"></set-Organization> -->
       </div>
+
       <div class="add-content screenSet" id="screenSet" v-else>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="基础信息" name="first">
             <base-message
+              v-if="messageObj.portalOpenTemplateModel"
               ref="baseMessage"
-              :projectManger="projectManger"
+              :isEditor="editor"
+              :messageObj="messageObj"
+              :newBuild="newBuild"
               @next="next"
             />
           </el-tab-pane>
           <el-tab-pane label="选中组件" name="second">
             <select-template
+              v-if="messageObj.portalOpenTemplateModel"
               ref="selectTemplate"
+              :isEditor="editor"
               :openTemplateId="openTemplateId"
+              :messageObj="messageObj"
+              :newBuild="newBuild"
             />
           </el-tab-pane>
         </el-tabs>
@@ -58,6 +64,7 @@ import baseMessage from "../../components/education/template/baseMessage";
 import selectTemplate from "../../components/education/template/selectTemplate";
 import selectRegion from "../../components/education/template/selectRegion";
 import setOrganization from "../../components/education/template/setOrganization";
+import { openLoading, closeLoading } from "../../utils/utils";
 export default {
   data() {
     return {
@@ -65,57 +72,12 @@ export default {
       curmbSecond: "模板管理",
       curmbThird: '新建项目模板',
       active: 0,
-      fished: false,
-      projectManger: false,
-      formData: {
-        openTemplateName: "",    //开放模板名称
-        projectBegintime: "",    //模板开始时间
-        projectEndtime: "",      //模板结束时间
-        openTemplateIntro: "",   //开放模板简介
-        type: 1,               //封面类型 1图片2视频 
-        expireDay: "",         // 开放有效期
-        subjectId: "",          //开放模板所属学科ID
-        subjectName: "",       //开放模板所属学科名称
-        attachmentUrl1: "",
-        attachmentUrl2: "",
-        attachmentUrl3: "",
-        attachmentMore1: {},
-        attachmentMore2: {},
-        organizationName: "",       // 发起机构名称（多个机构拼接
-        organizationNameList: [''],  //发起机构列表
-        openTemplateDetail: ''      //开放模板详情
-      },
-      attachmentModel:[    //基础信息的图片视频
-        {
-          attachmentExt: '',// 附件格式
-          attachmentName: '',//附件名称
-          attachmentSize:'',//附件大小,
-          attachmentType: 1,//1：图片 2：视频 3：pdf
-          attachmentUrl: '',//附件链接
-          id: '', //关联唯一ID
-          kind: 1, //1：列表图片 2：封面配置 3：附件配置
-          openTemplateId: ''//开放模板id
-        },
-         {
-          attachmentExt: '',// 附件格式
-          attachmentName: '',//附件名称
-          attachmentSize:'',//附件大小,
-          attachmentType: 1,//1：图片 2：视频 3：pdf
-          attachmentUrl: '',//附件链接
-          id: '', //关联唯一ID
-          kind: 1, //1：列表图片 2：封面配置 3：附件配置
-          openTemplateId: ''//开放模板id
-        }
-      ],
-      baseobj: {}, 
-      formTemplate: {
-        component: [],
-        configure: 2,
-        certificate: ""
-      },
-      openTemplateId: 26,
+      fished: false,  // 是到到最后一步
+      messageObj: {}, 
+      openTemplateId: '',
       activeName: 'first',
-      editor: true  // 是否为编辑状态
+      editor: true,  // 是否为编辑状态 还是查看状态
+      newBuild: true // 是否为新建状态
     }
   },
   components: {
@@ -127,7 +89,22 @@ export default {
     setOrganization
   },
   created() {
-    this.fished = this.active == 0 ? false : true
+    if (!this.$route.query.id) {
+      this.newBuild = true;
+      this.editor = true;
+    } else if (this.$route.query.isEdit == 1) {
+      this.openTemplateId = this.$route.query.id;
+      this.newBuild = false;
+      this.editor = true;
+    } else {
+      this.openTemplateId = this.$route.query.id;
+      this.newBuild = false;
+      this.editor = false;
+    }
+    this.fished = this.active == 0 ? false : true;
+    if (!this.newBuild) {
+      this.getBaseMessage()
+    }
   },
   methods: {
     //用于存储基本信息
@@ -148,8 +125,19 @@ export default {
       this.$refs.selectTemplate.componentDraft(3);
     },
     handleClick() {
-
-    }
+    },
+     // 获取已有的基本信息
+    getBaseMessage() {
+      openLoading(this);
+      this.GET(`portal/openTemplate/getOpenTemplateInfo/${this.openTemplateId}`).then(res => {
+        closeLoading(this);
+        if (res.code == "000000") {
+          this.messageObj = res.data
+        } else {
+          this.$message.info(res.message);
+        }
+      });
+    },
   }
 }
 </script>

src/views/education/template-open.vue

@@ -16,47 +16,53 @@
             </el-steps>
           </el-col>
           <el-col :span="5" :offset="5">
-            <el-button v-if="!canNext" size="small" type="info" plain>下一步</el-button>
+            <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!==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>
         </el-row>
+        <!-- 模板列表 -->
         <div v-if="active == 0" class="tpl-main">
            <template-list @checkFn="checkFn"></template-list>
         </div>
-        <!-- 模板列表 -->
-       
 
         <!-- 填写项目信息-->
-        <base-message
-         ref="baseMessage"
-          v-if="active == 1 && formData"
-          :formData="formData"
-          :projectManger="projectManger"
+        <template-message
+          ref="templateMessage"
+          v-if="active == 1"
+          :openTemplateId="openTemplateId"
+          :projectId="projectId"
+          :editor="editor"
+          @next="next"
+          @backSelectVue="backSelectVue"
         />
       
          <!-- 选择学员 -->
-        <div class="three-step" v-else-if="active === 2">
+        <div class="three-step" v-if="active === 2">
           <el-tabs v-model="activeName" @tab-click="handleClickTabs">
             <el-tab-pane label="设定行政范围" name="first">
-              <select-region @setRegion="setRegion"></select-region>
+              <select-region ref="selectRegion" :projectId="projectId"></select-region>
             </el-tab-pane>
             <el-tab-pane label="设定机构" name="second">
-              <set-Organization ></set-Organization>
+              <set-organization ref="setOrganization"></set-organization>
             </el-tab-pane>
           </el-tabs>
         </div>
       </div>
+
+      <dialog-componet :dialogObj="dialogObj" @hide="hide"></dialog-componet>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "../../components/breadcrumb.vue";
-import baseMessage from "../../components/education/template/baseMessage";
+import templateMessage from "../../components/education/template/templateMessage";
 import selectTemplate from "../../components/education/template/selectTemplate";
 import selectRegion from "../../components/education/template/selectRegion";
 import setOrganization from "../../components/education/template/setOrganization";
 import templateList from "../../components/education/template/templateList";
+import dialog from "../../components/education/template/dialog";
 import { openLoading, closeLoading } from "../../utils/utils";
 import * as commonUtil from "../../utils/utils";
 let vm = null;
@@ -67,32 +73,6 @@ export default {
       curmbSecond: "项目管理",
       curmbThird: '发起项目',
       active: 0,
-      fished: false,
-      projectManger: true,
-      formData: {
-        projectName: "",
-        projectBegintime: "",
-        projectEndtime: "",
-        projectIntro: "",
-        type: 1,
-        useTime: "",
-        xueke: "",
-        attachmentUrl1: "",
-        attachmentUrl2: "",
-        attachmentUrl3: "",
-        attachmentMore1: {},
-        attachmentMore2: {},
-        scopeType: 0,
-        organizationName: "",
-        organizationNameList: [''],
-        sendOption: 1,
-        receiveOption: 1,
-        visibleFlag: 1,
-        learnableFlag: 2,
-        authorityType: 1,
-        allowLearn: 2,
-        richContent: ''
-      },
       formTemplate: {
         component: [],
         configure: 2,
@@ -100,17 +80,53 @@ export default {
       },
       activeName: "first",
       canNext: false,
-      openTemplateId: '',
-      r: []//设定行政范围和设定机构相互影响的行政范围
+      openTemplateId: 0, // 开放模板ID
+      projectId: '', // 项目id
+      status: 10, // 0正常10没有加入机构11审核中12审核失败20存在进行中项目21数量已达上限
+      editor: false, // 是否为编辑状态
+      dialogObj: {
+        visible: false,
+        title: '',
+        message: '',
+        hideMsg: ''
+      },
+      statusObj: {
+        status_10: {
+          title: '您暂未加入机构',
+          message: '请前往云鹊医App-个人中心完善机构信息，加入机构后，可创建项目',
+          hideMsg: '我知道了'
+        },
+        status_11: {
+          title: '您创建的机构正在审核中',
+          message: '请前往云鹊医App-个人中心查看审核进度，审核通过后，可创建机构',
+          hideMsg: '我知道了'
+        },
+        status_12: {
+          title: '您创建的机构审核不通过',
+          message: '请前往云鹊医App-个人中心完善机构信息，加入机构后，可创建项目',
+          hideMsg: '我知道了'
+        },
+        status_20: {
+          title: '该项目正在进行中',
+          message: '不能重复创建，请选择其他模版或者下架正在进行中的项目',
+          hideMsg: '确定'
+        },
+        status_21: {
+          title: '该项目创建数量已上限',
+          message: '本年度免费创建数已达',
+          hideMsg: '确定'
+        }
+      }
     }
   },
   components: {
     BreadCrumb,
-    baseMessage,
+    templateMessage,
     selectTemplate,
     selectRegion,
     setOrganization,
-    templateList
+    templateList,
+    dialogComponet:dialog
   },
   created() {
     vm = this;
@@ -121,21 +137,83 @@ export default {
   methods: {
     // 下一步
     nextStep() {
-      // let flag = this.$refs.baseMessage.nextStep();
-      // if (!flag) {
-      //   return;
-      // }
-      this.active++;
+      if (this.active == 0) {
+        // let flag = this.checkSelectTemplate();
+        let flag = true;
+        if (flag) {
+          this.active = 1;
+        }
+        return;
+      }
       if (this.active == 1) {
-        this.fished = true;
+        this.$refs.templateMessage.nextStep();
+        return;
       }
     },
+    // 填写项目信息组件的下一步回调
+    next(id) {
+      this.projectId = id;
+      this.active = 2;
+    },
+    // 暂存
+    save() {
+      if (this.active == 1) {
+        this.$refs.templateMessage.save();
+      } else if (this.active == 2) {
+        this.regionComplete();
+      }
+    },
+    // 完成
     complete() {
-      console.log('完成');
+      this.regionComplete(this.changeStatus());
+    },
+    // 选择学元范围暂存
+    regionComplete(fishFn) {
+      let req = {
+        projectId: this.projectId,
+        scopeOfAdministrative:  this.$refs.selectRegion.setScope(),
+        scopeOfDepartment: 99999999,
+        flag: fishFn ? 3 : 1, //0：下一步 1：暂存
+      };
+      openLoading(vm);
+      vm.POST("portal/new/scope", req).then(res => {
+        closeLoading(vm);
+        if(res.code == '000000' && fishFn) {
+          fishFn();
+        }
+        if (!fishFn) {
+          vm.$message({
+            type: "info",
+            message: res.message
+          });
+        }
+      });
+    },
+    // 完成后更改状态
+    changeStatus() {
+      let req = {
+        projectId: this.projectId,
+        changeStatus: 3 //待审核
+      };
+      vm.POST("portal/portalInfo/changeStatus", req)
+        .then(res => {
+          vm.$message({
+            type: "info",
+            message: res.message
+          });
+        })
+        .catch(() => {
+          vm.$message({
+            type: "warning",
+            message: res.message
+          });
+        })
     },
      //切换tabs
     handleClickTabs(tab, event) {
-      // this.activeName = tab.name;
+      if (tab.name == 'second') {
+        this.setRegion();
+      }
     },
     // 模板列表选中
     checkFn(id) {
@@ -149,7 +227,13 @@ export default {
         .then(res => {
           closeLoading(vm);
           if (res.code == "000000") {
-            console.log()
+              if (res.data.status == 0) {
+                return true;
+              } else {
+                this.dialogObj = Object.assign(this.dialogObj, this.statusObj[`status_${res.data.status}`]);
+                this.dialogObj.visible = true;
+                return false;
+              }
           } else {
             vm.$message.info(res.message);
           }
@@ -159,12 +243,21 @@ export default {
           vm.$message.warning('请稍后重试');
         });
     },
-    // 设定行政范围和设定机构范围相互影响
-    setRegion(r) {
-      this.r = r;
-      console.log('====================================');
-      console.log(r);
-      console.log('====================================');
+    // 隐藏弹框
+    hide() {
+      this.dialogObj.visible = false;
+    },
+    // 获取行政范围
+    setRegion() {
+      this.getOrganizationList(this.$refs.selectRegion.getScope());
+    },
+    // 查询行政范围的设定机构列表
+    getOrganizationList(r) {
+      this.$refs.setOrganization.getOrganization(r);
+    },
+    // 返回选择模板页
+    backSelectVue() {
+      this.active = 0;
     }
   }
 }
@@ -240,6 +333,19 @@ export default {
       color: #449284;
       border: 1px solid #449284 !important;
     }
+    .dis-btn {
+      width:78px;
+      height:34px;
+      background:rgba(240,242,245,1);
+      border-radius:3px;
+      font-size:14px;
+      font-family:PingFangSC-Regular,PingFang SC;
+      font-weight:400;
+      color:rgba(144,147,153,1);
+      line-height:34px;
+      text-align: center;
+      cursor: pointer;
+    }
   }
   .add-content {
     background: #fff;