From 62753ca8b33d2191a547c2f8d98768bdeb74b02c Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Sat, 17 Sep 2022 11:01:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=A8=A1=E5=BC=8FRFID?=
 =?UTF-8?q?=E8=A7=A3=E9=99=A4=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lendManage/mixins/lending.js              | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/archivesManage/lendManage/mixins/lending.js b/src/views/archivesManage/lendManage/mixins/lending.js
index 3a0b126..42e1ed1 100644
--- a/src/views/archivesManage/lendManage/mixins/lending.js
+++ b/src/views/archivesManage/lendManage/mixins/lending.js
@@ -245,8 +245,8 @@ export const lendingCrud = {
     },
     async getDevId() {
       return await new Promise(async(resolve, reject) => {
-        // const mac = await RFID.getDeviceMac()
-        const mac = '12-34-56-12-34-56'
+        const mac = await RFID.getDeviceMac()
+        // const mac = '12-34-56-12-34-56'
         if (!mac || mac === '') {
           this.$message.error('获取mac地址失败')
         } else {
@@ -311,15 +311,19 @@ export const lendingCrud = {
       } else if (this.tipTable.filter((item) => { return item.warnState === '解除失败' || item.warnState === '恢复失败' }).length > 0) {
         this.btnDisabled = true
         this.unbindWarnLoading = false
-        if (this.ase === 0) {
-          this.$message.error('借阅成功n条数据' + ' ' + '借阅失败' + this.lendSelections.length + '条数据')
-        } else {
-          this.$message.error('归还成功n条数据' + ' ' + '归还失败' + this.lendSelections.length + '条数据')
-        }
+        this.alarmErrorTip()
       } else {
         this.btnDisabled = false
         this.unbindWarnLoading = false
-        this.$message.success('解绑/恢复成功n条数据')
+        let params
+        if (this.ase === 0) {
+          params = this.lendSelections.map(item => item.orderNo)
+        } else {
+          params = this.lendSelections.map(item => item.id)
+        }
+        console.log(params)
+        // 全部成功之后确认借出 / 归还
+        this.confirmLendOrReturn(this.ase, params, this.lendSelections)
       }
     },
     async checkStatus(param) {