Merge branch 'dev' into xuhui

src/views/houseData/propertyInfo.vue

@@ -13,6 +13,14 @@
             <a-form-item label="物业名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-input placeholder="请输入查询内容" v-decorator="['cspName_l']" />
             </a-form-item>
+          </a-col>
+          <a-col span="8" >
+            <a-form-item label="在管小区数排序" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select placeholder="请选择排序方式" v-decorator="['managedNum']">
+                <a-select-option value="managedNum_asc">正序</a-select-option>
+                <a-select-option value="managedNum_desc">倒序</a-select-option>
+              </a-select>
+            </a-form-item>
           </a-col>
             <!-- 动态搜索条件 -->
           <template v-if="customKeyEnable">
@@ -235,9 +243,11 @@ export default {
       })
       const searchParams = Object.assign({}, {
         'cspName_l': !this.form.getFieldValue('cspName_l')? '': this.form.getFieldValue('cspName_l'), 
-        // 'orgCode_l': !this.form.getFieldValue('orgCode_l')?'':this.form.getFieldValue('orgCode_l'),
         'sectType_in': '1',
       }, obj)
+      if(this.form.getFieldValue('managedNum')){
+        searchParams[this.form.getFieldValue('managedNum')] = 1
+      }
       this.searchParams = searchParams
       this.$ajax.get({
         url: this.$api.GET_PROPCOMPANIES_LIST,