From 7047fc97f7a1dd8f4dea2080255850e96f2f423d Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 8 Sep 2025 17:02:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/upload.vue      |  1 +
 src/views/inquiryMachine/content.vue | 48 +++++++++++++++++---------
 src/views/inquiryMachine/menu.vue    | 51 +++++++++++++++++++---------
 3 files changed, 68 insertions(+), 32 deletions(-)

diff --git a/src/views/components/upload.vue b/src/views/components/upload.vue
index 105b6be..39a3860 100644
--- a/src/views/components/upload.vue
+++ b/src/views/components/upload.vue
@@ -165,6 +165,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "~@/assets/styles/digitalScreen.scss";
+
 ::v-deep .book-cover-upload {
   display: flex;
   justify-content: flex-start;
diff --git a/src/views/inquiryMachine/content.vue b/src/views/inquiryMachine/content.vue
index 55c4cb7..961ffb3 100644
--- a/src/views/inquiryMachine/content.vue
+++ b/src/views/inquiryMachine/content.vue
@@ -72,14 +72,17 @@
               </el-form-item>
               <!-- @imgAdd="imgAdd" -->
               <!-- https://blog.csdn.net/ws6afa88/article/details/108765569?utm_medium=distribute.pc_relevant.none-task-blog-2~default~baidujs_baidulandingword~default-1-108765569-blog-131412288.235^v43^pc_blog_bottom_relevance_base6&spm=1001.2101.3001.4242.1&utm_relevant_index=4 -->
-
+              <el-form-item v-if="currentKeyColumn.type === 4" label="链接" prop="linkUrl">
+                <el-input v-model="form.linkUrl" :style="containerStyle" />
+              </el-form-item>
+              <UploadCover v-if="currentKeyColumn.type === 3 || currentKeyColumn.type === 4" ref="uploadCoverRefs" :label-name="labelName" :form="form" upload-type="book" @childCover="handleCover" />
+              <img v-if="currentKeyColumn.type === 4 && bookCover" style="display: block; height: 200px; margin-left: 90px;" :src="bookCover || require('@/assets/images/cover-bg.png')" alt="封面">
               <quill-editor
                 v-if="currentKeyColumn.type !== 4"
                 v-model="editorContent"
                 :editor-content="editorContent"
                 :editor-ref="editorRef"
               />
-
               <!-- <mavon-editor
                 v-if="currentKeyColumn.type !== 4"
                 ref="md"
@@ -91,11 +94,7 @@
                 @imgAdd="imgAdd"
                 @change="handleEditorChange"
               /> -->
-              <el-form-item v-if="currentKeyColumn.type === 4" label="链接" prop="linkUrl">
-                <el-input v-model="form.linkUrl" :style="containerStyle" />
-              </el-form-item>
-              <UploadCover v-if="currentKeyColumn.type === 4" ref="uploadCoverRefs" :label-name="labelName" :form="form" upload-type="book" @childCover="handleCover" />
-              <img v-if="currentKeyColumn.type === 4 && bookCover" style="display: block; height: 200px; margin-left: 90px;" :src="bookCover || require('@/assets/images/cover-bg.png')" alt="图书封面">
+
             </el-form>
             <div slot="footer" class="dialog-footer">
               <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -197,10 +196,7 @@ export default {
       'user'
     ]),
     activeAddBtn() {
-      // 条件1：id为0时，按钮不可用
       const condition1 = this.currentKeyColumn.id === 0
-
-      // 条件2：id不为0且type为1且tableData长度为1时，按钮不可用
       const condition2 = this.currentKeyColumn.id !== 0 &&
       this.currentKeyColumn.type === 1 &&
       this.tableData.length === 1
@@ -260,18 +256,30 @@ export default {
     },
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
-      if (this.$refs.uploadCoverRefs) {
-        this.$refs.uploadCoverRefs.fileNames = null
-      }
+
     },
     // 新增前
     [CRUD.HOOK.beforeToAdd](crud, form) {
+      this.$nextTick(() => {
+        if (this.$refs.uploadCoverRefs) {
+          this.$refs.uploadCoverRefs.fileNames = null
+        }
+      })
       this.bookCover = null
       this.form.imgUrl = null
+      this.editorContent = ''
     },
     // 编辑前
     [CRUD.HOOK.beforeToEdit](crud, form) {
+      console.log('form.imgUrl', form.imgUrl)
+      this.$nextTick(() => {
+        console.log('this.$refs.uploadCoverRefs', this.$refs.uploadCoverRefs)
+        if (this.$refs.uploadCoverRefs) {
+          this.$refs.uploadCoverRefs.fileNames = form.imgUrl
+        }
+      })
       this.bookCover = this.baseApi + '/api/fileRelevant/getImg?imgType=2&imgId=' + form.imgUrl
+      this.editorContent = this.form.introHtml
     },
     // 提交前的验证
     [CRUD.HOOK.afterValidateCU](crud) {
@@ -408,10 +416,18 @@ export default {
 .inquiry-dialog{
   ::v-deep .el-dialog{
     width: 1170px !important;
-    .el-dialog__body .el-form-item .el-form-item__content{
-      width: 254px !important;
+    .el-dialog__body{
+       .el-form-item {
+        .el-form-item__content{
+          width: 254px !important;
+        }
+        &.book-cover-upload {
+          .el-form-item__content{
+            width: 580px !important;
+          }
+        }
+       }
     }
-
     .v-note-wrapper{
       height: 420px;
     }
diff --git a/src/views/inquiryMachine/menu.vue b/src/views/inquiryMachine/menu.vue
index 2e649d3..4a63ded 100644
--- a/src/views/inquiryMachine/menu.vue
+++ b/src/views/inquiryMachine/menu.vue
@@ -6,21 +6,21 @@
         <div class="head-container">
           <crudOperation :permission="permission">
             <template v-slot:left>
-              <el-button size="mini" :disabled="currentNodeLevel===3 || crud.selections[0].type !== 1" @click="toAddOrEdit('add')">
+              <el-button size="mini" :disabled="currentNodeLevel===3 || (crud.selections[0] && crud.selections[0].type !== 1)" @click="toAddOrEdit('add')">
                 <i class="iconfont icon-xinzeng" />
                 新增
               </el-button>
-              <el-button :disabled="crud.selections.length !== 1 || crud.selections[0].id === 0" size="mini" @click="toAddOrEdit('edit')">
+              <el-button :disabled="crud.selections.length !== 1 || (crud.selections[0] && crud.selections[0].id === 0)" size="mini" @click="toAddOrEdit('edit')">
                 <i class="iconfont icon-bianji" />
                 编辑
               </el-button>
             </template>
             <template v-slot:right>
-              <el-button :disabled="crud.selections.length === 0 || crud.selections[0].id === 0" size="mini" :loading="crud.delAllLoading" @click="toDelete(crud.selections)">
+              <el-button :disabled="crud.selections.length === 0 || (crud.selections[0] && crud.selections[0].id === 0)" size="mini" :loading="crud.delAllLoading" @click="toDelete(crud.selections)">
                 <i class="iconfont icon-shanchu" />
                 删除
               </el-button>
-              <el-button icon="el-icon-sort" size="mini" :loading="sortLoading" :disabled="brotherNodeNum <= 1 || crud.selections[0].id === 0" @click="toSort(crud.selections)">排序</el-button>
+              <el-button icon="el-icon-sort" size="mini" :loading="sortLoading" :disabled="brotherNodeNum <= 1 || (crud.selections[0] && crud.selections[0].id === 0)" @click="toSort(crud.selections)">排序</el-button>
             </template>
           </crudOperation>
         </div>
@@ -273,13 +273,17 @@ export default {
     ]),
     filteredSelectOptions() {
       if (this.btnType === 'edit') {
-        return this.selectOptions.map(item => ({
-          ...item,
-          disabled: this.currentNodeLevel === 2 && !([2, 3].includes(item.value))
-        }))
+        // return this.selectOptions.map(item => ({
+        //   ...item,
+        //   disabled: this.currentNodeLevel === 2 && !([2, 3].includes(item.value))
+        // }))
+        if (this.currentNodeLevel === 3) {
+          return this.selectOptions.filter(item => [2, 3].includes(item.value))
+        } else if (this.currentNodeLevel === 2 && this.selectedMenu.children.length !== 0) {
+          return this.selectOptions.filter(item => [1].includes(item.value))
+        }
       }
-
-      if (this.currentNodeLevel === 2) {
+      if (this.btnType === 'add' && this.currentNodeLevel === 2) {
         return this.selectOptions.filter(item => [2, 3].includes(item.value))
       }
 
@@ -426,22 +430,31 @@ export default {
       console.log(`当前节点层级：${node.level}`)
     },
     changeType(val) {
-      const currentSelected = this.form.queryTopicList
-      let savedData = []
-      if (this.form.queryMenu.type === 2) {
-        savedData = currentSelected ? [currentSelected] : []
+      const currentSelected = this.form.queryTopicList // 当前选中的栏目数据
+      let savedData = [] // 暂存处理后的数据（统一用数组过渡，避免类型混乱）
+
+      // 1. 统一处理当前选中数据，转为数组格式（无论之前是单选/多选）
+      if (currentSelected === null || currentSelected === undefined) {
+        savedData = [] // 无选中数据时，初始化为空数组
+      } else if (Array.isArray(currentSelected)) {
+        savedData = [...currentSelected] // 多选（数组）：直接浅拷贝
       } else {
-        savedData = currentSelected || []
+        savedData = [currentSelected] // 单选（单个对象）：转为数组，便于统一处理
       }
 
+      // 2. 根据目标类型（val），赋值为对应格式（单选：单个对象 / 多选：数组）
       if (val === 2) {
+        // 目标类型：栏目显示（单选）- 取数组第一个元素，无则为null
         this.form.queryTopicList = savedData.length > 0 ? savedData[0] : null
       } else {
+        // 目标类型：栏目列表/其他（多选）- 直接赋值数组，空则为空数组
         this.form.queryTopicList = [...savedData]
       }
 
+      // 3. 强制刷新下拉框组件（解决切换类型后选项不更新的问题）
       this.selectKey = Math.random()
 
+      // 4. 按需加载对应类型的栏目数据（type=2加载特定类型，其他加载全部）
       this.$nextTick(() => {
         this.getInitQueryTopic(val === 2 ? 1 : null)
       })
@@ -558,7 +571,13 @@ export default {
       })
     },
     toSort(data) {
-      this.$refs.sort.sortTableData = this.$refs.tree.getNode(data[0].parentId).data.children
+      console.log(data)
+      if (data[0].parentId === null) {
+        this.$refs.sort.sortTableData = this.crud.data[0].children
+      } else {
+        this.$refs.sort.sortTableData = this.$refs.tree.getNode(data[0].parentId).data.children
+      }
+
       this.$refs.sort.sortVisible = true
     },
     treeNodeSort(data) {