From 4c09b3ee5a843d33597d0bce63c28b9521ec136c Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 19 Feb 2024 17:32:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E7=AD=9B=E9=80=89/=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../inStorage/pendingInArchive/file/index.vue |   2 +-
 .../module/uploadFile/index.vue               |   6 +-
 .../managementLibrary/file/index.vue          |   2 +-
 .../module/uploadFile/index.vue               |   6 +-
 .../collectionLibrary/file/index.vue          |   2 +-
 .../collectionLibrary/index.vue               | 105 ++++++++++++++++--
 .../module/uploadFile/index.vue               |   6 +-
 .../components/archivesDetail/juannei.vue     |   6 +-
 .../archivesDetail/uploadFile/index.vue       |   6 +-
 src/views/prearchiveLibrary/module/detail.vue |   6 +-
 .../archivesCategory/listBrowsing/index.vue   |   4 +-
 .../fileLibraryManage/listBrowsing/index.vue  |   4 +-
 12 files changed, 119 insertions(+), 36 deletions(-)

diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue
index 7993cde..f9bb91c 100644
--- a/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue
+++ b/src/views/archiveKeeping/inStorage/pendingInArchive/file/index.vue
@@ -44,7 +44,7 @@
               <div v-else> {{ scope.row.file_dpi }} </div>
             </template>
           </el-table-column>
-          <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+          <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
                 <i class="fileIcon icon-image" />
diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue
index c5d843c..5135fe9 100644
--- a/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue
+++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue
@@ -28,13 +28,13 @@
           {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
-      <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
+      <!-- <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
           <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
-      </el-table-column>
-      <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+      </el-table-column> -->
+      <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
             <i class="fileIcon icon-image" />
diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue
index 11733f6..8106a8d 100644
--- a/src/views/archivesManage/managementLibrary/file/index.vue
+++ b/src/views/archivesManage/managementLibrary/file/index.vue
@@ -44,7 +44,7 @@
               <div v-else> {{ scope.row.file_dpi }} </div>
             </template>
           </el-table-column>
-          <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+          <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
                 <i class="fileIcon icon-image" />
diff --git a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
index 240c2ae..bad22cc 100644
--- a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
@@ -28,13 +28,13 @@
           {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
-      <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
+      <!-- <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
           <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
-      </el-table-column>
-      <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+      </el-table-column> -->
+      <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
             <i class="fileIcon icon-image" />
diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue
index 8b31cb6..939c0e6 100644
--- a/src/views/collectReorganizi/collectionLibrary/file/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue
@@ -44,7 +44,7 @@
             </template>
           </el-table-column>
           <!-- @click="showCoverPreview(scope.row)" -->
-          <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+          <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
                 <i class="fileIcon icon-image" />
diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue
index c97e8df..ce69e01 100644
--- a/src/views/collectReorganizi/collectionLibrary/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/index.vue
@@ -29,8 +29,7 @@
               </el-tree>
             </div>
             <h3 class="arc-title arc-title-bottom">快速筛选</h3>
-            <!-- show-checkbox
-              @check-change="handleCheckChange" -->
+            <!-- @node-click="handleClassifyFilter" -->
             <el-tree
               ref="classifyTree"
               v-loading="classifyLoading"
@@ -40,7 +39,8 @@
               node-key="id"
               :expand-on-click-node="false"
               highlight-current
-              @node-click="handleClassifyFilter"
+              show-checkbox
+              @check-change="handleCheckChange"
             >
               <span slot-scope="{ node, data }" class="custom-tree-node">
                 <span v-if="data.childDictionarys || data.fondsName" class="iconClassify">
@@ -170,6 +170,7 @@ export default {
             const json = {}
             json.id = index
             json.dictionaryName = item
+            json.dictionaryParents = '-1'
             json.childDictionarys = []
             return json
           })
@@ -398,17 +399,99 @@ export default {
       }
     },
     handleCheckChange(data, checked, indeterminate) {
-      // 获取所有选中的节点 start
+      // 获取所有选中的节点
       const res = this.$refs.classifyTree.getCheckedNodes()
-      const arrClassify = []
-      res.forEach((item) => {
-        arrClassify.push(item)
+
+      if (res.some(obj => obj.fondsName === '全宗')) {
+        this.smartQuery.fonds_no = null
+      } else {
+        const fondsGroup = res.filter(item => item.fondsId).map(item => item.fondsNo)
+        this.smartQuery.fonds_no = fondsGroup.join(',')
+      }
+
+      const groupedData = {}
+      res.forEach(function(item) {
+        if (item.dictionaryParents === '-1') {
+          groupedData.archive_year = groupedData.archive_year || []
+          groupedData.archive_year.push(item.dictionaryName)
+        } else if (item.dictionaryParents === '4028e3c389cee5920189cf0af3d30000') {
+          groupedData.security_class = groupedData.security_class || []
+          groupedData.security_class.push(item.dictionaryName)
+        } else if (item.dictionaryParents === '4028e3c38a20f4d4018a213c26ff001c') {
+          groupedData.retention = groupedData.retention || []
+          groupedData.retention.push(item.dictionaryName)
+        } else if (item.dictionaryParents === '4028e3c38b4159fe018b415a7c470000') {
+          groupedData.doc_type = groupedData.doc_type || []
+          groupedData.doc_type.push(item.dictionaryName)
+        } else if (item.dictionaryParents === '4028e3c38b415cea018b417f4a6c0011') {
+          groupedData.medium_type = groupedData.medium_type || []
+          groupedData.medium_type.push(item.dictionaryName)
+        }
       })
-      // this.dataTree 就是选中的数据
-      // this.dataTree = arrDeptId
-      console.log(arrClassify)
 
-      console.log(data, checked, indeterminate)
+      if (data.id) {
+        const selectedParentVal = this.$refs.classifyTree.getNode(data.id).parent.data.dictionaryCode
+        switch (selectedParentVal) {
+          case 'security_class':
+            if (res.some(obj => obj.dictionaryCode === 'security_class')) {
+              this.smartQuery.security_class = null
+            } else {
+              if (groupedData.security_class) {
+                this.smartQuery.security_class = groupedData.security_class.join(',')
+              } else {
+                this.smartQuery.security_class = null
+              }
+            }
+            break
+          case 'retention':
+            if (res.some(obj => obj.dictionaryCode === 'retention')) {
+              this.smartQuery.retention = null
+            } else {
+              if (groupedData.retention) {
+                this.smartQuery.retention = groupedData.retention.join(',')
+              } else {
+                this.smartQuery.retention = null
+              }
+            }
+            break
+          case 'doc_type':
+            if (res.some(obj => obj.dictionaryCode === 'doc_type')) {
+              this.smartQuery.doc_type = null
+            } else {
+              if (groupedData.doc_type) {
+                this.smartQuery.doc_type = groupedData.doc_type.join(',')
+              } else {
+                this.smartQuery.doc_type = null
+              }
+            }
+            break
+          case 'medium_type':
+            if (res.some(obj => obj.dictionaryCode === 'medium_type')) {
+              this.smartQuery.medium_type = null
+            } else {
+              if (groupedData.medium_type) {
+                this.smartQuery.medium_type = groupedData.medium_type.join(',')
+              } else {
+                this.smartQuery.medium_type = null
+              }
+            }
+            break
+          default:
+            if (res.some(obj => obj.dictionaryCode === 'archive_year')) {
+              this.smartQuery.archive_year = null
+            } else {
+              if (groupedData.archive_year) {
+                this.smartQuery.archive_year = groupedData.archive_year.join(',')
+              } else {
+                this.smartQuery.archive_year = null
+              }
+            }
+        }
+      }
+
+      this.$nextTick(() => {
+        this.handlePageList('quickFilter')
+      })
     },
     handleOpenAnjuan(data, parentId, parentsRow) {
       this.parentsProjectId = parentId
diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
index 90f0d9a..2156b8b 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
@@ -28,13 +28,13 @@
           {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
-      <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
+      <!-- <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
           <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
-      </el-table-column>
-      <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+      </el-table-column> -->
+      <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
             <i class="fileIcon icon-image" />
diff --git a/src/views/components/archivesDetail/juannei.vue b/src/views/components/archivesDetail/juannei.vue
index 78352ec..aa17f40 100644
--- a/src/views/components/archivesDetail/juannei.vue
+++ b/src/views/components/archivesDetail/juannei.vue
@@ -61,13 +61,13 @@
                 {{ getFileSize(scope.row.file_size) }}
               </template>
             </el-table-column>
-            <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center">
+            <!-- <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center">
               <template slot-scope="scope">
                 <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
                 <div v-else> {{ scope.row.file_dpi }} </div>
               </template>
-            </el-table-column>
-            <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+            </el-table-column> -->
+            <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
               <template slot-scope="scope">
                 <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
                   <img width="60px" height="32px" class="screenshot" :src="baseApi+ '/downloadFile' +scope.row.file_path" :onerror="defaultImg" @click="showCoverPreview(scope.row)">
diff --git a/src/views/components/archivesDetail/uploadFile/index.vue b/src/views/components/archivesDetail/uploadFile/index.vue
index d12e5e5..9153fef 100644
--- a/src/views/components/archivesDetail/uploadFile/index.vue
+++ b/src/views/components/archivesDetail/uploadFile/index.vue
@@ -28,13 +28,13 @@
           {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
-      <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
+      <!-- <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
           <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
-      </el-table-column>
-      <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+      </el-table-column> -->
+      <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
             <i class="fileIcon icon-image" />
diff --git a/src/views/prearchiveLibrary/module/detail.vue b/src/views/prearchiveLibrary/module/detail.vue
index 581ff58..d21c671 100644
--- a/src/views/prearchiveLibrary/module/detail.vue
+++ b/src/views/prearchiveLibrary/module/detail.vue
@@ -36,13 +36,13 @@
                 {{ getFileSize(scope.row.file_size) }}
               </template>
             </el-table-column>
-            <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center">
+            <!-- <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center">
               <template slot-scope="scope">
                 <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
                 <div v-else> {{ scope.row.file_dpi }} </div>
               </template>
-            </el-table-column>
-            <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
+            </el-table-column> -->
+            <el-table-column prop="file_thumbnail" label="缩略图" min-width="60" align="center">
               <template slot-scope="scope">
                 <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
                   <i class="fileIcon icon-image" />
diff --git a/src/views/system/archivesCategory/listBrowsing/index.vue b/src/views/system/archivesCategory/listBrowsing/index.vue
index 36deef9..54fb9e8 100644
--- a/src/views/system/archivesCategory/listBrowsing/index.vue
+++ b/src/views/system/archivesCategory/listBrowsing/index.vue
@@ -74,7 +74,7 @@
 </template>
 <script>
 import { FetchCategoryFieldManage } from '@/api/system/category/category'
-import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
+import { FetchInitCategoryView } from '@/api/collect/collect'
 import { add } from '@/api/system/category/listBrowsing'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
@@ -151,7 +151,7 @@ export default {
       })
     },
     getBottomTableData() {
-      FetchInitArchivesView({ categoryId: this.selectedCategory.id, isdel: false, page: 0, size: 10 }).then((res) => {
+      FetchInitCategoryView({ categoryId: this.selectedCategory.pid, isdel: false, page: 0, size: 10, ignore: false, categoryLevel: this.selectedCategory.categoryLevel }).then((res) => {
         this.table.bottom.data.splice(0, this.table.bottom.data.length)
         if (res && res.list) {
           res.list.content.forEach((item) => {
diff --git a/src/views/system/fileLibraryManage/listBrowsing/index.vue b/src/views/system/fileLibraryManage/listBrowsing/index.vue
index b69c10b..2674ff2 100644
--- a/src/views/system/fileLibraryManage/listBrowsing/index.vue
+++ b/src/views/system/fileLibraryManage/listBrowsing/index.vue
@@ -74,7 +74,7 @@
 </template>
 <script>
 import { FetchDocumentFieldManage } from '@/api/system/fileLibrary/fileLibrary'
-import { FetchInitArchivesView } from '@/api/archivesManage/archivesList'
+import { FetchInitPreDocument } from '@/api/prearchiveLibrary/prearchiveLibrary'
 import { add } from '@/api/system/fileLibrary/listBrowsing'
 import eForm from './module/form'
 import sortDialog from './module/sortDialog'
@@ -151,7 +151,7 @@ export default {
       })
     },
     getBottomTableData() {
-      FetchInitArchivesView({ documentId: this.selectedCategory.id, isdel: false, page: 0, size: 10 }).then((res) => {
+      FetchInitPreDocument({ documentId: this.selectedCategory.pid, page: 0, size: 10 }).then((res) => {
         this.table.bottom.data.splice(0, this.table.bottom.data.length)
         if (res && res.list) {
           res.list.content.forEach((item) => {