Skip to content

P
pc
Commit 41b7355a authored by 程卓's avatar 程卓
Browse files
Options

Revert "增加小区列表筛选条件, 增加判断是否为徐汇项目是则不展示邻里小慧条件,增加小区管理处的搜索条件" 

This reverts commit a41539d3.
parent c852fd2a
Show whitespace changes
Inline Side-by-side
Showing with 33 additions and 111 deletions
package.json
View file @ 41b7355a
...@@ -15,10 +15,7 @@ ...@@ -15,10 +15,7 @@
"build:xuhui-sit": "cross-env NODE_ENV='xuhui-sit' node build/build.js", "build:xuhui-sit": "cross-env NODE_ENV='xuhui-sit' node build/build.js",
"build:xuhui-prod": "cross-env NODE_ENV='xuhui-prod' node build/build.js", "build:xuhui-prod": "cross-env NODE_ENV='xuhui-prod' node build/build.js",
"build:huangpu-sit": "cross-env NODE_ENV='huangpu-sit' node build/build.js", "build:huangpu-sit": "cross-env NODE_ENV='huangpu-sit' node build/build.js",
"build:huangpu-prod": "cross-env NODE_ENV='huangpu-prod' node build/build.js", "build:huangpu-prod": "cross-env NODE_ENV='huangpu-prod' node build/build.js"
"build:yangpu-sit": "cross-env NODE_ENV='yangpu-sit' node build/build.js",
"build:yangpu-prod": "cross-env NODE_ENV='yangpu-prod' node build/build.js"
}, },
"dependencies": { "dependencies": {
"ant-design-vue": "^1.4.3", "ant-design-vue": "^1.4.3",
......
src/server/api.js
View file @ 41b7355a
...@@ -52,8 +52,8 @@ case 'huangpu-prod': ...@@ -52,8 +52,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' BASE_URL = 'http://xuhui.hm.omniview.pro/api'
// BASE_URL = 'http://pudong.hm.omniview.pro/api' // BASE_URL = 'http://pudong.hm.omniview.pro/api'
// MOCK_URL = 'https://yapi.omniview.pro/mock/278' // MOCK_URL = 'https://yapi.omniview.pro/mock/278'
......
src/store/mutations.js
View file @ 41b7355a
...@@ -8,9 +8,6 @@ export default { ...@@ -8,9 +8,6 @@ export default {
setRoutes(state, data) { setRoutes(state, data) {
state.routes = data state.routes = data
}, },
CHANGE_ISXUHUI(state, data) {
state.isXuhui = data
},
setWebviewSrc(state, src) { setWebviewSrc(state, src) {
state.webviewSrc = src state.webviewSrc = src
}, },
......
src/store/state.js
View file @ 41b7355a
...@@ -17,6 +17,5 @@ export default { ...@@ -17,6 +17,5 @@ export default {
tabName: '', tabName: '',
webviewSrc: null, webviewSrc: null,
content: null, content: null,
openKeys: [], openKeys: []
isXuhui: false, // 是否为徐汇项目
} }
src/views/home.vue
View file @ 41b7355a
...@@ -833,8 +833,6 @@ export default { ...@@ -833,8 +833,6 @@ export default {
this.openConfig = this.$com.confirm(res, 'data.content', []).customKeyEnable this.openConfig = this.$com.confirm(res, 'data.content', []).customKeyEnable
// 是否开启自定义字段存入cookie // 是否开启自定义字段存入cookie
this.$cookie.set('customKeyEnable', this.openConfig) this.$cookie.set('customKeyEnable', this.openConfig)
let isXuHui = this.$com.confirm(res, 'data.content', [])
this.$store.commit('CHANGE_ISXUHUI', isXuHui.projectArea == 'xuhui')
} }
}) })
}, },
......
src/views/houseData/basicInfo.vue
View file @ 41b7355a
...@@ -3,9 +3,7 @@ ...@@ -3,9 +3,7 @@
<div class="routerWapper"> <div class="routerWapper">
<div v-if="$route.path == '/houseData/basicInfo'" class="layoutMargin layoutPadding"> <div v-if="$route.path == '/houseData/basicInfo'" class="layoutMargin layoutPadding">
<a-form :form="form" class="protalForm" > <a-form :form="form" class="protalForm" >
<a-row class="formItem" type="flex" :justify="simpleSearchForm ? 'end' : ''" <a-row class="formItem" type="flex" align='top' :gutter="18">
align="top"
:gutter="simpleSearchForm ? 16 : 0">
<a-col span="8"> <a-col span="8">
<a-form-item label="小区名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-form-item label="小区名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-input placeholder="请输入查询内容" v-decorator="['stNameFrst_l']" /> <a-input placeholder="请输入查询内容" v-decorator="['stNameFrst_l']" />
...@@ -43,7 +41,7 @@ ...@@ -43,7 +41,7 @@
</a-form-item> </a-form-item>
</a-col> </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 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">
<a-select-option value="false">否</a-select-option> <a-select-option value="false">否</a-select-option>
<a-select-option value="true">是</a-select-option> <a-select-option value="true">是</a-select-option>
...@@ -51,7 +49,7 @@ ...@@ -51,7 +49,7 @@
</a-form-item> </a-form-item>
</a-col> </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 label="小区性质" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select <a-select
v-decorator="['stKind_in']" v-decorator="['stKind_in']"
mode="multiple" mode="multiple"
...@@ -64,9 +62,25 @@ ...@@ -64,9 +62,25 @@
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 动态搜索条件 -->
<template v-if="customKeyEnable">
<a-col span="8" v-for="i in searchList" :key="i.id" >
<a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]">
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select>
<a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'" placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]">
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select>
<a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'" v-decorator="[i.keyCode]" />
<a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
<a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
</a-form-item>
</a-col>
</template>
<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 label="小区层数" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select <a-select
v-decorator="['stLevel']" v-decorator="['stLevel']"
mode="multiple" mode="multiple"
...@@ -81,63 +95,34 @@ ...@@ -81,63 +95,34 @@
</a-col> </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 label="物业服务类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['wuyeServiceType'] " @change="changeServiceType"> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['wuyeServiceType'] " @change="changeServiceType">
<a-select-option v-for="(item) in wuyeServiceType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option> <a-select-option v-for="(item) in wuyeServiceType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </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 label="邻里小汇类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['finishDate'] " @change="changeFinishDate"> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['neighbourType'] " @change="changeNeighbourType">
<a-select-option v-for="(item) in finishDate" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col span="8" v-if="$store.state.isXuhui">
<a-form-item v-if="!simpleSearchForm" label="邻里小汇类型" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select allowClear placeholder="请选择查询内容" v-decorator="['neighbourType'] " @change="changeNeighbourType">
<a-select-option v-for="(item) in neighbourType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option> <a-select-option v-for="(item) in neighbourType" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<!-- 动态搜索条件 -->
<template v-if="customKeyEnable"> <a-col span="8">
<a-col span="8" v-for="i in searchList" :key="i.id" > <a-form-item label="竣工日期" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-form-item :label="i.keyName" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}"> <a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['finishDate'] " @change="changeFinishDate">
<a-select @change="handleChangeZdy(i.keyCode,$event)" v-if="i.compntType == 'select' || i.compntType == 'radio'" showSearch allowClear placeholder="请选择查询内容" v-decorator="[i.keyCode]"> <a-select-option v-for="(item) in finishDate" :key="item.key" :value="item.key">{{ item.name }}</a-select-option>
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select>
<a-select @change="handleChangeZdy(i.keyCode,$event)" mode="multiple" v-else-if="i.compntType =='checkbox'" placeholder="请选择查询内容(多选)" v-decorator="[i.keyCode]">
<a-select-option v-for="(item) in JSON.parse(i.sltJson)" :key="item" :value="item">{{ item }}</a-select-option>
</a-select> </a-select>
<a-date-picker @change="handleChangeZdy(i.keyCode,$event)" v-else-if="i.compntType =='date'" v-decorator="[i.keyCode]" />
<a-input v-else-if="i.compntType =='num'" type="tel" placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
<a-input v-else placeholder="请输入查询内容" v-decorator="[i.keyCode]" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</template>
<!-- 功能按钮区 --> <!-- 功能按钮区 -->
<a-col span="24" class="algin-right"> <a-col span="24" class="algin-right">
<a-button @click="exportEWM">导出二维码</a-button> <a-button @click="exportEWM">导出二维码</a-button>
<a-button @click="exportList">导出数据</a-button> <a-button @click="exportList">导出数据</a-button>
<a-button @click="reset">重置</a-button> <a-button @click="reset">重置</a-button>
<a-button type="primary" @click="search">搜索</a-button> <a-button type="primary" @click="search">搜索</a-button>
<a-button
type="primary"
v-if="simpleSearchForm"
@click="showMoreSearch"
>更多搜索</a-button
>
<a-button
type="primary"
v-if="!simpleSearchForm"
@click="closeMoreSearch"
>简单搜索</a-button
>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
...@@ -155,8 +140,6 @@ export default { ...@@ -155,8 +140,6 @@ export default {
name: 'basicInfo', name: 'basicInfo',
data() { data() {
return { return {
simpleSearchForm: true, // 展示、收取简单搜索开关，true为简单搜索
levelType: [ levelType: [
{ {
name: '单层', name: '单层',
...@@ -353,26 +336,6 @@ export default { ...@@ -353,26 +336,6 @@ export default {
beforeCreate() { // 页面进来创建form beforeCreate() { // 页面进来创建form
this.form = this.$form.createForm(this) this.form = this.$form.createForm(this)
}, },
computed: {
formItemLabelCol() {
let labelCol = {}
if (this.simpleSearchForm) {
labelCol = { span: 0 }
} else {
labelCol = { span: 8 }
}
return labelCol
},
formItemWrapperCol() {
let wrapperCol = {}
if (this.simpleSearchForm) {
wrapperCol = { span: 24 }
} else {
wrapperCol = { span: 16 }
}
return wrapperCol
}
},
created () { // 进页面获取数据 created () { // 进页面获取数据
this.customKeyEnable=this.$cookie.get('customKeyEnable') this.customKeyEnable=this.$cookie.get('customKeyEnable')
this.getHos() this.getHos()
...@@ -389,12 +352,6 @@ export default { ...@@ -389,12 +352,6 @@ export default {
} }
}, },
methods: { methods: {
closeMoreSearch() {
this.simpleSearchForm = true
},
showMoreSearch() {
this.simpleSearchForm = false
},
pageChange(page){ //分页切换 pageChange(page){ //分页切换
this.pagination.pageNo = page this.pagination.pageNo = page
this.pagination.current = page this.pagination.current = page
......
src/views/houseData/cmDivision.vue
View file @ 41b7355a
...@@ -8,13 +8,6 @@ ...@@ -8,13 +8,6 @@
<a-input placeholder="请输入查询内容" v-decorator="['csName_l']" /> <a-input placeholder="请输入查询内容" v-decorator="['csName_l']" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col span="8">
<a-form-item label="街道名称" class="formItem" :label-col="{span:10}" :wrapper-col="{span:14}">
<a-select showSearch allowClear placeholder="请选择查询内容" v-decorator="['c.streetId']" @change="changeStreet">
<a-select-option v-for="(item) in street" :key="item.streetId" :value="item.strName+'#'+item.streetId">{{ item.strName }}</a-select-option>
</a-select>
</a-form-item>
</a-col>
<!-- 动态搜索条件 --> <!-- 动态搜索条件 -->
<template v-if="customKeyEnable"> <template v-if="customKeyEnable">
<a-col span="8" v-for="i in searchList" :key="i.id" > <a-col span="8" v-for="i in searchList" :key="i.id" >
...@@ -98,14 +91,12 @@ export default { ...@@ -98,14 +91,12 @@ export default {
pageSizeOptions: ['10', '20', '50', '100'], pageSizeOptions: ['10', '20', '50', '100'],
}, },
tableData: [], tableData: [],
street: []
} }
}, },
beforeCreate() { // 页面进来创建form beforeCreate() { // 页面进来创建form
this.form = this.$form.createForm(this) this.form = this.$form.createForm(this)
}, },
created () { // 进页面获取数据 created () { // 进页面获取数据
this.getStreet()
this.customKeyEnable=this.$cookie.get('customKeyEnable') this.customKeyEnable=this.$cookie.get('customKeyEnable')
if(this.customKeyEnable && this.customKeyEnable == 'true'){ if(this.customKeyEnable && this.customKeyEnable == 'true'){
// this.getKeys() // this.getKeys()
...@@ -122,22 +113,6 @@ export default { ...@@ -122,22 +113,6 @@ export default {
} }
}, },
methods: { methods: {
getStreet(){ //获取街道下拉
this.$ajax.get({
url: this.$api.GET_STREET_LIST,
params: {
pageSize: 10000
}
}).then(res => {
this.street = this.$com.confirm(res, 'data.content', [])
})
},
changeStreet(value) { // 切换街道
this.form.setFieldsValue({
'c.streetId': value
})
this.search()
},
handleChangeZdy(i, e){ // 自定义字段 - 搜索条件的 change handleChangeZdy(i, e){ // 自定义字段 - 搜索条件的 change
if (Object.prototype.toString.call(e)== '[object Array]') { if (Object.prototype.toString.call(e)== '[object Array]') {
e2 = e.join(',') e2 = e.join(',')
...@@ -171,7 +146,6 @@ export default { ...@@ -171,7 +146,6 @@ export default {
const searchParams = Object.assign({}, { const searchParams = Object.assign({}, {
'csName_l': !this.form.getFieldValue('csName_l')?'':this.form.getFieldValue('csName_l'), 'csName_l': !this.form.getFieldValue('csName_l')?'':this.form.getFieldValue('csName_l'),
'sectType_in': '1', 'sectType_in': '1',
'c.streetId': !this.form.getFieldValue('c.streetId')?'':this.form.getFieldValue('c.streetId').split('#')[1],
}, obj) }, obj)
this.searchParams = searchParams this.searchParams = searchParams
......
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