入口编辑api对接

debug.log

+[1112/102746.726:ERROR:process_info.cc(329)] VirtualQueryEx: 拒绝访问。 (0x5)
+[1112/102746.728:ERROR:process_info.cc(556)] ReadMemoryInfo failed
+[1112/102746.728:ERROR:scoped_process_suspend.cc(40)] NtResumeProcess: 已尝试访问正在退出的过程。 (0xc000010a)

src/views/education/edit-entry.vue

@@ -4,7 +4,7 @@
     <div class="component-content screenSet" id="screenSet">
       <div class="header-title">{{ title }}</div>
       <div class="button-group">
-        <el-button size="small" @click="complete(1)">暂存</el-button>
+        <el-button v-show="showStorage" size="small" @click="complete(1)">暂存</el-button>
         <el-button type="primary" size="small" @click="complete(2)">完成</el-button>
       </div>
       <el-form
@@ -235,6 +235,14 @@
           </el-col>
         </el-form-item>
       </el-form>
+      <el-dialog title="确认上架" :visible.sync="dialogUp" width="30%" center>
+        <p class="dialog_p">该项目已关联<span> 0 </span>个子项目</p>
+        <p class="dialog_p">继续上架，将在APP端无法显示该项目</p>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="insertOrUpdate(2)">确认上架</el-button>
+          <el-button type="primary" @click="dialogUp = false">取消</el-button>
+        </span>
+      </el-dialog>
     </div>
   </div>
 </template>
@@ -266,6 +274,7 @@ export default {
       curmbSecond: "项目组件",
       curmbThird: "新建入口",
       title: "",
+      showStorage: false,
       entryId: null,
       peopleLevel: null,
       uploadImgMessage: false,
@@ -273,6 +282,8 @@ export default {
       imgMouseOver: false,
       imgMouseOver2: false,
       organizationContent: "云鹊医",
+      statusValue: 0,
+      dialogUp: false,
       formData: {
         entryName: "",
         entryBegintime: "",
@@ -383,26 +394,34 @@ export default {
       if (vm.entryId == null) {
         vm.title = "新建入口";
         vm.curmbThird = "新建入口";
+        vm.showStorage = true;
       } else {
         vm.title = "编辑入口";
         vm.curmbThird = "编辑入口";
+        vm.showStorage = false;
       }
     },
-    initOption() {
-      vm.optionsProject = [
-        {
-          value: 1,
-          label: "项目A"
-        },
-        {
-          value: 2,
-          label: "项目B"
+    setOption(data) {
+      let list = [];
+      for(let i = 0; i<data.length ; i++) {
+        let obj = {
+          value: data[i].projectId,
+          label: data[i].projectName,
+        }
+        list.push(obj);
+      }
+      return list;
     },
-        {
-          value: 3,
-          label: "项目C"
+    initOption() {
+      vm.optionsProject = [];
+      let req = {};
+      openLoading(vm);
+      vm.GET("portal/entryInfo/getProjectList", req).then(res => {
+        closeLoading(vm);
+        if (res.code == "000000") {
+          vm.optionsProject = vm.setOption(res.data);
         }
-      ];
+      });
     },
     submitForm(formName) {
       let flag = null;
@@ -601,6 +620,20 @@ export default {
       }
       vm.tagDrop();
     },
+    initTags(value) {
+      vm.tagsProject = [];
+      let len = 0;
+      for (let i = 0; i < value.length; i++) {
+        for (let j = 0; j < vm.optionsProject.length; j++) {
+          if (value[i] == vm.optionsProject[j].value) {
+            vm.tagsProject[len] = {};
+            vm.tagsProject[len].value = vm.optionsProject[j].value;
+            vm.tagsProject[len].name = vm.optionsProject[j].label;
+            len++;
+          }
+        }
+      }
+    },
     handleCloseProject(tag) {
       if (tag.disabled == true) {
         return;
@@ -624,13 +657,24 @@ export default {
         if (res.code == "000000") {
           vm.setEditData(res.data);
           vm.entryOptionData = res.data;
-          console.log("portalEntryUniInfo", vm.entryOptionData);
+          vm.statusValue = res.data.portalEntry.entryStatus;
+          // console.log("portalEntryUniInfo", vm.entryOptionData);
         } else {
           vm.$message(res.message);
         }
       });
     },
+    setProject(data) {
+      let list = [];
+      for(let i = 0; i<data.length; i++) {
+        list.push(data[i].projectId);
+      }
+      return list;
+    },
     setEditData(data) {
+      if(data.portalEntry.entryStatus === 1) {
+        vm.showStorage = true;
+      }
       vm.formData = {
         entryName: data.portalEntry.entryName,
         organizationName: data.portalEntry.organizationName,
@@ -648,8 +692,11 @@ export default {
         },
         attachmentMore2: {
           attachmentName: data.attachments[1].attachmentName,
-        }
+        },
+        project: vm.setProject(data.subprojects),
       };
+      let projectEdit = vm.setProject(data.subprojects);
+      vm.initTags(projectEdit);
     },
     complete(type) {
       //1是暂存，2是完成
@@ -670,11 +717,16 @@ export default {
           vm.formData.attachmentUrl1 != "" &&
           vm.formData.attachmentUrl2 != ""
         ) {
+          if(vm.statusValue === 3 && vm.formData.project.length == 0) {
+            vm.dialogUp = true;
+          } else {
             vm.insertOrUpdate(type);
           }
+        }
         //完成
       } else {
         //暂存
+        vm.insertOrUpdate(type);
       }
     },
     insertOrUpdate(isCompleted) {
@@ -711,6 +763,14 @@ export default {
           ],
           subprojects: []
         };
+        for(let i = 0;i < vm.tagsProject.length ; i++) {
+          portalEntryUniInfo.subprojects[i] = {
+              // entryId: vm.entryOptionData.portalEntry.id,
+              // id: vm.entryOptionData.portalEntry.id,
+              projectId: vm.tagsProject[i].value,
+              projectName: vm.tagsProject[i].label,
+          }
+        }
       } else {
         portalEntryUniInfo = {
           portalEntry: {
@@ -724,9 +784,7 @@ export default {
             entryName: vm.formData.entryName,
             entryStatus: vm.entryOptionData.portalEntry.entryStatus,
             id: vm.entryOptionData.portalEntry.id,
-            // modifiedId: 0,
-            // modifiedTime: "2019-11-11T05:51:12.811Z",
-            organizationId: vm.entryOptionData.portalEntry.createdId,
+            organizationId: 0,
             organizationName: vm.formData.organizationName
           },
           attachments: [
@@ -751,6 +809,16 @@ export default {
           ],
           subprojects: []
         };
+        for(let i = 0;i < vm.tagsProject.length ; i++) {
+          portalEntryUniInfo.subprojects[i] = {
+              // entryId: vm.entryOptionData.portalEntry.id,
+              // id: vm.entryOptionData.portalEntry.id,
+              projectId: vm.tagsProject[i].value,
+              projectName: vm.tagsProject[i].label,
+          }
+        }
+        console.log('tagsProject',vm.tagsProject);
+        // debugger;
       }
       console.log("portalEntryUniInfo", portalEntryUniInfo);
       openLoading(vm);
@@ -775,6 +843,12 @@ export default {
     position: relative;
     padding: 10px;
     background: #fff;
+    .dialog_p {
+      text-align: center;
+      span{
+        font-weight: 700;
+      }
+    }
     .header-title {
       padding: 10px 12px;
       font-size: 12px;
@@ -788,6 +862,15 @@ export default {
       z-index: 999;
     }
     .basic-form {
+      ::-webkit-scrollbar
+      {
+          width: 4px;
+          height: 20px;
+          background-color: #D8D8D8;
+      }
+      ::-webkit-scrollbar-thumb {
+          background-color: #D8D8D8;
+      }
       position: relative;
       margin-top: 10px;
       .basic-item-icon {

src/views/education/entry-manager.vue

@@ -66,9 +66,9 @@
         ></el-pagination>
       </div>
       <el-dialog title="确认上架" :visible.sync="dialogUp" width="30%" center>
-        <p v-if="childrenNum > 0" class="dialog_p">该项目已关联{{ childrenNum }}个子项目</p>
+        <p v-if="childrenNum > 0" class="dialog_p">该项目已关联<span> {{ childrenNum }} </span>个子项目</p>
         <p v-if="childrenNum > 0" class="dialog_p">确认要继续上架吗？</p>
-        <p v-if="childrenNum == 0" class="dialog_p">该项目已关联0个子项目</p>
+        <p v-if="childrenNum == 0" class="dialog_p">该项目已关联<span> 0 </span>个子项目</p>
         <p v-if="childrenNum == 0" class="dialog_p">继续上架，将在APP端无法显示该项目</p>
         <span v-if="childrenNum > 0" slot="footer" class="dialog-footer">
           <el-button @click="dialogUp = false">取消</el-button>
@@ -83,7 +83,7 @@
         <p class="dialog_p">删除后，该项目将不存在</p>
         <p class="dialog_p">同时释放该项目关联的所有子项目</p>
         <span slot="footer" class="dialog-footer">
-          <el-button @click="changeStatus(null,5)">确认上架</el-button>
+          <el-button @click="changeStatus(null,5)">确认删除</el-button>
           <el-button type="primary" @click="dialogDel = false">取消</el-button>
         </span>
       </el-dialog>
@@ -113,7 +113,7 @@ export default {
       tableData: [],
       dialogUp: false,
       dialogDel: false,
-      childrenNum: 1,
+      childrenNum: 0,
       scopeRow: {}
     };
   },
@@ -170,13 +170,14 @@ export default {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.formInline.pageSize = val;
+      vm.searchData();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.formInline.pageNo = val;
+      vm.search();
     },
     toPage(id) {
-      console.log(id);
       if (id === undefined) {
         this.$router.push("edit-entry");
       } else {
@@ -185,10 +186,12 @@ export default {
     },
     openDialog(type, row) {
       vm.scopeRow = row;
+      vm.childrenNum = row.subprojectNum;
       vm.dialogUp = true;
     },
     changeStatus(id, changeTo) {
       vm.dialogUp = false;
+      vm.dialogDel = false;
       let req = {};
       let entryId = id;
       if (entryId == null) {
@@ -204,10 +207,22 @@ export default {
       ).then(res => {
         closeLoading(vm);
         if (res.code == "000000") {
+          if(changeTo === 3) {
+             vm.$message({
+                message: '发布成功',
+                type: 'success'
+              });
+          } else {
             vm.$message(res.message);
+          }
+        } else {
+          //失败
+          if(changeTo === 3) {
+            vm.$message.error('发布失败');
           } else {
             vm.$message(res.message);
           }
+        }
         vm.search();
       });
     },
@@ -231,6 +246,9 @@ export default {
     background: #fff;
     .dialog_p {
       text-align: center;
+      span{
+        font-weight: 700;
+      }
     }
     .button-jump {
       margin-right: 10px;