Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_MY_WEBFRONT into feature_meiyuan

src/views/property/accessCard.vue

@@ -4,6 +4,9 @@
       <el-form-item label="电梯描述">
         <el-input v-model="queryParams.descr" placeholder="请输入" />
       </el-form-item>
+      <el-form-item :label="getColumnName('accesscardid')">
+        <el-input v-model="queryParams.accesscardid" placeholder="请输入" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
@@ -130,7 +133,8 @@ export default {
       queryParams: {
         pageIndex: 1,
         pageSize: 10,
-        descr: undefined
+        descr: undefined,
+        accesscardid: undefined
       },
       // 表单参数
       form: {},

src/views/property/carPort.vue

@@ -4,6 +4,9 @@
       <el-form-item label="车位描述">
         <el-input v-model="queryParams.descr" placeholder="请输入" />
       </el-form-item>
+      <el-form-item :label="getColumnName('carportid')">
+        <el-input v-model="queryParams.carportid" placeholder="请输入" />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
@@ -156,7 +159,8 @@ export default {
       queryParams: {
         pageIndex: 1,
         pageSize: 10,
-        descr: undefined
+        descr: undefined,
+        carportid: undefined
       },
       // 表单参数
       form: {},