Merge branch 'v0.0.9' of http://10.87.21.221:8000/jzyd_yyds/soc_web into v0.0.9

src/views/system/bind/index.vue

@@ -29,7 +29,7 @@
                     @checkChange="checkChange"
                     @click="clickTreeNode"
                   ref="orgTree"
-                
+
                   ></org-tree>
               </el-form-item>
 
@@ -59,6 +59,16 @@
                 />
               </el-form-item>
 
+              <el-form-item label="NFC点位" prop="collectionAreaName">
+                <el-input
+                  maxlength="50"
+                  v-model="queryParams.collectionAreaName"
+                  placeholder="请输入NFC点位"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
               <el-form-item label="标签编号" prop="code">
                 <el-input
                   maxlength="50"
@@ -69,6 +79,16 @@
                 />
               </el-form-item>
 
+              <el-form-item label="标签名称" prop="labelName">
+                <el-input
+                  maxlength="50"
+                  v-model="queryParams.labelName"
+                  placeholder="请输入标签名称"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+
               <el-form-item label="状态" prop="enable">
                 <el-select
                   v-model="queryParams.enable"
@@ -82,6 +102,7 @@
                   ></el-option>
                 </el-select>
               </el-form-item>
+
             </el-form>
 
             <el-row :gutter="10">
@@ -353,6 +374,7 @@ export default {
         collectionAreaName: null,
         checkId: null,
         checkSub: true,
+        labelName: null
       },
       // 表单参数
       form: {},
@@ -534,6 +556,7 @@ export default {
         orgPath: null,
         collectionAreaName: null,
         checkId: null,
+        labelName: null
       };
       this.resetForm("form");
     },