手环名称添加

src/views/base/bracelet/index.vue

@@ -4,6 +4,16 @@
     <div class="app-container">
       <el-form :model="queryParams" ref="queryFormOne" size="small" :inline="true" v-show="showSearch" label-width="68px">
 
+        <el-form-item  prop="shName">
+          <el-input
+            v-model="queryParams.shName"
+            placeholder="请输入手环名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+            maxlength="20"
+          />
+        </el-form-item>
+
         <el-form-item  prop="shCode">
           <el-input
             v-model="queryParams.shCode"
@@ -82,6 +92,7 @@
         </template>
       </el-table-column>
         <el-table-column label="手环id" align="center" prop="shId" v-if="false" />
+        <el-table-column label="手环名称" align="center" prop="shName" sortable/>
         <el-table-column label="手环编码" align="center" prop="shCode" sortable/>
         <el-table-column label="所属手环箱" align="center" prop="shboxName" sortable>
         <template slot-scope="scope">
@@ -154,18 +165,20 @@
       <!-- 手环弹窗 -->
       <el-dialog :title="title" :visible.sync="showsh" width="600px" height="600px" append-to-body @close="cancel">
           <el-form  ref="queryshCode" :model="queryshCode"  :rules="rules"   label-width="100px" @submit.native.prevent>
-            <el-form-item label="手环编码" prop="shCode">
+            <el-form-item label="手环编码" prop="shCode" >
                 <el-input 
                 v-model="queryshCode.shCode" 
                 placeholder="请输入手环编码" 
                 maxlength="50"
+                style="width: 400px;"
                 />
             </el-form-item>    
-            <el-form-item label="手环名称" prop="shName">
+            <el-form-item label="手环名称" prop="shName" >
                 <el-input 
                 v-model="queryshCode.shName" 
                 placeholder="请输入手环名称" 
-                maxlength="32"
+                maxlength="50"
+                style="width: 400px;"
                 />
             </el-form-item>       
         </el-form>
@@ -250,18 +263,20 @@
       <!-- 修改手环弹窗 -->
       <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-form-item label="手环编码" prop="shCode" with="50px" >
                 <el-input 
                 v-model="queryshEdit.shCode" 
                 placeholder="请输入手环编码" 
                 maxlength="50"
+                style="width: 400px;"
                 />
             </el-form-item> 
             <el-form-item label="手环名称" prop="shName">
                 <el-input 
                 v-model="queryshEdit.shName" 
                 placeholder="请输入手环名称" 
-                maxlength="20"
+                maxlength="50"
+                style="width: 400px;"
                 />
             </el-form-item>         
         </el-form>
@@ -598,6 +613,15 @@
       <!-- 手环箱管理页面绑定手环弹窗 -->
       <el-dialog :title="title" :visible.sync="showShall" width="1000px" height="1000px" append-to-body @close="cancelOne">
         <el-form :model="queryShBoxall" ref="queryFormThree"  size="small" :inline="true" v-show="showSearch" label-width="100px">
+          <el-form-item  prop="shName">
+          <el-input
+            v-model="queryShBoxall.shName"
+            placeholder="请输入手环名称"
+            clearable
+            @keyup.enter.native="handleQueryShBind"
+            maxlength="50"
+          />
+        </el-form-item>
         <el-form-item  prop="shCode">
           <el-input
             v-model="queryShBoxall.shCode"
@@ -647,6 +671,7 @@
 
       <el-table v-loading="loadingSix" :data="shBindList" width="600px" height = "400px" >
         <el-table-column label="手环id" align="center" prop="shId" v-if="false" />
+        <el-table-column label="手环名称" align="center" prop="shName" />
         <el-table-column label="手环编码" align="center" prop="shCode" />
         <el-table-column label="手环状态" align="center" prop="shStatus" >
         <template slot-scope="scope">
@@ -685,6 +710,7 @@
         <el-table-column type="selection" width="55" align="center"  :selectable="selectable" >
         </el-table-column>
         <el-table-column label="手环id" align="center" prop="shId" v-if="false" />
+        <el-table-column label="手环名称" align="center" prop="shName" />
         <el-table-column label="手环编码" align="center" prop="shCode" />
       </el-table>
       <div slot="footer" class="dialog-footer">
@@ -882,14 +908,15 @@
           shboxCode: undefined,
           shPersonName:undefined,
           shStatus:undefined,
+          shName:undefined,
         },
         queryshCode:{
           pageNum: 1,
           pageSize: 10,
           shCode: undefined,
-          shName: undefined,
           shboxName: undefined,
           shboxId: undefined,
+          shName:undefined,
         },
         queryshCodeBind:{
           pageNum: 1,
@@ -921,9 +948,9 @@
           pageSize: 10,
           shId: undefined,
           shCode: undefined,
-          shName:undefined,
           shboxName: undefined,
           shboxId: undefined,
+          shName: undefined,
         },
 
         queryShbox: {
@@ -943,6 +970,7 @@
           shId:undefined,
           shPersonName: undefined,
           shStatus:undefined,
+          shName:undefined,
         },
         queryDeviceAttribute: {
           pageNum: 1,
@@ -1624,6 +1652,7 @@
           this.queryshEdit.pageNum = 1;
           this.queryshEdit.shId = row.shId;
           this.queryshEdit.shCode = row.shCode;
+          this.queryshEdit.shName = row.shName;
         },