查询条件

src/server/api.js

@@ -52,8 +52,8 @@ case 'huangpu-prod':
 
 default: // 默认环境下（开发环境）
   // BASE_URL = 'http://31.0.161.39/apiv2' 
-  BASE_URL = 'http://211.136.105.193/apiv2'
-  // BASE_URL = 'http://xuhui.hm.omniview.pro/api'
+  // BASE_URL = 'http://211.136.105.193/apiv2'
+  BASE_URL = 'http://xuhui.hm.omniview.pro/api'
   // BASE_URL = 'http://pudong.hm.omniview.pro/api'
  
   // MOCK_URL = 'https://yapi.omniview.pro/mock/278'

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,
@@ -172,6 +243,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/login.vue

@@ -83,7 +83,7 @@ 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({
             path: '/portal-home'