diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
index 3bc8a12..a1e430c 100644
--- a/src/views/base/bracelet/index.vue
+++ b/src/views/base/bracelet/index.vue
@@ -2,7 +2,7 @@
   <el-tabs v-model="activeName" @tab-click="handleClick" class="app-container">
     <el-tab-pane label="手环管理" name="first" onclick="handleQuery">
     <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form :model="queryParams" ref="queryFormOne" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
         <el-form-item  prop="shCode">
           <el-input
@@ -20,14 +20,6 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item  prop="shboxCode">
-          <el-input
-            v-model="queryParams.shboxCode"
-            placeholder="请输入手环箱编码"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
         <el-form-item  prop="shPersonName">
           <el-input
             v-model="queryParams.shPersonName"
@@ -157,7 +149,7 @@
       />
       
       <!-- 手环弹窗 -->
-      <el-dialog :title="title" :visible.sync="showsh" width="600px" height="600px" append-to-body>
+      <el-dialog :title="title" :visible.sync="showsh" width="600px" height="600px" append-to-body @close="cancel">
           <el-form :model="queryshCode" ref="queryshCode" :rules="rules" size="small" :inline="true" v-show="showSearch" label-width="100px">
             <el-form-item label="手环编码" prop="shCode">
                 <el-input 
@@ -244,7 +236,7 @@
       </el-dialog>
 
       <!-- 修改手环弹窗 -->
-      <el-dialog :title="title" :visible.sync="showShEdit" width="600px" height="600px" append-to-body>
+      <el-dialog :title="title" :visible.sync="showShEdit" width="600px" height="600px" append-to-body @close="cancelEdit">
           <el-form :model="queryshEdit" ref="queryshEdit" :rules="rules" size="small" :inline="true" v-show="showSearch" label-width="100px">
             <el-form-item label="手环编码" prop="shCode">
                 <el-input 
@@ -1169,11 +1161,12 @@
         // 取消按钮
         cancel() {
             this.showsh = false;
-            this.reset();
+             this.resetAdd();
         },
         // 修改手环页面取消按钮
         cancelEdit() {
             this.showShEdit = false;
+             this.resetEdit();
         },
         // 手环绑定选择页面取消按钮
         cancelBind() {
@@ -1204,9 +1197,14 @@
             this.formThree = {};
             this.resetForm("formThree");
         },
+        // 手环新增按钮页面表单重置
+        resetAdd() {
+            this.queryshCode.shCode = '';
+            this.resetForm("queryshCode");
+        },        
         // 手环修改按钮页面表单重置
         resetEdit() {
-            this.queryshEdit = {};
+            this.queryshEdit.shCode = {};
             this.resetForm("queryshEdit");
         },
         // 手环绑定选择页面表单重置
@@ -1246,7 +1244,7 @@
 
         /** 重置按钮操作 */
         resetQuery() {
-            this.resetForm("queryForm");
+            this.resetForm("queryFormOne");  
             this.currentSelectionSh = [];//重置清除已选列表
             this.handleQuery();
         },
@@ -1554,6 +1552,7 @@
         /** 修改按钮操作 */
         handleUpdate(row) {
             //  this.reset();
+            this.queryshEdit.pageNum = 1;
             const shPersonName = row.shPersonName;
             const shId = row.shId;
             if(shPersonName!=null&&shPersonName!=''){
@@ -1652,7 +1651,10 @@
 
         /** 提交按钮 */
         submitForm() { 
+          console.log(this.shboxIdOne);
+          console.log(this.radioOne);
           this.queryshCode.shCode = this.queryshCode.shCode;
+          this.queryshCode.shboxId = this.shboxIdOne;
           this.$refs["queryshCode"].validate(valid => {
             if (valid) {
               addSh(this.queryshCode).then(response => {
@@ -1864,6 +1866,8 @@
 
         //打开手环页面
         openShbox(row){
+          // this.resetAdd();
+          this.queryshCode.pageNum = 1;
           this.shboxIdOne = null;
           this.title = "新增手环"
           this.showsh = true;
@@ -1886,6 +1890,7 @@
 
         //打开编辑页面
         openShEdit(row){
+          this.resetEdit();
           this.shId = row.shId;
           this.title = "修改手环"
           this.showShEdit = true;