Merge branch 'dev-lp0602' into dev0602

src/page/main/support/document-type/index.vue

@@ -175,6 +175,7 @@ import { Search } from "@element-plus/icons-vue";
 import { watch, nextTick, reactive, toRefs, ref, computed, onBeforeMount } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import axios from "@/request/http.js";
+import { topId } from "../helper.js";
 import { ElMessage } from "element-plus";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 
@@ -399,7 +400,7 @@ const editCurType = async (row) => {
   if (res.data.code == 200) {
     const data = res.data.data || {};
     state.formData = {
-      parent_id: data.parent_id,
+      parent_id: data.parent_id === topId ? "topLevel" : data.parent_id,
       classify_name: data.classify_name,
       sort: data.sort,
       describe: data.describe,
@@ -454,7 +455,8 @@ const deleteCurType = (row) => {
 };
 const beforeSwitchStatus = async (row) => {
   const res = await axios.get(`/apaas/knowledge/v5/documentmgr/classify/quote/${row.id}`);
-  if (!res.data.data) {
+  console.log(res);
+  if (res.data.code !== 200) {
     ElMessage.warning("请将该文档类型下所挂载的文档删除或转移至其他文档类型下再停用！");
     return false;
   }

src/page/main/support/document/add/index.vue

@@ -36,7 +36,7 @@ import { reactive, toRefs, computed, ref, onBeforeMount, nextTick } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import axios from "@/request/http.js";
 import { ElMessage } from "element-plus";
-import { $imgAdd } from "../helper";
+import { $imgAdd } from "../../helper";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 
 const route = useRoute();

src/page/main/support/document/edit/index.vue

@@ -36,7 +36,7 @@ import { reactive, toRefs, computed, ref, onBeforeMount, nextTick } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import axios from "@/request/http.js";
 import { ElMessage } from "element-plus";
-import { $imgAdd } from "../helper";
+import { $imgAdd } from "../../helper";
 import bgBreadcrumb from "@/components/bg-breadcrumb.vue";
 
 const route = useRoute();

src/page/main/support/document/helper.js → src/page/main/support/helper.js

 import $axios from "@/request/http";
 
+export const topId = "00000000-0000-0000-0000-000000000000";
+
 export const $imgAdd = function (args, editorRef) {
   const [pos, $file] = args;
   const formdata = new FormData();