Merge branch 'preview_xiaowang' into dev

src/views/dataBoard/overview/index.vue

@@ -73,8 +73,8 @@
       -- bmysxqk = 不满意事项情况
       -- xqwwcqk = 需求未完成情况
     -->
-    <MapDialog v-if="isShowMapDialog" ref="MapDialog" :currentLevelData="currentLevelData" :type="mapType"
+    <!-- <MapDialog v-if="isShowMapDialog" ref="MapDialog" :currentLevelData="currentLevelData" :type="mapType"
-               @close="isShowMapDialog = false"/>
+               @close="isShowMapDialog = false"/> -->
     <cpt-loading v-show="false"/>
     <MapResourceInfo ref="MapResourceInfo" :currentLevelData="currentLevelData"/>
   </div>

src/views/modules/base/resi.vue

@@ -969,16 +969,36 @@ export default {
         }
       );
     },
-    handelCLickShowCheckPassword(row) {
+    async handelCLickShowCheckPassword(row) {
-      this.editUserId = row.resiId;
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`;
-      this.showCheckPassword = true;
+      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(async (vali) => {
+      this.$refs.checkPasswordFrom.validate((vali) => {
         if (vali) {
-          const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
+          this.saveCheckPassword(this.checkPasswordFrom.password);
+        } else {
+          return false;
+        }
+      });
+    },
+    async saveCheckPassword(password){
+      const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`;
           let parm = {
-            password: this.checkPasswordFrom.password,
+            password,
           };
           const { data, code, msg } = await requestPost(url, parm);
           if (code === 0) {
@@ -992,12 +1012,7 @@ export default {
           } else {
             this.$message.error(msg);
           }
-        } else {
-          return false;
-        }
-      });
     },
-
      handleAdd() {
       this.$router.push({ name: "add-resi" });
     },
@@ -1178,7 +1193,7 @@ export default {
   watch: {
     $route: {
       handler: function (newVal, oldVal) {
-        if (newVal.name == "base-resi") {
+        if (newVal.name == "base-resi" && oldVal.name!='edit-resi') {
           this.$nextTick(() => {
             this.$refs.myResiSearch.form.attentionCrowds = [];
               this.$refs.myResiSearch.form.healthStatus = [];

src/views/modules/portrayal/jumin/index.vue

@@ -21,7 +21,7 @@
         <div class="list">
           <div
             :class="{ item: true, active: index == active }"
-            v-for="(item, index) in menuList"
+            v-for="(item, index) in menuList" :key="index"
             @click="handelCLickMenu(item.id, index)"
           >
             <span>{{ item.name }}</span
@@ -1161,7 +1161,6 @@ export default {
               business_record:'业务记录',
               update_record:'更新记录'
             };
-          
             const keysWithValueOne = [];
             for (const key in this.resiDetailObj.baseInfoDto.categoryInfo) {
                 if (this.resiDetailObj.baseInfoDto.categoryInfo[key] === 1 && this.incidence[key]) {
@@ -1265,10 +1264,28 @@ export default {
           console.log(err);
         });
     },
-
+    // async handleSaveTuomin1() {
-    handelClickJumpEdit() {
+    //   const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
-      this.checkType = "edit";
+    //   let parm = {
-      this.showCheckPassword = true;
+    //     password,
+    //   };
+    //   const { data, code, msg } = await requestPost(url, parm);
+    // },
+   async  handelClickJumpEdit() {
+      const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${this.resiId}`;
+      const { data, code, msg } = await requestPost(url);
+      if(code==0){
+          if(data==true){
+            this.handleSaveTuomin()
+          }
+          else{
+            this.checkType = "edit";
+            this.showCheckPassword = true;
+          }
+      }
+      else{
+        this.$message.error(msg);
+      }
     },
     async getDictName(url, params, value, itemType, opction) {
       try {