Merge branch '公众号推送' into dev

src/views/modules/communityService/fuwuzhaoren/index.vue

@@ -324,7 +324,6 @@
                :visible.sync="showPersonList"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :modal="false"
                :title="'人员名单'"
                width="1150px"
                top="15vh"

src/views/modules/communityService/gangweizhaoren/index.vue

@@ -347,7 +347,6 @@
                :close-on-press-escape="false"
                :title="'人员名单'"
                close-on-press-escape="true"
-               :modal="false"
                width="1150px"
                top="15vh"
                class="dialog-h"

src/views/modules/communityService/jinengzhaoren/index.vue

@@ -323,7 +323,6 @@
                :visible.sync="showPersonList"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :modal="false"
                :modal-append-to-body="false"
                :title="'人员名单'"
                width="1150px"

src/views/modules/communityService/jinengzhaoren/personList.vue

@@ -179,7 +179,7 @@
     </el-table-column>
       </el-table>
       <el-dialog width="800px" :center="true" title="密码验证" :visible.sync="showCheckPassword" :modal-append-to-body="false"          :close-on-click-modal="true"
-               :close-on-press-escape="true">
+               :close-on-press-escape="true" :model="false">
       <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="请输入当前账号密码"
@@ -339,6 +339,8 @@ export default {
           const { data, code, msg } = await requestPost(url, parm);
           if (code === 0) {
             this.showCheckPassword = false;
+            //跳转居民编辑弹框不关闭问题
+            // this.$parent.$parent.showPersonList = false;
             this.$router.push({
               name: "edit-resi",
               query: { id: this.editUserId },

src/views/modules/communityService/policy/policyList.vue

@@ -286,9 +286,8 @@
       v-if="showPersonList"
       :visible.sync="showPersonList"
       :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :modal="false"
-               :modal-append-to-body="false"
+      :close-on-press-escape="false"
+      :modal-append-to-body="false"
       :title="'符合政策人员名单'"
       width="1600px"
       height="1100px"

src/views/modules/communityService/wennuanzhaoren/index.vue

@@ -301,27 +301,6 @@
                 @handleOk="handleOk"
                 @handleClose="handleClose"></add-form>
     </el-dialog>
-    <!-- 编辑与新增写在一个组件中 -->
-    <!-- <el-dialog v-if="showEdit"
-               :visible.sync="showEdit"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'编辑'"
-               :modal-append-to-body="false"
-               width="850px"
-               top="5vh"
-               class="dialog-h"
-               @closed="showEdit = false">
-      <edit-form ref="ref_edit_form"
-                 :serviceRecordId="serviceRecordId"
-                 :serviceOrgName="serviceOrgName"
-                 :satisfyArray="satisfyArray"
-                 :statusArray="statusArray"
-                 @handleOk="handleOk"
-                 @handleClose="handleClose"
-                 :formType="formType">
-      </edit-form>
-    </el-dialog> -->
     <el-dialog v-if="showDetail"
                :visible.sync="showDetail"
                :close-on-click-modal="false"