From af4548c888d68abcacf602140d6ce6143ca00a23 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 26 Dec 2025 12:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |  2 +
 .../archivesList/archivesAnjuan/index.vue     | 62 +++++++++++++++--
 .../archivesList/archivesJuannei/index.vue    | 69 ++++++++++++++++---
 .../archivesManage/archivesList/index.vue     | 11 ++-
 .../archivesList/mixins/archives.js           |  1 +
 .../archivesList/module/packing/index.vue     |  1 +
 src/views/components/AccessDoor.vue           |  6 +-
 src/views/components/WarehouseWarning.vue     |  6 +-
 src/views/components/category/PreviewForm.vue | 63 ++++++++++++++++-
 src/views/home.vue                            |  7 +-
 vue.config.js                                 |  2 +-
 11 files changed, 200 insertions(+), 30 deletions(-)

diff --git a/src/main.js b/src/main.js
index e49d0c2..b0865bc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -81,6 +81,8 @@ Vue.prototype.$x2js = new X2js() // 创建x2js对象，挂到vue原型上
 
 Vue.config.productionTip = false
 
+Vue.prototype.$bus = new Vue()
+
 new Vue({
   el: '#app',
   router,
diff --git a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
index 41e66cd..952d4a9 100644
--- a/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/archivesAnjuan/index.vue
@@ -27,6 +27,24 @@
           <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
+        <el-select
+          v-if="!recycleMain.isRecycle"
+          v-model="ctgValue"
+          class="filter-item"
+          filterable
+          placeholder="请选择档案类目筛选"
+          clearable
+          @click="getIntellClassify()"
+          @change="getTableList()"
+          @clear="handleCtgClear"
+        >
+          <el-option
+            v-for="item in ctgOptions"
+            :key="item.dicCode"
+            :label="item.dicName"
+            :value="item.dicCode"
+          />
+        </el-select>
         <el-input v-model="anjuanQuery[anjuanInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 220px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="anjuanInputSelect" style="width: 90px" @change="querySelect(anjuanInputSelect)">
             <el-option
@@ -209,6 +227,7 @@ import { header, form } from '@crud/crud'
 import { mapGetters } from 'vuex'
 import { archivesCrud } from '../mixins/archives'
 import { FetchIsExistBorrow, FetchAddArchivesWaitRegister } from '@/api/archivesManage/lendManage'
+import { getDicts } from '@/api/archivesConfig/dict'
 import PreviewForm from '@/views/components/category/PreviewForm'
 import ArchivesInfo from '../module/archivesInfo/index'
 import Packing from '../module/packing/index'
@@ -275,7 +294,9 @@ export default {
       lengingVisible: false, // 借阅
       codeLoading: false,
       printDialogVisible: false, // 打印弹窗显示状态
-      printLabelList: [] // 传递给打印组件的标签数据
+      printLabelList: [], // 传递给打印组件的标签数据
+      ctgValue: '',
+      ctgOptions: []
     }
   },
   computed: {
@@ -354,8 +375,28 @@ export default {
     this.query.queryType = this.stateOptions[0].value
   },
   mounted() {
+    this.getIntellClassify()
   },
   methods: {
+    // 分类下拉框清空事件
+    handleCtgClear() {
+      this.ctgValue = '' // 确保值被清空
+      this.getTableList() // 清空后刷新列表
+    },
+    getIntellClassify() {
+      // 如果已有分类数据，不再重复请求
+      if (this.ctgOptions.length > 0) return
+
+      getDicts().then(data => {
+        if (data) {
+          const res = data.filter(item => {
+            item.checked = false
+            return item.dicCode === 'DALM'
+          })
+          this.ctgOptions = res[0]?.childMenus || [] // 增加可选链，避免报错
+        }
+      })
+    },
     // 打印条码
     onPrint(res) {
       this.codeLoading = true
@@ -410,10 +451,11 @@ export default {
 
     // 文件/案卷重置query
     resetQuery() {
+      this.ctgValue = ''
       if (this.selectedCategory.isType === 5) {
         this.queryOption = [
-          { value: 'queryTitle', label: '姓名' },
-          { value: 'archiveNo', label: '编号' }
+          { value: 'queryTitle', label: '题名' },
+          { value: 'archiveNo', label: '档号' }
           // { value: 'responsibleby', label: '责任者' },
           // { value: 'docNo', label: '发文字号 ' },
           // { value: 'barcode', label: '条形码' },
@@ -422,7 +464,7 @@ export default {
         ]
       } else {
         this.queryOption = [
-          { value: 'queryTitle', label: '姓名' },
+          { value: 'queryTitle', label: '题名' },
           { value: 'archiveNo', label: '档号' }
           // { value: 'archiveCtgNo', label: '实体分类号' },
           // { value: 'barcode', label: '条形码' },
@@ -444,17 +486,23 @@ export default {
       })
     },
     // list
+    // list
     getTableList() {
       // this.query.queryType = null
       this.query.queryTitle = ''
       this.query.archiveNo = ''
-      this.query.archiveCtgNo = ''
+      // 注释/删除：原本清空archiveCtgNo的代码
+      // this.query.archiveCtgNo = ''
       this.query.responsibleby = ''
       this.query.docNo = ''
       this.query.documentNo = ''
       this.query.barcode = ''
       this.query.folderLocation = ''
       this.query.tempNo = ''
+
+      // 新增：将ctgValue赋值给archiveCtgNo
+      this.query.archiveCtgNo = this.ctgValue || ''
+
       switch (this.anjuanInputSelect) {
         case 'queryTitle': // 题名
           this.query.queryTitle = this.anjuanQuery[this.anjuanInputSelect]
@@ -517,7 +565,7 @@ export default {
       this.$refs.table.toggleRowSelection(row)
       this.selections = this.crud.selections
       this.isAnjuan = this.crud.selections.length !== 1
-      this.$emit('getJnInAjBtnState', this.isAnjuan)
+      this.$bus.$emit('updateAnjuanState', this.isAnjuan) // 发送事件
       this.$emit('getSelections', row, null)
     },
     // 触发单选
@@ -525,7 +573,7 @@ export default {
       this.selections = selection
       // 判断案卷内的卷内-新增btn-状态
       this.isAnjuan = selection.length !== 1
-      this.$emit('getJnInAjBtnState', this.isAnjuan)
+      this.$bus.$emit('updateAnjuanState', this.isAnjuan) // 发送事件
       this.$emit('getSelections', row, selection)
     },
     // 绑定标签
diff --git a/src/views/archivesManage/archivesList/archivesJuannei/index.vue b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
index c5628bc..b30a457 100644
--- a/src/views/archivesManage/archivesList/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/archivesJuannei/index.vue
@@ -7,7 +7,7 @@
       </div> -->
       <div v-if="!recycleMain.isRecycle" class="archives-crud">
         <!-- 新增 -->
-        <el-button v-if="selectedCategory.isType !== 4" size="mini" :disabled="isAnjuan" icon="el-icon-plus" @click="handleForm('add','档案',2)">新增</el-button>
+        <el-button v-if="selectedCategory.isType !== 4" size="mini" :disabled="localIsAnjuan" icon="el-icon-plus" @click="handleForm('add','档案',2)">新增</el-button>
         <!-- 修改 -->
         <el-button size="mini" icon="el-icon-edit" :disabled="selections.length !== 1" @click="handleForm('edit','档案',null)">修改</el-button>
         <!-- 删除btn 多选 -->
@@ -28,6 +28,24 @@
           <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
           <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
+        <el-select
+          v-if="!recycleMain.isRecycle"
+          v-model="ctgValue"
+          class="filter-item"
+          filterable
+          placeholder="请选择档案类目筛选"
+          clearable
+          @click="getIntellClassify()"
+          @change="getTableList()"
+          @clear="handleCtgClear"
+        >
+          <el-option
+            v-for="item in ctgOptions"
+            :key="item.dicCode"
+            :label="item.dicName"
+            :value="item.dicCode"
+          />
+        </el-select>
         <el-input v-model="juanneiQuery[juanneiInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 220px;" class="input-prepend filter-item" @clear="getTableList()" @keyup.enter.native="getTableList">
           <el-select slot="prepend" v-model="juanneiInputSelect" style="width: 90px" @change="querySelect(juanneiInputSelect)">
             <el-option
@@ -114,12 +132,11 @@
             {{ scope.row[field.fieldName] }}
           </template>
         </el-table-column>
-        <el-table-column v-if="!recycleMain.isRecycle" label="标签" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
+        <!-- <el-table-column v-if="!recycleMain.isRecycle" label="标签" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
           <template slot-scope="scope">
-            <!-- 未绑 / 已绑 -->
             <span :class="['row-state', 'row-binding', scope.row.tid ? 'state-active' : '' ]">{{ scope.row.tid ? '已绑': '未绑' }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column v-if="!recycleMain.isRecycle" label="装盒" width="100" align="center" :fixed="fixedStatusBar ? false : 'right' ">
           <!-- state-active 已装/已入/已借/已绑 -->
           <template slot-scope="scope">
@@ -199,6 +216,7 @@
 import { header, form } from '@crud/crud'
 import { mapGetters } from 'vuex'
 import { archivesCrud } from '../mixins/archives'
+import { getDicts } from '@/api/archivesConfig/dict'
 import PreviewForm from '@/views/components/category/PreviewForm'
 import ArchivesInfo from '../module/archivesInfo/index'
 import BindingTagDlg from '@/views/components/BindingTagDlg'
@@ -250,8 +268,8 @@ export default {
       junneiData: [],
       juanneiQuery: {},
       queryOption: [
-        { value: 'queryTitle', label: '姓名' },
-        { value: 'archiveNo', label: '编号' }
+        { value: 'queryTitle', label: '题名' },
+        { value: 'archiveNo', label: '档号' }
         // { value: 'responsibleby', label: '责任者' },
         // { value: 'documentNo', label: '文件编号 ' },
         // { value: 'barcode', label: '条形码' },
@@ -270,7 +288,10 @@ export default {
       ],
       codeLoading: false,
       printDialogVisible: false, // 打印弹窗显示状态
-      printLabelList: [] // 传递给打印组件的标签数据
+      printLabelList: [], // 传递给打印组件的标签数据
+      ctgValue: '',
+      ctgOptions: [],
+      localIsAnjuan: true
     }
   },
   computed: {
@@ -284,7 +305,8 @@ export default {
     tableDisplayFields(val) {
       this.doLayout()
     },
-    isAnjuan: function(newValue, oldValue) {
+    isAnjuan(newVal, oldVal) {
+      console.log('卷内组件 isAnjuan 同步更新：', oldVal, '→', newVal)
     },
     fixedStatusBar: function(newValue, oldValue) {
     },
@@ -303,8 +325,36 @@ export default {
     this.selections = []
   },
   mounted() {
+    this.getIntellClassify()
+    this.$bus.$on('updateAnjuanState', (isAnjuan) => {
+      console.log('卷内组件通过事件总线接收：', isAnjuan)
+      this.localIsAnjuan = isAnjuan // 直接更新本地状态，按钮禁用状态会立即变化
+    })
+  },
+  beforeDestroy() {
+  // 销毁事件监听，避免内存泄漏
+    this.$bus.$off('updateAnjuanState')
   },
   methods: {
+    // 分类下拉框清空事件
+    handleCtgClear() {
+      this.ctgValue = '' // 确保值被清空
+      this.getTableList() // 清空后刷新列表
+    },
+    getIntellClassify() {
+      // 如果已有分类数据，不再重复请求
+      if (this.ctgOptions.length > 0) return
+
+      getDicts().then(data => {
+        if (data) {
+          const res = data.filter(item => {
+            item.checked = false
+            return item.dicCode === 'DALM'
+          })
+          this.ctgOptions = res[0]?.childMenus || [] // 增加可选链，避免报错
+        }
+      })
+    },
     // 打印条码
     onPrint(res) {
       this.codeLoading = true
@@ -382,6 +432,9 @@ export default {
       this.query.documentNo = ''
       this.query.barcode = ''
       this.query.folderLocation = ''
+
+      this.query.archiveCtgNo = this.ctgValue || ''
+
       switch (this.juanneiInputSelect) {
         case 'queryTitle': // 题名
           this.query.queryTitle = this.juanneiQuery[this.juanneiInputSelect]
diff --git a/src/views/archivesManage/archivesList/index.vue b/src/views/archivesManage/archivesList/index.vue
index 67312a5..66a0a93 100644
--- a/src/views/archivesManage/archivesList/index.vue
+++ b/src/views/archivesManage/archivesList/index.vue
@@ -13,7 +13,7 @@
             <el-tree ref="archivesTree" v-loading="crud.loading" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick" />
           </div>
         </div>
-        <!-- <div v-if="!isRecycle" class="container-left left-tree-item">
+        <div v-if="!isRecycle" class="container-left left-tree-item">
           <span class="right-top-line" />
           <span class="left-bottom-line" />
           <div class="tree-title">智能检索</div>
@@ -43,7 +43,7 @@
               </template>
             </el-tree>
           </div>
-        </div> -->
+        </div>
       </el-col>
 
       <!-- 档案管理列表 -->
@@ -170,6 +170,10 @@ export default {
     isdel: function(newValue, oldValue) {
     },
     isRecycle: function(newValue, oldValue) {
+    },
+    isAnjuan(newValue, oldValue) {
+      console.log('父组件 isAnjuan 真实变化：', oldValue, '→', newValue)
+    // 这里能直观看到父组件的 isAnjuan 是不是真的变了
     }
   },
   mounted() {
@@ -322,6 +326,7 @@ export default {
     },
     // 判断案卷内的卷内-新增btn-状态 中转站
     getJnInAjBtnState(data) {
+      console.log('getJnInAjBtnState', data)
       this.isAnjuan = data
     },
     getAjInProjectBtnState(data) {
@@ -790,7 +795,7 @@ export default {
 <style lang="scss" scoped>
 @import "~@/assets/styles/archives-manage.scss";
 .tree-scroll{
-  height: calc(100vh - 235px);
+  height: calc(100vh - 610px);
   overflow-y: scroll;
   overflow-x: hidden;
 }
diff --git a/src/views/archivesManage/archivesList/mixins/archives.js b/src/views/archivesManage/archivesList/mixins/archives.js
index 3ee663b..763eef5 100644
--- a/src/views/archivesManage/archivesList/mixins/archives.js
+++ b/src/views/archivesManage/archivesList/mixins/archives.js
@@ -302,6 +302,7 @@ export const archivesCrud = {
                 } else if (isAnOrJuan === 2) {
                   if (this.recycleMain.anjuanSelection[item.fieldName]) {
                     this.$refs.previewForm.addOrUpdateForm = JSON.parse(JSON.stringify(this.recycleMain.anjuanSelection))
+                    console.log(' this.$refs.previewForm.addOrUpdateForm', this.$refs.previewForm.addOrUpdateForm)
                   }
                 }
               })
diff --git a/src/views/archivesManage/archivesList/module/packing/index.vue b/src/views/archivesManage/archivesList/module/packing/index.vue
index e5fc300..ac33d00 100644
--- a/src/views/archivesManage/archivesList/module/packing/index.vue
+++ b/src/views/archivesManage/archivesList/module/packing/index.vue
@@ -303,6 +303,7 @@ export default {
         this.$message.success('装盒成功！')
         this.packingVisible = false
         this.$emit('close-dialog')
+        this.crud.refresh()
         this.tableData = []
         this.caseQuery[this.inputSelect] = ''
       })
diff --git a/src/views/components/AccessDoor.vue b/src/views/components/AccessDoor.vue
index e8afffa..0d34beb 100644
--- a/src/views/components/AccessDoor.vue
+++ b/src/views/components/AccessDoor.vue
@@ -69,11 +69,11 @@ export default {
   },
   methods: {
     toPage() {
-      if (this.roles.includes('admin') || this.roles.includes('logManage:list')) {
+      if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
         this.$router.push({
-          name: 'LogManage',
+          name: 'RunningLog',
           params: {
-            locationIndex: 3
+            locationIndex: 1
           }
         })
       } else {
diff --git a/src/views/components/WarehouseWarning.vue b/src/views/components/WarehouseWarning.vue
index fe1c50a..b3e6d3f 100644
--- a/src/views/components/WarehouseWarning.vue
+++ b/src/views/components/WarehouseWarning.vue
@@ -64,11 +64,11 @@ export default {
   },
   methods: {
     toPage() {
-      if (this.roles.includes('admin') || this.roles.includes('logManage:list')) {
+      if (this.roles.includes('admin') || this.roles.includes('RunningLog:list')) {
         this.$router.push({
-          name: 'LogManage',
+          name: 'RunningLog',
           params: {
-            locationIndex: 2
+            locationIndex: 0
           }
         })
       } else {
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index 8536c00..125e866 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -59,10 +59,31 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <el-table ref="popoverTable" :data="popoverTableData" highlight-current-row row-key="id" :tree-props="{children: 'childMenus', hasChildren: 'hasChildren'}" style="width: 100%;" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
+        <!-- 新增：检索输入框 -->
+        <div class="table-search" style="margin-bottom: 16px; display: flex; justify-content: flex-start;">
+          <el-input
+            v-model="searchKeyword"
+            placeholder="请输入字典名称/代码/说明进行检索"
+            clearable
+            style="width: 300px;"
+            @input="handleTableSearch"
+          />
+        </div>
+        <!-- 表格：绑定筛选后的数据 -->
+        <el-table
+          ref="popoverTable"
+          :data="filteredPopoverTableData"
+          highlight-current-row
+          row-key="id"
+          :tree-props="{children: 'childMenus', hasChildren: 'hasChildren'}"
+          style="width: 100%;"
+          height="calc(100vh - 400px)"
+          @selection-change="handleSelectionChange"
+          @row-click="clickRowHandler"
+        >
           <el-table-column type="selection" width="55" />
           <el-table-column prop="dicName" label="字典名称" />
-          <el-table-column prop="dicCode" label="字典代码" />
+          <el-table-column prop="dicCode" label="字典代码" width="100" />
           <el-table-column prop="dicExplain" label="内容说明" />
         </el-table>
       </div>
@@ -143,7 +164,33 @@ export default {
           label: node.dicName,
           children: node.childMenus
         }
+      },
+      searchKeyword: '', // 检索关键词
+      selectedRows: [] // 选中的行数据
+    }
+  },
+  computed: {
+    // 计算属性：筛选后的表格数据（支持树形结构递归筛选）
+    filteredPopoverTableData() {
+      const keyword = this.searchKeyword.trim().toLowerCase()
+      if (!keyword) {
+        return this.popoverTableData
+      }
+      const filterTree = (treeData) => {
+        return treeData.filter(item => {
+          const isMatch =
+            item.dicName?.toLowerCase().includes(keyword) ||
+            item.dicCode?.toLowerCase().includes(keyword) ||
+            item.dicExplain?.toLowerCase().includes(keyword)
+          if (item.childMenus && item.childMenus.length > 0) {
+            const filteredChildren = filterTree(item.childMenus)
+            item.childMenus = filteredChildren
+            return isMatch || filteredChildren.length > 0
+          }
+          return isMatch
+        })
       }
+      return filterTree(JSON.parse(JSON.stringify(this.popoverTableData))) // 深拷贝避免修改原始数据
     }
   },
   watch: {
@@ -172,6 +219,9 @@ export default {
     // }
   },
   methods: {
+    handleTableSearch() {
+      // 无需额外操作，计算属性会自动响应 searchKeyword 变化
+    },
     // 递归查询字典名称对应的字典代码
     // getNode(tree, dicName) {
     //   for (let i = 0; i < tree.length; i++) {
@@ -454,6 +504,7 @@ export default {
     },
     handleClose(done) {
       this.popoverVisible = false
+      this.searchKeyword = ''
       done()
     }
   }
@@ -500,4 +551,12 @@ export default {
     line-height: 30px;
   }
 }
+
+.table-search{
+  ::v-deep .el-input--small .el-input__inner{
+    border: 1px solid #339cff;
+    background-color: transparent;
+    color: #fff;
+  }
+}
 </style>
diff --git a/src/views/home.vue b/src/views/home.vue
index ddd14e2..482f654 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -27,7 +27,7 @@
             </h3>
             <div class="home-floor-tab">
               <!-- :class="{ 'active-floor': floorEnvIndex == 0 }" @click="changeFloorEnvTab(0)" -->
-              <p :class="{ 'active-floor': floorEnvIndex == 0 || floorEnvIndex == 1 }">3楼</p>
+              <p :class="{ 'active-floor': floorEnvIndex == 0 || floorEnvIndex == 1 }">1楼</p>
             </div>
             <!-- 环境数据轮播容器：隐藏指示器，分屏展示温湿度 + 其他指标 -->
             <el-carousel
@@ -123,13 +123,14 @@
               </p>
             </h3>
             <div class="home-floor-tab">
-              <p :class="{ 'active-floor': floorIndex == 0 }" @click="changeFloorTab(0)">3楼</p>
+              <p :class="{ 'active-floor': floorIndex == 0 }" @click="changeFloorTab(0)">1楼</p>
             </div>
             <el-carousel ref="carouselRef" trigger="click" :interval="4000" indicator-position="none" height="110px" arrow="never" @change="handleChange">
               <el-carousel-item>
                 <div class="warehouse-tab">
                   <ul class="warehouse-nav">
-                    <li @click="changeActiveTab(1,0)">
+                    <!--  @click="changeActiveTab(1,0)" -->
+                    <li>
                       <span />
                       <p>全景图</p>
                     </li>
diff --git a/vue.config.js b/vue.config.js
index 5372b5f..555a9bf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 const name = defaultSettings.title // 网址标题
-const port = 8013 // 端口配置
+const port = 7090 // 端口配置
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   // hash 模式下可使用