Merge branch 'dev-eduadmin-20190222' into 'release'

暂存问题



See merge request !4

src/views/education/add-manager.vue

@@ -955,7 +955,9 @@ export default {
         attachmentPDFModel: JSON.stringify(attachmentPDFModel)
       };
       //console.log(postData);
+      openLoading(vm);
       vm.POST("portal/portalInfo/insertOrUpdate", postData).then(res => {
+        closeLoading(vm);
         if(option == "storage" || option == "storageEdit") {
           vm.$message.info(res.message);
         }
@@ -1094,6 +1096,13 @@ export default {
         }
       } else if (this.active == 1) {
         //暂存步骤2
+        if(this.tagsRegion.length == 0) {
+          vm.$message({
+            type: "info",
+            message: '成功',
+          });
+          return;
+        }
         let req = {
           projectId: this.projectId,
           setKindOfAdministrative: this.getKind("administrativeScope"),
@@ -1140,7 +1149,7 @@ export default {
     complete() {
       //type 1:暂存 2：完成
       if (this.projectStatus == 4) {
-        vm.$message.info("已上架状态只能编辑基础信息");
+        vm.$message.info("完成");
         vm.$router.push({ path: "item-manager" });
         return;
       }
@@ -1721,8 +1730,10 @@ export default {
 
     //删除label节点 同步树结构
     handleCloseTree(tag) {
-      this.tagsRegion.splice(this.tagsRegion.indexOf(tag), 1);
-      this.setCheckedKeys(this.tagsRegion);
+      if (this.projectStatus != 4) {
+        this.tagsRegion.splice(this.tagsRegion.indexOf(tag), 1);
+        this.setCheckedKeys(this.tagsRegion);
+      }
     },
     //获取反选数据
     getDifference(a, b) {
@@ -1779,6 +1790,7 @@ export default {
         "没",
         this.changedOrganization2
       );
+      this.updatePerson();
     },
     //改变机构 table 的check状态
     selectionChangeDepartment(val) {
@@ -2492,13 +2504,18 @@ export default {
     updateOrganizationAndPerson(allSelectedKeys) {
       this.tableOrganization = [];
       this.tablePerson = [];
+      // this.lookedOrganization = [];
+      // this.changedOrganization = [];
+      // this.changedOrganization2 = [];
+      // this.lookedPerson = [];
+      // this.changedPerson = [];
+      // this.changedPerson2 = [];
     },
     //设定机构改变更新设定人员
-    updatePerson(organization) {
-      if (this.hasOrganizationInit === true) {
-        this.tablePerson = [];
-      }
-      this.hasOrganizationInit = true;
+    updatePerson() {
+      // this.lookedPerson = [];
+      // this.changedPerson = [];
+      // this.changedPerson2 = [];
     },
     //scope的不同status操作
     scopeStatus(data) {