From 99a6000981c6b88dd21012b78f7cd37aa79b8221 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 15 Jul 2024 17:49:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8E=A8=E9=80=81=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwuzhaoren/index.vue    |  7 ++--
 .../fuwuzhaoren/personList.vue                | 32 +++++++++++++++----
 .../communityService/gangweizhaoren/index.vue | 10 ++++--
 .../gangweizhaoren/personList.vue             | 30 +++++++++++++----
 .../communityService/jinengzhaoren/index.vue  |  9 ++++--
 .../jinengzhaoren/personList.vue              | 30 +++++++++++++----
 .../communityService/policy/personList.vue    | 30 +++++++++++++++--
 .../communityService/policy/policyList.vue    |  6 +++-
 .../communityService/wennuanzhaoren/index.vue | 10 ++++--
 .../wennuanzhaoren/personList.vue             | 30 +++++++++++++----
 10 files changed, 156 insertions(+), 38 deletions(-)

diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index bcc6bf73a..697865c9b 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/index.vue
@@ -327,11 +327,12 @@
                :modal="false"
                :title="'人员名单'"
                width="1150px"
-               top="5vh"
+               top="15vh"
                class="dialog-h"
                @closed="showPersonList = false">
       <person-list ref="ref_person_list"
                    :serviceId="commonServiceId"
+                   :selfObj="selfObj"
                    :tagId="tagId">
       </person-list>
     </el-dialog>
@@ -448,8 +449,9 @@ export default {
       // 多选行
       multiSelectedRows: [],
 
-      searchdemandOptions:[]
+      searchdemandOptions:[],
 
+      selfObj:{}
     };
   },
   computed: {
@@ -563,6 +565,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 
diff --git a/src/views/modules/communityService/fuwuzhaoren/personList.vue b/src/views/modules/communityService/fuwuzhaoren/personList.vue
index 3cf70ac2e..0e37dd04d 100644
--- a/src/views/modules/communityService/fuwuzhaoren/personList.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/personList.vue
@@ -98,7 +98,7 @@
 
     <div class="div_btn">
       <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
-      <el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
+      <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -445,9 +445,28 @@ export default {
       this.handleSearch();
     },
 // 公众号消息推送
-onMessagePush(){
-  alert("哥哥，点我")
-},
+sendFindPeopleMsg(){
+      let parm = {
+        parentCategoryCode: this.selfObj.parentCategoryCode,
+        categoryCode: this.selfObj.categoryCode,
+        resiList: this.selectedPersonListIds,
+        serviceTimeStart: this.selfObj.serviceTimeStart,
+        serviceTimeEnd: this.selfObj.serviceTimeEnd
+      }
+      this.$http
+        .post("/actual/base/communityPublicity/sendFindPeopleMsg",parm)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("推送成功");
+            this.handleSearch();
+          }
+        })
+        .catch((err) => {
+          return this.$message.error("网络错误");
+        });
+    },
     /**
      * 组织选择触发事件
      * @returns {Promise<void>}
@@ -595,11 +614,10 @@ onMessagePush(){
       type: String,
       required: true,
     },
-    serviceId: {
-      type: String,
+    selfObj:{
+      type: Object,
       required: true,
     }
-    
   }
 }
 </script>
diff --git a/src/views/modules/communityService/gangweizhaoren/index.vue b/src/views/modules/communityService/gangweizhaoren/index.vue
index 0367dc598..7028f752f 100644
--- a/src/views/modules/communityService/gangweizhaoren/index.vue
+++ b/src/views/modules/communityService/gangweizhaoren/index.vue
@@ -329,7 +329,7 @@
                :title="detailDiaTitle"
                :modal-append-to-body="false"
                width="850px"
-               top="5vh"
+               top="15vh"
                class="dialog-h"
                @closed="diaDetailClose">
       <detail-form ref="ref_detail_form"
@@ -349,11 +349,12 @@
                close-on-press-escape="true"
                :modal="false"
                width="1150px"
-               top="5vh"
+               top="15vh"
                class="dialog-h"
                @closed="showPersonList = false">
       <person-list ref="ref_person_list"
                    :serviceId="commonServiceId"
+                   :selfObj="selfObj"
                    :tagId="tagId">
       </person-list>
     </el-dialog>
@@ -470,7 +471,9 @@ export default {
 
       // 多选行
       multiSelectedRows: [],
-      searchdemandOptions:[]
+      searchdemandOptions:[],
+
+      selfObj:{}
     };
   },
   computed: {
@@ -589,6 +592,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 
diff --git a/src/views/modules/communityService/gangweizhaoren/personList.vue b/src/views/modules/communityService/gangweizhaoren/personList.vue
index 433c9ac4e..6bc946d94 100644
--- a/src/views/modules/communityService/gangweizhaoren/personList.vue
+++ b/src/views/modules/communityService/gangweizhaoren/personList.vue
@@ -98,7 +98,7 @@
 
     <div class="div_btn">
       <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
-       <el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
+       <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -441,8 +441,27 @@ export default {
       this.handleSearch();
     },
     // 推送公众号
-    onMessagePush() {
-      alert("哥哥，点我")
+    sendFindPeopleMsg(){
+      let parm = {
+        parentCategoryCode: this.selfObj.parentCategoryCode,
+        categoryCode: this.selfObj.categoryCode,
+        resiList: this.selectedPersonListIds,
+        serviceTimeStart: this.selfObj.serviceTimeStart,
+        serviceTimeEnd: this.selfObj.serviceTimeEnd
+      }
+      this.$http
+        .post("/actual/base/communityPublicity/sendFindPeopleMsg",parm)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("推送成功");
+            this.handleSearch();
+          }
+        })
+        .catch((err) => {
+          return this.$message.error("网络错误");
+        });
     },
     /**
      * 组织选择触发事件
@@ -591,11 +610,10 @@ export default {
       type: String,
       required: true,
     },
-    serviceId: {
-      type: String,
+    selfObj:{
+      type: Object,
       required: true,
     }
-    
   }
 }
 </script>
diff --git a/src/views/modules/communityService/jinengzhaoren/index.vue b/src/views/modules/communityService/jinengzhaoren/index.vue
index b1be6a21f..063fab7d0 100644
--- a/src/views/modules/communityService/jinengzhaoren/index.vue
+++ b/src/views/modules/communityService/jinengzhaoren/index.vue
@@ -327,10 +327,11 @@
                :modal-append-to-body="false"
                :title="'人员名单'"
                width="1150px"
-               top="5vh"
+               top="15vh"
                class="dialog-h"
                @closed="showPersonList = false">
       <person-list ref="ref_person_list"
+                   :selfObj="selfObj"
                    :serviceId="commonServiceId"
                    :tagId="tagId">
       </person-list>
@@ -447,7 +448,10 @@ export default {
 
       // 多选行
       multiSelectedRows: [],
-      searchdemandOptions:[]
+      searchdemandOptions:[],
+
+      //人员列表用
+      selfObj:{}
     };
   },
   computed: {
@@ -564,6 +568,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 
diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue
index 4b8415b1a..2232d4ee9 100644
--- a/src/views/modules/communityService/jinengzhaoren/personList.vue
+++ b/src/views/modules/communityService/jinengzhaoren/personList.vue
@@ -98,7 +98,7 @@
 
     <div class="div_btn">
       <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
-      <el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
+      <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -442,8 +442,27 @@ export default {
       this.handleSearch();
     },
     //推送公众号
-    onMessagePush() {
-      alert("哥哥，点我")
+    sendFindPeopleMsg(){
+      let parm = {
+        parentCategoryCode: this.selfObj.parentCategoryCode,
+        categoryCode: this.selfObj.categoryCode,
+        resiList: this.selectedPersonListIds,
+        serviceTimeStart: this.selfObj.serviceTimeStart,
+        serviceTimeEnd: this.selfObj.serviceTimeEnd
+      }
+      this.$http
+        .post("/actual/base/communityPublicity/sendFindPeopleMsg",parm)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("推送成功");
+            this.handleSearch();
+          }
+        })
+        .catch((err) => {
+          return this.$message.error("网络错误");
+        });
     },
     /**
      * 组织选择触发事件
@@ -592,11 +611,10 @@ export default {
       type: String,
       required: true,
     },
-    serviceId: {
-      type: String,
+    selfObj:{
+      type: Object,
       required: true,
     }
-    
   }
 }
 </script>
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
index 0a2aeda35..0c404b7b9 100644
--- a/src/views/modules/communityService/policy/personList.vue
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -128,7 +128,7 @@
         type="primary"
         size="small"
         class="diy-button--red"
-        @click="handleIncrementServeTimes"
+        @click="sendFindPeopleMsg"
         >公众号消息推送</el-button
       >
       <el-button
@@ -451,7 +451,29 @@ export default {
       // 重新加载列表
       this.handleSearch();
     },
-
+    // 公众号推送
+    sendFindPeopleMsg(){
+      let parm = {
+        parentCategoryCode: this.selfObj.parentCategoryCode,
+        categoryCode: this.selfObj.categoryCode,
+        resiList: this.selectedPersonListIds,
+        serviceTimeStart: this.selfObj.serviceTimeStart,
+        serviceTimeEnd: this.selfObj.serviceTimeEnd
+      }
+      this.$http
+        .post("/actual/base/communityPublicity/sendFindPeopleMsg",parm)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("推送成功");
+            this.handleSearch();
+          }
+        })
+        .catch((err) => {
+          return this.$message.error("网络错误");
+        });
+    },
     /**
      * 组织选择触发事件
      * @returns {Promise<void>}
@@ -609,6 +631,10 @@ export default {
       type: String,
       default: "",
     },
+    selfObj:{
+      type: Object,
+      required: true,
+    }
   },
 };
 </script>
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index ff2c3122f..3ed16f9d6 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -292,7 +292,7 @@
       :title="'符合政策人员名单'"
       width="1600px"
       height="1100px"
-      top="5vh"
+      top="15vh"
       class="dialog-h"
       @closed="showPersonList = false"
     >
@@ -301,6 +301,7 @@
         :policyId="policyId"
         :tagId="tagId"
         :serviceId="serviceId"
+        :selfObj="selfObj"
       >
       </person-list>
     </el-dialog>
@@ -365,6 +366,8 @@ export default {
 
       selection: [],
       serviceId: "",
+
+      selfObj:{}
     };
   },
   computed: {
@@ -740,6 +743,7 @@ export default {
       this.showPersonList = true;
       this.serviceId = row.serviceId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.policyId = row.id;
     },
   },
diff --git a/src/views/modules/communityService/wennuanzhaoren/index.vue b/src/views/modules/communityService/wennuanzhaoren/index.vue
index 60469d755..8912cca4d 100644
--- a/src/views/modules/communityService/wennuanzhaoren/index.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/index.vue
@@ -330,7 +330,7 @@
                :modal-append-to-body="false"
                :modal="false"
                width="850px"
-               top="5vh"
+               top="15vh"
                class="dialog-h"
                @closed="diaDetailClose">
       <detail-form ref="ref_detail_form"
@@ -347,10 +347,11 @@
                :close-on-press-escape="false"
                :title="'人员名单'"
                width="1150px"
-               top="5vh"
+               top="15vh"
                class="dialog-h"
                @closed="showPersonList = false">
       <person-list ref="ref_person_list"
+                   :selfObj="selfObj"
                    :serviceId="commonServiceId"
                    :tagId="tagId">
       </person-list>
@@ -470,7 +471,9 @@ export default {
       ruleList: [],
 
       // 多选行
-      multiSelectedRows: []
+      multiSelectedRows: [],
+
+      selfObj:{}
     };
   },
   computed: {
@@ -588,6 +591,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 
diff --git a/src/views/modules/communityService/wennuanzhaoren/personList.vue b/src/views/modules/communityService/wennuanzhaoren/personList.vue
index dfc918550..7bb532dd8 100644
--- a/src/views/modules/communityService/wennuanzhaoren/personList.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/personList.vue
@@ -101,7 +101,7 @@
 
     <div class="div_btn">
       <el-button type="primary" size="small" class="diy-button--blue" @click="onDeleteBatch">批量删除</el-button>
-      <el-button type="primary" size="small" class="diy-button--blue" @click="onMessagePush">公众号消息推送</el-button>
+      <el-button type="primary" size="small" class="diy-button--blue" @click="sendFindPeopleMsg">公众号消息推送</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -451,8 +451,27 @@ export default {
       this.handleSearch();
     },
      //推送公众号
-     onMessagePush() {
-      alert("哥哥，点我")
+     sendFindPeopleMsg(){
+      let parm = {
+        parentCategoryCode: this.selfObj.parentCategoryCode,
+        categoryCode: this.selfObj.categoryCode,
+        resiList: this.selectedPersonListIds,
+        serviceTimeStart: this.selfObj.serviceTimeStart,
+        serviceTimeEnd: this.selfObj.serviceTimeEnd
+      }
+      this.$http
+        .post("/actual/base/communityPublicity/sendFindPeopleMsg",parm)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("推送成功");
+            this.handleSearch();
+          }
+        })
+        .catch((err) => {
+          return this.$message.error("网络错误");
+        });
     },
 
     /**
@@ -639,11 +658,10 @@ export default {
       type: String,
       required: true,
     },
-    serviceId: {
-      type: String,
+    selfObj:{
+      type: Object,
       required: true,
     }
-    
   },
 }
 </script>

From f05cd74293dc1d8e6434cead3c24691fcc7fb612 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 15 Jul 2024 18:16:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=BC=80=E6=89=BE=E4=BA=BA?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityService/fuwuzhaoren/index.vue    |  1 -
 .../communityService/gangweizhaoren/index.vue |  1 -
 .../communityService/jinengzhaoren/index.vue  |  1 -
 .../jinengzhaoren/personList.vue              |  4 +++-
 .../communityService/policy/policyList.vue    |  5 ++---
 .../communityService/wennuanzhaoren/index.vue | 21 -------------------
 6 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/communityService/fuwuzhaoren/index.vue b/src/views/modules/communityService/fuwuzhaoren/index.vue
index 697865c9b..f7dede659 100644
--- a/src/views/modules/communityService/fuwuzhaoren/index.vue
+++ b/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"
diff --git a/src/views/modules/communityService/gangweizhaoren/index.vue b/src/views/modules/communityService/gangweizhaoren/index.vue
index 7028f752f..bb99c631d 100644
--- a/src/views/modules/communityService/gangweizhaoren/index.vue
+++ b/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"
diff --git a/src/views/modules/communityService/jinengzhaoren/index.vue b/src/views/modules/communityService/jinengzhaoren/index.vue
index 063fab7d0..ea21bec59 100644
--- a/src/views/modules/communityService/jinengzhaoren/index.vue
+++ b/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"
diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue
index 2232d4ee9..92c9a5250 100644
--- a/src/views/modules/communityService/jinengzhaoren/personList.vue
+++ b/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 },
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 3ed16f9d6..39394ccda 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/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"
diff --git a/src/views/modules/communityService/wennuanzhaoren/index.vue b/src/views/modules/communityService/wennuanzhaoren/index.vue
index 8912cca4d..d366c6f09 100644
--- a/src/views/modules/communityService/wennuanzhaoren/index.vue
+++ b/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"