diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue index 9bd2c6fe8..055b75f1c 100644 --- a/src/views/modules/base/community/buildForm.vue +++ b/src/views/modules/base/community/buildForm.vue @@ -372,7 +372,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue index 0ce2960cd..fd692c625 100644 --- a/src/views/modules/base/community/communityForm.vue +++ b/src/views/modules/base/community/communityForm.vue @@ -285,7 +285,8 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; + }); } } else { diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index f1f87ad31..49fc0d184 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -19,8 +19,7 @@ margin-left: 10px; margin-top: 0px; color: #3e8ef7; - cursor: pointer; - " + cursor: pointer;" icon="el-icon-edit">编辑 @@ -2882,14 +2881,13 @@ export default { const { msg, data } = await map.searchNearby(query); this.loading = false; this.resultList = []; - if (msg == "success" && data.resultList && data.resultList.length > 0) { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map((item) => { return { - value: `${item.hotPointID}`, - label: `${item.address + item.name}`, + value: `${item.id}`, + label: `${item.address + item.title}`, }; }); } diff --git a/src/views/modules/base/virtualResi.vue b/src/views/modules/base/virtualResi.vue index 140b0b563..c06236085 100644 --- a/src/views/modules/base/virtualResi.vue +++ b/src/views/modules/base/virtualResi.vue @@ -240,7 +240,7 @@ @@ -380,8 +380,7 @@ export default { dialogEditVisible: false, dialogVisible: false, formType: 'add', - // 显示人员详情 - dialogVisible2: false, + lookResiId: "", uploadUlr: @@ -441,6 +440,11 @@ export default { category: this.$route.query.category, searchForm: {}, + + showCheckPassword:false, + checkPasswordFrom: { + password: "", + }, }; }, @@ -844,19 +848,82 @@ export default { handleClick(tab, event) { }, - // 查看 async handleLook(row) { - this.lookResiId = row.resiId; - this.dialogVisible2 = true; - }, - + this.lookResiId = row.resiId; + let { + agencyId, + gridId, + gridName, + gender, + homeId, + homeName, + name, + resiId, + } = row; + this.$store.dispatch("saveData", { + agencyId, + gridId, + gridName, + gender, + homeId, + homeName, + name, + resiId, + }); + 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; + } + ); + }, // 编辑 - async handleEdit(row) { - this.editUserId = row.resiId; - this.formName = "编辑居民"; - this.formType = 'edit' - this.dialogVisible = true; - await this.residentBaseInfo(); + async handelCLickShowCheckPassword(row) { + const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`; + const { data, code, msg } = await requestPost(url); + if(code==0){ + if(data==true){ + this.editUserId = row.resiId; + this.saveCheckPassword() + } + else{ + this.editUserId = row.resiId; + this.showCheckPassword = true; + } + } + else{ + this.$message.error(msg); + } + }, + handelClickCheckPassword() { + this.$refs.checkPasswordFrom.validate((vali) => { + if (vali) { + this.saveCheckPassword(this.checkPasswordFrom.password); + } else { + return false; + } + }); + }, + async saveCheckPassword(password){ + const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; + let parm = { + password, + }; + const { data, code, msg } = await requestPost(url, parm); + if (code === 0) { + this.showCheckPassword = false; + this.$router.push({ + name: "edit-resi", + query: { id: this.editUserId }, + params: { idNum: data.idNum, mobile: data.mobile, name: data.name, nationality: data.nationality }, + }); + this.checkPasswordFrom.password = ""; + } else { + this.$message.error(msg); + } }, // 获取详情 residentBaseInfo() { diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue index 194a3bbfc..5df0dff83 100644 --- a/src/views/modules/communityParty/activity/initiateActivity.vue +++ b/src/views/modules/communityParty/activity/initiateActivity.vue @@ -693,7 +693,7 @@ export default { this.resultList = data.resultList console.log(this.resultList, "this.resultList"); this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); console.log(this.searchOptions, "this.searchOptions"); diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 11e23b78b..5878c9549 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -475,7 +475,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index 32b1c7c3f..ee65ec5de 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -470,8 +470,8 @@ export default { this.resultList = data.resultList; this.searchOptions = this.resultList.map((item) => { return { - value: `${item.hotPointID}`, - label: `${item.address + item.name}`, + value: `${item.id}`, + label: `${item.address + item.title}`, }; }); } diff --git a/src/views/modules/communityService/dqfwzx/cpts/edit.vue b/src/views/modules/communityService/dqfwzx/cpts/edit.vue index 466520ee1..94c02f5d6 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/edit.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/edit.vue @@ -433,7 +433,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue index a8b7a5d66..985b3d969 100644 --- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue +++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue @@ -275,7 +275,8 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; + }); } } else { diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue index 8749ad256..c6a22bd08 100644 --- a/src/views/modules/communityService/sqzzz/cpts/edit.vue +++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue @@ -297,7 +297,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue index f6be5aaf4..edab27c57 100644 --- a/src/views/modules/partymember/icpartyorg-add-or-update.vue +++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue @@ -483,7 +483,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue index 3d38684a7..c8660be08 100644 --- a/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue @@ -250,7 +250,8 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; + }); } } else { diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue index 56986f73b..083848cc4 100644 --- a/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue +++ b/src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue @@ -340,7 +340,8 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; + }); } } else { diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index d0ffef10b..bbf3a2856 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -707,7 +707,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); if(flag){ this.handleClickKey(0) diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 308ac3d37..b582bd9ce 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -366,7 +366,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 57bdea3eb..4a0da561f 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -543,7 +543,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/eventOld/cpts/add.vue b/src/views/modules/shequzhili/eventOld/cpts/add.vue index f3d479aab..8b56fbc0e 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/add.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/add.vue @@ -551,7 +551,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index c33d9d59a..a77d1ae62 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -349,7 +349,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.hotPointID}`, label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue index 67008d955..7bd03908d 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/anquanxuncha/addForm.vue @@ -415,7 +415,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue index 660d33458..e783c42ab 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/shebei/addForm.vue @@ -380,7 +380,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue index 256550b73..e036b199d 100644 --- a/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/anquan/yinhuan/addForm.vue @@ -550,7 +550,7 @@ this.searchOptions = this.resultList.map(item => { return { value: `${item.id}`, - label: `${item.address + item.name}` + label: `${item.address + item.title}` }; }); } diff --git a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue index bc857c83e..0336468b9 100644 --- a/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/chengshiguanli/addForm.vue @@ -383,7 +383,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.hotPointID}`, label: `${item.address + item.name}` }; + return { value: `${item.hotPointID}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue index 8d86cfb36..ccff4dda5 100644 --- a/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/gonggongfuwu/addForm.vue @@ -381,7 +381,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue index 7fbeb178f..764c34f44 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/changsuo/addForm.vue @@ -382,7 +382,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue index 4affe2866..36e58b5ac 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/wuzi/addForm.vue @@ -400,7 +400,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue index 0da2e1888..273f13e42 100644 --- a/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/yingji/zizuzhi/addForm.vue @@ -634,7 +634,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); } } else { diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue index 49ebf017d..afff232b5 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/shebei/addForm.vue @@ -389,7 +389,7 @@ export default { if (data.resultList && data.resultList.length > 0) { this.resultList = data.resultList; this.searchOptions = this.resultList.map(item => { - return { value: `${item.id}`, label: `${item.address + item.name}` }; + return { value: `${item.id}`, label: `${item.address + item.title}` }; }); console.log("this.searchOptions",this.searchOptions ) }