From efc3b462fc5bf0c42569775590713d224751e660 Mon Sep 17 00:00:00 2001
From: x_ying <2438792676@qq.com>
Date: Mon, 20 Jun 2022 17:33:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=80=9F=E9=98=85=E7=AE=A1=E7=90=86/=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E7=9B=98=E7=82=B9=20=20=E9=9C=80=E6=B1=82=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesManage/archivesCheck/data1.json   |   8 +-
 .../archivesManage/archivesCheck/index.vue    |  59 +++--
 .../archivesCheck/module/checkDetail.vue      |  86 +++++-
 .../lendManage/borrowerManage/index.vue       |  29 +-
 .../archivesManage/lendManage/data2.json      | 247 ++++++++++++++++++
 .../archivesManage/lendManage/data3.json      | 247 ++++++++++++++++++
 .../lendManage/lendConfirm/index.vue          |  78 +++---
 .../lendConfirm/module/archiveDetail.vue      |  42 +--
 .../lendConfirm/module/lendDialog.vue         |  59 +++++
 .../lendManage/lendQuery/index.vue            |  42 +--
 .../lendManage/returnArchives/index.vue       |  29 +-
 .../lendManage/toLend/index.vue               |  54 ++--
 .../toLend/module/archiveDetail.vue           |   4 +
 13 files changed, 825 insertions(+), 159 deletions(-)
 create mode 100644 src/views/archivesManage/lendManage/data2.json
 create mode 100644 src/views/archivesManage/lendManage/data3.json
 create mode 100644 src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue

diff --git a/src/views/archivesManage/archivesCheck/data1.json b/src/views/archivesManage/archivesCheck/data1.json
index 71dda51..7f5f107 100644
--- a/src/views/archivesManage/archivesCheck/data1.json
+++ b/src/views/archivesManage/archivesCheck/data1.json
@@ -51,7 +51,7 @@
       },
       {
           "id":"6e604355ff1e47e8b48117dca36420c7",
-          "isCheckNum":"PD-202205250840",
+          "isCheckNum":"PD-202205250841",
           "isContainPath":"父区域-子区域，父区域-子区域1",
           "isCheckState":"执行中",
           "isStoreNum":"233",
@@ -63,7 +63,7 @@
       },
       {
           "id":"6f4a6631d9d3424b960793704f3757b3",
-          "isCheckNum":"PD-202205250840",
+          "isCheckNum":"PD-202205250841",
           "isContainPath":"父区域-子区域，父区域-子区域1",
           "isCheckState":"执行中",
           "isStoreNum":"233",
@@ -75,7 +75,7 @@
       },
       {
           "id":"76e29d5c0a0541bfb1ee9da432183b15",
-          "isCheckNum":"PD-202205250840",
+          "isCheckNum":"PD-202205250842",
           "isContainPath":"父区域-子区域，父区域-子区域1",
           "isCheckState":"已执行",
           "isStoreNum":"233",
@@ -87,7 +87,7 @@
       },
       {
           "id":"a0ffdd94161146c49161662c3f9a70cd",
-          "isCheckNum":"PD-202205250840",
+          "isCheckNum":"PD-202205250842",
           "isContainPath":"父区域-子区域，父区域-子区域1",
           "isCheckState":"已执行",
           "isStoreNum":"233",
diff --git a/src/views/archivesManage/archivesCheck/index.vue b/src/views/archivesManage/archivesCheck/index.vue
index 8a15e48..cb8d5e3 100644
--- a/src/views/archivesManage/archivesCheck/index.vue
+++ b/src/views/archivesManage/archivesCheck/index.vue
@@ -45,28 +45,29 @@
       height="calc(100vh - 315px)"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
+      @row-dblclick="handleDbClick"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="isCheckNum" label="盘点单号" min-width="100" />
-      <el-table-column prop="isContainPath" label="包含位置" min-width="140" />
-      <el-table-column prop="isCheckState" label="盘点状态" min-width="60">
+      <el-table-column type="index" align="center" label="序号" width="55" />
+      <el-table-column prop="isCheckNum" align="center" label="盘点单号" min-width="100" />
+      <el-table-column prop="isContainPath" align="center" label="包含位置" min-width="140" />
+      <el-table-column prop="isCheckState" align="center" label="盘点状态" min-width="60">
         <template slot-scope="scope">
           <!-- 已执行 / 待执行/执行中 -->
           <span class="clear">{{ scope.row.isCheckState }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="isStoreNum" label="在库档案" min-width="60" />
-      <el-table-column prop="isCheckedNum" label="已盘档案" min-width="60" />
-      <el-table-column prop="isNoCheckNum" label="未盘档案" min-width="60" />
-      <el-table-column prop="isLendNum" label="已借档案" min-width="60" />
-      <el-table-column prop="isMisplaceNum" label="错位档案" min-width="60" />
-      <el-table-column prop="isBuildTime" label="创建时间" min-width="100" />
-      <el-table-column prop="" label="操作" min-width="60">
+      <el-table-column prop="isStoreNum" align="center" label="在库档案" min-width="60" />
+      <el-table-column prop="isCheckedNum" align="center" label="已盘档案" min-width="60" />
+      <el-table-column prop="isNoCheckNum" align="center" label="未盘档案" min-width="60" />
+      <el-table-column prop="isLendNum" align="center" label="已借档案" min-width="60" />
+      <el-table-column prop="isMisplaceNum" align="center" label="错位档案" min-width="60" />
+      <el-table-column prop="isBuildTime" align="center" label="创建时间" min-width="100" />
+      <!-- <el-table-column prop="" align="center" label="操作" min-width="60">
         <template slot-scope="scope">
           <el-button size="mini" style="width:80px;height:26px;background:#3A99FD;padding:5px 10px" @click="handleDetail(scope.$index, scope.row)">盘点详情</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- 删除模态框 -->
     <el-dialog title="确认删除" :visible.sync="deleteVisible" :before-close="handleClose">
@@ -84,6 +85,8 @@
     </el-dialog>
     <!-- 新增模态框 -->
     <addCheck ref="addCheckDom" />
+    <!-- 盘点详情 -->
+    <checkDetail ref="checkDetailDom" />
     <!--分页组件-->
     <pagination />
   </div>
@@ -91,19 +94,27 @@
 
 <script>
 import rrOperation from '@crud/RR.operation'
-import CRUD, { presenter } from '@crud/crud'
+import CRUD, { presenter, header } from '@crud/crud'
 // import crudJob from '@/api/system/job'
 // import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'
-import { header } from '@crud/crud'
 import data1 from './data1.json'
 import addCheck from './module/addCheck.vue'
+import checkDetail from './module/checkDetail.vue'
+
 export default {
-  components: { pagination, rrOperation, addCheck },
+  components: { pagination, rrOperation, addCheck, checkDetail },
   mixins: [header(), presenter()],
   cruds() {
     return CRUD({
-      title: '档案盘点'
+      title: '档案盘点',
+      optShow: {
+        // add: false,
+        // edit: false,
+        // del: false,
+        // download: true,
+        // group: false
+      }
     })
   },
   dicts: ['job_status'],
@@ -151,6 +162,22 @@ export default {
     },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row)
+    },
+    handleDbClick(row) {
+      this.$refs.table.clearSelection()
+      const checkDetailDom = this.$refs.checkDetailDom
+      checkDetailDom.detailVisible = true
+      checkDetailDom.rowData = row
+      const arr = data1.rows.filter(item => item.isCheckNum === row.isCheckNum)
+      checkDetailDom.tableData = arr
+      // 状态类名
+      if (row.isCheckState === '已执行') {
+        checkDetailDom.classLend = 'have-clear'
+      } else if (row.isCheckState === '待执行') {
+        checkDetailDom.classLend = 'fail-clear'
+      } else if (row.isCheckState === '执行中') {
+        checkDetailDom.classLend = 'no-clear'
+      }
     }
 
   }
diff --git a/src/views/archivesManage/archivesCheck/module/checkDetail.vue b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
index 5d032c9..f57b6da 100644
--- a/src/views/archivesManage/archivesCheck/module/checkDetail.vue
+++ b/src/views/archivesManage/archivesCheck/module/checkDetail.vue
@@ -1,15 +1,97 @@
 <template>
   <div>
-    盘点详情
+    <el-dialog title="盘点详情" :visible.sync="detailVisible">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <div class="dpflex">
+          <p class="one"><span class="color-blue">盘点单号:</span><span class="color-white">{{ rowData.isCheckNum }}</span></p>
+          <p :class="classLend" class="two"><span class="color-blue">盘点状态:</span><span class="color-white clear" style="padding:0;margin-left:20px">{{ rowData.isCheckState }}</span></p>
+          <p class="tree"><span class="color-blue">已盘档案:</span><span class="color-white">{{ rowData.isCheckedNum }}</span></p>
+          <p class="four"><span class="color-blue">已借档案:</span><span class="color-white">{{ rowData.isLendNum }}</span></p>
+        </div>
+        <div class="dpflex">
+          <p class="one"><span class="color-blue">所在区域:</span><span class="color-white">{{ rowData.isContainPath }}</span></p>
+          <p class="two"><span class="color-blue">在库档案:</span><span class="color-white">{{ rowData.isStoreNum }}</span></p>
+          <p class="tree"><span class="color-blue">未盘档案:</span><span class="color-white">{{ rowData.isNoCheckNum }}</span></p>
+          <p class="four"><span class="color-blue">错位档案:</span><span class="color-white">{{ rowData.isMisplaceNum }}</span></p>
+        </div>
+        <p style="margin-left: 30px;"><span class="color-blue">创建时间:</span><span class="color-white">{{ rowData.isBuildTime }}</span></p>
+        <el-table :data="tableData" style="margin-top:15px;width:100%;height:290px">
+          <el-table-column type="index" label="序号" align="center" width="90" />
+          <el-table-column prop="" align="center" label="盘点结果" width="90" />
+          <el-table-column prop="" align="center" label="子条数目" width="90" />
+          <el-table-column prop="" align="center" label="门类级别" width="90" />
+          <el-table-column prop="" align="center" label="全宗号" width="90" />
+          <el-table-column prop="" align="center" label="档号" width="180" />
+          <el-table-column prop="" align="center" label="归档年度" width="90" />
+          <el-table-column prop="" align="center" label="题名" width="180" />
+          <el-table-column prop="" align="center" label="保密程度" width="90" />
+          <el-table-column prop="" align="center" label="部门名称" width="90" />
+          <el-table-column prop="" align="center" label="盒名称" width="90" />
+          <el-table-column prop="isContainPath" align="center" label="所在位置" width="220" />
+          <el-table-column prop="isBuildTime" align="center" label="创建时间" width="150" />
+        </el-table>
+      </div></el-dialog>
   </div>
 </template>
 
 <script>
 export default {
-
+  data() {
+    return {
+      detailVisible: false,
+      tableData: [],
+      rowData: {},
+      classLend: ''
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
+@import '~@/assets/styles/lend-manage.scss';
+::v-deep .el-dialog__body{
+  padding: 10px 40px 80px 0;
+}
+::v-deep .el-dialog{
+  width: 950px;
+  height: 520px;
+}
+::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
+    position: absolute;
+    right: -280px;
+}
+p{
+  display: flex;
+  height: 40px;
+  align-items: center;
+  .color-blue{
+    color: #3A99FD;
+    width: 70px;
+    height: 19px;
+    text-align: right;
+  }
+  .color-white{
+    color: white;
+    padding: 0 0 0 20px;
+  }
+}
+.dpflex{
+  display: flex;
+  .one{
+    width: 320px;
+    margin-left: 30px;
+  }
+  .two{
+    flex:1;
+  }
+  .tree{
+    flex: 1;
+  }
+  .four{
+    flex: 1;
+  }
+}
 
 </style>
diff --git a/src/views/archivesManage/lendManage/borrowerManage/index.vue b/src/views/archivesManage/lendManage/borrowerManage/index.vue
index 8b3cf66..7814721 100644
--- a/src/views/archivesManage/lendManage/borrowerManage/index.vue
+++ b/src/views/archivesManage/lendManage/borrowerManage/index.vue
@@ -3,7 +3,7 @@
     <head-slot>
       <!-- <crudOperation :permission="permission" /> -->
       <el-button icon="el-icon-plus" size="mini" @click="addFormVisible = true">新增</el-button>
-      <el-button icon="el-icon-edit" size="mini" :disabled="selections.length ? false : true " @click="handelEdit">修改</el-button>
+      <el-button icon="el-icon-edit" size="mini" :disabled="selections.length===1 ? false : true " @click="handelEdit">修改</el-button>
       <el-button icon="el-icon-delete" size="mini" :disabled="selections.length ? false : true " @click="deleteVisible = true">删除</el-button>
 
       <!-- 搜索 -->
@@ -28,14 +28,14 @@
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
     >
-      <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="100" />
-      <el-table-column prop="borrowerName" label="借阅人" min-width="85" />
-      <el-table-column prop="borrowerDepartment" label="所属部门" min-width="85" />
-      <el-table-column prop="borrowerIdType" label="证件类型" min-width="85" />
-      <el-table-column prop="borrowerIdNum" label="证件号码" min-width="140" />
-      <el-table-column prop="borrowerTel" label="电话号码" min-width="120" />
-      <el-table-column prop="isOperationTime" label="操作时间" min-width="140" />
+      <el-table-column type="selection" align="center" width="55" />
+      <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="borrowerDepartment" align="center" label="所属部门" min-width="85" />
+      <el-table-column prop="borrowerIdType" align="center" label="证件类型" min-width="85" />
+      <el-table-column prop="borrowerIdNum" align="center" label="证件号码" min-width="140" />
+      <el-table-column prop="borrowerTel" align="center" label="电话号码" min-width="120" />
+      <el-table-column prop="isOperationTime" align="center" label="操作时间" min-width="140" />
     </el-table>
 
     <!-- 借阅者增加模态框 -->
@@ -264,15 +264,8 @@ export default {
       this.deleteVisible = false
     },
     handelEdit() {
-      if (this.selections.length === 1) {
-        this.borrowerForm = this.selections[0]
-        this.editFormVisible = true
-      } else {
-        this.$message({
-          message: '只可以选中1条数据进行修改',
-          type: 'warning'
-        })
-      }
+      this.borrowerForm = this.selections[0]
+      this.editFormVisible = true
     }
   }
 }
diff --git a/src/views/archivesManage/lendManage/data2.json b/src/views/archivesManage/lendManage/data2.json
new file mode 100644
index 0000000..b3cc026
--- /dev/null
+++ b/src/views/archivesManage/lendManage/data2.json
@@ -0,0 +1,247 @@
+{
+  "total":12,
+  "rows":[
+      {
+          "id":"29f16d62bc7242d5ba8dc84de5451f93",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-26 14:02",
+          "borrowerName":"李四",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"已解除",
+          "isDocNum":"JY202205050001",
+          "isArchiveNum":"1",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"3d6d548d30db426ea3d95d63f589b294",
+          "isCategoryName":"文书档案-卷案级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"已解除",
+          "isDocNum":"JY202205050002",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"45ff597e7cc64d11803ac422816b1e23",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-27 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"未解除",
+          "isDocNum":"JY202205050003",
+          "isArchiveNum":"1",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"49106aa0d1534a7a900843d0c4531840",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-28 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"未解除",
+          "isDocNum":"JY202205050004",
+          "isArchiveNum":"1",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"6e604355ff1e47e8b48117dca36420c7",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"解除失败",
+          "isDocNum":"JY202205050005",
+          "isArchiveNum":"1"
+
+      },
+      {
+          "id":"6f4a6631d9d3424b960793704f3757b3",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"解除失败",
+          "isDocNum":"JY202205050006",
+          "isArchiveNum":"1"
+      },
+      {
+          "id":"76e29d5c0a0541bfb1ee9da432183b15",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isDocNum":"JY202205050007"
+      },
+      {
+          "id":"a0ffdd94161146c49161662c3f9a70cd",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-07-25 14:02",
+          "borrowerName":"王五",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isDocNum":"JY202205050008"
+      },
+      {
+          "id":"a79e0d67165a4b08b089b309dd947908",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      },
+      {
+          "id":"ca9b850145b74eeda3c22a997696c979",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      },
+      {
+          "id":"dff5529c0d0f45b2b19f2adec7ca0102",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      },
+      {
+          "id":"f3f6ff94c26a4a54967de9cfc56a3b01",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待登记",
+          "isOperationTime":"2022-06-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      }
+  ],
+  "footer":null,
+  "postparam":null
+}
\ No newline at end of file
diff --git a/src/views/archivesManage/lendManage/data3.json b/src/views/archivesManage/lendManage/data3.json
new file mode 100644
index 0000000..7e665ac
--- /dev/null
+++ b/src/views/archivesManage/lendManage/data3.json
@@ -0,0 +1,247 @@
+{
+  "total":12,
+  "rows":[
+      {
+          "id":"29f16d62bc7242d5ba8dc84de5451f93",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"逾期",
+          "isOperationTime":"2022-05-26 14:02",
+          "borrowerName":"李四",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"已解除",
+          "isDocNum":"JY202205050001",
+          "isArchiveNum":"1",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"3d6d548d30db426ea3d95d63f589b294",
+          "isCategoryName":"文书档案-卷案级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"逾期",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"已解除",
+          "isDocNum":"JY202205050002",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"45ff597e7cc64d11803ac422816b1e23",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"逾期",
+          "isOperationTime":"2022-05-27 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"未解除",
+          "isDocNum":"JY202205050003",
+          "isArchiveNum":"1",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"49106aa0d1534a7a900843d0c4531840",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"逾期",
+          "isOperationTime":"2022-05-28 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"未解除",
+          "isDocNum":"JY202205050004",
+          "isArchiveNum":"1",
+          "isHandler":"管理员"
+      },
+      {
+          "id":"6e604355ff1e47e8b48117dca36420c7",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待还",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"解除失败",
+          "isDocNum":"JY202205050005",
+          "isArchiveNum":"1"
+
+      },
+      {
+          "id":"6f4a6631d9d3424b960793704f3757b3",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"逾期",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isWarnState":"解除失败",
+          "isDocNum":"JY202205050006",
+          "isArchiveNum":"1"
+      },
+      {
+          "id":"76e29d5c0a0541bfb1ee9da432183b15",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"逾期",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isDocNum":"JY202205050007"
+      },
+      {
+          "id":"a0ffdd94161146c49161662c3f9a70cd",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待还",
+          "isOperationTime":"2022-07-25 14:02",
+          "borrowerName":"王五",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085",
+          "isDocNum":"JY202205050008"
+      },
+      {
+          "id":"a79e0d67165a4b08b089b309dd947908",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待还",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      },
+      {
+          "id":"ca9b850145b74eeda3c22a997696c979",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待还",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      },
+      {
+          "id":"dff5529c0d0f45b2b19f2adec7ca0102",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待还",
+          "isOperationTime":"2022-05-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      },
+      {
+          "id":"f3f6ff94c26a4a54967de9cfc56a3b01",
+          "isCategoryName":"文书档案-文件级",
+          "fieldCnName":"盒号",
+          "isArchivesID":"FTZN-2022-BGS-D30-0001",
+          "isTitleName":"这是一份文件的标题标题...",
+          "isFieldName":"文书-文件-2022",
+          "isStoragePath":"库房A-库区A-01列-1节1层-左",
+          "isLendStatus":"待还",
+          "isOperationTime":"2022-06-25 14:02",
+          "borrowerName":"张三",
+          "borrowDays":"2022-5-25至2022-6-25",
+          "borrowGoal":"工作考察",
+          "borrowerDepartment":"办公室",
+          "borrowerIdType":"身份证",
+          "borrowerIdNum":"420880190011115636",
+          "borrowerTel":"027-5955 7085"
+      }
+  ],
+  "footer":null,
+  "postparam":null
+}
\ No newline at end of file
diff --git a/src/views/archivesManage/lendManage/lendConfirm/index.vue b/src/views/archivesManage/lendManage/lendConfirm/index.vue
index 805e98e..f82489b 100644
--- a/src/views/archivesManage/lendManage/lendConfirm/index.vue
+++ b/src/views/archivesManage/lendManage/lendConfirm/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="lend-confirm">
     <headSlot>
-      <el-button icon="el-icon-plus" size="mini" :disabled="selections.length ? false : true " @click="lendFormVisible = true">借出</el-button>
+      <el-button icon="el-icon-plus" size="mini" :disabled="selections.length ? false : true " @click="handleLendBtn">借出</el-button>
       <el-button icon="el-icon-edit" size="mini" @click="handelReRecord">重新登记</el-button>
       <el-button icon="el-icon-minus" size="mini" :disabled="selections.length ? false : true " @click="handleRemove">移出</el-button>
       <crudOperation style="margin-left:10px" />
@@ -19,44 +19,26 @@
       @row-dblclick="handleDbClick"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="isDocNum" label="单据号" min-width="85" />
-      <el-table-column prop="isArchiveNum" label="数量" min-width="50" />
-      <el-table-column prop="borrowerName" label="借阅人" min-width="60" />
-      <el-table-column prop="borrowerDepartment" label="所属部门" min-width="85" />
-      <el-table-column prop="borrowerIdType" label="证件类型" min-width="85" />
-      <el-table-column prop="borrowerIdNum" label="证件号码" min-width="100" />
-      <el-table-column prop="borrowerTel" label="电话号码" min-width="85" />
-      <el-table-column prop="borrowDays" label="借阅时间" :show-overflow-tooltip="true" min-width="120" />
-      <el-table-column prop="borrowGoal" label="借阅目的" min-width="60" />
-      <el-table-column prop="isLendStatus" label="借阅状态" min-width="60">
+      <el-table-column type="index" label="序号" align="center" width="55" />
+      <el-table-column prop="isDocNum" align="center" label="单据号" min-width="85" />
+      <el-table-column prop="isArchiveNum" align="center" label="数量" min-width="50" />
+      <el-table-column prop="borrowerName" align="center" label="借阅人" min-width="60" />
+      <el-table-column prop="borrowerDepartment" align="center" label="所属部门" min-width="85" />
+      <el-table-column prop="borrowerIdType" align="center" label="证件类型" min-width="85" />
+      <el-table-column prop="borrowerIdNum" align="center" label="证件号码" min-width="120" />
+      <el-table-column prop="borrowerTel" align="center" label="电话号码" min-width="85" />
+      <el-table-column prop="borrowDays" align="center" label="借阅时间" min-width="150" />
+      <el-table-column prop="borrowGoal" align="center" label="借阅目的" min-width="70" />
+      <el-table-column prop="isLendStatus" align="center" label="借阅状态" min-width="70">
         <template slot-scope="scope">
           <!-- 已借 / 待借 -->
           <span class="cell-lend">{{ scope.row.isLendStatus }}</span>
         </template>
       </el-table-column>
-      <el-table-column sortable prop="isOperationTime" label="操作时间" min-width="85" />
+      <el-table-column sortable prop="isOperationTime" align="center" label="操作时间" min-width="120" />
     </el-table>
     <!--借出弹框-->
-    <el-dialog ref="dialogTable" title="借出" :visible.sync="lendFormVisible">
-      <span class="dialog-right-top" />
-      <span class="dialog-left-bottom" />
-      <el-table :data="selections" :cell-class-name="cellWarn">
-        <el-table-column type="index" label="序号" width="55" />
-        <el-table-column prop="isCategoryName" label="所属门类" />
-        <el-table-column prop="isArchivesID" label="档号" min-width="140" />
-        <el-table-column prop="isTitleName" label="题名" min-width="140" />
-        <el-table-column prop="isWarnState" label="状态" min-width="85">
-          <template slot-scope="scope">
-            <!-- 已解除 / 未解除/解除失败 -->
-            <span class="clear">{{ scope.row.isWarnState }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button disabled>解除警报</el-button>
-      </div>
-    </el-dialog>
+    <lendDialog ref="lendDialogDom" />
     <!-- 移出确认弹框 -->
     <delConfirm ref="delConfirmDom" :list-name="listName" />
     <!-- 档案详情 -->
@@ -73,10 +55,10 @@ import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import delConfirm from '../components/delConfirm.vue'
 import archiveDetail from './module/archiveDetail.vue'
-
+import lendDialog from './module/lendDialog.vue'
 import data1 from '../data1.json'
 export default {
-  components: { headSlot, pagination, crudOperation, archiveDetail, delConfirm },
+  components: { headSlot, pagination, crudOperation, archiveDetail, delConfirm, lendDialog },
   mixins: [presenter()],
   cruds() {
     return CRUD({
@@ -96,7 +78,6 @@ export default {
     return {
       tableData: [],
       selections: [],
-      lendFormVisible: false,
       lendForm: {},
       listName: '借出确认'
     }
@@ -113,9 +94,21 @@ export default {
     },
     // 档案详情
     handleDbClick(row) {
-      this.$refs.archiveDetailDom.detailVisible = true
+      this.$refs.table.clearSelection()
+      const archiveDetailDom = this.$refs.archiveDetailDom
+      archiveDetailDom.detailVisible = true
       const arr = data1.rows.filter(item => item.isDocNum === row.isDocNum)
-      this.$refs.archiveDetailDom.rowData = arr
+      archiveDetailDom.rowData = arr
+      console.log(arr[0])
+      // 借阅状态样式类名
+      if (arr[0].isLendStatus === '已借') {
+        archiveDetailDom.classLend = 'have-lend'
+      } else if (arr[0].isLendStatus === '待借') {
+        archiveDetailDom.classLend = 'no-lend'
+      } else {
+        archiveDetailDom.classLend = 'other-lend'
+      }
+      console.log(archiveDetailDom.classLend)
     },
     clickRowHandler(row) {
       this.$refs.table.toggleRowSelection(row)
@@ -138,14 +131,9 @@ export default {
         return 'other-lend'
       }
     },
-    cellWarn({ row, columnIndex }) {
-      if (row.isWarnState === '已解除' && columnIndex === 4) {
-        return 'no-clear'
-      } else if (row.isWarnState === '未解除' && columnIndex === 4) {
-        return 'have-clear'
-      } else if (row.isWarnState === '解除失败' && columnIndex === 4) {
-        return 'fail-clear'
-      }
+    handleLendBtn() {
+      this.$refs.lendDialogDom.table = this.selections
+      this.$refs.lendDialogDom.lendFormVisible = true
     }
   }
 }
diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue
index 79c7769..6c0e731 100644
--- a/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue
+++ b/src/views/archivesManage/lendManage/lendConfirm/module/archiveDetail.vue
@@ -4,31 +4,24 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <!-- <p><span class="color-blue">所属门类:</span><span class="color-white">{{ rowData.isCategoryName }}</span></p>
-        <p><span class="color-blue">档号:</span><span class="color-white">{{ rowData.isArchivesID }}</span></p>
-        <p><span class="color-blue">题名:</span><span class="color-white">{{ rowData.isTitleName }}</span></p>
-        <p><span class="color-blue">盒名称:</span><span class="color-white">{{ rowData.isFieldName }}</span></p>
-        <p><span class="color-blue">存放位置:</span><span class="color-white">{{ rowData.isStoragePath }}</span></p> -->
         <div class="dpflex">
           <p class="left"><span class="color-blue">借阅人:</span><span class="color-white">{{ rowData[0].borrowerName }}</span></p>
-          <p class="right"><span class="color-blue">所属部门:</span><span class="color-white">{{ rowData[0].borrowerDepartment }}</span></p>
+          <p class="center"><span class="color-blue">所属部门:</span><span class="color-white">{{ rowData[0].borrowerDepartment }}</span></p>
+          <p :class="classLend" class="right"><span class="color-blue">借阅状态:</span><span class="color-white cell-lend">{{ rowData[0].isLendStatus }}</span></p>
         </div>
         <div class="dpflex">
           <p class="left"><span class="color-blue">证件类型:</span><span class="color-white">{{ rowData[0].borrowerIdType }}</span></p>
-          <p class="right"><span class="color-blue">证件号码:</span><span class="color-white">{{ rowData[0].borrowerIdNum }}</span></p>
-        </div>
-        <div class="dpflex">
-          <p class="left"><span class="color-blue">电话号码:</span><span class="color-white">{{ rowData[0].borrowerTel }}</span></p>
-          <p class="right"><span class="color-blue">借阅日期:</span><span class="color-white">{{ rowData[0].borrowDays }}</span></p>
+          <p class="center"><span class="color-blue">证件号码:</span><span class="color-white">{{ rowData[0].borrowerIdNum }}</span></p>
+          <p class="right"><span class="color-blue">电话号码:</span><span class="color-white">{{ rowData[0].borrowerTel }}</span></p>
         </div>
         <div class="dpflex">
           <p class="left"><span class="color-blue">借阅目的:</span><span class="color-white">{{ rowData[0].borrowGoal }}</span></p>
-          <p class="right"><span class="color-blue">借阅状态:</span><span class="color-white">{{ rowData[0].isLendStatus }}</span></p>
+          <p class="center"><span class="color-blue">借阅日期:</span><span class="color-white">{{ rowData[0].borrowDays }}</span></p>
+          <p class="right"><span class="color-blue">操作时间:</span><span class="color-white">{{ rowData[0].isOperationTime }}</span></p>
         </div>
-        <p><span class="color-blue">操作时间:</span><span class="color-white">{{ rowData[0].isOperationTime }}</span></p>
       </div>
-      <el-table :data="rowData">
-        <el-table-column type="index" label="序号" width="55" />
+      <el-table :data="rowData" style="margin-top:15px">
+        <el-table-column type="index" label="序号" align="center" width="55" />
         <el-table-column prop="isCategoryName" label="所属门类" min-width="100" />
         <el-table-column prop="isTitleName" label="题名" min-width="140" />
         <el-table-column prop="isArchivesID" label="档号" min-width="130" />
@@ -44,19 +37,25 @@ export default {
   data() {
     return {
       detailVisible: false,
-      rowData: []
+      rowData: [],
+      classLend: ''
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+@import '~@/assets/styles/lend-manage.scss';
 ::v-deep .el-dialog__body{
   padding: 60px 40px 80px 40px;
 }
 ::v-deep .el-dialog{
   width: 1200px;
 }
+::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
+    position: absolute;
+    right: -280px;
+}
 p{
   display: flex;
   height: 40px;
@@ -75,10 +74,17 @@ p{
 .dpflex{
   display: flex;
   .left{
-    width: 300px;
+    flex: 1;
+  }
+  .center{
+    flex:1;
   }
   .right{
-    width: 300px;
+    flex: 1;
+    .cell-lend{
+      margin-left: 20px;
+    }
   }
 }
+
 </style>
diff --git a/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue
new file mode 100644
index 0000000..fd64882
--- /dev/null
+++ b/src/views/archivesManage/lendManage/lendConfirm/module/lendDialog.vue
@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <el-dialog ref="dialogTable" title="借出" :visible.sync="lendFormVisible">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <p style="color:#fff;margin:0 0 20px 20px">以下档案需要先解除电子标签警报</p>
+      <el-table :data="table" :cell-class-name="cellWarn" height="325px">
+        <el-table-column type="index" label="序号" width="80" />
+        <el-table-column prop="isCategoryName" label="所属门类" />
+        <el-table-column prop="isArchivesID" label="档号" min-width="140" />
+        <el-table-column prop="isTitleName" label="题名" min-width="140" />
+        <el-table-column prop="isWarnState" label="状态" min-width="85">
+          <template slot-scope="scope">
+            <!-- 已解除 / 未解除/解除失败 -->
+            <span class="clear">{{ scope.row.isWarnState }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button disabled>解除警报</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      lendFormVisible: false,
+      table: []
+    }
+  },
+  methods: {
+    cellWarn({ row, columnIndex }) {
+      if (row.isWarnState === '已解除' && columnIndex === 4) {
+        return 'no-clear'
+      } else if (row.isWarnState === '未解除' && columnIndex === 4) {
+        return 'have-clear'
+      } else if (row.isWarnState === '解除失败' && columnIndex === 4) {
+        return 'fail-clear'
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '~@/assets/styles/lend-manage.scss';
+::v-deep .el-dialog{
+  width: 950px;
+  height: 520px;
+}
+::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
+    position: absolute;
+    right: -154px;
+}
+
+</style>
diff --git a/src/views/archivesManage/lendManage/lendQuery/index.vue b/src/views/archivesManage/lendManage/lendQuery/index.vue
index 8689a76..ebcc2e1 100644
--- a/src/views/archivesManage/lendManage/lendQuery/index.vue
+++ b/src/views/archivesManage/lendManage/lendQuery/index.vue
@@ -42,7 +42,7 @@
     <!--表格渲染-->
     <el-table
       ref="table"
-      style="min-width: 100%"
+      style="width: 100%"
       height="calc(100vh - 355px)"
       :data="tableData"
       :cell-class-name="cell"
@@ -51,22 +51,22 @@
       @row-dblclick="handleDbClick"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="isLendStatus" label="借阅状态" min-width="60">
+      <el-table-column type="index" label="序号" align="center" width="55" />
+      <el-table-column prop="isLendStatus" align="center" label="借阅状态" width="100">
         <template slot-scope="scope">
           <!-- 已借 / 待借 -->
           <span class="cell-lend">{{ scope.row.isLendStatus }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="isFieldName" label="所属门类" min-width="85" />
-      <el-table-column prop="isArchivesID" label="档号" min-width="130" />
-      <el-table-column prop="isTitleName" label="题名" min-width="130" />
-      <el-table-column prop="isFieldName" label="盒名称" min-width="85" />
-      <el-table-column prop="isStoragePath" label="存放位置" min-width="130" />
-      <el-table-column prop="borrowerName" label="借阅人" min-width="60" />
-      <el-table-column prop="borrowDays" label="借阅时间" min-width="130" />
-      <el-table-column prop="borrowGoal" label="借阅目的" min-width="85" />
-      <el-table-column v-if="false" sortable prop="isOperationTime" label="操作时间" min-width="85" />
+      <el-table-column prop="isFieldName" align="center" label="所属门类" width="150" />
+      <el-table-column prop="isArchivesID" align="center" label="档号" width="200" />
+      <el-table-column prop="isTitleName" align="center" label="题名" width="200" />
+      <el-table-column prop="isFieldName" align="center" label="盒名称" width="150" />
+      <el-table-column prop="isStoragePath" align="center" label="存放位置" width="250" />
+      <el-table-column prop="borrowerName" align="center" label="借阅人" width="90" />
+      <el-table-column prop="borrowDays" align="center" label="借阅时间" width="180" />
+      <el-table-column prop="borrowGoal" align="center" label="借阅目的" width="90" />
+      <el-table-column align="center" sortable prop="isOperationTime" label="操作时间" width="200" />
     </el-table>
     <!-- 档案详情 -->
     <archiveDetail ref="archiveDetailDom" />
@@ -81,7 +81,7 @@ import CRUD, { presenter } from '@crud/crud'
 import pagination from '@crud/Pagination'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
-import data1 from '../data1.json'
+import data3 from '../data3.json'
 import archiveDetail from './module/archiveDetail.vue'
 export default {
   components: { headSlot, pagination, rrOperation, crudOperation, archiveDetail },
@@ -130,7 +130,7 @@ export default {
   },
   methods: {
     getData() {
-      this.tableData = data1.rows
+      this.tableData = data3.rows
     },
     selectionChangeHandler() {
       console.log('selectionChangeHandler')
@@ -139,18 +139,17 @@ export default {
       this.$refs.table.toggleRowSelection(row)
     },
     cell({ row, columnIndex }) {
-      if (row.isLendStatus === '待借' && columnIndex === 2) {
+      if (row.isLendStatus === '逾期' && columnIndex === 2) {
         return 'no-lend'
-      } else if (row.isLendStatus === '已借' && columnIndex === 2) {
+      } else if (row.isLendStatus === '待还' && columnIndex === 2) {
         return 'have-lend'
-      } else if (row.isLendStatus === '' && columnIndex === 2) {
-        return 'other-lend'
       }
     },
     // 档案详情
     handleDbClick(row) {
+      this.$refs.table.clearSelection()
       this.$refs.archiveDetailDom.detailVisible = true
-      const arr = data1.rows.filter(item => item.isDocNum === row.isDocNum)
+      const arr = data3.rows.filter(item => item.isDocNum === row.isDocNum)
       this.$refs.archiveDetailDom.rowData = arr
     }
   }
@@ -167,7 +166,7 @@ export default {
   border: 1px solid #339cff;
   .el-select {
     background-color: #021941;
-    color: #fff;
+    color: #339CFF;
   }
   .el-input__inner {
     background-color: #021941;
@@ -180,4 +179,7 @@ export default {
     border: none;
   }
 }
+::v-deep .el-icon-arrow-up:before{
+  color: #339CFF;
+}
 </style>
diff --git a/src/views/archivesManage/lendManage/returnArchives/index.vue b/src/views/archivesManage/lendManage/returnArchives/index.vue
index d5854f7..da0990c 100644
--- a/src/views/archivesManage/lendManage/returnArchives/index.vue
+++ b/src/views/archivesManage/lendManage/returnArchives/index.vue
@@ -7,7 +7,7 @@
     <!--表格渲染-->
     <el-table
       ref="table"
-      style="min-width:100%"
+      style="width:100%"
       height="calc(100vh - 355px)"
       :data="tableData"
       :cell-class-name="cell"
@@ -17,24 +17,24 @@
       @row-dblclick="handleDbClick"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="isDocNum" :show-overflow-tooltip="true" label="单据号" min-width="100" />
-      <el-table-column prop="isCategoryName" label="门类名称" min-width="110" />
-      <el-table-column prop="isArchivesID" :show-overflow-tooltip="true" label="档号" min-width="120" />
-      <el-table-column prop="isTitleName" :show-overflow-tooltip="true" label="题名" min-width="120" />
-      <el-table-column prop="isFieldName" label="盒名称" min-width="120" />
-      <el-table-column prop="isStoragePath" :show-overflow-tooltip="true" label="存放位置" min-width="120" />
-      <el-table-column prop="borrowerName" label="借阅人" min-width="60" />
-      <el-table-column prop="borrowDays" :show-overflow-tooltip="true" label="借阅时间" min-width="115" />
-      <el-table-column prop="borrowGoal" label="借阅目的" min-width="80" />
-      <el-table-column prop="isLendStatus" label="借阅状态" min-width="80">
+      <el-table-column type="index" label="序号" align="center" width="55" />
+      <el-table-column prop="isDocNum" align="center" label="单据号" width="160" />
+      <el-table-column prop="isCategoryName" align="center" label="门类名称" width="150" />
+      <el-table-column prop="isArchivesID" align="center" label="档号" width="220" />
+      <el-table-column prop="isTitleName" align="center" label="题名" width="200" />
+      <el-table-column prop="isFieldName" align="center" label="盒名称" width="140" />
+      <el-table-column prop="isStoragePath" align="center" label="存放位置" width="220" />
+      <el-table-column prop="borrowerName" align="center" label="借阅人" width="100" />
+      <el-table-column prop="borrowDays" align="center" label="借阅时间" width="180" />
+      <el-table-column prop="borrowGoal" align="center" label="借阅目的" width="100" />
+      <el-table-column prop="isLendStatus" align="center" label="借阅状态" width="100">
         <template slot-scope="scope">
           <!-- 已借 / 待借 -->
           <span class="cell-lend">{{ scope.row.isLendStatus }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="isHandler" label="操作人" min-width="60" />
-      <el-table-column sortable prop="isOperationTime" :show-overflow-tooltip="true" label="操作时间" min-width="100" />
+      <el-table-column prop="isHandler" align="center" label="操作人" width="100" />
+      <el-table-column sortable align="center" prop="isOperationTime" label="操作时间" width="180" />
     </el-table>
     <!-- 归还确认 -->
     <el-dialog title="归还确认" :visible.sync="returnVisible" :before-close="handleClose">
@@ -130,6 +130,7 @@ export default {
     },
     // 档案详情
     handleDbClick(row) {
+      this.$refs.table.clearSelection()
       this.$refs.archiveDetailDom.detailVisible = true
       const arr = data1.rows.filter(item => item.isDocNum === row.isDocNum)
       this.$refs.archiveDetailDom.rowData = arr
diff --git a/src/views/archivesManage/lendManage/toLend/index.vue b/src/views/archivesManage/lendManage/toLend/index.vue
index c0b44be..55a9c5f 100644
--- a/src/views/archivesManage/lendManage/toLend/index.vue
+++ b/src/views/archivesManage/lendManage/toLend/index.vue
@@ -12,26 +12,25 @@
       style="min-width: 100%"
       height="calc(100vh - 355px)"
       :data="tableData"
-      :cell-class-name="cell"
       :default-sort="{ prop: 'isOperationTime', order: 'descending' }"
       @selection-change="selectionChangeHandler"
       @row-click="clickRowHandler"
       @row-dblclick="handleDbClick"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" width="55" />
-      <el-table-column prop="isCategoryName" label="所属门类" min-width="85" />
-      <el-table-column prop="isArchivesID" label="档号" :show-overflow-tooltip="true" min-width="120" />
-      <el-table-column prop="isTitleName" :show-overflow-tooltip="true" label="题名" min-width="120" />
-      <el-table-column prop="isFieldName" label="盒名称" min-width="85" />
-      <el-table-column prop="isStoragePath" label="存放位置" :show-overflow-tooltip="true" min-width="120" />
-      <el-table-column prop="isLendStatus" label="借阅状态" min-width="60">
+      <el-table-column type="index" label="序号" align="center" width="55" />
+      <el-table-column prop="isCategoryName" label="所属门类" align="center" min-width="85" />
+      <el-table-column prop="isArchivesID" label="档号" align="center" min-width="120" />
+      <el-table-column prop="isTitleName" align="center" label="题名" min-width="120" />
+      <el-table-column prop="isFieldName" align="center" label="盒名称" min-width="85" />
+      <el-table-column prop="isStoragePath" align="center" label="存放位置" min-width="120" />
+      <el-table-column prop="isLendStatus" align="center" label="借阅状态" min-width="60">
         <template slot-scope="scope">
-          <!-- 已借 / 待借 -->
+          <!-- 待登记 -->
           <span class="cell-lend">{{ scope.row.isLendStatus }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="isOperationTime" label="操作时间" min-width="85" />
+      <el-table-column prop="isOperationTime" align="center" label="操作时间" min-width="85" />
     </el-table>
     <!-- 借阅登记模态框 -->
     <el-dialog
@@ -138,7 +137,7 @@ import DateRangePicker from '@/components/DateRangePicker'
 import CRUD, { presenter } from '@crud/crud'
 import delConfirm from '../components/delConfirm.vue'
 import archiveDetail from './module/archiveDetail.vue'
-import data1 from '../data1.json'
+import data2 from '../data2.json'
 export default {
   components: { headSlot, DateRangePicker, pagination, delConfirm, archiveDetail },
   mixins: [presenter()],
@@ -185,7 +184,7 @@ export default {
   methods: {
     // 获取数据
     getData() {
-      this.tableData = data1.rows
+      this.tableData = data2.rows
     },
     handleRecord() {
       this.recordFormVisible = true
@@ -196,6 +195,7 @@ export default {
     },
     // 档案详情
     handleDbClick(row) {
+      this.$refs.table.clearSelection()
       this.$refs.archiveDetailDom.detailVisible = true
       this.$refs.archiveDetailDom.rowData = row
     },
@@ -207,20 +207,30 @@ export default {
     },
     handleRecordConfirm() {
       this.recordFormVisible = false
-    },
-    cell({ row, columnIndex }) {
-      if (row.isLendStatus === '待借' && columnIndex === 7) {
-        return 'no-lend'
-      } else if (row.isLendStatus === '已借' && columnIndex === 7) {
-        return 'have-lend'
-      } else if (row.isLendStatus === '' && columnIndex === 7) {
-        return 'other-lend'
-      }
     }
+    // cell({ row, columnIndex }) {
+    //   if (row.isLendStatus === '待借' && columnIndex === 7) {
+    //     return 'no-lend'
+    //   } else if (row.isLendStatus === '已借' && columnIndex === 7) {
+    //     return 'have-lend'
+    //   } else if (row.isLendStatus === '' && columnIndex === 7) {
+    //     return 'other-lend'
+    //   }
+    // }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-@import '~@/assets/styles/lend-manage.scss';
+// @import '~@/assets/styles/lend-manage.scss';
+.cell-lend{
+  display: inline-block;
+  text-align: center;
+  width: 76px;
+  height: 26px;
+  line-height: 26px;
+  color: #F65163;
+  border: 1px solid #F65163;
+  border-radius:13px ;
+}
 </style>
diff --git a/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue b/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue
index 7215be1..fa3d205 100644
--- a/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue
+++ b/src/views/archivesManage/lendManage/toLend/module/archiveDetail.vue
@@ -28,6 +28,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-dialog{
+  width: 600px;
+}
 ::v-deep .el-dialog__body{
   padding: 60px  0 80px 110px;
 }
@@ -46,4 +49,5 @@ p{
     padding: 0 0 0 20px;
   }
 }
+
 </style>