Merge branch 'bug_mk' into dev

# Conflicts:
#	src/views/modules/base/community/communityForm.vue
#	src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
#	src/views/modules/plugins/point/icpointnucleicmonitoring-add-or-update.vue
#	src/views/modules/plugins/point/icpointvaccinesinoculation-add-or-update.vue

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}` };
 
             });
           }

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 {

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">编辑</el-link>
           </el-breadcrumb-item>
         </el-breadcrumb>
@@ -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}`,
+                value: `${item.id}`,
-                label: `${item.address + item.name}`,
+                label: `${item.address + item.title}`,
               };
             });
           }

src/views/modules/base/virtualResi.vue

@@ -240,7 +240,7 @@
 
                         <template v-if="filterEdit(scope.row.agencyId)">
                             <el-button v-if="btnAuths.ic_resi_update" style="margin-right: 10px"
-                                @click="handleEdit(scope.row)" size="small" type="text">编辑</el-button>
+                                @click="handelCLickShowCheckPassword(scope.row)" size="small" type="text">编辑</el-button>
 
                             <el-popconfirm v-if="btnAuths.ic_resi_del" title="删除之后无法回复，确认删除？"
                                 @onConfirm="handleDel(scope.row)">
@@ -292,19 +292,6 @@
             </div>
         </el-dialog>
 
-        <el-dialog title="居民详情" :visible.sync="dialogVisible2" width="986px" top="5vh" append-to-body class="dialog-h"
-            :close-on-click-modal="false" :before-close="() => {
-                this.dialogVisible2 = false;
-            }
-                ">
-            <div class="dialog-h-content scroll-h">
-                <resi-info v-if="dialogVisible2" ref="resiInfo" :fixed="true" :resi-id="lookResiId" />
-            </div>
-
-            <div class="resi-btns">
-                <el-button size="small" class="diy-button--white" plain @click="dialogVisible2 = false">关闭</el-button>
-            </div>
-        </el-dialog>
 
         <!-- 变更记录 -->
         <el-dialog :visible.sync="changeRecordShow" :close-on-click-modal="false" :close-on-press-escape="false"
@@ -331,6 +318,19 @@
             width="620px" top="5vh" class="dialog-h" @closed="diaClose">
             <resideath-add ref="ref_death" @dialogCancle="deathClose"></resideath-add>
         </el-dialog>
+        <!-- 密码验证 -->
+        <el-dialog title="密码验证" :visible.sync="showCheckPassword">
+            <el-form :model="checkPasswordFrom" :rules="checkPasswordRulse" ref="checkPasswordFrom">
+                <el-form-item label="密码" prop="password">
+                <el-input v-model.trim="checkPasswordFrom.password" autocomplete="off" type="password" placeholder="请输入当前账号密码"
+                    @keydown.native.enter="handelClickCheckPassword"></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="showCheckPassword = false">取 消</el-button>
+                <el-button type="primary" @click="handelClickCheckPassword">确 定</el-button>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -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.lookResiId = row.resiId;
-            this.dialogVisible2 = true;
+      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) {
+        async handelCLickShowCheckPassword(row) {
-            this.editUserId = row.resiId;
+            const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
-            this.formName = "编辑居民";
+            const { data, code, msg } = await requestPost(url);
-            this.formType = 'edit'
+            if(code==0){
-            this.dialogVisible = true;
+                if(data==true){
-            await this.residentBaseInfo();
+                    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() {

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");

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}` };
 
             });
           }

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}`,
+                value: `${item.id}`,
-                label: `${item.address + item.name}`,
+                label: `${item.address + item.title}`,
               };
             });
           }

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}` };
 
             });
           }

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 {

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}` };
 
             });
           }

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}` };
 
             });
           }

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 {

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 {

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)

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}` };
 
             });
           }

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 {

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 {

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}` };
 
             });
           }

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 {

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 {

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}`
 								};
 							});
 						}

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 {

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 {

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 {

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 {

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 {

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 )
 					}