Skip to content

J
jilinzhongdianrenqun-web
Commit f8a07e07 by wangchunyang
Options

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

parent ed2c29ed
正在显示 包含 68 行增加 和 58 行删除
src/store/module/user.js
......@@ -151,17 +151,13 @@ export default {
const controlData = {
no: data.no
}
// 内层Promise
return new Promise((resolve, reject) => {
otherUserInfo(controlData).then(resop => {
commit('setOtherUserInfo', resop.data.data)
console.log('内层Promise', data, resop.data.data)
// console.log('内层Promise', resop.data.data)
resolve(data)
}).catch(err => {
reject(err)
}).catch(er => {
reject(er)
})
})
// resolve(data)
}).catch(err => {
reject(err)
})
......@@ -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 }) {
getUnreadCount().then(res => {
......
src/view/key-person/key-person-dual/index.vue
......@@ -3,44 +3,44 @@
<Tabs v-model="activeTab" @on-click="handleTabChange">
<TabPane label="接收中人员" name="receiving">
<div class="search-div">
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16">
<Col span="4">
<span>姓名：</span>
<Input v-model="filters.receiving.name" placeholder="请输入" style="width: 65%" />
</Col>
<Col span="4">
<span>身份证号：</span>
<Input v-model="filters.receiving.card_no" placeholder="请输入" style="width: 65%" />
<Input v-model="filters.receiving.card_no" placeholder="请输入" style="width: 55%" />
</Col>
<Col span="4">
<span>选择市：</span>
<Select v-model="filters.receiving.city_id" clearable style="width: 65%" @on-change="handleFilterCascade('receiving', 'city', $event)">
<Select v-model="filters.receiving.city_id" clearable style="width: 55%" @on-change="handleFilterCascade('receiving', 'city', $event)">
<Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择区：</span>
<Select v-model="filters.receiving.area_id" clearable style="width: 65%" @on-change="handleFilterCascade('receiving', 'area', $event)">
<Select v-model="filters.receiving.area_id" clearable style="width: 55%" @on-change="handleFilterCascade('receiving', 'area', $event)">
<Option v-for="c in areaState.receiving.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择街道：</span>
<Select v-model="filters.receiving.street_id" clearable style="width: 65%" @on-change="handleFilterCascade('receiving', 'street', $event)">
<Select v-model="filters.receiving.street_id" clearable style="width: 55%" @on-change="handleFilterCascade('receiving', 'street', $event)">
<Option v-for="c in areaState.receiving.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择社区：</span>
<Select v-model="filters.receiving.community_id" clearable style="width: 65%">
<Select v-model="filters.receiving.community_id" clearable style="width: 55%">
<Option v-for="c in areaState.receiving.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
</Row>
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16" class="mbt15">
<Col span="4">
<span>转发状态：</span>
<Select v-model="filters.receiving.turn_status" clearable style="width: 65%">
<Select v-model="filters.receiving.turn_status" clearable style="width: 55%">
<Option v-for="opt in dicts.turnStatus" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>
</Select>
</Col>
......@@ -74,41 +74,41 @@
<TabPane label="被接收人员" name="received">
<div class="search-div">
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16">
<Col span="4">
<span>姓名：</span>
<Input v-model="filters.received.name" placeholder="请输入" style="width: 65%" />
</Col>
<Col span="4">
<span>身份证号：</span>
<Input v-model="filters.received.card_no" placeholder="请输入" style="width: 65%" />
<Input v-model="filters.received.card_no" placeholder="请输入" style="width: 55%" />
</Col>
<Col span="4">
<span>选择市：</span>
<Select v-model="filters.received.city_id" clearable style="width: 65%" @on-change="handleFilterCascade('received', 'city', $event)">
<Select v-model="filters.received.city_id" clearable style="width: 55%" @on-change="handleFilterCascade('received', 'city', $event)">
<Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择区：</span>
<Select v-model="filters.received.area_id" clearable style="width: 65%" @on-change="handleFilterCascade('received', 'area', $event)">
<Select v-model="filters.received.area_id" clearable style="width: 55%" @on-change="handleFilterCascade('received', 'area', $event)">
<Option v-for="c in areaState.received.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择街道：</span>
<Select v-model="filters.received.street_id" clearable style="width: 65%" @on-change="handleFilterCascade('received', 'street', $event)">
<Select v-model="filters.received.street_id" clearable style="width: 55%" @on-change="handleFilterCascade('received', 'street', $event)">
<Option v-for="c in areaState.received.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择社区：</span>
<Select v-model="filters.received.community_id" clearable style="width: 65%">
<Select v-model="filters.received.community_id" clearable style="width: 55%">
<Option v-for="c in areaState.received.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
</Row>
<Row>
<Row class="mbt15">
<Col span="24" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch('received')">搜索</Button>
<Button @click="handleReset('received')">重置</Button>
......@@ -130,44 +130,44 @@
<TabPane label="待接收" name="pending">
<div class="search-div">
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16">
<Col span="4">
<span>姓名：</span>
<Input v-model="filters.pending.name" placeholder="请输入" style="width: 65%" />
</Col>
<Col span="4">
<span>身份证号：</span>
<Input v-model="filters.pending.card_no" placeholder="请输入" style="width: 65%" />
<Input v-model="filters.pending.card_no" placeholder="请输入" style="width: 55%" />
</Col>
<Col span="4">
<span>选择市：</span>
<Select v-model="filters.pending.city_id" clearable style="width: 65%" @on-change="handleFilterCascade('pending', 'city', $event)">
<Select v-model="filters.pending.city_id" clearable style="width: 55%" @on-change="handleFilterCascade('pending', 'city', $event)">
<Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择区：</span>
<Select v-model="filters.pending.area_id" clearable style="width: 65%" @on-change="handleFilterCascade('pending', 'area', $event)">
<Select v-model="filters.pending.area_id" clearable style="width: 55%" @on-change="handleFilterCascade('pending', 'area', $event)">
<Option v-for="c in areaState.pending.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择街道：</span>
<Select v-model="filters.pending.street_id" clearable style="width: 65%" @on-change="handleFilterCascade('pending', 'street', $event)">
<Select v-model="filters.pending.street_id" clearable style="width: 55%" @on-change="handleFilterCascade('pending', 'street', $event)">
<Option v-for="c in areaState.pending.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择社区：</span>
<Select v-model="filters.pending.community_id" clearable style="width: 65%">
<Select v-model="filters.pending.community_id" clearable style="width: 55%">
<Option v-for="c in areaState.pending.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
</Row>
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16" class="mbt15">
<Col span="4">
<span>推送状态：</span>
<Select v-model="filters.pending.push_status" clearable style="width: 65%">
<Select v-model="filters.pending.push_status" clearable style="width: 55%">
<Option v-for="opt in dicts.pushStatus" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>
</Select>
</Col>
......@@ -201,44 +201,44 @@
<TabPane label="推送" name="push">
<div class="search-div">
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16" class="">
<Col span="4">
<span>姓名：</span>
<Input v-model="filters.push.name" placeholder="请输入" style="width: 65%" />
</Col>
<Col span="4">
<span>身份证号：</span>
<Input v-model="filters.push.card_no" placeholder="请输入" style="width: 65%" />
<Input v-model="filters.push.card_no" placeholder="请输入" style="width: 55%" />
</Col>
<Col span="4">
<span>选择市：</span>
<Select v-model="filters.push.city_id" clearable style="width: 65%" @on-change="handleFilterCascade('push', 'city', $event)">
<Select v-model="filters.push.city_id" clearable style="width: 55%" @on-change="handleFilterCascade('push', 'city', $event)">
<Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择区：</span>
<Select v-model="filters.push.area_id" clearable style="width: 65%" @on-change="handleFilterCascade('push', 'area', $event)">
<Select v-model="filters.push.area_id" clearable style="width: 55%" @on-change="handleFilterCascade('push', 'area', $event)">
<Option v-for="c in areaState.push.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择街道：</span>
<Select v-model="filters.push.street_id" clearable style="width: 65%" @on-change="handleFilterCascade('push', 'street', $event)">
<Select v-model="filters.push.street_id" clearable style="width: 55%" @on-change="handleFilterCascade('push', 'street', $event)">
<Option v-for="c in areaState.push.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择社区：</span>
<Select v-model="filters.push.community_id" clearable style="width: 65%">
<Select v-model="filters.push.community_id" clearable style="width: 55%">
<Option v-for="c in areaState.push.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
</Row>
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16" class="mbt15">
<Col span="4">
<span>推送状态：</span>
<Select v-model="filters.push.push_status" clearable style="width: 65%">
<Select v-model="filters.push.push_status" clearable style="width: 55%">
<Option v-for="opt in dicts.pushStatus" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>
</Select>
</Col>
......@@ -274,48 +274,48 @@
<TabPane label="转发" name="forward">
<div class="search-div">
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16" class="">
<Col span="4">
<span>姓名：</span>
<Input v-model="filters.forward.name" placeholder="请输入" style="width: 65%" />
</Col>
<Col span="4">
<span>身份证号：</span>
<Input v-model="filters.forward.card_no" placeholder="请输入" style="width: 65%" />
<Input v-model="filters.forward.card_no" placeholder="请输入" style="width: 55%" />
</Col>
<Col span="4">
<span>选择市：</span>
<Select v-model="filters.forward.city_id" clearable style="width: 65%" @on-change="handleFilterCascade('forward', 'city', $event)">
<Select v-model="filters.forward.city_id" clearable style="width: 55%" @on-change="handleFilterCascade('forward', 'city', $event)">
<Option v-for="c in cityOptions" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择区：</span>
<Select v-model="filters.forward.area_id" clearable style="width: 65%" @on-change="handleFilterCascade('forward', 'area', $event)">
<Select v-model="filters.forward.area_id" clearable style="width: 55%" @on-change="handleFilterCascade('forward', 'area', $event)">
<Option v-for="c in areaState.forward.areaList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择街道：</span>
<Select v-model="filters.forward.street_id" clearable style="width: 65%" @on-change="handleFilterCascade('forward', 'street', $event)">
<Select v-model="filters.forward.street_id" clearable style="width: 55%" @on-change="handleFilterCascade('forward', 'street', $event)">
<Option v-for="c in areaState.forward.streetList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
<Col span="4">
<span>选择社区：</span>
<Select v-model="filters.forward.community_id" clearable style="width: 65%">
<Select v-model="filters.forward.community_id" clearable style="width: 55%">
<Option v-for="c in areaState.forward.communityList" :key="c.parent_id" :value="c.parent_id">{{ c.name }}</Option>
</Select>
</Col>
</Row>
<Row type="flex" :gutter="16" class="mb10">
<Row type="flex" :gutter="16" class="mbt15">
<Col span="4">
<span>推送状态：</span>
<Select v-model="filters.forward.push_status" clearable style="width: 65%">
<Select v-model="filters.forward.push_status" clearable style="width: 55%">
<Option v-for="opt in dicts.pushStatus" :key="opt.value" :value="opt.value">{{ opt.label }}</Option>
</Select>
</Col>
<Col span="8" class="text-right">
<Col span="12" class="text-right">
<Button type="primary" class="mr10" @click="handleSearch('forward')">搜索</Button>
<Button @click="handleReset('forward')">重置</Button>
</Col>
......@@ -1580,6 +1580,9 @@ export default {
margin-bottom: 15px;
background-color: #f8fbff;
}
.mbt15 {
margin-top: 15px;
}
.mb10 {
margin-bottom: 10px;
}
......
src/view/key-person/key-person-visit-record/index.vue
......@@ -8,29 +8,29 @@
</Col>
<Col span="4">
<span>身份证号：</span>
<Input v-model="filters.card_no" placeholder="请输入" style="width: 65%" />
<Input v-model="filters.card_no" placeholder="请输入" style="width: 55%" />
</Col>
<Col span="4">
<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>
</Select>
</Col>
<Col span="4">
<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>
</Select>
</Col>
<Col span="4">
<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>
</Select>
</Col>
<Col span="4">
<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>
</Select>
</Col>
......@@ -38,13 +38,13 @@
<Row type="flex" :gutter="16" class="mb10">
<Col span="4">
<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>
</Select>
</Col>
<Col span="4">
<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>
</Select>
</Col>
......@@ -297,7 +297,7 @@ export default {
},
async loadCityOptions () {
try {
const res = await selectCityList({ parent_id: '0' })
const res = await selectCityList({})// { parent_id: '0' }
if (res.data && res.data.errcode === 0) {
this.cityOptions = res.data.data || []
}
......@@ -765,9 +765,10 @@ export default {
padding: 16px;
}
.search-div {
background: #fff;
padding: 16px;
margin-bottom: 16px;
border: 1px solid #dce1e7;
padding: 15px;
margin-bottom: 15px;
background-color: #f8fbff;
}
.mb10 {
margin-bottom: 10px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论