Merge branch 'dev' into xuhui

src/views/houseData/indCous.vue

@@ -14,6 +14,13 @@
               <a-input placeholder="请输入查询内容" v-decorator="['hocName_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 allowClear placeholder="请选择查询内容" v-decorator="['streetId']" >
+                <a-select-option v-for="(item) in street" :key="item.streetId" :value="item.streetId">{{ item.strName }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <!-- 动态搜索条件 -->
           <template v-if="customKeyEnable">
             <a-col span="8"  v-for="i in searchList" :key="i.id" >
@@ -102,6 +109,7 @@ export default {
         pageSizeOptions: ['10', '20', '50', '100'],
       },
       tableData: [],
+      street: [], // 街道数据
     }
   },
   beforeCreate() { // 页面进来创建form
@@ -120,10 +128,21 @@ export default {
     if (this.$route.name == 'indCous' ) {
       this.$nextTick(function () {
         this.getSearchParams()
+        this.getStreet()
       })
     }
   },
   methods: {
+    getStreet(){ //获取街道下拉
+      this.$ajax.get({
+        url: this.$api.GET_STREET_LIST,
+        params: {
+          pageSize: 10000
+        }
+      }).then(res => {
+        this.street = this.$com.confirm(res, 'data.content', [])
+      })
+    },
     handleChangeZdy(i, e){ // 自定义字段 - 搜索条件的 change
       if (Object.prototype.toString.call(e)== '[object Array]') {
         e2 = e.join(',')
@@ -152,6 +171,7 @@ export default {
       const searchParams = Object.assign({}, {
         'hocCode_l': this.form.getFieldValue('hocCode_l') || '',
         'hocName_l': this.form.getFieldValue('hocName_l') || '',
+        'streetId': this.form.getFieldValue('streetId')?this.form.getFieldValue('streetId'):'',
         'sectType_in': '1',
       }, obj)
       this.searchParams = searchParams
@@ -192,6 +212,9 @@ export default {
             case 'hocName_l':
               this.form.setFieldsValue({ 'hocName_l': searchParams.params[elem] })
               break
+            case 'streetId':
+              this.form.setFieldsValue({ 'streetId': searchParams.params[elem] })
+              break
             default:
               break
             }

src/views/houseData/propertyInfoView.vue

@@ -463,7 +463,7 @@
                     </a-row>
                     <a-row type="flex" justify="start" class="detailsPartLine">
                       <a-col span="24">
-                        <DetailsItem :labelSpan='12' :textSpan='12' label='' :text='""'/>
+                        <DetailsItem :labelSpan='12' :textSpan='12' label='所属街道' :text='detail.streetName'/>
                       </a-col>
                     </a-row>
                   </a-col>

src/views/houseData/tbls.vue

@@ -274,13 +274,18 @@ export default {
       this.$ajax.get({
         url: this.$api.GET_TBLS_KEYS,
         params: {
-          tbl: params
+          tbl: params,
+          pageSize: this.pagination.pageSize,
+          pageNo: this.pagination.current
         },
       }).then(res => {
         this.taskCollectList = []
         if (res.code == '200') {
           let list = this.$com.confirm(res, 'data.content', []) 
-          this.pagination.total= this.$com.confirm(res, 'data.totalRows', 0)
+          this.pagination.total = this.$com.confirm(res, 'data.totalRows', 0)
+          this.pagination.pageSize = res.data.pageSize
+          this.pagination.current = res.data.page
+          this.pagination.pageNo = res.data.totalPages
           for(let i=0;i<list.length;i++){
             if (list[i].compntType == 'select') {
               list[i].compntType = '选择项'