合并逻辑

src/views/houseData/basicInfo.vue

@@ -330,7 +330,8 @@ export default {
       tableName: '', // 邻里小汇
       formed: '', // 邻里小汇
       type: '', // 邻里小汇
-      isBeforeTwoThousand: false
+      isBeforeTwoThousand: false,
+      personalizedKey: ''
     }
   },
   beforeCreate() { // 页面进来创建form
@@ -346,12 +347,29 @@ export default {
     if(this.$route.name == 'basicInfo'){
       this.$nextTick(function () {
         // setTimeout(() => {
+        this.getConfig(),
         this.getSearchParams()
         // }, 0)
       })
     }
   },
   methods: {
+    getConfig() {
+      this.$ajax.get({
+        url: this.$api.GET_CONFIG,
+      }).then(res => {
+        if (res.code === '200') {
+          let inner = res.data.content
+          this.personalizedKey = inner.formedKey
+        }
+      })
+    },
+    closeMoreSearch() {
+      this.simpleSearchForm = true
+    },
+    showMoreSearch() {
+      this.simpleSearchForm = false
+    },
     pageChange(page){ //分页切换
       this.pagination.pageNo = page
       this.pagination.current = page
@@ -457,13 +475,14 @@ export default {
         'unitKind': !this.stLevel?'': this.stLevel,
         'cspServiceType': !this.cspServiceType? '': this.cspServiceType,
         // 'tableName': !this.tableName?'': this.tableName,
-        'formed': !this.formed?'': this.formed,
         'type': !this.type? '': this.type,
         'sectType_in': '1',
         'c.createTime_desc': 'desc',
         'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '',
         'finishDate_gt': !this.isBeforeTwoThousand? '2000-01-01': '',
       }, obj, isHocId)// 融合obj 和isHocId 到入参
+
+      searchParams[this.personalizedKey] = !this.formed?'': this.formed
       if (this.$route.query.id && this.$route.query.id != '') {
         // 如果query的id不为空,则回显,并根据id搜索
         this.form.setFieldsValue({'c.cspId': this.$route.query.name+'#'+this.$route.query.id})

src/views/houseData/indCous.vue

@@ -4,23 +4,52 @@
     <div v-if="$route.name == 'indCous'" class="layoutMargin layoutPadding">
       <a-form :form="form" class="protalForm" >
         <a-row class="formItemLine" type="flex" align='top' :gutter="18">
-          <a-col span="8">
+          <a-col span="6">
             <a-form-item label="业主大会编码" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-input placeholder="请输入查询内容" v-decorator="['hocCode_l']" />
             </a-form-item>
           </a-col>
-          <a-col span="8" >
+          <a-col span="6" >
             <a-form-item label="业委会名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
               <a-input placeholder="请输入查询内容" v-decorator="['hocName_l']" />
             </a-form-item>
           </a-col>
-          <a-col span="8" >
+          <a-col span="6" >
             <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>
+          <a-col span="6">
+            <a-form-item label="业委会到期时间" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-date-picker v-decorator="['overdueDate']" />
+            </a-form-item>
+          </a-col>
+
+          <a-col span="6" >
+            <a-form-item label="运作情况" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select allowClear placeholder="请选择查询内容" v-decorator="['runSts']" >
+                <a-select-option v-for="(item) in runStsList" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col span="6" >
+            <a-form-item label="换届情况" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select allowClear placeholder="请选择查询内容" v-decorator="['changeSts']" >
+                <a-select-option v-for="(item) in changeList" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+
+          <a-col span="6" >
+            <a-form-item label="是否为党员" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
+              <a-select allowClear placeholder="请选择查询内容" v-decorator="['isDY']" >
+                <a-select-option v-for="(item) in dyList" :key="item.key" :value="item.key">{{ item.name }}</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" >
@@ -94,6 +123,48 @@ export default {
           }
         }
       ],
+      runStsList: [
+        {
+          name: '正常',
+          key: '1'
+        },
+        {
+          name: '不正常',
+          key: '2'
+        },
+        {
+          name: '瘫痪',
+          key: '3'
+        }
+      ],
+      changeList: [
+        {
+          name: '按时换届',
+          key: '1'
+        },
+        {
+          name: '任期期满正在换届',
+          key: '2'
+        },
+        {
+          name: '任期期满但未换届',
+          key: '3'
+        }
+      ],
+      dyList: [
+        {
+          name: '主任与副主任是党员',
+          key: '1'
+        },
+        {
+          name: '主任是党员',
+          key: '2'
+        },
+        {
+          name: '副主任是党员',
+          key: '3'
+        },
+      ],
       pagination: { // 分页信息
         pageNo: 1,
         pageSize: 20,
@@ -127,6 +198,7 @@ export default {
   mounted(){
     if (this.$route.name == 'indCous' ) {
       this.$nextTick(function () {
+        this.form.setFieldsValue({'overdueDate': this.$route.query.date})
         this.getSearchParams()
         this.getStreet()
       })
@@ -172,6 +244,10 @@ export default {
         'hocCode_l': this.form.getFieldValue('hocCode_l') || '',
         'hocName_l': this.form.getFieldValue('hocName_l') || '',
         'streetId': this.form.getFieldValue('streetId')?this.form.getFieldValue('streetId'):'',
+        'conEndDate_lte': !!this.form.getFieldValue('overdueDate')? (this.$moment(this.form.getFieldValue('overdueDate')).format('L')).split('/').join('') : '',
+        'onwersTypeoper': !!this.form.getFieldValue('runSts')? this.form.getFieldValue('runSts'): '',
+        'onwersTransition': !!this.form.getFieldValue('changeSts')? this.form.getFieldValue('changeSts'): '',
+        'partyMemberByDuty': !!this.form.getFieldValue('isDY')? this.form.getFieldValue('isDY'): '',
         'sectType_in': '1',
       }, obj)
       this.searchParams = searchParams

src/views/houseData/propertyInfoView.vue

@@ -108,15 +108,6 @@
                       </a-row>
                     </a-col>
                   </a-row>
-                  <div>
-                    <p style=" text-align: left; font-weight: bold; color: #232323; font-size: 16px; text-indent: 0.5rem;
-                    line-height: 60px; border-bottom: 1px solid #e0e0e0; margin-top: 20px;">管理小区列表</p>
-
-                    <a-table class="elevator-table portalTable propertyInfoViewTable" :dataSource="tableData" :columns="columns" size="small" :pagination="pagination"
-                      rowKey="id" bordered> 
-                    </a-table> 
-
-                  </div>
                 </div>
                     <!-- 小区管理处 -->
                 <a-row v-if="urls.name == 'cmDivisionView'" type="flex" justify="start">
@@ -175,6 +166,7 @@
                 </a-row>
                     <!-- 小区经理 -->
                 <a-row v-if="urls.name == 'managerView'" type="flex" justify="start">
+                  <a-row>
                     <a-col span="8">
                     <a-row type="flex" justify="start" class="detailsPartLine">
                       <a-col span="24">
@@ -226,6 +218,17 @@
                       </a-col>
                     </a-row>
                   </a-col>
+                  </a-row>
+                  <a-row style="width: 100%">
+                    <div>
+                    <p style=" text-align: left; font-weight: bold; color: #232323; font-size: 16px; text-indent: 0.5rem;
+                    line-height: 60px; border-bottom: 1px solid #e0e0e0; margin-top: 20px;">管理小区列表</p>
+
+                    <a-table :dataSource="tableData" :columns="columns" size="large" :pagination="pagination" rowKey="id" bordered> 
+                    </a-table> 
+
+                  </div>
+                  </a-row>
                 </a-row>
                     <!-- 非居信息 -->
                 <a-row v-if="urls.name == 'nonResidentsView'" type="flex" justify="start">
@@ -845,13 +848,14 @@ export default {
     }
   },
   mounted() {
+    this.getStList()
   },
   methods: {
     getStList(){
       this.$ajax.get({
         url: this.$api.GET_BASIC_LIST,
         params: {
-          cspId: this.$route.query.id,
+          'c.csmId': this.$route.query.id,
           pageSize: 10,
           pageNo: this.pagination.pageNo
         }

src/views/login.vue

@@ -83,7 +83,6 @@ export default {
         if (res.code == 200) { 
           res.token = this.$com.confirm(res, 'data.content', [])
           // console.log(res.token)
-          // this.$cookie.set('token', 'bearer '+res.token.access_token)
           this.$cookie.set('token', res.token.access_token)
           this.$cookie.set('userName', res.name) // 存储当前账号的用户名
           this.$router.push({