From 6f40855301b008a2b98b67cc57a7dc4b8304b717 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 10 Oct 2024 18:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E7=8E=AF=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/base/bracelet/index.vue | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 7c5cf03..bedd431 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -158,7 +158,7 @@
                 <el-input 
                 v-model="queryshCode.shCode" 
                 placeholder="请输入手环编码" 
-                maxlength="20"
+                maxlength="50"
                 />
             </el-form-item>         
         </el-form>
@@ -247,7 +247,7 @@
                 <el-input 
                 v-model="queryshEdit.shCode" 
                 placeholder="请输入手环编码" 
-                maxlength="20"
+                maxlength="50"
                 />
             </el-form-item>         
         </el-form>
@@ -590,7 +590,7 @@
             placeholder="请输入手环编码"
             clearable
             @keyup.enter.native="handleQueryShBind"
-            maxlength="20"
+            maxlength="50"
           />
         </el-form-item>
         <el-form-item  prop="shPersonName">
@@ -1382,6 +1382,13 @@
             const param = {
               shId:row.shId,
             }
+            if(row.shPersonName!=null && row.shPersonName!=''){
+              this.$alert('手环已绑定使用人，不可解绑', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
             this.$modal.confirm('确定把该手环与手环箱解除绑定吗？解绑后重新绑定才能继续使用！').then(function() {
               return delSh(param);
             }).then(() => {
@@ -1806,6 +1813,13 @@
               });
               return;
             }
+            if (row.teamId!=null && row.teamId!='' && row.teamId!=0) {
+              this.$alert('手环箱未归还，无法删除', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
             const  param = {
               shboxId:row.shboxId
             }