From 911aacf0b23ea0e911e1dd4a7f8da334dc3bf17f Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 2 Aug 2022 17:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=9B=92-=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archivesManage/caseManage.js          |  4 +--
 .../module/archivesInfo/index.vue             |  2 +-
 .../caseManage/caseList/index.vue             | 35 ++++++++++++++-----
 src/views/components/BindingTagDlg.vue        |  2 +-
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/api/archivesManage/caseManage.js b/src/api/archivesManage/caseManage.js
index 05c282d..d655e6f 100644
--- a/src/api/archivesManage/caseManage.js
+++ b/src/api/archivesManage/caseManage.js
@@ -12,10 +12,10 @@ export function edit(parameter) {
     data: parameter
   })
 }
-
+// 删除档案盒
 export function del(data) {
   return request({
-    url: 'api/archives/delete',
+    url: 'api/case/del',
     method: 'post',
     data: data
   })
diff --git a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
index bdaa40c..8105452 100644
--- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
@@ -98,7 +98,7 @@ export default {
               item.context = '待借阅'
             } else if (item.context === 3) {
               item.context = '待归还'
-            } else if (item.context === 4 || item.context === '') {
+            } else if (item.context === 4 || item.context === '' || item.context === null) {
               item.context = '-'
             }
           }
diff --git a/src/views/archivesManage/caseManage/caseList/index.vue b/src/views/archivesManage/caseManage/caseList/index.vue
index 97537d7..f59b540 100644
--- a/src/views/archivesManage/caseManage/caseList/index.vue
+++ b/src/views/archivesManage/caseManage/caseList/index.vue
@@ -84,6 +84,7 @@
 
 <script>
 import caseCrudMethod from '@/api/archivesManage/caseManage'
+import { del } from '@/api/archivesManage/caseManage'
 import BindingTagDlg from '@/views/components/BindingTagDlg'
 import eForm from './module/form'
 import openCaseDlg from './module/openCaseDlg'
@@ -184,7 +185,6 @@ export default {
       this.$refs.bindingTag.bindingVisible = true
     },
     openCase(data) {
-      console.log(data)
       const isBool = data.every(item => item.storageType === 0)
       if (isBool) {
         const bool = data.some(item => item.depositNum === 0)
@@ -203,11 +203,9 @@ export default {
     },
     // 表格双击
     handleDbClick(row) {
-      // console.log(row, 'row')
       this.$refs.detailDom.rowData = row
       const params = {
         caseId: row.id
-        // caseId: '1716F6C668C83A929C738B'
       }
       this.crud.crudMethod.findInCase(params).then(res => {
         if (res) {
@@ -230,16 +228,37 @@ export default {
     },
     // 删除
     handleDel(data) {
-      const bool = data.every(item => item.depositNum === 0)
-      if (bool) {
-        this.deleteVisible = true
+      const boolDeposit = data.every(item => item.depositNum === 0)
+      const boolStorage = data.every(item => item.storageType === 0)
+
+      if (boolStorage) {
+        if (boolDeposit) {
+          this.deleteVisible = true
+        } else {
+          this.$message.error('请清空档案盒后再删除!')
+        }
       } else {
-        this.$message.error('请清空档案盒后再删除!')
+        this.$message.error('请操作出库并清空档案盒后才可删除盒!')
       }
     },
     // 确认删除
     handleDelConfirm(data) {
-      this.deleteVisible = false
+      const params = data.map(item => {
+        return item.id
+      })
+      del(params).then(res => {
+        if (res.doDel.length === 0) {
+          this.$message.error('删除失败')
+        } else {
+          if (res.doDel.length === data.length) {
+            this.$message.success('全部删除成功')
+          } else {
+            this.$message.success('部分删除成功')
+          }
+        }
+        this.deleteVisible = false
+        this.crud.refresh()
+      })
     }
   }
 }
diff --git a/src/views/components/BindingTagDlg.vue b/src/views/components/BindingTagDlg.vue
index 7829c05..8c30c88 100644
--- a/src/views/components/BindingTagDlg.vue
+++ b/src/views/components/BindingTagDlg.vue
@@ -289,7 +289,7 @@ export default {
     async opened() {
       if (!this.isBinding) {
         // this.devId = await this.getDevId()
-        this.devId = 'D002'
+        this.devId = 'D001'
         await this.tryConnect({ op: 'RFID_CheckStatus', sDevID: this.devId })
         await this.readEpc({ op: 'RFID_ReadEpc', sDevID: this.devId })
         await this.startBind()