From 8f3c82a14bcdc383b96e3ea32e2f3d258fc5b56d Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 8 Jan 2026 14:35:54 +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

---
 .../RFIDArchives/borrowerManage/index.vue     |  4 ++--
 .../borrowerManage/module/addBorrower.vue     | 10 ++++-----
 .../RFIDArchives/components/archiveDetail.vue |  4 ++--
 .../RFIDArchives/lendQuery/index.vue          | 12 +++++------
 .../RFIDArchives/returnArchives/index.vue     | 10 ++++-----
 .../RFIDArchives/toLend/index.vue             |  4 ++--
 .../toLend/module/archiveDetail.vue           |  4 ++--
 .../archivesList/mixins/archives.js           | 21 +++++++++++++------
 .../caseManage/caseList/index.vue             |  4 ++--
 .../caseList/module/detailDialog.vue          |  4 ++--
 .../inStorage/module/inDialog.vue             | 10 ++++-----
 .../outInStorage/module/detailDialog.vue      |  4 ++--
 12 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/views/archivesManage/RFIDArchives/borrowerManage/index.vue b/src/views/archivesManage/RFIDArchives/borrowerManage/index.vue
index 9acd372..9f0132a 100644
--- a/src/views/archivesManage/RFIDArchives/borrowerManage/index.vue
+++ b/src/views/archivesManage/RFIDArchives/borrowerManage/index.vue
@@ -37,8 +37,8 @@
       <el-table-column type="index" align="center" label="序号" width="100" />
       <el-table-column prop="borrowerName" align="center" label="借阅人" min-width="85" />
       <el-table-column prop="phone" align="center" label="编号" min-width="85" />
-      <!-- <el-table-column prop="cardType" align="center" label="证件类型" min-width="85" />
-      <el-table-column prop="idcard" align="center" label="证件号码" min-width="140" />
+      <el-table-column prop="department" align="center" label="所属部门" min-width="85" />
+      <!--<el-table-column prop="idcard" align="center" label="证件号码" min-width="140" />
       <el-table-column prop="phone" align="center" label="电话号码" min-width="120" /> -->
       <el-table-column prop="create_time" align="center" label="操作时间" min-width="120">
         <template slot-scope="scope">
diff --git a/src/views/archivesManage/RFIDArchives/borrowerManage/module/addBorrower.vue b/src/views/archivesManage/RFIDArchives/borrowerManage/module/addBorrower.vue
index 5ee4235..bfbb3b9 100644
--- a/src/views/archivesManage/RFIDArchives/borrowerManage/module/addBorrower.vue
+++ b/src/views/archivesManage/RFIDArchives/borrowerManage/module/addBorrower.vue
@@ -11,7 +11,7 @@
           <el-form-item label="编号" prop="phone">
             <el-input v-model.number="form.phone" />
           </el-form-item>
-          <!-- <el-form-item label="所属部门" prop="department" class="down-select">
+          <el-form-item label="所属部门" prop="department" class="down-select">
             <el-select v-model="form.department" placeholder="请选择">
               <el-option
                 v-for="(item,index) in departOptions"
@@ -21,7 +21,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="证件类型" prop="cardType" class="down-select">
+          <!-- <el-form-item label="证件类型" prop="cardType" class="down-select">
             <el-select v-model="form.cardType" placeholder="请选择">
               <el-option
                 v-for="(item,index) in idTypeOptions"
@@ -47,8 +47,8 @@
 import { form } from '@crud/crud'
 import { lendingCrud } from '../../mixins/lending'
 // import { validatePhone } from '@/utils/validate'
-// , department: '',  idcard: '', phone: ''
-const defaultForm = { id: '', borrowerName: '', phone: '' }
+// ,  idcard: '', phone: ''
+const defaultForm = { id: '', borrowerName: '', department: '', phone: '' }
 
 export default {
   name: 'AddBorrower',
@@ -75,7 +75,7 @@ export default {
     }
   },
   mounted() {
-    // this.getDepart()
+    this.getDepart()
   },
   methods: {
   }
diff --git a/src/views/archivesManage/RFIDArchives/components/archiveDetail.vue b/src/views/archivesManage/RFIDArchives/components/archiveDetail.vue
index 1ebac3a..81e6834 100644
--- a/src/views/archivesManage/RFIDArchives/components/archiveDetail.vue
+++ b/src/views/archivesManage/RFIDArchives/components/archiveDetail.vue
@@ -19,8 +19,8 @@
         <el-table :data="tableData" max-height="400px" style="margin-top:15px;">
           <el-table-column type="index" label="序号" align="center" width="55" />
           <el-table-column prop="categoryName" label="门类名称" align="center" min-width="160" />
-          <el-table-column prop="archiveNo" label="档号" align="center" width="160" show-overflow-tooltip />
-          <el-table-column prop="maintitle" label="题名" align="center" width="180" show-overflow-tooltip />
+          <el-table-column prop="archiveNo" label="编号" align="center" width="160" show-overflow-tooltip />
+          <el-table-column prop="maintitle" label="姓名" align="center" width="180" show-overflow-tooltip />
           <el-table-column prop="caseName" label="盒名称" align="center" min-width="120" show-overflow-tooltip />
           <el-table-column prop="folderLocationDetails" label="存放位置" align="center" min-width="300">
             <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
diff --git a/src/views/archivesManage/RFIDArchives/lendQuery/index.vue b/src/views/archivesManage/RFIDArchives/lendQuery/index.vue
index 1cf55d5..2a1a995 100644
--- a/src/views/archivesManage/RFIDArchives/lendQuery/index.vue
+++ b/src/views/archivesManage/RFIDArchives/lendQuery/index.vue
@@ -52,8 +52,8 @@
       </el-table-column>
       <el-table-column prop="orderNo" align="center" label="单据号" width="140" />
       <el-table-column prop="categoryName" align="center" label="门类名称" width="120" show-overflow-tooltip />
-      <el-table-column prop="archiveNo" align="center" label="档号" width="160" show-overflow-tooltip />
-      <el-table-column prop="maintitle" align="center" label="题名" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="archiveNo" align="center" label="编号" width="160" show-overflow-tooltip />
+      <el-table-column prop="maintitle" align="center" label="姓名" min-width="180" show-overflow-tooltip />
       <el-table-column prop="caseName" align="center" label="盒名称" width="120" show-overflow-tooltip />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="300">
         <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
@@ -137,12 +137,12 @@ export default {
       ],
       borrowType: '全部',
       queryOption: [
-        { value: 'orderNo', label: '单据号' },
+        { value: 'archiveNo', label: '编号' },
+        { value: 'maintitle', label: '姓名' },
         { value: 'borrowerName', label: '借阅人' },
-        { value: 'archiveNo', label: '档号' },
-        { value: 'maintitle', label: '题名' },
         { value: 'folderLocationDetails', label: '位置' },
-        { value: 'caseName', label: '档案盒' }
+        { value: 'caseName', label: '档案盒' },
+        { value: 'orderNo', label: '单据号' }
       ]
     }
   },
diff --git a/src/views/archivesManage/RFIDArchives/returnArchives/index.vue b/src/views/archivesManage/RFIDArchives/returnArchives/index.vue
index a191c34..1d56171 100644
--- a/src/views/archivesManage/RFIDArchives/returnArchives/index.vue
+++ b/src/views/archivesManage/RFIDArchives/returnArchives/index.vue
@@ -46,8 +46,8 @@
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="orderNo" align="center" label="单据号" width="140" />
       <el-table-column prop="categoryName" align="center" label="门类名称" width="120" show-overflow-tooltip />
-      <el-table-column prop="archiveNo" align="center" label="档号" min-width="160" show-overflow-tooltip />
-      <el-table-column prop="maintitle" align="center" label="题名" min-width="180" show-overflow-tooltip />
+      <el-table-column prop="archiveNo" align="center" label="编号" min-width="160" show-overflow-tooltip />
+      <el-table-column prop="maintitle" align="center" label="姓名" min-width="180" show-overflow-tooltip />
       <el-table-column prop="caseName" align="center" label="盒名称" width="120" show-overflow-tooltip />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" width="300">
         <template v-if="scope.row.folderLocationDetails !== null" slot-scope="scope">
@@ -127,9 +127,9 @@ export default {
       isReturn: true,
       selections: [],
       queryOption: [
-        { value: 'caseName', label: '档案盒' },
-        { value: 'orderNo', label: '单据号' },
-        { value: 'borrowerName', label: '借阅人' }
+        { value: 'caseName', label: '编号' },
+        { value: 'borrowerName', label: '借阅人' },
+        { value: 'orderNo', label: '单据号' }
         // { value: 'barcode', label: '条形码' }
       ],
       isRfidReading: false, // 控制RFID读取状态：true=正在读取，false=未读取
diff --git a/src/views/archivesManage/RFIDArchives/toLend/index.vue b/src/views/archivesManage/RFIDArchives/toLend/index.vue
index 50d133e..6de39e9 100644
--- a/src/views/archivesManage/RFIDArchives/toLend/index.vue
+++ b/src/views/archivesManage/RFIDArchives/toLend/index.vue
@@ -31,8 +31,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" width="55" />
       <el-table-column prop="categoryName" label="门类名称" align="center" min-width="85" />
-      <el-table-column prop="archiveNo" label="档号" align="center" min-width="120" />
-      <el-table-column prop="maintitle" align="center" label="题名" min-width="120" show-overflow-tooltip />
+      <el-table-column prop="archiveNo" label="编号" align="center" min-width="120" />
+      <el-table-column prop="maintitle" align="center" label="姓名" min-width="120" show-overflow-tooltip />
       <el-table-column prop="caseName" align="center" label="盒名称" min-width="85" />
       <el-table-column prop="folderLocationDetails" align="center" label="存放位置" min-width="160">
         <template slot-scope="scope">
diff --git a/src/views/archivesManage/RFIDArchives/toLend/module/archiveDetail.vue b/src/views/archivesManage/RFIDArchives/toLend/module/archiveDetail.vue
index ef3d88a..6880507 100644
--- a/src/views/archivesManage/RFIDArchives/toLend/module/archiveDetail.vue
+++ b/src/views/archivesManage/RFIDArchives/toLend/module/archiveDetail.vue
@@ -5,8 +5,8 @@
       <span class="dialog-left-bottom" />
       <div v-if="rowData" class="setting-dialog">
         <p><span class="color-blue">所属门类:</span><span class="color-white">{{ rowData.categoryName }}</span></p>
-        <p><span class="color-blue">档号:</span><span class="color-white">{{ rowData.archiveNo }}</span></p>
-        <p><span class="color-blue">题名:</span><span class="color-white">{{ rowData.maintitle }}</span></p>
+        <p><span class="color-blue">编号:</span><span class="color-white">{{ rowData.archiveNo }}</span></p>
+        <p><span class="color-blue">姓名:</span><span class="color-white">{{ rowData.maintitle }}</span></p>
         <p><span class="color-blue">盒名称:</span><span class="color-white">{{ rowData.caseName }}</span></p>
         <p><span class="color-blue">借阅状态:</span><span class="cell-lend no-lend">{{ rowData.borrowType | borrowStatus }}</span></p>
         <p><span class="color-blue">存放位置:</span>
diff --git a/src/views/archivesManage/archivesList/mixins/archives.js b/src/views/archivesManage/archivesList/mixins/archives.js
index a3d42f7..5a41d01 100644
--- a/src/views/archivesManage/archivesList/mixins/archives.js
+++ b/src/views/archivesManage/archivesList/mixins/archives.js
@@ -209,14 +209,23 @@ export const archivesCrud = {
             this[name] = data.list.content
             this.yearGroup = data.yearGroup
             this.page.total = data.list.totalElements
-
             // 自适应高度
-            if (this[name].length === 0 || this[name].length < 10) {
-              this[heightName] = `calc(100vh - 344px)`
+            if (this.recycleMain.isRecycle) {
+              if (this[name].length === 0 || this[name].length < 10) {
+                this[heightName] = `calc(100vh - 296px)`
+              } else {
+                const h = '100vh'
+                // this[heightName] = `calc(${h} - 434px)`
+                this[heightName] = `calc(${h} - 296px)`
+              }
             } else {
-              const h = '100vh'
-              // this[heightName] = `calc(${h} - 434px)`
-              this[heightName] = `calc(${h} - 344px)`
+              if (this[name].length === 0 || this[name].length < 10) {
+                this[heightName] = `calc(100vh - 344px)`
+              } else {
+                const h = '100vh'
+                // this[heightName] = `calc(${h} - 434px)`
+                this[heightName] = `calc(${h} - 344px)`
+              }
             }
 
             if (name === 'anjuanData' || name === 'junneiData') {
diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue
index edfa9bb..b0c6845 100644
--- a/src/views/archivesManage/caseManage/caseList/index.vue
+++ b/src/views/archivesManage/caseManage/caseList/index.vue
@@ -108,10 +108,10 @@
       <el-table :data="printData" border>
         <el-table-column type="index" label="序号" width="55" align="center" />
         <!-- <el-table-column label="件号" prop="pieceNo" width="55" align="center" /> -->
-        <el-table-column label="档号" prop="archiveNo" align="center" width="180px" />
+        <el-table-column label="编号" prop="archiveNo" align="center" width="180px" />
         <el-table-column label="文号" prop="docNo" align="center" width="160" />
         <el-table-column label="责任者" prop="responsibleby" align="center" />
-        <el-table-column label="题名" prop="maintitle" align="center" width="200px" />
+        <el-table-column label="姓名" prop="maintitle" align="center" width="200px" />
         <el-table-column label="日期" prop="create_time" align="center" width="100">
           <template slot-scope="scope">
             <div>{{ parseTime(scope.row.create_time, '{y}-{m}-{d}') }}</div>
diff --git a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
index 6ddee8b..118e976 100644
--- a/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
+++ b/src/views/archivesManage/caseManage/caseList/module/detailDialog.vue
@@ -35,9 +35,9 @@
           </el-table-column>
           <el-table-column prop="categoryName" label="门类名称" align="center" width="140" :show-overflow-tooltip="true" />
           <el-table-column prop="fondsNo" label="全宗号" align="center" width="180" />
-          <el-table-column prop="archiveNo" label="档号" align="center" width="220" />
+          <el-table-column prop="archiveNo" label="编号" align="center" width="220" />
           <el-table-column prop="archiveYear" label="归档年度" align="center" width="150" />
-          <el-table-column prop="maintitle" :show-overflow-tooltip="true" align="center" label="题名" width="180" />
+          <el-table-column prop="maintitle" :show-overflow-tooltip="true" align="center" label="姓名" width="180" />
           <el-table-column prop="securityClass" label="保密程度" align="center" width="150" />
           <el-table-column prop="department" label="部门名称" align="center" width="150" />
           <el-table-column prop="caseName" label="盒名称" :show-overflow-tooltip="true" align="center" width="190" />
diff --git a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
index 40ff6f3..4a7c1dc 100644
--- a/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
+++ b/src/views/archivesManage/outInStorage/inStorage/module/inDialog.vue
@@ -377,7 +377,7 @@ export default {
 
 <style lang="scss" scoped>
 ::v-deep .in-dialog .el-dialog {
-  width: 725px;
+  width: 875px;
   .setting-dialog {
     height: 552px;
     overflow: hidden;
@@ -388,7 +388,7 @@ export default {
 }
 ::v-deep .in-dialog .el-dialog .el-dialog__header .el-dialog__close::before {
   position: absolute;
-  right: -50px;
+  right: -120px;
   bottom: -10px;
 }
 .header {
@@ -430,7 +430,7 @@ export default {
 }
 .frame-content {
   display: flex;
-  flex-wrap: wrap;
+  // flex-wrap: wrap;
   .frame-item {
     display: flex;
     width: 148px;
@@ -474,8 +474,8 @@ export default {
 .state-btn {
   display: flex;
   justify-content: right;
-  padding-right: 30px;
-  width: 100%;
+  // padding-right: 20px;
+  width: auto !important;
 }
 ::v-deep .head-container .filter-item .el-input__inner {
   height: 36px;
diff --git a/src/views/archivesManage/outInStorage/module/detailDialog.vue b/src/views/archivesManage/outInStorage/module/detailDialog.vue
index dab6c4c..fb404f8 100644
--- a/src/views/archivesManage/outInStorage/module/detailDialog.vue
+++ b/src/views/archivesManage/outInStorage/module/detailDialog.vue
@@ -37,9 +37,9 @@
           </el-table-column>
           <el-table-column prop="categoryName" align="center" label="门类名称" width="140" show-overflow-tooltip />
           <el-table-column prop="fondsNo" align="center" label="全宗号" width="80" />
-          <el-table-column prop="archiveNo" align="center" label="档号" min-width="200" show-overflow-tooltip />
+          <el-table-column prop="archiveNo" align="center" label="编号" min-width="200" show-overflow-tooltip />
           <el-table-column prop="archiveYear" align="center" label="归档年度" width="100" />
-          <el-table-column prop="maintitle" align="center" label="题名" width="140" show-overflow-tooltip />
+          <el-table-column prop="maintitle" align="center" label="姓名" width="140" show-overflow-tooltip />
           <el-table-column prop="securityClass" align="center" label="保密程度" width="140" />
           <el-table-column prop="department" align="center" label="部门" width="100" />
           <el-table-column prop="caseName" align="center" label="盒名称" min-width="200" show-overflow-tooltip />