diff --git a/src/assets/img/QRcode.jpg b/src/assets/img/QRcode.jpg
new file mode 100644
index 000000000..02ce33966
Binary files /dev/null and b/src/assets/img/QRcode.jpg differ
diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss
index 3417848c7..f24cc4d9e 100644
--- a/src/assets/scss/modules/management/form-main.scss
+++ b/src/assets/scss/modules/management/form-main.scss
@@ -111,4 +111,7 @@
   left: 5px;
   display: flex;
   justify-content: flex-start;
+}
+.m-table{
+  margin: 20px;
 }
\ No newline at end of file
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 3bd2be5b8..acfb2f384 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -77,6 +77,10 @@
                         <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
                             @click="handleExportModule('room')">下载房屋模板</el-button>
                     </div>
+                    <div  class="table-more-btn">
+                        <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+                            @click="handleExportIDCard()">下载电子门牌二维码</el-button>
+                    </div>
                     <!-- <div
 						v-if="
 							showYhymInfo && customerId !== '1535072605621841922'
@@ -123,8 +127,8 @@
 							>社区二维码</el-button
 						>
 					</div> -->
-                    <el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多<i
-                            class="el-icon-arrow-down el-icon--right"></i></el-button>
+                    <el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多
+                        <i class="el-icon-arrow-down el-icon--right"></i></el-button>
                 </el-popover>
             </div>
         </div>
@@ -384,6 +388,7 @@ export default {
             }
         });
         this.getQueryConditions();
+    
     },
 
     methods: {
@@ -426,6 +431,7 @@ export default {
                 updateStartDate: this.updateStartDate,
                 updateEndDate: this.updateEndDate,
             };
+            
             this.$refs.baobiao.init({
                 elseParams: {
                     categoryKeys: ["house_info"],
@@ -863,7 +869,52 @@ export default {
                 }
             );
         },
+        
+        //导入电子门牌信息
+        
+        handleExportIDCard() {
+            let title = this.agencyObj.label;
+            title = title + "电子门牌信息";
+            let url = "/actual/base/communityHouse/downloadZip";
+            console.log(this.agencyObj)
+            let params = {
+                pageSize:this.pageSize,
+                pageNo:this.pageNo,
+                level:this.agencyObj.level ,              
+                id:this.agencyObj.id,
+                ownerName: this.ownerName,
+                ownerPhone: this.ownerPhone,
+                rentFlag: this.rentFlag,
+                purpose: this.purpose,
+                remark: this.remark,
+                updateStartDate: this.updateStartDate,
+                updateEndDate: this.updateEndDate,
+                sortType:"asc",
+                neighborHoodId:"",
+                buildingId:"",
+                buildingUnitId:"",
+                houseId:"",
+            };
+            // if (this.agencyObj.level === "grid") {
+            //     params.gridId = this.agencyObj.id;
+            //     params.agencyId = "";
+            // } else {
+            //     params.gridId = "";
+            //     params.agencyId = this.agencyObj.id;
+            // }
 
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    console.log(data)
+                    this.download(data, title + ".zip");
+                },
+                (rspMsg, data) => {
+                    this.$message.error(rspMsg);
+                }
+            );
+        },
         //导出一户一档
         handleExportYihuyidang() {
             this.yihuyidangDisabled = true;
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 521111e1e..f1b0ea9ad 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -37,7 +37,7 @@
                     v-model.trim="dataForm.doorName">
           </el-input>
         </el-form-item>
-        <el-form-item label="房屋编码"
+        <!-- <el-form-item label="房屋编码"
                       prop="coding"
                       style="display: block">
           <el-input class="u-edit-width-normal"
@@ -53,7 +53,7 @@
                      size="small"
                      @click="handleCode">生成</el-button>
 
-        </el-form-item>
+        </el-form-item> -->
 
         <!-- <el-form-item label="房屋编码"
                       prop="houseCode"
@@ -63,20 +63,21 @@
                     v-model.trim="dataForm.houseCode">
           </el-input>
         </el-form-item> -->
-
-        <el-form-item v-if="dataForm.houseQrcodeUrl"
-                      label="二维码"
+        
+        <el-form-item 
+                      label=""
                       prop="coding"
                       style="display: block">
           <div style="display: flex; align-items:center">
-            <div class="u-edit-width-normal">
+            <!-- <div class="u-edit-width-normal">
               <img style="margin-left: 30px;width: 200px;"
                    :src="dataForm.houseQrcodeUrl">
-            </div>
+            </div> -->
+            <!--  -->
             <a style="margin-left: 10px;"
-               class="div-table-button--blue"
+               class="div-table-button--blue"     
                :href="dataForm.houseQrcodeUrl"
-               target="_blank"><i class="el-icon-download"></i>下载</a>
+               target="_blank"  @click="downloadQR"><i class="el-icon-download"></i>下载电子门牌二维码</a>
           </div>
         </el-form-item>
 
@@ -283,23 +284,66 @@ export default {
 
     },
 
+    downloadQR(){
+       let title = "房屋二维码";
+       console.log(this.houseId)
+       let  url = "/actual/base/communityHouse/createHouseQrcode/";
+       console.log(url)
+       let params={
+          id:this.houseId
+       }
+       app.ajax.exportFilePost(
+                url,
+                params,
+        
+                (data, rspMsg) => {
+                  console.log(data)
+                    this.download(data, title + ".png");
+                },
+                (rspMsg, data) => {
+                    this.$message.error(rspMsg);
+                }
+            );
+
+    },
+        // 下载文件
+        download(data, downFileName) {
+            if (!data) {
+                return;
+            }
+
+            var csvData = new Blob([data]);
+
+            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                window.navigator.msSaveOrOpenBlob(csvData, downFileName);
+            }
+            // for Non-IE (chrome, firefox etc.)
+            else {
+                var a = document.createElement("a");
+                document.body.appendChild(a);
+                a.style = "display: none";
+                var url = window.URL.createObjectURL(csvData);
+                a.href = url;
+                a.download = downFileName;
+                a.click();
+                a.remove();
+                window.URL.revokeObjectURL(url);
+            }
+        },
 
     async loadHouseInfo () {
 
       const url = "/actual/base/communityHouse/getClearHouseDeatilById/" + this.houseId
-
+      
       let params = {}
       const { data, code, msg } = await requestPost(url, params)
-
+      console.log(data)
       if (code === 0) {
         // debugger
         this.dataForm = { ...data }
-
         this.houseType = this.dataForm.houseType
         this.purpose = this.dataForm.purpose
         this.rentFlag = parseInt(this.dataForm.rentFlag)
-
-
       } else {
         this.$message.error(msg)
       }
diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue
new file mode 100644
index 000000000..ce5021693
--- /dev/null
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@@ -0,0 +1,453 @@
+<template>
+  <div>
+    <base-page ref="basePage" :tableData="tableData" :searchParams="searchParams" :tableParams="tableParams" :tableUrl="tableUrl"
+      :addUrl="addUrl" :editUrl="editUrl" :delUrl="delUrl" :editAuth="editAuth" :delAuth="delAuth" :infoUrl="infoUrl"
+      :exportUrl="exportUrl" :importUrl="importUrl" :mubanUrl="mubanUrl" :editParams="editParams"
+      :editFixedParams="editFixedParams" :editElseRules="editElseRules" :editConfig="editConfig" :editParamsDiv="5"
+      :editBtnName="(item) => '修改'" :formBtnFixed="true" idName="articleId">
+      <template v-slot:editOperateSup="{ id, formType, info }">
+        <el-button v-if="formType == 'add'" type="warning" size="small" :disabled="draftBtnDisable"
+          @click="handleClickDraft(info)">存草稿</el-button>
+      </template>
+
+      <template v-slot:listBtnSup="{ item }">
+        <el-button v-if="item.statusFlag == 'published' &&
+      item.agencyId == $store.state.user.agencyId
+      " @click="handleOfflineShow(item)" type="text" size="small" style="color: #666">下线</el-button>
+      </template>
+
+      <template v-slot:listBtnbefore="{ item }">
+        <el-button v-if="item.isTop == '1'" v-show="item.statusFlag == 'published'"
+          @click="handleCancleTopArticle(item, 'cancel_top')" type="text" size="small"
+          style="color: #fe6252">取消置顶</el-button>
+        <el-button v-show="item.statusFlag == 'published'" v-else @click="handleTopArticle(item, 'top')" type="text"
+          size="small" style="color: #22c1c3">置顶</el-button>
+      </template>
+    </base-page>
+  </div>
+
+</template>
+<script>
+import basePage from "@/views/modules/cpts/base/index";
+import { getItemByIdInCascader, collapse } from "@/utils/cascader";
+
+import dateFormat from "dai-js/tools/dateFormat.js";
+
+export default {
+  data() {
+    return {
+      offlineShowed: false,
+
+      draftBtnDisable: false,
+      searchParams: [
+        { field: "文章标题", keyName: "title", type: "input" },
+        {
+          field: "标签",
+          keyName: "tagIds",
+          type: "select",
+          multiple: true,
+          optionUrl: "/gov/voice/tag/taglist",
+          optionUrlParams: {},
+          optionList: [],
+          optionCook(list) {
+            return list.map((item) => ({
+              label: item.tagName,
+              value: item.tagId,
+            }));
+          },
+        },
+        {
+          field: "状态",
+          keyName: "statusFlag",
+          value: "",
+          type: "select",
+          optionUrl: "",
+          optionUrlParams: {},
+          optionList: [
+            {
+              label: "已发布",
+              value: "published",
+            },
+            {
+              label: "已下线",
+              value: "offline",
+            },
+          ],
+        },
+        {
+          field: "发布范围",
+          keyName: "publishRangeIds",
+          type: "cascader",
+          optionUrl: "/gov/org/customeragency/agencygridtree",
+          optionUrlParams: {
+            agencyId: this.$store.state.user.agencyId,
+          },
+          optionList: [],
+          optionProps: {
+            multiple: false,
+            value: "agencyId",
+            label: "agencyName",
+            children: "subAgencyList",
+            checkStrictly: true,
+          },
+          optionCook(obj) {
+            return [obj];
+          },
+          supKeys: ["publishRangeId", "publishRangeType"],
+          supValues: ["", ""],
+          handleChangeFn(vals, item) {
+            const { optionList } = item;
+            if (vals.length > 0) {
+              item["supValues"][0] = vals[vals.length - 1];
+              item["supValues"][1] = getItemByIdInCascader(
+                optionList,
+                vals,
+                "agencyId",
+                "subAgencyList"
+              )[vals.length - 1]["level"];
+              item["supValues"][1] =
+                item["supValues"][1] == "grid" ? "grid" : "agency";
+            } else {
+              item["supValues"][0] = "";
+              item["supValues"][1] = "";
+            }
+          },
+        },
+        {
+          field: "发布时间",
+          keyName: "publishTime",
+          type: "date-range",
+          supKeys: ["startDate", "endDate"],
+          supValues: ["", ""],
+       
+        },
+      ],
+      tableParams: [
+        { field: "序号", keyName: "", type: "no" },
+        { field: "文章标题", keyName: "title", type: "text" },
+        {
+          field: "标签",
+          keyName: "tagNameList",
+          type: "array",
+          arrayDiv: "、",
+        },
+        { field: "状态", keyName: "statusFlagName", type: "text" },
+        { field: "发布单位", keyName: "publisherName", type: "text" },
+        { field: "发布时间", keyName: "publishDate", type: "text" },
+        {
+          field: "发布范围",
+          keyName: "publishRangeDesc",
+          type: "text",
+        },
+        { field: "置顶", keyName: "isTopName", type: "text" },
+        { field: "点赞数", keyName: "likeCount", type: "text" },
+        { field: "转发量", keyName: "forwardCount", type: "text" },
+      ],
+      tableUrl: "/gov/voice/article/articleListV2",
+      mubanUrl: "",
+      importUrl: "",
+      exportUrl: "",
+
+      addUrl: "/gov/voice/article/addOrSaveDraft",
+      editUrl: "/gov/voice/article/updateArticle",
+      infoUrl: "/gov/voice/article/detailV2",
+      delUrl: "/gov/voice/article/delete批量",
+      editAuth(item) {
+        return item.statusFlagName == "已发布";
+      },
+      delAuth(item) {
+        return item.statusFlagName == "已下线";
+      },
+
+      editParams: [
+        {
+          field: "文章标题",
+          keyName: "title",
+          type: "input",
+          maxlength: 50,
+          editDisabled: true,
+          rules: [
+            {
+              required: true,
+              message: "文章标题不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "封面图片",
+          keyName: "imgArr",
+          type: "upload",
+          limit: 1,
+          listType: "picture-card",
+          editDisabled: true,
+          rules: [],
+          value: () => [],
+          uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/article/upload",
+          supKeys: ["imgUrlArr", "imgUrl"],
+          supValues: [() => [], ""],
+          beforeImgUpload(file, item, that) {
+            console.log(file);
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+
+            if (!isLt1M) {
+              that.$message.error("上传文件大小不能超过 10MB!");
+              return false;
+            }
+            if (srcType.indexOf("image") == -1) {
+              that.$message.error("仅限图片格式");
+              return false;
+            }
+            return true;
+          },
+        },
+        {
+          field: "发布范围",
+          keyName: "gridIdList",
+          type: "cascader",
+          value: () => [],
+          supKeys: ["publishRangeDesc"],
+          supValues: [""],
+          optionUrl: "/gov/org/customeragency/agencygridtree",
+          optionUrlParams: {
+            agencyId: this.$store.state.user.agencyId,
+          },
+          optionList: [],
+          optionProps: {
+            multiple: true,
+            value: "agencyId",
+            label: "agencyName",
+            children: "subAgencyList",
+            checkStrictly: false,
+            emitPath: false,
+          },
+          optionCook(obj) {
+            return [obj];
+          },
+          handleChangeFn(vals, item, that) {
+            console.log("handleChangeFn", vals);
+            const { optionList } = item;
+            const optionPlaneList = collapse(optionList, "subAgencyList");
+            if (vals.length > 0) {
+              let selectedList = vals.map(
+                (v) =>
+                  getItemByIdInCascader(
+                    optionPlaneList,
+                    [v],
+                    "agencyId",
+                    "subAgencyList"
+                  )[0]
+              );
+              console.log("handleChangeFn", selectedList);
+              let selectedFilterList = selectedList.filter(
+                (a) => a.level == "grid"
+              );
+              that.fmData[item["keyName"]] = selectedFilterList.map(
+                (a) => a.agencyId
+              );
+              that.fmData[item["supKeys"][0]] = selectedFilterList
+                .map((a) => a.agencyName)
+                .join("、");
+            } else {
+            }
+          },
+          rules: [
+            {
+              required: true,
+              message: "发布范围不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "发布时间",
+          keyName: "publishDate",
+          type: "date",
+          value: dateFormat(new Date(), "yyyy-MM-dd"),
+          pickerOptions: {
+            disabledDate(time) {
+              return time.getTime() > Date.now();
+            },
+          },
+          rules: [
+            {
+              required: true,
+              message: "发布时间不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "发布单位",
+          keyName: "publisher",
+          type: "select",
+          optionUrl: "/gov/voice/article/publishagencylist",
+          optionList: [],
+          optionType: "group",
+          supKeys: ["publisherName", "publisherType"],
+          supValues: ["", ""],
+          optionCook(data) {
+            let ret = [];
+            const { agencyDeptList, agencyGridList, agencyId, agencyName } =
+              data;
+            if (agencyId) {
+              ret.push({
+                label: "以组织名义",
+                optionList: [
+                  {
+                    label: agencyName,
+                    value: agencyId,
+                    type: "agency",
+                  },
+                ],
+              });
+            }
+            if (Array.isArray(agencyDeptList) && agencyDeptList.length > 0) {
+              ret.push({
+                label: "以部门名义",
+                optionList: [
+                  ...agencyDeptList.map((d) => ({
+                    label: d.agencyDeptName,
+                    value: d.departmentId,
+                    type: "department",
+                  })),
+                ],
+              });
+            }
+            if (Array.isArray(agencyGridList) && agencyGridList.length > 0) {
+              ret.push({
+                label: "以网格名义",
+                optionList: [
+                  ...agencyGridList.map((d) => ({
+                    label: d.agencyGridName,
+                    value: d.gridId,
+                    type: "grid",
+                  })),
+                ],
+              });
+            }
+            return ret;
+          },
+          handleChangeFn(vals, item, that) {
+            const { optionList } = item;
+            let opts = [];
+            optionList.forEach((g) => {
+              opts = [...opts, ...g.optionList];
+            });
+            let publisher = opts.find((p) => vals == p.value);
+            that.fmData[item["supKeys"][0]] = publisher.label;
+            that.fmData[item["supKeys"][1]] = publisher.type;
+          },
+          rules: [
+            {
+              required: true,
+              message: "发布单位不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "文章标签",
+          keyName: "tagNameList",
+          type: "select",
+          multiple: true,
+          filterable: true,
+          allowCreate: true,
+          optionUrl: "/gov/voice/tag/taglist",
+          optionUrlParams: {},
+          optionList: [],
+          optionCook(list) {
+            return list.map((item) => ({
+              label: item.tagName,
+              value: item.tagName,
+            }));
+          },
+        },
+        {
+          field: "内容",
+          keyName: "content",
+          type: "rich-text",
+          rules: [
+            {
+              required: true,
+              message: "内容不能为空",
+              trigger: "blur",
+            },
+          ],
+        },
+        {
+          field: "置顶",
+          keyName: "isTop",
+          type: "switch",
+          activeValue: "1",
+          inactiveValue: "0",
+        },
+        {
+          field: "消息推送",
+          keyName: "isPush",
+          type: "checkbox",
+          optionList:"是否通过公众号推送给社区居民"
+        },
+      ],
+      editFixedParams: {
+        type: "article",
+      },
+      editElseRules: {},
+      editConfig: {
+        confirmBtnName: "发布",
+        cookInfoFn(data) {
+          if (data.richTextFlag == "0") {
+            data.content = data.contentList
+              .map((item) => {
+                if (item.contentType == "text") {
+                  return `<p>${item.content}</p>`;
+                } else if (item.contentType == "img") {
+                  return `<img src="${item.content}" style="max-width:100%"></img>`;
+                } else if (item.contentType == "video") {
+                  return `<video src="${item.content}" style="max-width:100%" controls></video>`;
+                } else if (item.contentType == "file") {
+                  return `<a src="${item.content}" target="_blank">附件：${item.fileName}</a>`;
+                }
+              })
+              .join(" ");
+          } else {
+            data.content = data.contentList[0].content;
+          }
+          if (data.imgUrl) {
+            data.imgArr = [
+              {
+                name: "封面",
+                url: data.imgUrl,
+              },
+            ];
+            data.imgUrlArr = [data.imgUrl];
+          }
+
+          return data;
+        },
+
+        beforeSubmit(formType, fmData, that) {
+          if (fmData.isTop == "1" && !fmData.imgUrl) {
+            that.$message.error("请上传封面图片");
+            return false;
+          }
+          return true;
+        },
+      },
+
+      formData: {},
+      showAddImage: false,
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+      replayImgList: [],
+      hideUploadBtn: false,
+      selType: "top",
+      selArticleId: "",
+      selImgUrl: "",
+    };
+  },
+  components: { basePage }
+
+}
+</script>
+<style lang="scss"></style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/fuwuzhaoren/personList.vue b/src/views/modules/communityService/fuwuzhaoren/personList.vue
index 74f4e7567..9423daf35 100644
--- a/src/views/modules/communityService/fuwuzhaoren/personList.vue
+++ b/src/views/modules/communityService/fuwuzhaoren/personList.vue
@@ -97,11 +97,12 @@
     </div>
 
     <div class="div_btn">
+      <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="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
 
-    <div class="m-table">
+    <div class="m-table"> 
       <!--表格-->
       <el-table
           :data="personList"
@@ -162,6 +163,10 @@
             prop="serveTimes"
             label="享受服务次数">
         </el-table-column>
+        <el-table-column
+            prop=""
+            label="公众号消息推送">已推送
+        </el-table-column>
       </el-table>
     </div>
 
@@ -293,7 +298,10 @@ export default {
       // 重新加载列表
       this.handleSearch();
     },
-
+// 公众号消息推送
+onMessagePush(){
+  alert("哥哥，点我")
+},
     /**
      * 组织选择触发事件
      * @returns {Promise<void>}
diff --git a/src/views/modules/communityService/gangweizhaoren/personList.vue b/src/views/modules/communityService/gangweizhaoren/personList.vue
index 74f4e7567..4d043ab65 100644
--- a/src/views/modules/communityService/gangweizhaoren/personList.vue
+++ b/src/views/modules/communityService/gangweizhaoren/personList.vue
@@ -97,6 +97,7 @@
     </div>
 
     <div class="div_btn">
+       <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="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -162,6 +163,10 @@
             prop="serveTimes"
             label="享受服务次数">
         </el-table-column>
+        <el-table-column
+            prop=""
+            label="公众号消息推送">已推送
+        </el-table-column>
       </el-table>
     </div>
 
@@ -293,7 +298,10 @@ export default {
       // 重新加载列表
       this.handleSearch();
     },
-
+    // 推送公众号
+    onMessagePush() {
+      alert("哥哥，点我")
+    },
     /**
      * 组织选择触发事件
      * @returns {Promise<void>}
diff --git a/src/views/modules/communityService/gxxq/index.vue b/src/views/modules/communityService/gxxq/index.vue
index 69b3f7c5c..aedd88f64 100644
--- a/src/views/modules/communityService/gxxq/index.vue
+++ b/src/views/modules/communityService/gxxq/index.vue
@@ -292,13 +292,17 @@ export default {
         assignFlag: "",
       },
       statusArray: [
+        {
+          value: 2,
+          label: "待处理",
+        },
         {
           value: 1,
-          label: "已指派服务",
+          label: "已派单",
         },
         {
           value: 0,
-          label: "未指派服务",
+          label: "已完成",
         },
       ],
       endPickerOptions: {
diff --git a/src/views/modules/communityService/jinengzhaoren/personList.vue b/src/views/modules/communityService/jinengzhaoren/personList.vue
index 74f4e7567..8d80cfaf1 100644
--- a/src/views/modules/communityService/jinengzhaoren/personList.vue
+++ b/src/views/modules/communityService/jinengzhaoren/personList.vue
@@ -97,6 +97,7 @@
     </div>
 
     <div class="div_btn">
+      <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="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -162,6 +163,10 @@
             prop="serveTimes"
             label="享受服务次数">
         </el-table-column>
+        <el-table-column
+            prop=""
+            label="公众号消息推送">已推送
+        </el-table-column>
       </el-table>
     </div>
 
@@ -293,7 +298,10 @@ export default {
       // 重新加载列表
       this.handleSearch();
     },
-
+    //推送公众号
+    onMessagePush() {
+      alert("哥哥，点我")
+    },
     /**
      * 组织选择触发事件
      * @returns {Promise<void>}
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index d298def0c..a5d404be5 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -231,10 +231,12 @@
     </p>
     <div class="div_btn">
       <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button type="success" @click="handlePreview">预览</el-button>
       <el-button size="small" type="primary" @click="handleComfirm"
         >确 定</el-button
       >
     </div>
+
   </div>
 </template>
 
@@ -675,6 +677,7 @@ export default {
       this.formState = false
       this.handleClickAddRow();
     },
+   
   },
   props: {},
   computed: {},
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 530b3a537..77ab2a150 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -150,6 +150,18 @@
             <span> <i class="el-icon-plus"></i> 按标签查找 </span>
           </el-button>
         </el-form-item>
+        <el-form-item
+          style="display: block"
+          label="微信公众号"
+          :required="true"
+          label-width="150px"
+        >
+        <el-switch
+  v-model="value"
+  active-color="#409EFF"
+  inactive-color="#ff4949">
+</el-switch>
+      </el-form-item>
         <el-form-item label="指派服务" label-width="150px">
           <el-switch
             :active-value="1"
@@ -342,7 +354,8 @@ export default {
       //     statRuleList: []
       //   }
       // ],
-
+      // 微信公众号
+      value: true,
       policyLevelArray: [],
       // 公共服务分类
 
@@ -546,6 +559,7 @@ export default {
     //点击标签触发事件
     handleClickLabel() {
       this.showLabelForm = true;
+      //refs在这里的作用是，访问dom元素，clearValidate清除字段
       this.$refs['ref_form'].clearValidate('resiSearchTagId')
       this.$nextTick(() => {
         this.$refs["ref_label_form"].initForm("info");
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
index 7a0771763..56038d464 100644
--- a/src/views/modules/communityService/policy/personList.vue
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -122,6 +122,13 @@
     </div>
 
     <div class="div_btn">
+      <el-button
+        type="primary"
+        size="small"
+        class="diy-button--red"
+        @click="handleIncrementServeTimes"
+        >公众号消息推送</el-button
+      >
       <el-button
         type="primary"
         size="small"
@@ -167,6 +174,8 @@
         </el-table-column>
         <el-table-column prop="serveTimes" label="享受服务次数">
         </el-table-column>
+        <el-table-column prop="" width="100"  label="公众号消息推送" >已推送
+        </el-table-column>
       </el-table>
     </div>
 
@@ -461,14 +470,12 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/form-main.scss";
-
 .btn-add-rule {
   margin-left: 150px;
   display: flex;
   justify-content: flex-start;
   margin-bottom: 20px;
 }
-
 .item_width_short {
   width: 380px;
 }
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index ab4c614a4..0864ee777 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -216,7 +216,17 @@
             <span>{{ scope.row.expiredFlag ? "已过期" : "未过期" }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column
+          prop="createdTimeStart"
+          align="center"
+          width="100"
+          label="政策发布时间"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.createdTimeStart }}</span>
+          </template>
+        </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="220">
           <template slot-scope="scope">
             <el-button @click="handleDetail(scope.row)" type="text" size="small"
@@ -502,6 +512,7 @@ export default {
       //导出改接口-政策找人
       const url = "/governance/policy/policyExport";
       const { pageSize, pageNo, formData } = this;
+
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
@@ -638,7 +649,6 @@ export default {
         pageNo,
         ...formData,
       });
-      console.log(this.formData);
       this.tableLoading = false;
       if (code === 0) {
         this.total = data.total || 0;
diff --git a/src/views/modules/communityService/wennuanzhaoren/personList.vue b/src/views/modules/communityService/wennuanzhaoren/personList.vue
index 4977bd19f..e568b1005 100644
--- a/src/views/modules/communityService/wennuanzhaoren/personList.vue
+++ b/src/views/modules/communityService/wennuanzhaoren/personList.vue
@@ -99,7 +99,7 @@
     </div>
 
     <div class="div_btn">
-      <!-- <el-button type="primary" size="small" class="diy-button--blue" @click="handleExport">导出</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="handleIncrementServeTimes">标记享受服务人员</el-button>
       <el-button type="primary" size="small" class="diy-button--blue" @click="handleSearch">查询</el-button>
     </div>
@@ -167,6 +167,10 @@
             prop="serveTimes"
             label="享受服务次数">
         </el-table-column>
+        <el-table-column
+            prop=""
+            label="公众号消息推送">已推送
+        </el-table-column>
       </el-table>
     </div>
 
@@ -298,6 +302,10 @@ export default {
       // 重新加载列表
       this.handleSearch();
     },
+     //推送公众号
+     onMessagePush() {
+      alert("哥哥，点我")
+    },
 
     /**
      * 组织选择触发事件
@@ -487,7 +495,8 @@ export default {
       required: true,
     }
     
-  }
+  },
+
 }
 </script>
 
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index cc06b3bcd..5eabd1f41 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -186,6 +186,8 @@
                 {{ scope.row[item.keyName].join(item.arrayDiv || ",") }}
               </template>
             </el-table-column>
+
+
           </template>
 
           <el-table-column v-if="operateCol"
@@ -302,6 +304,7 @@ export default {
     tableParams: {
       type: Array,
       default: () => [],
+
     },
 
     tableUrl: {
@@ -416,7 +419,6 @@ export default {
   data () {
     return {
       tableData: [],
-
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
@@ -425,9 +427,7 @@ export default {
       formShow: false,
       formTitle: "详情",
       formType: "", // 列表list 新增add  修改edit 详情info
-
       ref_search_height: 100,
-
       multipleSelection: [],
     };
   },