Commit f8a07e07 by wangchunyang

登录后同步加载用户信息调整,回访、双属地页面样式调整

parent ed2c29ed
...@@ -151,17 +151,13 @@ export default { ...@@ -151,17 +151,13 @@ export default {
const controlData = { const controlData = {
no: data.no no: data.no
} }
// 内层Promise otherUserInfo(controlData).then(resop => {
return new Promise((resolve, reject) => { commit('setOtherUserInfo', resop.data.data)
otherUserInfo(controlData).then(resop => { // console.log('内层Promise', resop.data.data)
commit('setOtherUserInfo', resop.data.data) resolve(data)
console.log('内层Promise', data, resop.data.data) }).catch(er => {
resolve(data) reject(er)
}).catch(err => {
reject(err)
})
}) })
// resolve(data)
}).catch(err => { }).catch(err => {
reject(err) reject(err)
}) })
...@@ -170,6 +166,16 @@ export default { ...@@ -170,6 +166,16 @@ export default {
} }
}) })
}, },
async getOtherUserInfo (data, rl) {
const controlData = {
no: data.no
}
otherUserInfo(controlData).then(resop => {
commit('setOtherUserInfo', resop.data.data)
console.log('内层Promise', resop.data.data)
rl(data)
})
},
// 此方法用来获取未读消息条数,接口只返回数值,不返回消息列表 // 此方法用来获取未读消息条数,接口只返回数值,不返回消息列表
getUnreadMessageCount ({ state, commit }) { getUnreadMessageCount ({ state, commit }) {
getUnreadCount().then(res => { getUnreadCount().then(res => {
......
...@@ -8,29 +8,29 @@ ...@@ -8,29 +8,29 @@
</Col> </Col>
<Col span="4"> <Col span="4">
<span>身份证号:</span> <span>身份证号:</span>
<Input v-model="filters.card_no" placeholder="请输入" style="width: 65%" /> <Input v-model="filters.card_no" placeholder="请输入" style="width: 55%" />
</Col> </Col>
<Col span="4"> <Col span="4">
<span>选择市:</span> <span>选择市:</span>
<Select v-model="filters.city_id" clearable style="width: 65%" @on-change="handleFilterCascade('city', $event)"> <Select v-model="filters.city_id" clearable style="width: 55%" @on-change="handleFilterCascade('city', $event)">
<Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option> <Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select> </Select>
</Col> </Col>
<Col span="4"> <Col span="4">
<span>选择区:</span> <span>选择区:</span>
<Select v-model="filters.area_id" clearable style="width: 65%" @on-change="handleFilterCascade('area', $event)"> <Select v-model="filters.area_id" clearable style="width: 55%" @on-change="handleFilterCascade('area', $event)">
<Option v-for="c in areaState.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option> <Option v-for="c in areaState.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select> </Select>
</Col> </Col>
<Col span="4"> <Col span="4">
<span>选择街道:</span> <span>选择街道:</span>
<Select v-model="filters.street_id" clearable style="width: 65%" @on-change="handleFilterCascade('street', $event)"> <Select v-model="filters.street_id" clearable style="width: 55%" @on-change="handleFilterCascade('street', $event)">
<Option v-for="c in areaState.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option> <Option v-for="c in areaState.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select> </Select>
</Col> </Col>
<Col span="4"> <Col span="4">
<span>选择社区:</span> <span>选择社区:</span>
<Select v-model="filters.community_id" clearable style="width: 65%"> <Select v-model="filters.community_id" clearable style="width: 55%">
<Option v-for="c in areaState.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option> <Option v-for="c in areaState.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select> </Select>
</Col> </Col>
...@@ -38,13 +38,13 @@ ...@@ -38,13 +38,13 @@
<Row type="flex" :gutter="16" class="mb10"> <Row type="flex" :gutter="16" class="mb10">
<Col span="4"> <Col span="4">
<span>风险等级:</span> <span>风险等级:</span>
<Select v-model="filters.rating_level" clearable style="width: 65%"> <Select v-model="filters.rating_level" clearable style="width: 55%">
<Option v-for="opt in ratingLevelOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option> <Option v-for="opt in ratingLevelOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>
</Select> </Select>
</Col> </Col>
<Col span="4"> <Col span="4">
<span>回访状态:</span> <span>回访状态:</span>
<Select v-model="filters.visit_status" clearable style="width: 65%"> <Select v-model="filters.visit_status" clearable style="width: 55%">
<Option v-for="opt in visitStatusOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option> <Option v-for="opt in visitStatusOptions" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>
</Select> </Select>
</Col> </Col>
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
}, },
async loadCityOptions () { async loadCityOptions () {
try { try {
const res = await selectCityList({ parent_id: '0' }) const res = await selectCityList({})// { parent_id: '0' }
if (res.data && res.data.errcode === 0) { if (res.data && res.data.errcode === 0) {
this.cityOptions = res.data.data || [] this.cityOptions = res.data.data || []
} }
...@@ -765,9 +765,10 @@ export default { ...@@ -765,9 +765,10 @@ export default {
padding: 16px; padding: 16px;
} }
.search-div { .search-div {
background: #fff; border: 1px solid #dce1e7;
padding: 16px; padding: 15px;
margin-bottom: 16px; margin-bottom: 15px;
background-color: #f8fbff;
} }
.mb10 { .mb10 {
margin-bottom: 10px; margin-bottom: 10px;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论