From 4e2ed70e70cf89f84f42b5e4b8a4c9de47f6032b Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Fri, 19 Aug 2022 15:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E8=A3=85=E7=9B=92=E7=9A=84=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E4=B8=8D=E5=8F=AF=E5=88=A0=E9=99=A4/=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E6=A3=80=E7=B4=A2=E5=80=9F=E9=98=85=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?/=E5=80=9F=E9=98=85=E6=B5=81=E7=A8=8B=E7=A1=AE=E8=AE=A4title?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../archivesManage/archivesList/mixins/archives.js | 10 ++++++++--
 .../archivesSearch/module/detailDialog.vue         | 14 ++++++++------
 .../lendManage/lendProcess/index.vue               |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/archivesManage/archivesList/mixins/archives.js b/src/views/archivesManage/archivesList/mixins/archives.js
index 7181fdf..eb7bb54 100644
--- a/src/views/archivesManage/archivesList/mixins/archives.js
+++ b/src/views/archivesManage/archivesList/mixins/archives.js
@@ -246,8 +246,14 @@ export const archivesCrud = {
     },
     // 选择删除
     toDelete(data) {
-      this.$refs.deltArchives.deleteVisible = true
-      this.getTotalSumAll()
+      // 已装盒的档案不可删除
+      const indexCaseBool = data.findIndex(item => item.case_no !== '')
+      if (indexCaseBool !== -1) {
+        this.$message.error('已装盒的档案不可删除!')
+      } else {
+        this.$refs.deltArchives.deleteVisible = true
+        this.getTotalSumAll()
+      }
     },
     getTotalSumAll() {
       this.totalSumAll = 0
diff --git a/src/views/archivesManage/archivesSearch/module/detailDialog.vue b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
index 852e884..401d58f 100644
--- a/src/views/archivesManage/archivesSearch/module/detailDialog.vue
+++ b/src/views/archivesManage/archivesSearch/module/detailDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="档案盒详情" :visible.sync="detailVisible" @close="handleClose">
+    <el-dialog title="档案详情" :visible.sync="detailVisible" @close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
@@ -57,12 +57,11 @@
                 <p class="left"><span class="color-blue">库房位置：</span>
                   <span v-if="!rowData.folder_location" class="color-white">-</span>
                   <span v-else class="color-white"><el-tag effect="dark">{{ rowData.folder_location }}</el-tag></span>
-                <!-- <span v-if="!scope.row.folder_location_details">-</span>
-                <span v-else>
-                  <el-tag effect="dark">{{ scope.row.folder_location_details }}</el-tag>
-                </span> -->
                 </p>
-                <p class="right"><span class="color-blue">借阅状态：</span><span class="color-white">{{ rowData.borrow_type | borrowStatus }}</span></p>
+                <p class="right"><span class="color-blue">借阅状态：</span>
+                  <span :class="['color-white', rowData.borrow_type ? 'row-state row-lending' : '' ]">{{ 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>
@@ -97,6 +96,8 @@ export default {
           return '已归还'
         case 5:
           return '逾期'
+        case -1:
+          return '异常'
       }
     }
   },
@@ -232,6 +233,7 @@ export default {
     color: #339CFF;
 }
 .color-white{
+  display: inline-block;
   color: #fff;
 }
 ::v-deep .el-dialog .el-dialog__header .el-dialog__close::before{
diff --git a/src/views/archivesManage/lendManage/lendProcess/index.vue b/src/views/archivesManage/lendManage/lendProcess/index.vue
index 87e2635..3f597e4 100644
--- a/src/views/archivesManage/lendManage/lendProcess/index.vue
+++ b/src/views/archivesManage/lendManage/lendProcess/index.vue
@@ -13,7 +13,7 @@
     </div>
 
     <!-- 确认修改借阅规则 -->
-    <el-dialog title="确认删除" :visible.sync="rulesVisible" :close-on-click-modal="false" :before-close="handleClose">
+    <el-dialog title="编辑借阅规则" :visible.sync="rulesVisible" :close-on-click-modal="false" :before-close="handleClose">
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">