Commit 69e2e777 authored by 程卓's avatar 程卓

修改搜索条件

parent e6ab121e
...@@ -45,13 +45,13 @@ async function GetRoutes(router) { ...@@ -45,13 +45,13 @@ async function GetRoutes(router) {
break break
default: // 当前仅可使用pudong / xuhui-sit/uat进行打包 default: // 当前仅可使用pudong / xuhui-sit/uat进行打包
MicRouters = xuhui MicRouters = pudong
break break
} }
// 徐汇区的子项目要看当前用户是否是超管,否则不展示 处置单和投诉 // 徐汇区的子项目要看当前用户是否是超管,否则不展示 处置单和投诉
// console.log(env) // console.log(Store.state.userInfos)
if (env.indexOf('xuhui') != -1) { if (env.indexOf('xuhui') != -1 ) {
let newArr= [] let newArr= []
MicRouters.Layout.forEach((item) => { MicRouters.Layout.forEach((item) => {
if (item.name != 'tousu' && item.name != 'Disposal' ) { if (item.name != 'tousu' && item.name != 'Disposal' ) {
......
...@@ -62,8 +62,8 @@ case 'huangpu-prod': ...@@ -62,8 +62,8 @@ case 'huangpu-prod':
default: // 默认环境下(开发环境) default: // 默认环境下(开发环境)
// BASE_URL = 'http://31.0.161.39/apiv2' // BASE_URL = 'http://31.0.161.39/apiv2'
// BASE_URL = 'http://211.136.105.193/apiv2' // BASE_URL = 'http://211.136.105.193/apiv2'
BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2' // BASE_URL = 'http://xuhui.hm.omniview.pro/api/v2'
// BASE_URL = 'http://pudong.hm.omniview.pro/api/v2' BASE_URL = 'http://pudong.hm.omniview.pro/api/v2'
// BASE_URL = 'http://211.136.105.193/apiv2' // BASE_URL = 'http://211.136.105.193/apiv2'
// MOCK_URL = 'https://yapi.omniview.pro/mock/278' // MOCK_URL = 'https://yapi.omniview.pro/mock/278'
break break
......
...@@ -40,6 +40,11 @@ ...@@ -40,6 +40,11 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="更新时间" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-range-picker v-decorator="['syncTime_betn']" />
</a-form-item>
</a-col>
<a-col span="8"> <a-col span="8">
<a-form-item v-if="!simpleSearchForm" label="成立业主大会" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-form-item v-if="!simpleSearchForm" label="成立业主大会" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['isHoc']" @change="changeIsHoc"> <a-select allowClear placeholder="请选择查询内容" v-decorator="['isHoc']" @change="changeIsHoc">
...@@ -517,6 +522,11 @@ export default { ...@@ -517,6 +522,11 @@ export default {
} }
} }
} }
let syncTime_betn = ''
if (this.form.getFieldValue('syncTime_betn').length >1) {
syncTime_betn = this.$moment(this.form.getFieldValue('syncTime_betn')[0]).format('YYYYMMDD')+'000001'
syncTime_betn += ','+this.$moment(this.form.getFieldValue('syncTime_betn')[1]).format('YYYYMMDD')+'235959'
}
let searchParams = Object.assign({}, { let searchParams = Object.assign({}, {
'stNameFrst_l': this.form.getFieldValue('stNameFrst_l')|| '', 'stNameFrst_l': this.form.getFieldValue('stNameFrst_l')|| '',
'addrFrst_l': this.form.getFieldValue('addrFrst_l')|| '', 'addrFrst_l': this.form.getFieldValue('addrFrst_l')|| '',
...@@ -532,6 +542,7 @@ export default { ...@@ -532,6 +542,7 @@ export default {
'sectType': 1, 'sectType': 1,
'sectType_in': this.sectType_in, 'sectType_in': this.sectType_in,
'c.createTime_desc': 'desc', 'c.createTime_desc': 'desc',
syncTime_betn, // 更新时间
// 'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '', // 'finishDate_lt': !!this.isBeforeTwoThousand? '2000-01-01': '',
'finishDate_lt': this.isBeforeTwoThousand == '1' ? '2020-01-01':'', 'finishDate_lt': this.isBeforeTwoThousand == '1' ? '2020-01-01':'',
'finishDate_gt': this.isBeforeTwoThousand == '2' ? '2020-01-01':'', 'finishDate_gt': this.isBeforeTwoThousand == '2' ? '2020-01-01':'',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment