elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'fax' into preview

feature
mk 2 years ago
parent
1f0d475794 b1ea8a0605
commit
9cc00dd730
2 changed files with 114 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/views/modules/base/resi.vue
  2. 160
      src/views/modules/home/notice.vue

8
src/views/modules/base/resi.vue
View File

@ -129,11 +129,9 @@
</div> </div>
<div v-else-if="item.columnName == 'nationality'"> <div v-else-if="item.columnName == 'synthesizeScore'">
{{ {{
scope.row.gender == null scope.row.synthesizeScore
? ((1 - scope.row.nationality)*100).toFixed(2) + '%'
: ((1 - scope.row.nationality)*100).toFixed(2) + '%'
}} }}
</div> </div>
@ -359,7 +357,7 @@ export default {
// { columnName: "agencyName", label: "所属组织", width: 150 }, // { columnName: "agencyName", label: "所属组织", width: 150 },
{ columnName: "idTypeName", label: "证件类型", width: 80 }, { columnName: "idTypeName", label: "证件类型", width: 80 },
{ columnName: "idNum", label: "证件号", width: 170 }, { columnName: "idNum", label: "证件号", width: 170 },
{ columnName: "nationality", label: "信息完整度", width: 95 }, { columnName: "synthesizeScore", label: "信息完整度", width: 95 },
{ columnName: "categoryNames", label: "居民分类" }, { columnName: "categoryNames", label: "居民分类" },
{ columnName: "nationalityName", label: "国籍", width: 50 }, { columnName: "nationalityName", label: "国籍", width: 50 },
{ columnName: "nationName", label: "民族", width: 50 }, { columnName: "nationName", label: "民族", width: 50 },

160
src/views/modules/home/notice.vue
View File

@ -84,50 +84,112 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
handleClickNotice(item, index) { // handleClickNotice(item, index) {
// this.readClearOne(item); // // this.readClearOne(item);
if (item.msgType == "community_house") { // if (item.msgType == "community_house") {
let { agencyId, gridId, gridName, houseId, houseName, targetId } = item // let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName:'房屋详情' }); // this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
this.$router.push({ name: 'house-huaxiang' }); // this.$router.push({ name: 'house-huaxiang' });
this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => { // this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
if (item.name === "house-huaxiang") { // if (item.name === "house-huaxiang") {
return { ...item, title: '房屋信息' }; // return { ...item, title: '房屋信息' };
} // }
return item; // return item;
}); // });
} else if (item.msgType == "resident_base_info") { // } else if (item.msgType == "resident_base_info") {
let { // let {
agencyId, // agencyId,
gridId, // gridId,
gridName, // gridName,
gender, // gender,
homeId, // homeId,
homeName, // homeName,
name, // name,
targetId, // targetId,
deptName // deptName
} = item; // } = item;
this.$store.dispatch("saveData", { // this.$store.dispatch("saveData", {
agencyId, // agencyId,
gridId, // gridId,
gridName, // gridName,
gender, // gender,
homeId, // homeId,
homeName, // homeName,
name:'居民详情', // name: '居民详情',
resiId: targetId, // resiId: targetId,
}); // });
this.$router.push({ name: "jumin-huaxiang" }); // this.$router.push({ name: "jumin-huaxiang" });
this.$store.state.contentTabs = this.$store.state.contentTabs.map( // this.$store.state.contentTabs = this.$store.state.contentTabs.map(
(item) => { // (item) => {
if (item.name === "jumin-huaxiang") { // if (item.name === "jumin-huaxiang") {
return { ...item, title: name }; // return { ...item, title: name };
} // }
return item; // return item;
} // }
); // );
} // }
// },
handleClickNotice(item) {
this.readClearOne(item);
if (item.msgType == "community_house") {
let { agencyId, gridId, gridName, houseId, houseName, targetId } = item
this.$store.dispatch('saveDataH', { agencyId, gridId, gridName, houseId: targetId, houseName: '房屋详情' });
this.$router.push({ name: 'house-huaxiang' });
this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
if (item.name === "house-huaxiang") {
return { ...item, title: '房屋信息' };
}
return item;
});
} else if (item.msgType == "resident_base_info") {
let {
agencyId,
gridId,
gridName,
gender,
homeId,
homeName,
name,
targetId,
deptName
} = item;
this.$store.dispatch("saveData", {
agencyId,
gridId,
gridName,
gender,
homeId,
homeName,
name: '居民详情',
resiId: targetId,
});
this.$router.push({ name: "jumin-huaxiang" });
this.$store.state.contentTabs = this.$store.state.contentTabs.map(
(item) => {
if (item.name === "jumin-huaxiang") {
return { ...item, title: name };
}
return item;
}
);
} else if (item.msgType == "resident_category") {
let obj = {
PARTY_FLAG: '/main/communityParty-members-memberList',
SUBSISTENCE_ALLOWANCE_FLAG: '/main/base-residentManagement-subsistenceAllowance-subsistenceAllowance',
ENSURE_HOUSE_FLAG: '/main/base-residentManagement-housingNature-housingNature',
VETERAN_FLAG: '/main/base-residentManagement-veteran-veteran',
OLD_PEOPLE_FLAG: '/main/base-residentManagement-oldPeople-oldPeople',
SPECIAL_SUPPORT_FLAG: '/main/base-residentManagement-tefu-tefuList',
DISABILITY_FLAG: '/main/base-residentManagement-resiDisability-resiDisability',
SERIOUS_ILLNESS_FLAG: '大病',
CHRONIC_DISEASE_FLAG: '慢病',
SPECIAL_CROWD_FLAG: '特殊人群',
}
this.$router.push({
path: obj[item.category],
});
}
this.getNoticeData()
}, },
async read(item, index) { async read(item, index) {
@ -150,13 +212,13 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
async readClearOne(item){ async readClearOne(item) {
console.log("item",item) console.log("item", item)
const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}` const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`
const {data,code,msg} = await requestPost(url) const { data, code, msg } = await requestPost(url)
if(code == 0){ if (code == 0) {
this.getList() this.getList()
}else if(code >= 8000){ } else if (code >= 8000) {
this.$message.error(msg) this.$message.error(msg)
} }
}, },

Write Preview
Loading…
Cancel
Save