From ba3d4b6f62cc2c9c896adf419c7e6ff4f8256beb Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Tue, 2 Aug 2022 17:29:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E6=A3=80=E7=B4=A2=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=8D=E7=A9=BA=E6=A0=BCbug/=E5=80=9F?=
 =?UTF-8?q?=E9=98=85=E7=8A=B6=E6=80=81=E8=BF=87=E6=BB=A4=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archivesManage/archivesList.js        | 10 ++++++-
 src/api/archivesManage/archivesSearch.js      | 28 -------------------
 .../archivesManage/archivesSearch/index.vue   | 13 ++++-----
 .../archivesSearch/module/detailDialog.vue    | 18 +++++++++++-
 4 files changed, 32 insertions(+), 37 deletions(-)
 delete mode 100644 src/api/archivesManage/archivesSearch.js

diff --git a/src/api/archivesManage/archivesList.js b/src/api/archivesManage/archivesList.js
index 9f26aac..bd2d2a5 100644
--- a/src/api/archivesManage/archivesList.js
+++ b/src/api/archivesManage/archivesList.js
@@ -135,5 +135,13 @@ export function FetchReduction(parameter) {
   })
 }
 
-export default { add, edit, del, FetchInitArchivesView, FetchTableDisplayFields, FetchFormDisplayFields, FetchDoeditIsRepeat }
+// 模糊查询
+export function queryVagueArchives(params) {
+  return request({
+    url: 'api/archives/queryVagueArchives' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
+  })
+}
+
+export default { add, edit, del, FetchInitArchivesView, FetchTableDisplayFields, FetchFormDisplayFields, FetchDoeditIsRepeat, queryVagueArchives }
 
diff --git a/src/api/archivesManage/archivesSearch.js b/src/api/archivesManage/archivesSearch.js
deleted file mode 100644
index fad7499..0000000
--- a/src/api/archivesManage/archivesSearch.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import request from '@/utils/request'
-import qs from 'qs'
-
-// 模糊查询
-export function queryVagueArchives(params) {
-  return request({
-    url: 'api/archives/queryVagueArchives' + '?' + qs.stringify(params, { indices: false }),
-    method: 'get'
-  })
-}
-
-// 档案详情
-export function archivesDetails(params) {
-  return request({
-    url: 'api/archives/archivesDetails' + '?' + qs.stringify(params, { indices: false }),
-    method: 'get'
-  })
-}
-
-// 元数据
-export function archivesMetadata(params) {
-  return request({
-    url: 'api/archives/archivesMetadata' + '?' + qs.stringify(params, { indices: false }),
-    method: 'get'
-  })
-}
-
-export default { queryVagueArchives, archivesDetails, archivesMetadata }
diff --git a/src/views/archivesManage/archivesSearch/index.vue b/src/views/archivesManage/archivesSearch/index.vue
index 3f1d6fa..6dba71c 100644
--- a/src/views/archivesManage/archivesSearch/index.vue
+++ b/src/views/archivesManage/archivesSearch/index.vue
@@ -68,7 +68,8 @@
 
 <script>
 import detailDialog from './module/detailDialog.vue'
-import { queryVagueArchives, archivesDetails, archivesMetadata } from '@/api/archivesManage/archivesSearch'
+import { queryVagueArchives, FetchArchivesDetails, FetchArchivesMetadata } from '@/api/archivesManage/archivesList'
+
 export default {
   name: 'ArchivesSearch',
   components: { detailDialog },
@@ -104,25 +105,22 @@ export default {
   methods: {
     // 双击详情
     handleDbClick(row) {
-      console.log(row, 'row')
       const params = {
         'categoryId': row.category_id,
         'archivesId': row.archives_id
         // 'categoryId': '5EB3DE8FF78BBC64729E43',
         // 'archivesId': 'D63A2DFA58C02E09CB196C'
       }
-      console.log(params)
-      archivesDetails(params).then(res => {
+      FetchArchivesDetails(params).then(res => {
         if (res) {
           // console.log(res, 'res')
           const rowData = {}
           res.forEach(item => {
             rowData[item.fieldName] = item.context
           })
-          console.log(rowData, '=======')
           this.$refs.detailDom.rowData = rowData
           // 元数据
-          archivesMetadata(params).then(res => {
+          FetchArchivesMetadata(params).then(res => {
             this.$refs.detailDom.xmlStr = res
           })
           this.$refs.detailDom.detailVisible = true
@@ -141,7 +139,7 @@ export default {
         this.page.page = 1
       } else {
         this.params.criteria = this.select
-        this.params.query = this.keywords
+        this.params.query = this.keywords.replace(/\s+/ig, ' ')
         this.params.page = this.page.page - 1
         this.params.size = this.page.size
         this.doQuery(this.params)
@@ -163,6 +161,7 @@ export default {
       this.page.size = e
       this.page.page = 1
       this.params.size = e
+      this.params.page = 0
       this.doQuery(this.params)
       this.loading = false
     },
diff --git a/src/views/archivesManage/archivesSearch/module/detailDialog.vue b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
index dae5e44..7a77fa0 100644
--- a/src/views/archivesManage/archivesSearch/module/detailDialog.vue
+++ b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
@@ -55,7 +55,7 @@
               </div>
               <div class="dpflex">
                 <p class="left"><span class="color-blue">库房位置：</span><span class="color-white">{{ rowData.folder_location }}</span></p>
-                <p class="right"><span class="color-blue">借阅状态：</span><span class="color-white">{{ rowData.borrow_type }}</span></p>
+                <p class="right"><span class="color-blue">借阅状态：</span><span class="color-white">{{ rowData.borrow_type | borrowStatus }}</span></p>
               </div>
               <p class="sin-row"><span class="color-blue">条形码：</span><span class="color-white">{{ rowData.barcode }}</span></p>
             </div>
@@ -77,6 +77,22 @@
 
 <script>
 export default {
+  filters: {
+    borrowStatus(val) {
+      switch (val) {
+        case 1:
+          return '待登记'
+        case 2:
+          return '待借阅'
+        case 3:
+          return '待归还'
+        case 4:
+          return '已归还'
+        case 5:
+          return '逾期'
+      }
+    }
+  },
   data() {
     return {
       detailVisible: false,