Merge branch '公众号推送' into feature

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

@@ -326,11 +326,12 @@
                :close-on-press-escape="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>
@@ -447,8 +448,9 @@ export default {
       // 多选行
       multiSelectedRows: [],
 
-      searchdemandOptions:[]
+      searchdemandOptions:[],
 
+      selfObj:{}
     };
   },
   computed: {
@@ -562,6 +564,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 

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>

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"
@@ -348,11 +348,12 @@
                :title="'人员名单'"
                close-on-press-escape="true"
                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>
@@ -469,7 +470,9 @@ export default {
 
       // 多选行
       multiSelectedRows: [],
-      searchdemandOptions:[]
+      searchdemandOptions:[],
+
+      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;
     },
 

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>

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

@@ -326,10 +326,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>
@@ -446,7 +447,10 @@ export default {
 
       // 多选行
       multiSelectedRows: [],
-      searchdemandOptions:[]
+      searchdemandOptions:[],
+
+      //人员列表用
+      selfObj:{}
     };
   },
   computed: {
@@ -563,6 +567,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 

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>
@@ -444,8 +444,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("网络错误");
+        });
     },
     /**
      * 组织选择触发事件
@@ -594,11 +613,10 @@ export default {
       type: String,
       required: true,
     },
-    serviceId: {
-      type: String,
+    selfObj:{
+      type: Object,
       required: true,
     }
-    
   }
 }
 </script>

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>

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

@@ -291,7 +291,7 @@
       :title="'符合政策人员名单'"
       width="1600px"
       height="1100px"
-      top="5vh"
+      top="15vh"
       class="dialog-h"
       @closed="showPersonList = false"
     >
@@ -300,6 +300,7 @@
         :policyId="policyId"
         :tagId="tagId"
         :serviceId="serviceId"
+        :selfObj="selfObj"
       >
       </person-list>
     </el-dialog>
@@ -364,6 +365,8 @@ export default {
 
       selection: [],
       serviceId: "",
+
+      selfObj:{}
     };
   },
   computed: {
@@ -739,6 +742,7 @@ export default {
       this.showPersonList = true;
       this.serviceId = row.serviceId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.policyId = row.id;
     },
   },

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

@@ -309,7 +309,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"
@@ -326,10 +326,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>
@@ -449,7 +450,9 @@ export default {
       ruleList: [],
 
       // 多选行
-      multiSelectedRows: []
+      multiSelectedRows: [],
+
+      selfObj:{}
     };
   },
   computed: {
@@ -567,6 +570,7 @@ export default {
     async handlePersonList (row) {
       this.commonServiceId = row.serviceRecordId;
       this.tagId = row.resiSearchTagId;
+      this.selfObj = row;
       this.showPersonList = true;
     },
 

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>