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 @@ @@ -247,7 +247,7 @@ @@ -590,7 +590,7 @@ placeholder="请输入手环编码" clearable @keyup.enter.native="handleQueryShBind" - maxlength="20" + maxlength="50" /> @@ -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 }