From ac42e582b4cb434a5dbbcc91f515f38f063256fd Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 24 Mar 2023 10:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=9B=B4=E6=94=B9=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E4=B8=BA=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue             |    4 +-
 src/views/dataBoard/cpts/map/popup.vue        |    2 +-
 src/views/modules/base/collect.vue            |    4 +-
 .../modules/base/community/buildForm.vue      |    2 +-
 src/views/modules/base/community/roomForm.vue |    4 +-
 .../base/huji/chusheng/cpts/detail.vue        |    2 +-
 .../modules/base/huji/chusheng/cpts/edit.vue  |    6 +-
 .../modules/base/huji/chusheng/index.vue      |    4 +-
 .../modules/base/huji/immigration/detail.vue  |    2 +-
 .../modules/base/huji/immigration/edit.vue    |    6 +-
 .../modules/base/huji/immigration/index.vue   |    4 +-
 .../base/organization/organization.vue        |   14 +-
 src/views/modules/base/roomForm.vue           |    4 +-
 src/views/modules/base/visitor.vue            |    2 +-
 .../communityParty/members/crateForm.vue      |    6 +-
 .../communityParty/members/detailForm.vue     |    2 +-
 .../modules/communityParty/members/index.vue  |    4 +-
 .../modules/communityParty/members/points.vue |    6 +-
 .../regionalParty/unitsForm.vue               |    4 +-
 .../communityService/commonDemand/addForm.vue |    4 +-
 .../commonDemand/editForm.vue                 |    4 +-
 .../communityService/dqfwzx/cpts/order.vue    |    2 +-
 .../communityService/fuwujilu/addForm.vue     |    4 +-
 .../communityService/fuwujilu/editForm.vue    |    4 +-
 .../communityService/fuwujiluOld/addForm.vue  |    4 +-
 .../fuwujiluOld/detailForm.vue                |    4 +-
 .../communityService/measure/detail.vue       |    2 +-
 .../communityService/measure/index.vue        |    4 +-
 .../modules/communityService/measure/info.vue |    2 +-
 .../communityService/measure/points.vue       |    6 +-
 .../ninePlaces/places/placesForm.vue          |    4 +-
 .../ninePlaces/team/teamDetail.vue            |    8 +-
 .../ninePlaces/team/teamForm.vue              |    8 +-
 .../communityService/policy/addPolicy.vue     | 1174 ++++++++++-------
 .../communityService/policy/detailForm.vue    |    4 +-
 .../policy/personListItem.vue                 |    6 +-
 .../communityService/policy/policyList.vue    |  109 +-
 .../communityService/sqzzz/cpts/edit.vue      |    4 +-
 .../customer/feedback/customer-info.vue       |    2 +-
 .../customer/feedback/customer-manage.vue     |    8 +-
 .../modules/customer/manage/customer-info.vue |    2 +-
 .../customer/manage/customer-manage.vue       |    8 +-
 src/views/modules/demo/demo-add-or-update.vue |    4 +-
 src/views/modules/demo/demo.vue               |    4 +-
 .../icpartymemberpayrecorddetail.vue          |    2 +-
 .../partymember/icpartymemberpoint.vue        |    2 +-
 src/views/modules/partymember/lookMember.vue  |    4 +-
 .../change/changedeath-add-or-update.vue      |    4 +-
 .../modules/plugins/change/changedeath.vue    |    2 +-
 .../plugins/change/changerelocation.vue       |    2 +-
 .../change/changewelfare-add-or-update.vue    |    4 +-
 .../modules/plugins/change/changewelfare.vue  |    2 +-
 src/views/modules/plugins/change/verify.vue   |    4 +-
 .../plugins/change/verifyForm copy.vue        |    2 +-
 .../modules/plugins/change/verifyForm.vue     |    2 +-
 .../rent/rentblacklist-add-or-update.vue      |    4 +-
 .../modules/plugins/rent/rentcontractinfo.vue |   12 +-
 .../plugins/rent/rentcontractreview.vue       |    4 +-
 .../modules/plugins/rent/renthouseForm.vue    |    4 +-
 .../rent/renttenantinfo-add-or-update.vue     |    4 +-
 .../modules/plugins/rent/renttenantinfo.vue   |    6 +-
 .../plugins/visit/visitor-add-or-update.vue   |    4 +-
 .../visit/visitvisitor-add-or-update.vue      |    4 +-
 .../modules/plugins/visit/visitvisitor.vue    |    2 +-
 .../secretaryLog/humanisticCare/careForm.vue  |    4 +-
 .../modules/shequzhili/event/cpts/add.vue     |   10 +-
 .../shequzhili/event/cpts/event-detail.vue    |    2 +-
 .../event/cpts/process-form-demand.vue        |    2 +-
 .../modules/shequzhili/issue/cpts/add.vue     |   10 +-
 .../shequzhili/issue/cpts/eventDetail.vue     |    2 +-
 .../shequzhili/issue/cpts/suggestDetail.vue   |    2 +-
 .../issue/cptsAudit/eventDetail.vue           |    2 +-
 .../shequzhili/statics/gridMemberEvent.vue    |    2 +-
 .../shequzhili/tuceng/zhonghe/base.vue        |    2 +-
 .../shequzhili/tuceng/zhonghe/baseTotal.vue   |    2 +-
 .../shequzhili/xiangmu/cpts/demand-info.vue   |    2 +-
 .../modules/shequzhili/xiangmu/cpts/edit.vue  |    6 +-
 .../shequzhili/xiangmu/xiangmu-ling.vue       |    4 +-
 .../sys/icvaccineprarmeter-add-or-update.vue  |    2 +-
 src/views/modules/sys/roomForm.vue            |    4 +-
 .../modules/visual/command/cpts/popup.vue     |    2 +-
 .../fivelayers/mapIndex copy 2.vue            |    2 +-
 .../fivelayers/mapIndex copy.vue              |    2 +-
 .../fivelayers/mapIndex-baidu.vue             |    2 +-
 .../communityGovern/fivelayers/mapIndex.vue   |    2 +-
 .../geliguankong/detail-info.vue              |    2 +-
 .../shijianchuli/event-info.vue               |    2 +-
 .../shijianchuli/shijianchulifenxi copy.vue   |    2 +-
 .../zhongdianxingcheng/detail.vue             |    2 +-
 .../zhongdianxingcheng/zhongdianxingcheng.vue |    2 +-
 .../visual/communityParty/crateForm.vue       |    6 +-
 .../visual/communityParty/gridParty.vue       |    4 +-
 .../modules/visual/communityParty/party.vue   |    4 +-
 .../visual/communityParty/partyOld.vue        |    4 +-
 .../plugin/power/components/house-dialog.vue  |    2 +-
 .../plugin/power/components/info-dialog.vue   |    2 +-
 .../modules/visual/shundeju/controlCount.vue  |    2 +-
 src/views/modules/workSys/operAuth.vue        |    8 +-
 src/views/pages/login.vue                     |    2 +-
 99 files changed, 938 insertions(+), 715 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 37c3843d4..791665279 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -379,10 +379,10 @@ export default {
     // let rules = {}
     let checkMObile = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入手机号'))
+        callback(new Error('请输入联系电话'))
       } else {
         if (!isMobile(value) && !isPhone(value)) {
-          callback(new Error('手机号格式不正确'))
+          callback(new Error('联系电话格式不正确'))
         }
         callback()
       }
diff --git a/src/views/dataBoard/cpts/map/popup.vue b/src/views/dataBoard/cpts/map/popup.vue
index 276dd217e..bb5968153 100644
--- a/src/views/dataBoard/cpts/map/popup.vue
+++ b/src/views/dataBoard/cpts/map/popup.vue
@@ -29,7 +29,7 @@
 				</div>
 
 				<div class="item">
-					<span class="field">手机号：</span>
+					<span class="field">联系电话：</span>
 					<span>{{ info.telephone || "--" }}</span>
 				</div>
 				<div class="item">
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 899a28a04..c253e8e2b 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -134,7 +134,7 @@
           <el-table-column prop="memberMobile"
                            width="140"
                            align="center"
-                           label="成员手机号"
+                           label="成员联系电话"
                            :show-overflow-tooltip="true" />
           <el-table-column prop="relationship"
                            min-width="120"
@@ -300,7 +300,7 @@
           <el-table-column prop="memberMobile"
                            width="140"
                            align="center"
-                           label="成员手机号"
+                           label="成员联系电话"
                            :show-overflow-tooltip="true" />
           <el-table-column prop="heSuanCount"
                            width="120"
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index 12dde0011..6f98387a7 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -272,7 +272,7 @@ export default {
     },
     async addBuild () {
       if (this.dataForm.buildingLeaderMobile) {
-        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
         if (this.dataForm.buildingLeaderMobile && regPhone.test(this.dataForm.buildingLeaderMobile) === false) {
           this.btnDisable = false
           this.$message({
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index ea14d5c36..4272d894b 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -346,12 +346,12 @@ export default {
         })
         return false;
       }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/base/huji/chusheng/cpts/detail.vue b/src/views/modules/base/huji/chusheng/cpts/detail.vue
index e7ee2d8d7..bd6110f75 100644
--- a/src/views/modules/base/huji/chusheng/cpts/detail.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/detail.vue
@@ -21,7 +21,7 @@
           </div>
 
           <div class="m-info-prop">
-            <span class="u-info-title-3">手机号：</span>
+            <span class="u-info-title-3">联系电话：</span>
             <span>{{ fmData.mobile|| "--"}}</span>
           </div>
 
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index b0243d9ce..6d8710239 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -114,13 +114,13 @@
           </div>
         </el-form-item>
 
-        <el-form-item label="手机号"
+        <el-form-item label="联系电话"
                       prop="mobile"
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     maxlength="30"
                     show-word-limit
-                    placeholder="请输入手机号	"
+                    placeholder="请输入联系电话	"
                     v-model="fmData.mobile"
                     :disabled="formType === 'edit'">
           </el-input>
@@ -639,7 +639,7 @@ export default {
           if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
             return this.$message({
               type: "error",
-              message: "手机号格式有误",
+              message: "联系电话格式有误",
             });
           }
           this.submit();
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 48f988484..1fd6ccc38 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -96,7 +96,7 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="手机号"
+        <el-form-item label="联系电话"
                       prop="mobile">
           <el-input v-model="fmData.mobile"
                     class="u-item-width-normal"
@@ -228,7 +228,7 @@
         <el-table-column prop="mobile"
                          width="100"
                          align="center"
-                         label="手机号"
+                         label="联系电话"
                          :show-overflow-tooltip="true">
         </el-table-column>
 
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
index 11010fc07..06af3e096 100644
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -21,7 +21,7 @@
         </div>
 
         <div class="m-info-prop">
-          <span class="u-info-title u-info-title-100">手机号：</span>
+          <span class="u-info-title u-info-title-100">联系电话：</span>
           <span>{{ fmData.mobile?fmData.mobile:'--'}}</span>
         </div>
 
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 11befc2ec..73e1b8115 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -124,14 +124,14 @@
           </div>
         </el-form-item>
 
-        <el-form-item label="手机号"
+        <el-form-item label="联系电话"
                       prop="mobile"
                       style="display: block">
           <el-input class="u-edit-width-normal"
                     type="number"
                     maxlength="11"
                     show-word-limit
-                    placeholder="请输入手机号	"
+                    placeholder="请输入联系电话	"
                     :disabled="formType === 'edit'"
                     v-model="fmData.mobile">
           </el-input>
@@ -704,7 +704,7 @@ export default {
           if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
             return this.$message({
               type: 'error',
-              message: '手机号格式有误'
+              message: '联系电话格式有误'
             })
           }
           this.btnDisable = true
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index df4b53bf4..e70d43c3c 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -106,7 +106,7 @@
 					</el-input>
 				</el-form-item>
 
-				<el-form-item label="手机号" prop="mobile">
+				<el-form-item label="联系电话" prop="mobile">
 					<el-input
 						v-model="fmData.mobile"
 						class="u-item-width-normal"
@@ -276,7 +276,7 @@
 						prop="mobile"
 						width="140"
 						align="center"
-						label="手机号"
+						label="联系电话"
 					>
 					</el-table-column>
 
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index b3e03c026..e9d2fb350 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -379,10 +379,10 @@
             <el-input v-model="peoForm.name"
                       placeholder="请输入姓名"></el-input>
           </el-form-item>
-          <el-form-item label="手机号"
+          <el-form-item label="联系电话"
                         prop="mobile">
             <el-input v-model="peoForm.mobile"
-                      placeholder="请输入手机号"></el-input>
+                      placeholder="请输入联系电话"></el-input>
           </el-form-item>
           <!-- 性别下拉框 -->
           <el-form-item label="性别"
@@ -461,10 +461,10 @@
           <el-input v-model="peoForm.name"
                     placeholder="请输入姓名"></el-input>
         </el-form-item>
-        <el-form-item label="手机号"
+        <el-form-item label="联系电话"
                       prop="mobile">
           <el-input v-model="peoForm.mobile"
-                    placeholder="请输入手机号"></el-input>
+                    placeholder="请输入联系电话"></el-input>
         </el-form-item>
         <el-form-item label="性别"
                       prop="gender">
@@ -549,9 +549,9 @@
                     placeholder="姓名"
                     :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="手机号">
+        <el-form-item label="联系电话">
           <el-input v-model="peoForm.mobile"
-                    placeholder="手机号"
+                    placeholder="联系电话"
                     :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="组织/部门">
@@ -1090,7 +1090,7 @@ export default {
 
       rulesPeo: {
         name: [{ required: true, message: "姓名必填", trigger: "blur" }],
-        mobile: [{ required: true, message: "手机号必填", trigger: "blur" }],
+        mobile: [{ required: true, message: "联系电话必填", trigger: "blur" }],
         gender: [{ required: true, message: "性别必填", trigger: "blur" }],
         post: [{ required: true, message: "专兼职必填", trigger: "blur" }],
         duty: [{ required: true, message: "职责必填", trigger: "blur" }],
diff --git a/src/views/modules/base/roomForm.vue b/src/views/modules/base/roomForm.vue
index e7c546a43..bc69aa45c 100644
--- a/src/views/modules/base/roomForm.vue
+++ b/src/views/modules/base/roomForm.vue
@@ -302,12 +302,12 @@ export default {
         })
         return false;
       }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/base/visitor.vue b/src/views/modules/base/visitor.vue
index 9b0c92598..599d80ee4 100644
--- a/src/views/modules/base/visitor.vue
+++ b/src/views/modules/base/visitor.vue
@@ -61,7 +61,7 @@
         <el-table-column
           prop="mobile"
           width="180"
-          label="手机号"
+          label="联系电话"
           align="center"
         />
         <el-table-column
diff --git a/src/views/modules/communityParty/members/crateForm.vue b/src/views/modules/communityParty/members/crateForm.vue
index eb03a76bd..e45cf26dc 100644
--- a/src/views/modules/communityParty/members/crateForm.vue
+++ b/src/views/modules/communityParty/members/crateForm.vue
@@ -48,7 +48,7 @@
         </el-form-item>
       </div>
       <div class="flex-div">
-        <el-form-item label="手机号"
+        <el-form-item label="联系电话"
                       prop="mobile"
                       class="wd50">
           <el-input v-model="form.mobile"
@@ -266,10 +266,10 @@ export default {
   data () {
     let checkMObile = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入手机号'))
+        callback(new Error('请输入联系电话'))
       } else {
         if (!isMobile(value) && !isPhone(value)) {
-          callback(new Error('手机号格式不正确'))
+          callback(new Error('联系电话格式不正确'))
         }
         callback()
       }
diff --git a/src/views/modules/communityParty/members/detailForm.vue b/src/views/modules/communityParty/members/detailForm.vue
index 4669347d4..ababf87bb 100644
--- a/src/views/modules/communityParty/members/detailForm.vue
+++ b/src/views/modules/communityParty/members/detailForm.vue
@@ -33,7 +33,7 @@
         <div class="m-detail-main-2">
 
           <div class="m-info-prop">
-            <span class="u-info-title-2">手机号：</span>
+            <span class="u-info-title-2">联系电话：</span>
             <span>{{ info.mobile?info.mobile:'--'}}</span>
           </div>
           <div class="m-info-prop">
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 9b1d29233..aaa3a99a3 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -34,7 +34,7 @@
                         class="input-width"
                         clearable></el-input>
             </el-form-item>
-            <el-form-item label="手机号"
+            <el-form-item label="联系电话"
                           prop="mobile">
               <el-input v-model="searchForm.mobile"
                         placeholder="请输入"
@@ -230,7 +230,7 @@
                          align="center"
                          min-width="180" />
         <el-table-column prop="mobile"
-                         label="手机号"
+                         label="联系电话"
                          align="center"
                          min-width="160" />
         <el-table-column prop="rdsj"
diff --git a/src/views/modules/communityParty/members/points.vue b/src/views/modules/communityParty/members/points.vue
index f12b182d2..1091370b8 100644
--- a/src/views/modules/communityParty/members/points.vue
+++ b/src/views/modules/communityParty/members/points.vue
@@ -15,7 +15,7 @@
             <el-form-item label="姓名" prop="name">
               <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
-            <el-form-item label="手机号" prop="mobile">
+            <el-form-item label="联系电话" prop="mobile">
               <el-input v-model="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="证件号" prop="idCard">
@@ -95,7 +95,7 @@
         />
         <el-table-column
           prop="mobile"
-          label="手机号"
+          label="联系电话"
           align="center"
           min-width="160"
         />
@@ -232,7 +232,7 @@
           <!-- <el-form-item label="性别" prop="remark" :label-width="'100px'">
             <el-input v-model="form.remark" autocomplete="off" class="input-width"></el-input>
           </el-form-item> -->
-          <el-form-item label="手机号:" :label-width="'100px'">
+          <el-form-item label="联系电话:" :label-width="'100px'">
            <div class="input-width1">{{detailInfo.mobile}}</div>
           </el-form-item>
           <el-form-item label="证件号:" :label-width="'100px'">
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index 44e59cee0..3bb06c249 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -282,12 +282,12 @@ export default {
 
     },
     async addUnit () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       // if (regPhone.test(this.formData.contactMobile) === false) {
       //   this.btnDisable = false
       //   this.$message({
       //     type: 'warning',
-      //     message: '请输入正确的手机号码'
+      //     message: '请输入正确的联系电话'
       //   })
       //   return false;
       // }
diff --git a/src/views/modules/communityService/commonDemand/addForm.vue b/src/views/modules/communityService/commonDemand/addForm.vue
index c4c9cdec4..2104b62ec 100644
--- a/src/views/modules/communityService/commonDemand/addForm.vue
+++ b/src/views/modules/communityService/commonDemand/addForm.vue
@@ -1055,7 +1055,7 @@ export default {
 
       console.log(this.formData);
       // return false
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
 
       if (
         this.formData.principalContact &&
@@ -1064,7 +1064,7 @@ export default {
         this.btnDisable = false;
         this.$message({
           type: "warning",
-          message: "请输入正确的手机号码",
+          message: "请输入正确的联系电话",
         });
         return false;
       }
diff --git a/src/views/modules/communityService/commonDemand/editForm.vue b/src/views/modules/communityService/commonDemand/editForm.vue
index cd74c56b3..eb196dd72 100644
--- a/src/views/modules/communityService/commonDemand/editForm.vue
+++ b/src/views/modules/communityService/commonDemand/editForm.vue
@@ -574,12 +574,12 @@ import { nextTick } from 'vue';
 
       },
       async editFuwu () {
-        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+        const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
         if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
           this.btnDisable = false
           this.$message({
             type: 'warning',
-            message: '请输入正确的手机号码'
+            message: '请输入正确的联系电话'
           })
           return false;
         }
diff --git a/src/views/modules/communityService/dqfwzx/cpts/order.vue b/src/views/modules/communityService/dqfwzx/cpts/order.vue
index 8403155a5..58ac1bb4a 100644
--- a/src/views/modules/communityService/dqfwzx/cpts/order.vue
+++ b/src/views/modules/communityService/dqfwzx/cpts/order.vue
@@ -328,7 +328,7 @@ export default {
           if (!formVltHelper.userOrMobile(this.dataForm.appointmentPhone)) {
             return this.$message({
               type: "error",
-              message: "手机号格式有误",
+              message: "联系电话格式有误",
             });
           }
           this.submit();
diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue
index 4eaa6d64b..9772c6c0d 100644
--- a/src/views/modules/communityService/fuwujilu/addForm.vue
+++ b/src/views/modules/communityService/fuwujilu/addForm.vue
@@ -805,7 +805,7 @@ export default {
 
       console.log(this.formData);
       // return false
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
 
       if (
         this.formData.principalContact &&
@@ -814,7 +814,7 @@ export default {
         this.btnDisable = false;
         this.$message({
           type: "warning",
-          message: "请输入正确的手机号码",
+          message: "请输入正确的联系电话",
         });
         return false;
       }
diff --git a/src/views/modules/communityService/fuwujilu/editForm.vue b/src/views/modules/communityService/fuwujilu/editForm.vue
index 992a938ec..4beab23c7 100644
--- a/src/views/modules/communityService/fuwujilu/editForm.vue
+++ b/src/views/modules/communityService/fuwujilu/editForm.vue
@@ -506,12 +506,12 @@ export default {
 
     },
     async editFuwu () {
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/communityService/fuwujiluOld/addForm.vue b/src/views/modules/communityService/fuwujiluOld/addForm.vue
index ba7975b1f..042161db5 100644
--- a/src/views/modules/communityService/fuwujiluOld/addForm.vue
+++ b/src/views/modules/communityService/fuwujiluOld/addForm.vue
@@ -562,12 +562,12 @@ export default {
 
       console.log(this.formData)
       // return false
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (this.formData.principalContact && regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/communityService/fuwujiluOld/detailForm.vue b/src/views/modules/communityService/fuwujiluOld/detailForm.vue
index e0cabde67..a5f1fe42d 100644
--- a/src/views/modules/communityService/fuwujiluOld/detailForm.vue
+++ b/src/views/modules/communityService/fuwujiluOld/detailForm.vue
@@ -430,12 +430,12 @@ export default {
 
     },
     async editFuwu () {
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/communityService/measure/detail.vue b/src/views/modules/communityService/measure/detail.vue
index 0e6492548..e9a5e09c5 100644
--- a/src/views/modules/communityService/measure/detail.vue
+++ b/src/views/modules/communityService/measure/detail.vue
@@ -29,7 +29,7 @@
         </div>
 
         <div class="m-info-prop">
-          <span class="u-info-title-3">上报人手机号：</span>
+          <span class="u-info-title-3">上报人联系电话：</span>
           <span>{{ dataForm.reportUserMobile?dataForm.reportUserMobile:'--'}}</span>
         </div>
         <div class="m-info-prop">
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 8cffaf27a..7636e6ca2 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -317,7 +317,7 @@
                     class="input-width"
                     clearable></el-input>
         </el-form-item>
-        <el-form-item label="上报人手机号"
+        <el-form-item label="上报人联系电话"
                       prop="reportUserMobile">
           <el-input v-model="form.reportUserMobile"
                     :disabled="disabled"
@@ -752,7 +752,7 @@ export default {
           { required: true, message: "上报人不能为空", trigger: "blur" },
         ],
         reportUserMobile: [
-          { required: true, message: "上报人手机号不能为空", trigger: "blur" },
+          { required: true, message: "上报人联系电话不能为空", trigger: "blur" },
         ],
         reportTime: [
           { required: true, message: "上报时间不能为空", trigger: "blur" },
diff --git a/src/views/modules/communityService/measure/info.vue b/src/views/modules/communityService/measure/info.vue
index e7c354833..62c942928 100644
--- a/src/views/modules/communityService/measure/info.vue
+++ b/src/views/modules/communityService/measure/info.vue
@@ -160,7 +160,7 @@
           </div>
         </el-form-item>
         <el-form-item
-          label="上报人手机号"
+          label="上报人联系电话"
           :class="{ 'form-item': source === 'visiual' }"
           prop="reportUserMobile"
         >
diff --git a/src/views/modules/communityService/measure/points.vue b/src/views/modules/communityService/measure/points.vue
index f06369051..2ec6c5e5d 100644
--- a/src/views/modules/communityService/measure/points.vue
+++ b/src/views/modules/communityService/measure/points.vue
@@ -15,7 +15,7 @@
             <el-form-item label="姓名" prop="name">
               <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
-            <el-form-item label="手机号" prop="mobile">
+            <el-form-item label="联系电话" prop="mobile">
               <el-input v-model="searchForm.mobile" placeholder="请输入" class="input-width" clearable></el-input>
             </el-form-item>
             <el-form-item label="证件号" prop="idCard">
@@ -95,7 +95,7 @@
         />
         <el-table-column
           prop="mobile"
-          label="手机号"
+          label="联系电话"
           align="center"
           min-width="160"
         />
@@ -232,7 +232,7 @@
           <!-- <el-form-item label="性别" prop="remark" :label-width="'100px'">
             <el-input v-model="form.remark" autocomplete="off" class="input-width"></el-input>
           </el-form-item> -->
-          <el-form-item label="手机号:" :label-width="'100px'">
+          <el-form-item label="联系电话:" :label-width="'100px'">
            <div class="input-width1">{{detailInfo.mobile}}</div>
           </el-form-item>
           <el-form-item label="证件号:" :label-width="'100px'">
diff --git a/src/views/modules/communityService/ninePlaces/places/placesForm.vue b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
index 068a57a18..fd3083263 100644
--- a/src/views/modules/communityService/ninePlaces/places/placesForm.vue
+++ b/src/views/modules/communityService/ninePlaces/places/placesForm.vue
@@ -217,12 +217,12 @@ export default {
 
     },
     async addPlace () {
-      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       // if (regPhone.test(this.formData.mobile) === false) {
       //   this.btnDisable = false
       //   this.$message({
       //     type: 'warning',
-      //     message: '请输入正确的手机号码'
+      //     message: '请输入正确的联系电话'
       //   })
       //   return false;
       // }
diff --git a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
index d72bca8c8..47fc9cb3e 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamDetail.vue
@@ -171,12 +171,12 @@ export default {
       this.memberList.splice(index, 1)
     },
     async addTeam () {
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (regPhone.test(this.formData.mobile) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
@@ -240,9 +240,9 @@ export default {
         if (!item.mobile || !item.name) {
           return '成员的姓名和电话不能为空'
         } else {
-          const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+          const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
           if (regPhone.test(item.mobile) === false) {
-            return '请输入正确的手机号码';
+            return '请输入正确的联系电话';
           }
         }
       }
diff --git a/src/views/modules/communityService/ninePlaces/team/teamForm.vue b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
index 66732ebe0..6d033c59f 100644
--- a/src/views/modules/communityService/ninePlaces/team/teamForm.vue
+++ b/src/views/modules/communityService/ninePlaces/team/teamForm.vue
@@ -264,12 +264,12 @@ export default {
       this.memberList.splice(index, 1)
     },
     async addTeam () {
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (regPhone.test(this.formData.mobile) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
@@ -333,9 +333,9 @@ export default {
         if (!item.mobile || !item.name) {
           return '成员的姓名和电话不能为空'
         } else {
-          const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+          const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
           if (regPhone.test(item.mobile) === false) {
-            return '请输入正确的手机号码';
+            return '请输入正确的联系电话';
           }
         }
       }
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index 34f44ef42..7dd73bcd0 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -1,111 +1,132 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="formData"
-               :rules="dataRule"
-               :disabled="formType==='detail'"
-               class="div_form">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="div_form"
+      >
         <!-- 政策类型 -->
-        <el-form-item label="政策类型"
-              style="display: block"
-              label-width="150px"
-              prop="serviceType">
-          <div class="f-flex">
-            <el-form-item prop="serviceType" 
-                                    class="u-item-width-communitycascader f-bto0" 
-                                    :rules="dataRule.serviceType" >
-              <el-select class="cell-width-1"
-                        v-model.trim="formData.policyTypeLevel1Id"
-                        placeholder="请选择"
-                        clearable>
-                <el-option v-for="item in serviceTypesLevel1"
-                            @click.native="handleChangeServiceTypeLevel1"
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item prop="serviceType" 
-                                    class="u-item-width-communitycascader f-bto0" 
-                                    :rules="dataRule.serviceType" >
-              <el-select class="cell-width-1"
-                        v-model.trim="formData.policyTypeLevel2Id"
-                        placeholder="请选择"
-                        clearable>
-                <el-option v-for="item in serviceTypesLevel2"
-                            @click.native=""
-                            :key="item.id"
-                            :label="item.name"
-                            :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </div>
+        <el-form-item
+          label="政策类型"
+          style="display: block"
+          label-width="150px"
+          prop="serviceTypesLevel2"
+        >
+          <el-select
+            class="cell-width-1"
+            v-model.trim="formData.policyTypeLevel1Id"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceTypesLevel1"
+              @click.native="handleChangeServiceTypeLevel1"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+
+          <el-select
+            class="cell-width-1"
+            v-model.trim="formData.policyCategoryL2"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceTypesLevel2"
+              @click.native=""
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
 
-        <el-form-item label="政策标题"
-                      prop="title"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_1"
-                    placeholder="请输入政策标题"
-                    v-model="formData.title">
+        <el-form-item
+          label="政策标题"
+          prop="title"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入政策标题"
+            v-model="formData.title"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="政策有效期"
-                      style="display: block"
-                      label-width="150px"
-                      prop="startDate">
-          <el-date-picker v-model="formData.startDate"
-                          class="item_width_2"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
-                          placeholder="开始时间">
+        <el-form-item
+          label="政策有效期"
+          style="display: block"
+          label-width="150px"
+          prop="startDate"
+        >
+          <el-date-picker
+            v-model="formData.startDate"
+            class="item_width_2"
+            type="date"
+            value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
           </el-date-picker>
           <span class="u-data-tag">至</span>
-          <el-date-picker v-model="formData.endDate"
-                          class="item_width_2 u-data-tag"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
-                          placeholder="结束时间">
+          <el-date-picker
+            v-model="formData.endDate"
+            class="item_width_2 u-data-tag"
+            type="date"
+            value-format="yyyy-MM-dd"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="政策级别"
-                      style="display: block"
-                      label-width="150px"
-                      prop="policyLevel">
-          <el-select class="item_width_2"
-                     v-model="formData.policyLevel"
-                     placeholder="全部"
-                     clearable>
-            <el-option v-for="item in policyLevelArray"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+        <el-form-item
+          label="政策级别"
+          style="display: block"
+          label-width="150px"
+          prop="policyLevel"
+        >
+          <el-select
+            class="item_width_2"
+            v-model="formData.policyLevel"
+            placeholder="全部"
+            clearable
+          >
+            <el-option
+              v-for="item in policyLevelArray"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
-
         </el-form-item>
 
-        <el-form-item label="政策内容"
-                      prop="content"
-                      label-width="150px"
-                      style="display: block">
-          <el-input class="item_width_3"
-                    type="textarea"
-                    maxlength="1000"
-                    show-word-limit
-                    :rows="10"
-                    placeholder="请输入政策内容"
-                    v-model="formData.content"></el-input>
+        <el-form-item
+          label="政策内容"
+          prop="content"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_3"
+            type="textarea"
+            maxlength="1000"
+            show-word-limit
+            :rows="10"
+            placeholder="请输入政策内容"
+            v-model="formData.content"
+          ></el-input>
         </el-form-item>
 
         <!-- <div v-for="(item,index) in formData.ruleList"
@@ -159,72 +180,227 @@
                        @change="handleCateSlect"></el-cascader>
         </el-form-item> -->
 
-        <el-form-item class="block"
-                      label="附件"
-                      label-width="150px"
-                      prop="attach">
-          <el-upload :headers="$getElUploadHeaders()"
-                     class="upload-demo"
-                     :action="uploadUlr"
-                     accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
-                     :on-success="handleFileSuccess"
-                     :on-remove="handleFileRemove"
-                     :on-preview="handleFileDownload"
-                     :limit="3"
-                     :before-upload="beforeUpload"
-                     :file-list="fileList">
-            <el-button size="small"
-                       :disabled="fileList.length===3"
-                       type="primary">点击上传</el-button>
-            <div slot="tip"
-                 class="el-upload__tip">支持图片、word、pdf</div>
+        <el-form-item
+          class="block"
+          label="附件"
+          label-width="150px"
+          prop="attach"
+        >
+          <el-upload
+            :headers="$getElUploadHeaders()"
+            class="upload-demo"
+            :action="uploadUlr"
+            accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
+            :on-success="handleFileSuccess"
+            :on-remove="handleFileRemove"
+            :on-preview="handleFileDownload"
+            :limit="3"
+            :before-upload="beforeUpload"
+            :file-list="fileList"
+          >
+            <el-button
+              size="small"
+              :disabled="fileList.length === 3"
+              type="primary"
+              >点击上传</el-button
+            >
+            <div slot="tip" class="el-upload__tip">支持图片、word、pdf</div>
           </el-upload>
         </el-form-item>
-
+        <el-form-item
+          label="查找符合政策人员"
+          prop="resiSearchTagId"
+          label-width="150px"
+          :required="true"
+          style="display: block"
+        >
+          <template v-if="formData.resiSearchTagName">
+            <el-tag @close="handleCloseTag" closable style="margin-right: 10px">
+              {{ formData.resiSearchTagName }}
+            </el-tag>
+          </template>
+
+          <el-button type="primary" @click="handleClickLabel" size="mini">
+            <span> <i class="el-icon-plus"></i> 按标签查找 </span>
+          </el-button>
+        </el-form-item>
+        <el-form-item label="指派服务" label-width="150px">
+          <el-switch
+            :active-value="1"
+            :inactive-value="0"
+            v-model="formData.assignFlag"
+          >
+          </el-switch>
+        </el-form-item>
       </el-form>
+      <el-form :model="newFormData" :rules="newDataRule" ref="ref_policy_form1">
+        <el-form-item
+          v-if="formData.assignFlag"
+          label="服务方"
+          label-width="150px"
+          style="display: block"
+          prop="serverOrgId"
+        >
+          <el-select
+            v-model="newFormData.serverOrgType"
+            class="input-width-small"
+            placeholder="请选择"
+            clearable
+            @change="handleServiceChange('add', $event)"
+          >
+            <el-option
+              v-for="item in serviceOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          -
+          <el-select
+            v-model="newFormData.serverOrgId"
+            class="input-width-middle"
+            filterable
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in serviceOptiondList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="formData.assignFlag"
+          prop="noticeApproches"
+          label="自动通知服务方"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-checkbox-group v-model="newFormData.noticeApproches">
+            <el-checkbox label="sms" value="sms">短信通知</el-checkbox>
+            <el-checkbox label="wx" value="wx">微信公众号消息通知</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
 
+        <el-form-item
+          v-if="formData.assignFlag"
+          label="服务范围"
+          label-width="150px"
+          style="display: block"
+          prop="serviceScopeList"
+        >
+          <el-cascader
+            class="item_width_1"
+            ref="myCascader"
+            v-model="newFormData.serviceScopeList"
+            :key="iscascaderShow"
+            :options="casOptions"
+            :props="optionProps"
+            :show-all-levels="false"
+          ></el-cascader>
+        </el-form-item>
+
+        <el-form-item
+          v-if="formData.assignFlag"
+          label="服务时间"
+          label-width="150px"
+          prop="serviceTimeEnd"
+        >
+          <!-- :picker-options="startPickerOptions" -->
+          <el-date-picker
+            v-model="newFormData.serviceTimeStart"
+            class="item_width_2"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="开始时间"
+          >
+          </el-date-picker>
+          <!-- :picker-options="endPickerOptions" -->
+          <span class="u-data-tag">至</span>
+          <el-date-picker
+            v-model="newFormData.serviceTimeEnd"
+            class="item_width_2 u-data-tag"
+            style="width: 220px"
+            type="date"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            value="yyyy-MM-dd"
+            placeholder="结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
     </div>
 
     <div class="div_btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button v-if="formType!=='detail'"
-                 size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleAdd">确 定</el-button>
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType !== 'detail'"
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleAdd"
+        >确 定</el-button
+      >
     </div>
+    <el-dialog
+      v-if="showLabelForm"
+      :visible.sync="showLabelForm"
+      :append-to-body="true"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="'标签配置'"
+      width="900px"
+      top="5vh"
+      class="dialog-h"
+      @closed="showLabelForm = false"
+    >
+      <label-form
+        ref="ref_label_form"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      >
+      </label-form>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-import { requestPost } from '@/js/dai/request'
-import rule from './rule'
+import { mapGetters } from "vuex";
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+import rule from "./rule";
+import labelForm from "../labelConfig/addForm.vue";
 
-
-
-let loading // 加载动画
+let loading; // 加载动画
 export default {
-  data () {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
+  data() {
+    let endDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
       if (this.formData.serviceTimeStart) {
-        let serviceTimeStart = new Date(this.formData.serviceTimeStart)
-        return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart
+        let serviceTimeStart = new Date(this.formData.serviceTimeStart);
+        return (
+          time.getTime() > nowData ||
+          time.getTime() < serviceTimeStart ||
+          time.getTime() === serviceTimeStart
+        );
       } else {
-        return time.getTime() > nowData
+        return time.getTime() > nowData;
       }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
+    };
+    let startDisabledDate = (time) => {
+      //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now();
+      return time.getTime() > nowData;
+    };
 
     return {
-
       // ruleList: [
       //   {
       //     ruleName: '',
@@ -236,8 +412,9 @@ export default {
 
       policyLevelArray: [],
       // 公共服务分类
-      serviceTypesLevel1:[],
-      serviceTypesLevel2:[],
+      serviceTypesLevel1: [],
+      serviceTypesLevel2: [],
+      iscascaderShow: 0,
 
       btnDisable: false,
       demandOptions: [],
@@ -245,22 +422,27 @@ export default {
 
       optionProps: {
         multiple: true,
-        // value: 'objectId',
-        // label: 'objectName',
-        // children: 'children',
-        checkStrictly: true
+        value: "objectId",
+        label: "objectName",
+        children: "children",
+        checkStrictly: true,
+        emitPath: false,
       },
 
       formData: {
-        policyTypeLevel1Id:'',// 公共服务（政策级别）一级分类id
-        policyTypeLevel2Id:'',// 公共服务（政策级别）二级分类id
-        policyLevel: '',//政府级别
-        startDate: '',//起始时间yyyy-MM-dd	
-        endDate: '',//截止时间yyyy-MM-dd	
-        title: '',//
-        content: '',//
-        categoryList: [],
+        policyTypeLevel1Id: "", // 公共服务（政策级别）一级分类id
+        policyCategoryL2:"",
+        policyLevel: "", //政府级别
+        startDate: "", //起始时间yyyy-MM-dd
+        endDate: "", //截止时间yyyy-MM-dd
+        title: "", //
+        content: "", //
         attachmentList: [],
+        resiSearchTagName: "", //符合政策人员标签
+        assignFlag: 0, //是否指派服务
+        resiSearchTagId: "", //符合政策人员id
+        assignInfo: {},
+
         // ruleList: [
         //   {
         //     ruleName: '',
@@ -269,104 +451,210 @@ export default {
         //     statRuleList: []
         //   }
         // ],
-
       },
-
+      serviceOptiondList: "",
+      newFormData: {
+        noticeApproches: [],
+        serviceScopeList: [], //
+        serviceTimeStart: "", //服务起始时间yyyy-MM-dd
+        serviceTimeEnd: "", //服务截止时间yyyy-MM-dd
+        serverOrgType: "", //服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit
+        serverOrgId: "", //服务组织Id
+      },
+      newDataRule: {
+        serverOrgId: [
+          { required: true, message: "服务方不能为空", trigger: "bulr" },
+        ],
+        serviceScopeList: [
+          { required: true, message: "服务范围不能为空", trigger: "bulr" },
+        ],
+        serviceTimeEnd: [
+          { required: true, message: "服务时间不能为空", trigger: "bulr" },
+        ],
+      },
       endPickerOptions: {
-        disabledDate: endDisabledDate
+        disabledDate: endDisabledDate,
       },
       startPickerOptions: {
-        disabledDate: startDisabledDate
+        disabledDate: startDisabledDate,
       },
 
       fileList: [],
-      uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
+      uploadUlr: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadvariedfile",
+      showLabelForm: false, //标签组件状态
 
-    }
+      newArr: [],
+      sarr: [],
+      casOptions: [],
+    };
   },
 
   watch: {
     "formData.serviceTimeEnd": function (val) {
-      if (val && val != '') {
-        let arrayTemp = val.split(' ')
-        this.formData.serviceTimeEnd = arrayTemp[0] + ' 23:59:59'
+      if (val && val != "") {
+        let arrayTemp = val.split(" ");
+        this.formData.serviceTimeEnd = arrayTemp[0] + " 23:59:59";
       }
-
     },
   },
-  components: { rule },
-  async mounted () {
-    this.startLoading()
-
+  components: { rule, labelForm },
+  async mounted() {
+    this.startLoading();
+    this.getServiceTypeDictOptions();
     this.getDictOptions();
-    await this.loadDemandoption()
+    this.loadScopeTree();
+    await this.loadDemandoption();
 
-    if (this.formType === 'add') {
+    if (this.formType === "add") {
       this.$refs.ref_form.resetFields();
-
     } else {
-      this.loadFormInfo()
-
+      this.loadFormInfo();
     }
 
-    this.endLoading()
-
+    this.endLoading();
   },
 
-
   methods: {
-    addRule () {
-      let obj = {
-        name: '',
-        detail: []
-      }
+    // addRule () {
+    //   let obj = {
+    //     name: '',
+    //     detail: []
+    //   }
+
+    // this.formData.ruleList.push(obj)
+    // },
+    // delRule (index) {
+    //   this.formData.ruleList.splice(index, 1);
+    // },
+    // 获取服务范围树
+    async loadScopeTree() {
+      const url = "/gov/org/icServiceProject/service/serviceScopeTree";
+      // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
+      let params = {};
 
-      this.formData.ruleList.push(obj)
-    },
-    delRule (index) {
-      this.formData.ruleList.splice(index, 1);
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        ++this.iscascaderShow;
+        this.casOptions = [];
+        this.scopeIdArray = [];
+        this.casOptions.push(data);
+      } else {
+        this.$message.error(rspMsg);
+      }
     },
 
-    async loadFormInfo () {
-      const url = '/heart/policy/detail/' + this.policyId
+    async loadFormInfo() {
+      const url = "/heart/policy/detail/" + this.policyId;
 
-      let params = {}
+      let params = {};
 
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, msg } = await requestPost(url, params);
 
       if (code === 0) {
-        this.demandIdArray = []
-        data.categoryList.forEach(element => {
-          let arr = element.codePath.split(',')
-          this.demandIdArray.push(arr)
+        this.demandIdArray = [];
+        data.categoryList.forEach((element) => {
+          let arr = element.codePath.split(",");
+          this.demandIdArray.push(arr);
         });
         // this.formData.ruleList = data.ruleList
 
-
-        this.formData = data
+        this.formData = data;
 
         if (data.attachmentList) {
-          this.fileList = data.attachmentList
+          this.fileList = data.attachmentList;
         }
 
+        // this.$nextTick(() => {
+        //   data.ruleList.forEach((element, index) => {
 
-        this.$nextTick(() => {
-          data.ruleList.forEach((element, index) => {
-
-            this.$refs['ref_rule' + index][0].setRule(element.resiRuleList, element.houseRuleList, element.statRuleList)
-          });
-        })
-
-
+        //     this.$refs['ref_rule' + index][0].setRule(element.resiRuleList, element.houseRuleList, element.statRuleList)
+        //   });
+        // })
       } else {
-        this.$message.error(msg)
+        this.$message.error(msg);
       }
-
-
+    },
+    //点击标签触发事件
+    handleClickLabel() {
+      this.showLabelForm = true;
+      this.$nextTick(() => {
+        this.$refs["ref_label_form"].initForm("info");
+      });
+    },
+    addFormOk(val) {
+      this.showLabelForm = false;
+      this.formData.resiSearchTagId = val.tagId;
+      this.formData.resiSearchTagName = val.tagName;
+    },
+    addFormCancle() {
+      this.showLabelForm = false;
+    },
+    handleCloseTag() {
+      this.formData.resiSearchTagId = "";
+      this.formData.resiSearchTagName = "";
+    },
+    //获取标签名称并过滤
+    async getTagName() {
+      const url = "/governance/resiSearchTag/listResiSearchTags";
+      let params = {
+        pageSize: 99,
+      };
+      let { data, msg, code } = await requestPost(url, params);
+      if (code == 0) {
+        let showAddProduct = data.list.filter((item) => {
+          return [this.formData.resiSearchTagId].includes(item.tagId);
+        });
+        if (this.formData.resiSearchTagId) {
+          this.formData.resiSearchTagName = showAddProduct[0].tagName;
+        } else {
+          this.formData.resiSearchTagName = "--";
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async handleServiceChange(type, val) {
+      console.log(val);
+      await this.getServiceuserList(val);
     },
 
-    async getDictOptions () {
-
+    async getServiceuserList(serverOrgType) {
+      if (!serverOrgType) return false;
+      if (this.formData.commonServiceTypeId == "") {
+        this.$message.error("请先选择需求类别!");
+        return;
+      }
+      const url = "/actual/base/serviceitem/listServerOrg";
+      let params = {
+        serviceTypeId: this.formData.policyCategoryL2,
+        serverOrgType: serverOrgType,
+        businessType: "common_service",
+      };
+      let { data, code, msg } = await requestPost(url, params);
+      if (code == 0) {
+        this.serviceOptiondList = data;
+      } else if (code >= 8000) {
+        this.$message.error(msg);
+      }
+    },
+    async getServiceTypeDictOptions() {
+      this.$http
+        .post("/sys/dict/data/dictlist", {
+          dictType: "user_demand_service_type",
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.serviceOptions = res.data;
+          }
+        })
+        .catch(() => {
+          console.log("组织类型获取失败!");
+        });
+    },
+    async getDictOptions() {
       // 政策级别下拉
       this.$http
         .post("/sys/dict/data/dictlist", {
@@ -383,8 +671,8 @@ export default {
           return this.$message.error("网络错误");
         });
 
-        // 政策分类下拉（其实是获取的共性服务分类）
-        this.$http
+      // 政策分类下拉（其实是获取的共性服务分类）
+      this.$http
         .get("/governance/commonServiceType/selectList/0")
         .then(({ data: res }) => {
           if (res.code !== 0) {
@@ -398,196 +686,137 @@ export default {
         });
     },
 
-
     // 获取服务范围树
-    loadDemandoption () {
-      const url = '/governance/icresidemanddict/demandoption'
+    loadDemandoption() {
+      const url = "/governance/icresidemanddict/demandoption";
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
-      let params = {}
+      let params = {};
       window.app.ajax.post(
         url,
         params,
         (data, rspMsg) => {
-
           this.demandOptions = this.getFlagData(
             this.getTreeData(data),
             "usableFlag"
           );
         },
         (rspMsg, data) => {
-          this.$message.error(rspMsg)
+          this.$message.error(rspMsg);
         }
-      )
-
+      );
     },
 
-
-    handleCateSlect (val) {
-      debugger
-      console.log("val", val);
-      let arr = []
-      val.forEach((item) => {
-        let obj = {
-          codePath: item.join(','),
-          categoryCode: item[item.length - 1]
-        }
-
-        arr.push(obj)
-      });
-
-      console.log("arr", arr);
-      this.formData.categoryList = arr
+    // handleCateSlect(val) {
+    //   console.log("val", val);
+    //   let arr = [];
+    //   val.forEach((item) => {
+    //     let obj = {
+    //       codePath: item.join(","),
+    //       categoryCode: item[item.length - 1],
+    //     };
+
+    //     arr.push(obj);
+    //   });
+
+    //   console.log("arr", arr);
+    //   this.formData.categoryList = arr;
+    // },
+
+    async handleAdd() {
+      // var oDate1 = new Date(this.formData.startDate);
+      // var oDate2 = new Date(this.formData.endDate);
+      // if (oDate1.getTime() > oDate2.getTime()) {
+      //   this.$message.error("结束日期必须大于开始日期");
+      //   return false;
+      // }
+
+      // // this.formData.ruleList = this.ruleList
+
+      // // return false
+
+      // this.btnDisable = true;
+      // setTimeout(() => {
+      //   this.btnDisable = false;
+      // }, 5000);
+      // this.$refs["ref_form"].validate((valid, messageObj) => {
+      //   if (!valid) {
+      //     // app.util.validateRule(messageObj)
+      //     this.btnDisable = false;
+      //   } else {
+      //     this.addFuwu();
+      //   }
+      // });
+          this.addFuwu();
 
     },
-
-    async handleAdd () {
-
-      var oDate1 = new Date(this.formData.startDate);
-      var oDate2 = new Date(this.formData.endDate);
-      if (oDate1.getTime() > oDate2.getTime()) {
-        this.$message.error('结束日期必须大于开始日期')
-        return false
-      }
-
-
-      let isOk = false
-
-      for (let index = 0; index < this.formData.ruleList.length; index++) {
-        let oneRule = this.formData.ruleList[index]
-
-        let refObj = this.$refs['ref_rule' + index][0]
-
-        refObj.getRule()
-
-        if (refObj.okflag) {
-
-          if (!refObj.personChecked && !refObj.houseChecked && !refObj.staticChecked) {
-            this.$message.error('请选择匹配规则' + (index + 1))
-            isOk = false
-            break
+    getLastItem(list, vals, key) {
+      let LIST = list || [];
+      for (let item of LIST) {
+        // console.log(item[key]);
+        for (let i of vals) {
+          if (item[key] === i) {
+            console.log(item[key]);
+            this.sarr.push(item);
+          } else if (item["objectType"] == "district") {
+            this.getLastItem(item.children, vals, key);
           } else {
-
-            if (refObj.personChecked) {
-              oneRule.resiRuleList = refObj.resiRuleList
-              oneRule.resiRuleList.forEach(element => {
-                element.itemList = []
-                element.colOption = []
-
-                if (!element.colValLabel) {
-                  element.colValLabel = element.colVal
-                }
-                if (!element.nextLogicalRelName) {
-                  element.nextLogicalRelName = ''
-                }
-
-                element.ruleDesc = element.itemGroupName + element.itemLabel + element.queryTypeName + element.colValLabel + element.nextLogicalRelName
-
-              });
-            } else {
-              oneRule.resiRuleList = []
-            }
-
-            if (refObj.houseChecked) {
-
-              oneRule.houseRuleList = refObj.houseRuleList
-              oneRule.houseRuleList.forEach(element => {
-                element.itemList = []
-                element.colOption = []
-
-                if (!element.colValLabel) {
-                  element.colValLabel = element.colVal
-                }
-                if (!element.nextLogicalRelName) {
-                  element.nextLogicalRelName = ''
-                }
-
-                element.ruleDesc = element.itemGroupName + element.itemLabel + element.queryTypeName + element.colValLabel + element.nextLogicalRelName
-
-              });
-            } else {
-              oneRule.houseRuleList = []
-            }
-
-            if (refObj.staticChecked) {
-
-              oneRule.statRuleList = refObj.statRuleList
-
-              oneRule.statRuleList.forEach(element => {
-                element.itemList = []
-                element.colOption = []
-
-                if (!element.colValLabel) {
-                  element.colValLabel = element.colVal
-                }
-                if (!element.nextLogicalRelName) {
-                  element.nextLogicalRelName = ''
-                }
-
-                element.ruleDesc = element.itemGroupName + element.itemLabel + element.queryTypeName + element.colValLabel + element.nextLogicalRelName
-
-              });
-
-            } else {
-              oneRule.statRuleList = []
-            }
-
-            isOk = true
+            this.getLastItem(item.children, vals, key);
           }
-
-        } else {
-          isOk = false
-          break
-
-
         }
       }
-
-      if (!isOk) {
-        return false
+    },
+    async operationOption() {
+      this.sarr = []
+      // 使用递归找出符合条件的数据需要
+      await this.getLastItem(
+        this.casOptions,
+        this.newFormData.serviceScopeList,
+        "objectId"
+      );
+      //递归出的数据会有重复,因为一个街道下面有两个社区的话就会循环push两遍,在这里去重
+      const map = new Map();
+      this.newArr = this.sarr.filter(
+        (v) => !map.has(v.objectId) && map.set(v.objectId, 1)
+      );
+      for (let i in this.newArr) {
+        this.newFormData.serviceScopeList.push({
+          objectId: this.newArr[i].objectId,
+          objectType: this.newArr[i].objectType,
+          objectName: this.newArr[i].objectName,
+        });
       }
-
-      // this.formData.ruleList = this.ruleList
-      console.log(this.formData.ruleList)
-
-      // return false
-
-
-      this.btnDisable = true
-      setTimeout(() => {
-        this.btnDisable = false
-      }, 5000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          // app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-          this.addFuwu()
-
+      //  如果是编辑的话回填的数据会有数组字符串需要将不是对象属性的过滤掉
+      let arr = [];
+      this.newFormData.serviceScopeList.forEach((item) => {
+        if (typeof item != "string") {
+          arr.push(item);
         }
-
-      })
-
+      });
+      this.newFormData.serviceScopeList = arr;
     },
-
-    async addFuwu () {
-      console.log(this.formData)
-      this.formData.attachmentList = [...this.fileList]
-      let url = '/heart/policy/add'
-
-      if (this.formType === 'add' || this.formType === 'copy') {
-        url = '/heart/policy/add'
-        this.formData.policyId = ''
+    async addFuwu() {
+      // 处理服务范围数据
+      await this.operationOption();
+      this.formData.attachmentList = [...this.fileList];
+      
+      this.formData.assignInfo = this.newFormData;
+      let url = "/governance/policy/addPolicy";
+
+      if (this.formType === "add" || this.formType === "copy") {
+        url = "/governance/policy/addPolicy";
+        this.formData.policyId = "";
       } else {
-        url = '/heart/policy/update'
-        this.formData.policyId = this.policyId
+        url = "/heart/policy/update";
+        this.formData.policyId = this.policyId;
       }
 
       // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
       let params = {
-
-        ...this.formData
-      }
-
+        ...this.formData,
+      };
+      delete params.policyTypeLevel1Id
+      delete params.resiSearchTagName
+      console.log(params);
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
@@ -600,7 +829,7 @@ export default {
       }
     },
 
-    getTreeData (data) {
+    getTreeData(data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -615,7 +844,7 @@ export default {
       });
       return arr;
     },
-    getFlagData (data, flag) {
+    getFlagData(data, flag) {
       if (!Array.isArray(data)) return [];
       let arr1 = data.filter((item) => item[flag]);
       let arr2 = arr1.map((item) => {
@@ -627,125 +856,132 @@ export default {
       return arr2;
     },
 
-    beforeUpload (file) {
-      const array = file.name.split('.')
-      const extension = array[array.length - 1]
-
-      const formatarray = ['jpg', 'png', 'jpeg', 'bmp', 'mp4', 'wma', 'm4a', 'mp3', 'doc', 'docx', 'xls', 'xlsx', 'pdf']
+    beforeUpload(file) {
+      const array = file.name.split(".");
+      const extension = array[array.length - 1];
+
+      const formatarray = [
+        "jpg",
+        "png",
+        "jpeg",
+        "bmp",
+        "mp4",
+        "wma",
+        "m4a",
+        "mp3",
+        "doc",
+        "docx",
+        "xls",
+        "xlsx",
+        "pdf",
+      ];
 
       if (formatarray.indexOf(extension) === -1) {
-        this.$message.error('只支持图片、word、pdf')
-        return false
+        this.$message.error("只支持图片、word、pdf");
+        return false;
       }
-
     },
 
-    handleFileRemove (file) {
-
+    handleFileRemove(file) {
       if (file && file.status === "success") {
-        this.fileList.splice(this.fileList.findIndex(item => item.uid === file.uid), 1)
+        this.fileList.splice(
+          this.fileList.findIndex((item) => item.uid === file.uid),
+          1
+        );
       }
     },
 
-    handleFileSuccess (res, file) {
+    handleFileSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        const array = file.name.split(".");
+        const fileType = array[array.length - 1];
 
-      if (res.code === 0 && res.msg === 'success') {
-        const array = file.name.split('.')
-        const fileType = array[array.length - 1]
-
-        const picArray = ['jpg', 'png', 'jpeg', 'bmp']
-        const videoarray = ['mp4', 'wma', 'm4a']
-        const docArray = ['doc', 'docx', 'xls', 'xlsx', 'pdf']
-        const mp3Array = ['mp3']
+        const picArray = ["jpg", "png", "jpeg", "bmp"];
+        const videoarray = ["mp4", "wma", "m4a"];
+        const docArray = ["doc", "docx", "xls", "xlsx", "pdf"];
+        const mp3Array = ["mp3"];
 
         if (picArray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'image'
+          file.attachmentFormat = "image";
         } else if (videoarray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'video'
+          file.attachmentFormat = "video";
         } else if (docArray.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'doc'
+          file.attachmentFormat = "doc";
         } else if (mp3Array.indexOf(fileType) > -1) {
-          file.attachmentFormat = 'voice'
+          file.attachmentFormat = "voice";
         }
 
-        file.url = res.data.url
-        file.type = fileType
+        file.url = res.data.url;
+        file.type = fileType;
 
-        file.attachmentName = file.name
-        file.attachmentType = file.type
-        file.attachmentUrl = file.url
+        file.attachmentName = file.name;
+        file.attachmentType = file.type;
+        file.attachmentUrl = file.url;
 
-        this.fileList.push(file)
-        console.log(this.fileList)
-      } else this.$message.error(res.msg)
+        this.fileList.push(file);
+        console.log(this.fileList);
+      } else this.$message.error(res.msg);
     },
 
     //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
+    handleFileDownload(file) {
+      var a = document.createElement("a");
+      var event = new MouseEvent("click");
       a.download = file.name;
-      console.log(a)
+      console.log(a);
       a.href = file.url;
       a.dispatchEvent(event);
-
-
     },
-    handleCancle () {
-      this.resetData()
-      this.$emit('handleClose')
-
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
     },
     //下载
-    handleFileDownload (file) {
-
-      var a = document.createElement('a');
-      var event = new MouseEvent('click');
+    handleFileDownload(file) {
+      var a = document.createElement("a");
+      var event = new MouseEvent("click");
       a.download = file.name;
-      console.log(a)
+      console.log(a);
       a.href = file.url;
       a.dispatchEvent(event);
-
-
     },
 
-    resetData () {
-      this.ruleList = []
+    resetData() {
       this.formData = {
-        serviceTypeLevel1Id:'',
-        serviceTypeLevel2Id:'',
-        policyLevel: '',//政府级别
-        startDate: '',//起始时间yyyy-MM-dd	
-        endDate: '',//截止时间yyyy-MM-dd	
-        title: '',//
-        content: '',//
-        categoryList: [],
+        serviceTypeLevel1Id: "",
+        serviceTypeLevel2Id: "",
+        policyLevel: "", //政府级别
+        startDate: "", //起始时间yyyy-MM-dd
+        endDate: "", //截止时间yyyy-MM-dd
+        title: "", //
+        content: "", //
         attachmentList: [],
-        ruleList: [],
-      }
+      };
     },
     // 开启加载动画
-    startLoading () {
+    startLoading() {
       loading = Loading.service({
         lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
     },
     // 结束加载动画
-    endLoading () {
+    endLoading() {
       // clearTimeout(timer);
       if (loading) {
-        loading.close()
+        loading.close();
       }
     },
 
     // 服务类型下拉框选中事件
     handleChangeServiceTypeLevel1() {
-      this.formData.policyTypeLevel2Id = ''
+      this.formData.policyCategoryL2 = "";
       this.$http
-        .get("/governance/commonServiceType/selectList/" + this.formData.policyTypeLevel1Id)
+        .get(
+          "/governance/commonServiceType/selectList/" +
+            this.formData.policyTypeLevel1Id
+        )
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -755,58 +991,50 @@ export default {
         })
         .catch(() => {
           return this.$message.error("网络错误");
-        })
-    }
+        });
+    },
   },
   computed: {
-    dataRule () {
-
-
-      // this.ruleList.forEach((element, index) => {
-      //   let one = [
-      //     { required: true, message: '政策细则' + (index + 1) + '不能为空', trigger: 'blur' }
-      //   ]
-      //   rules['ruleName' + (index + 1)] = one
-
-      // });
-
-
-
+    dataRule() {
       return {
         serviceType: [
-          { required: true, message: '政策类型不能为空', trigger: 'blur' }
+          { required: true, message: "政策类型不能为空", trigger: "blur" },
         ],
         policyLevel: [
-          { required: true, message: '政策级别不能为空', trigger: 'change' }
+          { required: true, message: "政策级别不能为空", trigger: "change" },
         ],
         startDate: [
-          { required: true, message: '政策日期不能为空', trigger: 'change' }
+          { required: true, message: "政策日期不能为空", trigger: "change" },
         ],
         title: [
-          { required: true, message: '政策标题不能为空', trigger: 'change' }
+          { required: true, message: "政策标题不能为空", trigger: "change" },
         ],
-
-
-
-      }
+        resiSearchTagId: [
+          {
+            required: true,
+            message: "符合政策人员不能为空",
+            trigger: "change",
+          },
+        ],
+        content: [
+          { required: true, message: "政策内容不能为空", trigger: "change" },
+        ],
+      };
     },
-
-
   },
   props: {
-
     policyId: {
       type: String,
-      required: ''
+      required: "",
     },
 
-    formType: { //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
+    formType: {
+      //表单操作类型 add新增，edit编辑，detail详情,feedback反馈
       type: String,
-      required: ''
+      required: "",
     },
-
-  }
-}
+  },
+};
 </script>
 
 
diff --git a/src/views/modules/communityService/policy/detailForm.vue b/src/views/modules/communityService/policy/detailForm.vue
index e0cabde67..a5f1fe42d 100644
--- a/src/views/modules/communityService/policy/detailForm.vue
+++ b/src/views/modules/communityService/policy/detailForm.vue
@@ -430,12 +430,12 @@ export default {
 
     },
     async editFuwu () {
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (regPhone.test(this.formData.principalContact) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index 8f27dbadf..055f31562 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -94,13 +94,13 @@
             </el-input>
 
           </el-form-item>
-          <el-form-item label="手机号"
+          <el-form-item label="联系电话"
                         prop="mobile">
             <el-input v-model="formData.mobile"
                       size="small"
                       class="u-item-width-normal"
                       clearable
-                      placeholder="请输入手机号">
+                      placeholder="请输入联系电话">
             </el-input>
 
           </el-form-item>
@@ -160,7 +160,7 @@
         <el-table-column prop="mobile"
                          header-align="center"
                          align="center"
-                         label="手机号"
+                         label="联系电话"
                          width="110">
         </el-table-column>
         <el-table-column prop="idCard"
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index e4b884db6..5e6b2c417 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -105,13 +105,13 @@
 
     <div class="m-table">
       <div class="div_btn">
-        <el-button type="primary" size="small" @click="handleAdd"
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="small"
+          @click="handleAdd"
           >新增政策</el-button
         >
-
-        <!-- <el-button @click="handleExport"
-                     class="diy-button--reset"
-                     size="small">导出</el-button> -->
       </div>
 
       <el-table
@@ -121,50 +121,58 @@
         class="m-table-item"
         style="width: 100%"
         :height="maxTableHeight"
+        @select-all="selectAll"
+        @selection-change="handelSelection"
       >
         <el-table-column
-          label="序号"
+          type="selection"
           fixed="left"
-          type="index"
           align="center"
           width="50"
-        />
-
-        <el-table-column
-          prop="policyLevelName"
-          label="政策级别"
-          width="100"
-          align="center"
-          :show-overflow-tooltip="true"
         >
         </el-table-column>
-
         <el-table-column
           prop="title"
           align="center"
           min-width="150"
           label="政策标题"
           :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="policyLevelName"
+          label="政策级别"
+          width="100"
+          align="center"
+          :show-overflow-tooltip="true"
         >
+          <template slot-scope="scope">
+            {{
+              scope.row.policyLevel == 0
+                ? "市级"
+                : scope.row.policyLevel == 1
+                ? "区级"
+                : "街道级"
+            }}
+          </template>
         </el-table-column>
         <el-table-column
-          prop="content"
+          prop="resiSearchTagName"
           align="center"
           min-width="250"
-          label="政策内容"
+          label="符合政策人员标签"
           :show-overflow-tooltip="true"
         >
         </el-table-column>
 
         <el-table-column
-          prop="serviceTimeStart"
+          prop="createdTime"
           align="center"
           width="300"
           :show-overflow-tooltip="true"
-          label="政策时间"
+          label="政策发布时间"
         >
           <template slot-scope="scope">
-            <span>{{ scope.row.startDate }}-{{ scope.row.endDate }}</span>
+            <span>{{ scope.row.createdTime.substr(0, 10) }}</span>
           </template>
         </el-table-column>
 
@@ -184,32 +192,20 @@
 
         <el-table-column fixed="right" label="操作" align="center" width="220">
           <template slot-scope="scope">
-            <el-button
-              @click="handleDetail(scope.row)"
-              type="text"
-              size="small"
+            <el-button @click="handleDetail(scope.row)" type="text" size="small"
               >详情</el-button
             >
-            <el-button
-              @click="handleEdit(scope.row)"
-              type="text"
-              size="small"
+            <el-button @click="handleEdit(scope.row)" type="text" size="small"
               >编辑</el-button
             >
-            <el-button
-              @click="handleCopy(scope.row)"
-              type="text"
-              size="small"
+            <el-button @click="handleCopy(scope.row)" type="text" size="small"
               >复制</el-button
             >
             <!-- <el-button @click="handlePersonList(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--edit">人员名单</el-button> -->
-            <el-button
-              @click="handleDel(scope.row)"
-              type="text"
-              size="small"
+            <el-button @click="handleDel(scope.row)" type="text" size="small"
               >删除</el-button
             >
           </template>
@@ -290,7 +286,11 @@ export default {
       tableLoading: false,
       user: {},
       agencyId: "",
-      policyLevelArray: [], //政策级别下拉
+      policyLevelArray: [
+        { value: "0", label: "市级" },
+        { value: "1", label: "区级" },
+        { value: "2", label: "街道级" },
+      ], //政策级别下拉
       tableData: [],
 
       statusArray: [
@@ -323,6 +323,8 @@ export default {
 
       showPersonList: false,
       ruleList: [],
+
+      selection:[]
     };
   },
   computed: {
@@ -338,7 +340,6 @@ export default {
     console.log(this.$store.state);
     this.user = this.$store.state.user;
     this.agencyId = this.user.agencyId;
-    this.getDictOptions();
     this.getTableData();
   },
   methods: {
@@ -382,22 +383,6 @@ export default {
     //   this.showPersonList = true;
     // },
     async getDictOptions() {
-      // 政策级别下拉
-      this.$http
-        .post("/sys/dict/data/dictlist", {
-          dictType: "policy_level",
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.policyLevelArray = res.data;
-          }
-        })
-        .catch(() => {
-          return this.$message.error("网络错误");
-        });
-
       // 政策分类下拉（其实是获取的共性服务分类）
       this.$http
         .get("/governance/commonServiceType/selectList/0")
@@ -472,10 +457,20 @@ export default {
         this.$message.error("操作失败！");
       }
     },
-
+    selectAll(selection) {
+      this.selection = selection;
+      if (selection.length > 0) {
+        this.selAllFlag = true;
+      } else {
+        this.selAllFlag = false;
+      }
+    },
+    handelSelection(row){
+        this.selection = row
+    },
     async getTableData() {
       this.tableLoading = true;
-      const url = "/governance/policy/list";
+      const url = "/governance/policy/policyList";
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/recordList";
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue
index 95b473a09..09a346628 100644
--- a/src/views/modules/communityService/sqzzz/cpts/edit.vue
+++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue
@@ -462,7 +462,7 @@ export default {
           // if (!formVltHelper.userOrMobile(this.dataForm.principalPhone)) {
           //   return this.$message({
           //     type: "error",
-          //     message: "手机号格式有误",
+          //     message: "联系电话格式有误",
           //   });
           // }
           const {
@@ -474,7 +474,7 @@ export default {
           if (!vlt) {
             return this.$message({
               type: "error",
-              message: "成员姓名/手机号为空",
+              message: "成员姓名/联系电话为空",
             });
           }
           this.submit();
diff --git a/src/views/modules/customer/feedback/customer-info.vue b/src/views/modules/customer/feedback/customer-info.vue
index 492c91b09..9af9c8c25 100644
--- a/src/views/modules/customer/feedback/customer-info.vue
+++ b/src/views/modules/customer/feedback/customer-info.vue
@@ -71,7 +71,7 @@ export default {
         'district': '区县',
         'realName': '姓名',
         'gender': '性别',
-        'mobile': '手机号'
+        'mobile': '联系电话'
       }[key]
     },
     genderName (key) {
diff --git a/src/views/modules/customer/feedback/customer-manage.vue b/src/views/modules/customer/feedback/customer-manage.vue
index 1fafbad93..e1fb3d48f 100644
--- a/src/views/modules/customer/feedback/customer-manage.vue
+++ b/src/views/modules/customer/feedback/customer-manage.vue
@@ -200,7 +200,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="mobile"
-                        label="手机号">
+                        label="联系电话">
             <el-input v-model.number="dataForm4.mobile"
                       key="mobile">
               <span slot="prefix"
@@ -281,11 +281,11 @@ export default {
       isOnlyProvince: false,
       checkMobile: (rule, value, callback) => {
         // if (!Number.isInteger(value)) {
-        //   return callback(new Error('手机号格式不正确'))
+        //   return callback(new Error('联系电话格式不正确'))
         // }
         var phoneReg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
         if (!phoneReg.test(value.toString())) {
-          return callback(new Error('请输入正确格式的手机号'))
+          return callback(new Error('请输入正确格式的联系电话'))
         }
         callback()
       }
@@ -505,7 +505,7 @@ export default {
         realName: [{ required: true, message: '请输入姓名' }],
         gender: [{ required: true, message: '请输入性别' }],
         mobile: [
-          { required: true, message: '请输入手机号' },
+          { required: true, message: '请输入联系电话' },
           { validator: this.checkMobile }
         ]
       }
diff --git a/src/views/modules/customer/manage/customer-info.vue b/src/views/modules/customer/manage/customer-info.vue
index 492c91b09..9af9c8c25 100644
--- a/src/views/modules/customer/manage/customer-info.vue
+++ b/src/views/modules/customer/manage/customer-info.vue
@@ -71,7 +71,7 @@ export default {
         'district': '区县',
         'realName': '姓名',
         'gender': '性别',
-        'mobile': '手机号'
+        'mobile': '联系电话'
       }[key]
     },
     genderName (key) {
diff --git a/src/views/modules/customer/manage/customer-manage.vue b/src/views/modules/customer/manage/customer-manage.vue
index 3fb4ad1ee..ddc3c20ad 100644
--- a/src/views/modules/customer/manage/customer-manage.vue
+++ b/src/views/modules/customer/manage/customer-manage.vue
@@ -199,7 +199,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="mobile"
-                        label="手机号">
+                        label="联系电话">
             <el-input v-model.number="dataForm4.mobile"
                       key="mobile">
               <span slot="prefix"
@@ -280,11 +280,11 @@ export default {
       isOnlyProvince: false,
       checkMobile: (rule, value, callback) => {
         // if (!Number.isInteger(value)) {
-        //   return callback(new Error('手机号格式不正确'))
+        //   return callback(new Error('联系电话格式不正确'))
         // }
         var phoneReg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
         if (!phoneReg.test(value.toString())) {
-          return callback(new Error('请输入正确格式的手机号'))
+          return callback(new Error('请输入正确格式的联系电话'))
         }
         callback()
       }
@@ -504,7 +504,7 @@ export default {
         realName: [{ required: true, message: '请输入姓名' }],
         gender: [{ required: true, message: '请输入性别' }],
         mobile: [
-          { required: true, message: '请输入手机号' },
+          { required: true, message: '请输入联系电话' },
           { validator: this.checkMobile }
         ]
       }
diff --git a/src/views/modules/demo/demo-add-or-update.vue b/src/views/modules/demo/demo-add-or-update.vue
index 8b27b4c68..7eccb2071 100644
--- a/src/views/modules/demo/demo-add-or-update.vue
+++ b/src/views/modules/demo/demo-add-or-update.vue
@@ -4,8 +4,8 @@
           <el-form-item label="姓名" prop="realName">
           <el-input v-model="dataForm.realName" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="证件号" prop="identityNo">
           <el-input v-model="dataForm.identityNo" placeholder="证件号"></el-input>
diff --git a/src/views/modules/demo/demo.vue b/src/views/modules/demo/demo.vue
index 60c1d36f4..733ace148 100644
--- a/src/views/modules/demo/demo.vue
+++ b/src/views/modules/demo/demo.vue
@@ -7,7 +7,7 @@
                @keyup.enter.native="getDataList()">
         <el-form-item>
           <el-input v-model="dataForm.mobile"
-                    placeholder="手机号"
+                    placeholder="联系电话"
                     clearable></el-input>
         </el-form-item>
         <el-form-item>
@@ -55,7 +55,7 @@
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="mobile"
-                         label="手机号"
+                         label="联系电话"
                          header-align="center"
                          align="center"></el-table-column>
         <el-table-column prop="identityNo"
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index 0bb0065d1..ae7882f0e 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -99,7 +99,7 @@
         <el-table-column prop="orgName" label="所属党组织" header-align="center" align="center"></el-table-column>
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="times" label="缴费次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="money" label="缴费金额" header-align="center" align="center"></el-table-column>
         <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index 95c2710b6..ed3f0d86e 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -129,7 +129,7 @@
         ></el-table-column>
         <el-table-column
           prop="mobile"
-          label="手机号"
+          label="联系电话"
           header-align="center"
           align="center"
         ></el-table-column>
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index ba8c95878..fb1ed9615 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -36,7 +36,7 @@
                             class="input-width"
                             clearable></el-input>
                 </el-form-item>
-                <el-form-item label="手机号"
+                <el-form-item label="联系电话"
                               prop="mobile">
                   <el-input v-model="searchForm.mobile"
                             placeholder="请输入"
@@ -168,7 +168,7 @@
                              align="center"
                              min-width="180" />
             <el-table-column prop="mobile"
-                             label="手机号"
+                             label="联系电话"
                              align="center"
                              min-width="160" />
             <el-table-column prop="rdsj"
diff --git a/src/views/modules/plugins/change/changedeath-add-or-update.vue b/src/views/modules/plugins/change/changedeath-add-or-update.vue
index cf2dba584..9d225ae5e 100644
--- a/src/views/modules/plugins/change/changedeath-add-or-update.vue
+++ b/src/views/modules/plugins/change/changedeath-add-or-update.vue
@@ -10,8 +10,8 @@
           <el-form-item label="证件号" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="性别 0女 1男" prop="gender">
           <el-input v-model="dataForm.gender" placeholder="性别 0女 1男"></el-input>
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 680c42bd2..86a05754c 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -133,7 +133,7 @@
         ></el-table-column>
         <el-table-column
           prop="mobile"
-          label="手机号"
+          label="联系电话"
           header-align="center"
           align="center"
         ></el-table-column>
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 7111c51eb..56097448c 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -234,7 +234,7 @@
         ></el-table-column>
         <el-table-column
           prop="mobile"
-          label="手机号"
+          label="联系电话"
           header-align="center"
           align="center"
           min-width="120"
diff --git a/src/views/modules/plugins/change/changewelfare-add-or-update.vue b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
index 35c48ef2e..a2c4af9b9 100644
--- a/src/views/modules/plugins/change/changewelfare-add-or-update.vue
+++ b/src/views/modules/plugins/change/changewelfare-add-or-update.vue
@@ -13,8 +13,8 @@
           <el-form-item label="证件号" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="性别 0女 1男" prop="gender">
           <el-input v-model="dataForm.gender" placeholder="性别 0女 1男"></el-input>
diff --git a/src/views/modules/plugins/change/changewelfare.vue b/src/views/modules/plugins/change/changewelfare.vue
index f25e3efa7..e59100b41 100644
--- a/src/views/modules/plugins/change/changewelfare.vue
+++ b/src/views/modules/plugins/change/changewelfare.vue
@@ -76,7 +76,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center">
           <template slot-scope="scope">
             {{
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 7c8e4f8f1..4965635f0 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -95,7 +95,7 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="手机号"
+        <el-form-item label="联系电话"
                       prop="mobile">
           <el-input v-model="fmData.mobile"
                     class="u-item-width-normal"
@@ -187,7 +187,7 @@
         <el-table-column prop="mobile"
                          width="140"
                          align="center"
-                         label="手机号">
+                         label="联系电话">
         </el-table-column>
 
         <el-table-column prop="idCard"
diff --git a/src/views/modules/plugins/change/verifyForm copy.vue b/src/views/modules/plugins/change/verifyForm copy.vue
index de9c63faf..62af3506c 100644
--- a/src/views/modules/plugins/change/verifyForm copy.vue	
+++ b/src/views/modules/plugins/change/verifyForm copy.vue	
@@ -9,7 +9,7 @@
           <span>{{ detailInfo.name }}</span>
         </el-form-item>
         <el-form-item
-          label="手机号:"
+          label="联系电话:"
           label-width="150px"
         >
           <span>{{ detailInfo.mobile }}</span>
diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue
index adc488c70..a3043b03b 100644
--- a/src/views/modules/plugins/change/verifyForm.vue
+++ b/src/views/modules/plugins/change/verifyForm.vue
@@ -9,7 +9,7 @@
           <span>{{detailInfo.name||'--' }}</span>
         </div>
         <div class="m-info-prop">
-          <span class="u-info-title u-info-title-100">手机号：</span>
+          <span class="u-info-title u-info-title-100">联系电话：</span>
           <span>{{detailInfo.mobile||'--' }}</span>
         </div>
         <div class="m-info-prop">
diff --git a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
index 37deeb3fe..999e1f407 100644
--- a/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentblacklist-add-or-update.vue
@@ -10,8 +10,8 @@
           <el-form-item label="证件号" prop="idCard">
           <el-input v-model="dataForm.idCard" placeholder="证件号"></el-input>
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="性别 0女 1男" prop="gender">
           <el-input v-model="dataForm.gender" placeholder="性别 0女 1男"></el-input>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 4c7354fc2..85977cc70 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -104,8 +104,8 @@
           <el-form-item label="出租人证件号" label-width="100px">
               <el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
           </el-form-item>
-          <el-form-item label="出租人手机号" label-width="100px">
-              <el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
+          <el-form-item label="出租人联系电话" label-width="100px">
+              <el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人联系电话' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="承租人" label-width="100px">
@@ -114,8 +114,8 @@
           <el-form-item label="承租人证件号" label-width="100px">
             <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
           </el-form-item>
-          <el-form-item label="承租人手机号" label-width="100px">
-            <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+          <el-form-item label="承租人联系电话" label-width="100px">
+            <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人联系电话' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="合同到期时间" prop="endDate" label-width="100px">
@@ -167,9 +167,9 @@
           </template>
         </el-table-column>
         <el-table-column prop="lessorName" label="出租人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="lessorMobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lessorMobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="lesseeName" label="承租人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="lesseeMobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="lesseeMobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="signDate" label="合同签订时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="startDate" label="合同开始时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="endDate" label="合同结束时间" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 5236a3c2f..3b15a4990 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -107,8 +107,8 @@
         <el-form-item label="承租人证件号" label-width="110px">
           <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
         </el-form-item>
-        <el-form-item label="承租人手机号" label-width="110px">
-          <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
+        <el-form-item label="承租人联系电话" label-width="110px">
+          <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人联系电话' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人" label-width="100px">
diff --git a/src/views/modules/plugins/rent/renthouseForm.vue b/src/views/modules/plugins/rent/renthouseForm.vue
index bde1cf507..0b80acab1 100644
--- a/src/views/modules/plugins/rent/renthouseForm.vue
+++ b/src/views/modules/plugins/rent/renthouseForm.vue
@@ -529,12 +529,12 @@ export default {
         })
         return false;
       }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
index bfdb5a170..d48c89606 100644
--- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
@@ -7,8 +7,8 @@
         <el-form-item label="证件号" prop="idCard">
             <el-input v-model="dataForm.idCard" placeholder="证件号" disabled></el-input>
         </el-form-item>
-        <el-form-item label="手机号" prop="mobile">
-            <el-input v-model="dataForm.mobile" placeholder="手机号" disabled></el-input>
+        <el-form-item label="联系电话" prop="mobile">
+            <el-input v-model="dataForm.mobile" placeholder="联系电话" disabled></el-input>
         </el-form-item>
         <!--<el-form-item label="与房主关系" prop="yfzgx">-->
             <!--<el-input v-model="dataForm.yfzgx" placeholder="与房主关系" disabled></el-input>-->
diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue
index a298420f7..feee98855 100644
--- a/src/views/modules/plugins/rent/renttenantinfo.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo.vue
@@ -8,8 +8,8 @@
         <el-form-item label="证件号" label-width="100px">
           <el-input size="small" v-model="dataForm.idCard" placeholder='证件号' clearable @keyup.native="btKeyUpIdCard"></el-input>
         </el-form-item>
-        <el-form-item label="手机号" label-width="100px">
-          <el-input size="small" v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
+        <el-form-item label="联系电话" label-width="100px">
+          <el-input size="small" v-model="dataForm.mobile" placeholder='联系电话' clearable @keyup.native="btKeyUpMobile"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
@@ -31,7 +31,7 @@
         <!--<el-table-column prop="contractId" label="合同ID" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <!--<el-table-column prop="yfzgx" label="与房主关系" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="state" label="审核状态" header-align="center" align="center">
           <template slot-scope="scope">
diff --git a/src/views/modules/plugins/visit/visitor-add-or-update.vue b/src/views/modules/plugins/visit/visitor-add-or-update.vue
index 9d67dd0bc..736ee9528 100644
--- a/src/views/modules/plugins/visit/visitor-add-or-update.vue
+++ b/src/views/modules/plugins/visit/visitor-add-or-update.vue
@@ -13,8 +13,8 @@
                   <el-radio :label="'1'">{{ $t('user.gender0') }}</el-radio>
               </el-radio-group>
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="人员类型" prop="type">
               <el-radio-group v-model="dataForm.gender">
diff --git a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
index 9d67dd0bc..736ee9528 100644
--- a/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
+++ b/src/views/modules/plugins/visit/visitvisitor-add-or-update.vue
@@ -13,8 +13,8 @@
                   <el-radio :label="'1'">{{ $t('user.gender0') }}</el-radio>
               </el-radio-group>
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+          <el-form-item label="联系电话" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="联系电话"></el-input>
       </el-form-item>
           <el-form-item label="人员类型" prop="type">
               <el-radio-group v-model="dataForm.gender">
diff --git a/src/views/modules/plugins/visit/visitvisitor.vue b/src/views/modules/plugins/visit/visitvisitor.vue
index 502771d09..d89c32ea1 100644
--- a/src/views/modules/plugins/visit/visitvisitor.vue
+++ b/src/views/modules/plugins/visit/visitvisitor.vue
@@ -116,7 +116,7 @@
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
         <el-table-column prop="type" label="人员类型" header-align="center" align="center">
           <template slot-scope="scope">{{scope.row.type === '0' ? '访客' : '租客'}}</template>
         </el-table-column>
diff --git a/src/views/modules/secretaryLog/humanisticCare/careForm.vue b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
index 5e19d3856..5ae481f2a 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careForm.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careForm.vue
@@ -276,12 +276,12 @@ export default {
     },
     async addCare () {
 
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       // if (regPhone.test(this.formData.mobile) === false) {
       //   this.btnDisable = false
       //   this.$message({
       //     type: 'warning',
-      //     message: '请输入正确的手机号码'
+      //     message: '请输入正确的联系电话'
       //   })
       //   return false;
       // }
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index edef3a606..bd4001d95 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -39,13 +39,13 @@
                          @click="handleShowPersonList">居民信息中选择</el-button>
             </div>
           </el-form-item>
-          <el-form-item label="手机号"
+          <el-form-item label="联系电话"
                         prop="mobile"
                         label-width="150px"
                         style="display: block">
             <el-input class="cell-width-1"
                       maxlength="30"
-                      placeholder="请输入手机号	"
+                      placeholder="请输入联系电话	"
                       v-model="formData.mobile">
             </el-input>
           </el-form-item>
@@ -242,7 +242,7 @@ function iniFmData () {
     gridId: "", //所属网格
     reportUserId: "", //	报事人ID
     name: "", //	报事人姓名
-    mobile: "", //	手机号
+    mobile: "", //	联系电话
     idCard: "", //	证件号
     sourceType: "", //	反映渠道
     happenTime: "", //发生时间
@@ -337,7 +337,7 @@ export default {
         ],
         name: [{ required: true, message: "报事人不能为空", trigger: "blur" }],
         mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
         ],
         // idCard: [
         //   { required: true, message: "证件号不能为空", trigger: "blur" },
@@ -516,7 +516,7 @@ export default {
               if (!formVltHelper.userOrMobile(this.formData.mobile)) {
                 this.$message({
                   type: "error",
-                  message: "手机号格式有误",
+                  message: "联系电话格式有误",
                 });
                 return false;
               }
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 6c8ae6415..c752aa19a 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -52,7 +52,7 @@
             <span>{{ info.name }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
-            <span class="u-info-title-2">手机号：</span>
+            <span class="u-info-title-2">联系电话：</span>
             <span>{{ info.mobile }}</span>
           </div>
           <div :class="['m-info-prop',{'m-info-prop-vis':source==='visiual'}]">
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
index d0adfadb0..f164fbdb6 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue
@@ -210,7 +210,7 @@ function iniFmData () {
     content: '',//		服务内容1000字
     reportType: 'self_help',//	社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
     reportUserName: '',//	上报人姓名
-    reportUserMobile: '',//	自身上报时存储注册居民的手机号
+    reportUserMobile: '',//	自身上报时存储注册居民的联系电话
     reportTime: '',//	上报时间
     demandUserId: '',//	需求人：user.id或者ic_resi_user.id
     demandUserName: '',//	需求人姓名
diff --git a/src/views/modules/shequzhili/issue/cpts/add.vue b/src/views/modules/shequzhili/issue/cpts/add.vue
index e0934efab..9c411a682 100644
--- a/src/views/modules/shequzhili/issue/cpts/add.vue
+++ b/src/views/modules/shequzhili/issue/cpts/add.vue
@@ -55,7 +55,7 @@
             </div>
           </el-form-item>
           <el-form-item
-            label="手机号"
+            label="联系电话"
             prop="mobile"
             label-width="150px"
             style="display: block"
@@ -63,7 +63,7 @@
             <el-input
               class="cell-width-1"
               maxlength="30"
-              placeholder="请输入手机号	"
+              placeholder="请输入联系电话	"
               v-model="formData.mobile"
             >
             </el-input>
@@ -303,7 +303,7 @@ function iniFmData() {
     gridId: "", //所属网格
     reportUserId: "", //	报事人ID
     name: "", //	报事人姓名
-    mobile: "", //	手机号
+    mobile: "", //	联系电话
     idCard: "", //	证件号
     sourceType: "", //	反映渠道
     happenTime: "", //发生时间
@@ -394,7 +394,7 @@ export default {
         ],
         name: [{ required: true, message: "报事人不能为空", trigger: "blur" }],
         mobile: [
-          { required: true, message: "手机号不能为空", trigger: "blur" },
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
         ],
         // idCard: [
         //   { required: true, message: "证件号不能为空", trigger: "blur" },
@@ -569,7 +569,7 @@ export default {
               if (!formVltHelper.userOrMobile(this.formData.mobile)) {
                 this.$message({
                   type: "error",
-                  message: "手机号格式有误",
+                  message: "联系电话格式有误",
                 });
                 return false;
               }
diff --git a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
index e8681f83d..65a66681b 100644
--- a/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/eventDetail.vue
@@ -59,7 +59,7 @@
             <span>{{ eventDetailData.name||'--'  }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title-2">手机号：</span>
+            <span class="u-info-title-2">联系电话：</span>
             <span>{{ eventDetailData.mobile||'--'  }}</span>
           </div>
           <div class="m-info-prop">
diff --git a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
index 51683d087..8686b31e0 100644
--- a/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/suggestDetail.vue
@@ -67,7 +67,7 @@
 
     <el-row>
       <el-col :span="24" align="right">
-        <el-button size="small" @click="handleCancle" style="margin-left:16px;">关 闭</el-button></el-col
+        <el-button size="small" @click="handleCancle" style="margin-right:16px;">关 闭</el-button></el-col
       >
     </el-row>
   </div>
diff --git a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
index b01b3a3d7..77666e636 100644
--- a/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
+++ b/src/views/modules/shequzhili/issue/cptsAudit/eventDetail.vue
@@ -59,7 +59,7 @@
             <span>{{ eventDetailData.name||'--'  }}</span>
           </div>
           <div class="m-info-prop">
-            <span class="u-info-title-2">手机号：</span>
+            <span class="u-info-title-2">联系电话：</span>
             <span>{{ eventDetailData.mobile||'--'  }}</span>
           </div>
           <div class="m-info-prop">
diff --git a/src/views/modules/shequzhili/statics/gridMemberEvent.vue b/src/views/modules/shequzhili/statics/gridMemberEvent.vue
index 9c0da5e62..1982a014a 100644
--- a/src/views/modules/shequzhili/statics/gridMemberEvent.vue
+++ b/src/views/modules/shequzhili/statics/gridMemberEvent.vue
@@ -50,7 +50,7 @@
 
         <el-table-column prop="mobile"
                          align="center"
-                         label="手机号"
+                         label="联系电话"
                          width="140"
                          :show-overflow-tooltip="true">
         </el-table-column>
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
index d49d2f5b1..526681302 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue
@@ -136,7 +136,7 @@
             </el-input>
           </el-form-item>
 
-          <el-form-item label="手机号" prop="mobile">
+          <el-form-item label="联系电话" prop="mobile">
             <el-input
               v-model="fmData.mobile"
               class="resi-cell-input"
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
index 547cb63d7..2d2f9fc23 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -157,7 +157,7 @@
 					</el-input>
 				</el-form-item>
 
-				<!-- <el-form-item label="手机号" prop="mobile">
+				<!-- <el-form-item label="联系电话" prop="mobile">
 						<el-input
 							v-model="fmData.mobile"
 							class="u-item-width-normal"
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
index 36bc7b763..33ed17e8e 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/demand-info.vue
@@ -24,7 +24,7 @@
                 <span>{{ info.reportUserName }}</span>
               </div>
               <div class="m-info-prop">
-                <span class="u-info-title-2">上报人手机号：</span>
+                <span class="u-info-title-2">上报人联系电话：</span>
                 <span>{{ info.reportUserMobile }}</span>
               </div>
               <div class="m-info-prop">
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
index a63a5a059..c7b3fd535 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/edit.vue
@@ -153,7 +153,7 @@
         </el-form-item>
 
         <el-form-item
-          label="手机号"
+          label="联系电话"
           prop="mobile"
           label-width="150px"
           style="display: block"
@@ -162,7 +162,7 @@
             class="item_width_1"
             maxlength="30"
             show-word-limit
-            placeholder="请输入手机号	"
+            placeholder="请输入联系电话	"
             v-model="fmData.mobile"
             :disabled="formType === 'edit'"
           >
@@ -741,7 +741,7 @@ export default {
           if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
             return this.$message({
               type: "error",
-              message: "手机号格式有误",
+              message: "联系电话格式有误",
             });
           }
           this.submit();
diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
index 6494d5be1..7ec075d1e 100644
--- a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -45,7 +45,7 @@
                         placeholder="请输入">
               </el-input>
             </el-form-item>
-            <el-form-item label="手机号"
+            <el-form-item label="联系电话"
                           prop="mobile">
               <el-input v-model="fmData.mobile"
                         class="item_width_2"
@@ -229,7 +229,7 @@
 
           <el-table-column prop="mobile"
                            align="center"
-                           label="手机号"
+                           label="联系电话"
                            width="140"
                            :show-overflow-tooltip="true">
           </el-table-column>
diff --git a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
index a8fd79e8b..9a5619d1d 100644
--- a/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
+++ b/src/views/modules/sys/icvaccineprarmeter-add-or-update.vue
@@ -341,7 +341,7 @@
         var checkPhone = (rule, value, callback) => {
             let moblie = /^1(3|4|5|6|7|8|9)\d{9}$/; let tel = /^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/
             if (!moblie.test(this.dataForm.mobile) && !tel.test(this.dataForm.mobile)) {
-                return callback(new Error('请输入正确的手机号或座机号！'))
+                return callback(new Error('请输入正确的联系电话或座机号！'))
             } else {
                 callback()
             }
diff --git a/src/views/modules/sys/roomForm.vue b/src/views/modules/sys/roomForm.vue
index ad1c364da..9fc3c1f9f 100644
--- a/src/views/modules/sys/roomForm.vue
+++ b/src/views/modules/sys/roomForm.vue
@@ -336,12 +336,12 @@ export default {
         })
         return false;
       }
-      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //联系电话
       if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
         this.btnDisable = false
         this.$message({
           type: 'warning',
-          message: '请输入正确的手机号码'
+          message: '请输入正确的联系电话'
         })
         return false;
       }
diff --git a/src/views/modules/visual/command/cpts/popup.vue b/src/views/modules/visual/command/cpts/popup.vue
index e94861b04..da11d8257 100644
--- a/src/views/modules/visual/command/cpts/popup.vue
+++ b/src/views/modules/visual/command/cpts/popup.vue
@@ -251,7 +251,7 @@
           <span>{{ info.name || "--" }}</span>
         </div>
         <div class="item">
-          手机号：
+          联系电话：
           <span>{{ info.mobile || "--" }}</span>
         </div>
         <!-- <div class="item">
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue
index f1feea9aa..31cfd9009 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue	
@@ -245,7 +245,7 @@
           <div class="popContentTitle">报事人：
             <span>{{selInfo.name || "--" }}</span>
           </div>
-          <div class="popContentTitle">手机号：
+          <div class="popContentTitle">联系电话：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
           <div class="popContentTitle">证件号：
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue
index 42a3e55c3..e2d3a5b6c 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue	
@@ -244,7 +244,7 @@
           <div class="popContentTitle">报事人：
             <span>{{selInfo.name || "--" }}</span>
           </div>
-          <div class="popContentTitle">手机号：
+          <div class="popContentTitle">联系电话：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
           <div class="popContentTitle">证件号：
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
index 79dc2cdaf..6ce49aa39 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
@@ -245,7 +245,7 @@
           <div class="popContentTitle">报事人：
             <span>{{selInfo.name || "--" }}</span>
           </div>
-          <div class="popContentTitle">手机号：
+          <div class="popContentTitle">联系电话：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
           <div class="popContentTitle">证件号：
diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 0100df9b6..d0ad93e56 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -242,7 +242,7 @@
           <div class="popContentTitle">报事人：
             <span>{{selInfo.name || "--" }}</span>
           </div>
-          <div class="popContentTitle">手机号：
+          <div class="popContentTitle">联系电话：
             <span>{{ selInfo.mobile || "--" }}</span>
           </div>
           <div class="popContentTitle">证件号：
diff --git a/src/views/modules/visual/communityGovern/geliguankong/detail-info.vue b/src/views/modules/visual/communityGovern/geliguankong/detail-info.vue
index 44796a624..a1a50a1f8 100644
--- a/src/views/modules/visual/communityGovern/geliguankong/detail-info.vue
+++ b/src/views/modules/visual/communityGovern/geliguankong/detail-info.vue
@@ -18,7 +18,7 @@
               <span>{{ eventInfo.name }}</span>
             </div>
             <div class="m-info-prop">
-              <span>手机号：</span>
+              <span>联系电话：</span>
               <span>{{ eventInfo.mobile }}</span>
             </div>
 
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 27bfe68e6..aa57fc19f 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -67,7 +67,7 @@
               <span>{{ eventInfo.name || "--" }}</span>
             </div>
             <div class="m-info-prop">
-              <span>手机号：</span>
+              <span>联系电话：</span>
               <span>{{ eventInfo.mobile || "--" }}</span>
             </div>
             <!-- <div class="m-info-prop">
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue
index 31e4f4fad..5b92ffbc8 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
+++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi copy.vue	
@@ -267,7 +267,7 @@ export default {
             width: "10%",
           },
         ],
-        header: ["序号", "所属组织", "事件内容", "上报渠道", "报事人", "手机号", "状态", "操作"],
+        header: ["序号", "所属组织", "事件内容", "上报渠道", "报事人", "联系电话", "状态", "操作"],
         list: [],
         pageSize: 10,
         pageNo: 1,
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
index 64510caf6..9863ae155 100644
--- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue
@@ -25,7 +25,7 @@
             </div>
 
             <div class="m-info-prop">
-              <span class="u-info-title-3">手机号：</span>
+              <span class="u-info-title-3">联系电话：</span>
               <span class="info-content">{{ formData.showMobile||'--' }}</span>
             </div>
 
diff --git a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
index 184dc1c5f..226015d76 100644
--- a/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
+++ b/src/views/modules/visual/communityGovern/zhongdianxingcheng/zhongdianxingcheng.vue
@@ -152,7 +152,7 @@ export default {
             width: "8%",
           },
         ],
-        header: ["序号", "姓名", "手机号", "证件号", "来源地", "来曹事由", "48小时核酸", "来曹时间", "七天内旅居", "隔离状态", "操作"],
+        header: ["序号", "姓名", "联系电话", "证件号", "来源地", "来曹事由", "48小时核酸", "来曹时间", "七天内旅居", "隔离状态", "操作"],
         list: [],
         pageSize: 10,
         pageNo: 1,
diff --git a/src/views/modules/visual/communityParty/crateForm.vue b/src/views/modules/visual/communityParty/crateForm.vue
index 6883c8b31..e7498fc98 100644
--- a/src/views/modules/visual/communityParty/crateForm.vue
+++ b/src/views/modules/visual/communityParty/crateForm.vue
@@ -25,7 +25,7 @@
                 <span>{{ form.name }}</span>
               </div>
               <div class="m-info-prop">
-                <span>手机号：</span>
+                <span>联系电话：</span>
                 <span>{{ form.showMobile }}</span>
               </div>
               <div class="m-info-prop">
@@ -126,10 +126,10 @@ export default {
   data () {
     let checkMObile = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入手机号'))
+        callback(new Error('请输入联系电话'))
       } else {
         if (!isMobile(value)) {
-          callback(new Error('手机号格式不正确'))
+          callback(new Error('联系电话格式不正确'))
         }
         callback()
       }
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 1c299c46d..e7fd1d306 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -125,7 +125,7 @@ export default {
       headerEduList: [
         { title: "序号", coulmn: 'index' },
         { title: "姓名", coulmn: 'name' },
-        { title: "手机号码", coulmn: 'mobile' }
+        { title: "联系电话", coulmn: 'mobile' }
       ],
       noEduInit: false,
       selectAgency: null,
@@ -575,7 +575,7 @@ export default {
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>所属房屋：
                   <span>`+ houseName + `</span>
                 </div>
-                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>手机号：
+                <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>联系电话：
                   <span>`+ mobile + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>证件号：
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 11ec3f82c..d0971ca94 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -186,7 +186,7 @@ export default {
         { title: "序号", coulmn: 'index' },
         { title: "姓名", coulmn: 'name' },
         { title: "年龄", coulmn: 'age' },
-        { title: "手机号码", coulmn: 'mobile' }
+        { title: "联系电话", coulmn: 'mobile' }
       ],
       headerStyle: [
         {
@@ -206,7 +206,7 @@ export default {
         { title: "序号", coulmn: 'index' },
         { title: "姓名", coulmn: 'name' },
         { title: "学历", coulmn: 'education' },
-        { title: "手机号码", coulmn: 'mobile' }
+        { title: "联系电话", coulmn: 'mobile' }
       ],
       tableData: [
         // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
diff --git a/src/views/modules/visual/communityParty/partyOld.vue b/src/views/modules/visual/communityParty/partyOld.vue
index 9533c0383..6eeb9ed22 100644
--- a/src/views/modules/visual/communityParty/partyOld.vue
+++ b/src/views/modules/visual/communityParty/partyOld.vue
@@ -145,7 +145,7 @@ export default {
         { title: "序号", coulmn: 'index' },
         { title: "姓名", coulmn: 'name' },
         { title: "年龄", coulmn: 'age' },
-        { title: "手机号码", coulmn: 'mobile' }
+        { title: "联系电话", coulmn: 'mobile' }
       ],
       headerStyle: [
         {
@@ -165,7 +165,7 @@ export default {
         { title: "序号", coulmn: 'index' },
         { title: "姓名", coulmn: 'name' },
         { title: "学历", coulmn: 'education' },
-        { title: "手机号码", coulmn: 'mobile' }
+        { title: "联系电话", coulmn: 'mobile' }
       ],
       tableData: [
         // [1,'商丘路社区第一网格','商丘路小区','2号楼','杨颖、王平、刘佳敏、丁辉、杨萍'],
diff --git a/src/views/modules/visual/plugin/power/components/house-dialog.vue b/src/views/modules/visual/plugin/power/components/house-dialog.vue
index b334033f0..7312c7e45 100644
--- a/src/views/modules/visual/plugin/power/components/house-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/house-dialog.vue
@@ -55,7 +55,7 @@ export default {
         { title: "性别", coulmn: 'gender' },
         { title: "是否党员", coulmn: 'isParty' },
         { title: "证件号", coulmn: 'idCard' },
-        { title: "手机号", coulmn: 'mobile' }
+        { title: "联系电话", coulmn: 'mobile' }
       ],
       headerStyle: [
         { width: '80px' },
diff --git a/src/views/modules/visual/plugin/power/components/info-dialog.vue b/src/views/modules/visual/plugin/power/components/info-dialog.vue
index e5d0003dc..7a396d39a 100644
--- a/src/views/modules/visual/plugin/power/components/info-dialog.vue
+++ b/src/views/modules/visual/plugin/power/components/info-dialog.vue
@@ -10,7 +10,7 @@
               <img class="info-dialog-content-item-img" :src="infoDetail.avatar">
               <div class="info-dialog-content-item-info">
                 <div class="info-dialog-content-item-info-name">{{infoDetail.name}}</div>
-                <div class="info-dialog-content-item-info-mobile">手机号：{{infoDetail.mobile}}</div>
+                <div class="info-dialog-content-item-info-mobile">联系电话：{{infoDetail.mobile}}</div>
                 <div class="info-dialog-content-item-info-mobile">类别：{{infoDetail.categoryName}}</div>
               </div>
             </div>
diff --git a/src/views/modules/visual/shundeju/controlCount.vue b/src/views/modules/visual/shundeju/controlCount.vue
index a2b6866dc..0e11821ad 100644
--- a/src/views/modules/visual/shundeju/controlCount.vue
+++ b/src/views/modules/visual/shundeju/controlCount.vue
@@ -134,7 +134,7 @@ export default {
         { title: "人脸", coulmn: 'faceImg' },
         { title: "证件号", coulmn: 'idCard' },
         // { title: "性别", coulmn: 'gender' },
-        { title: "手机号", coulmn: 'mobile' },
+        { title: "联系电话", coulmn: 'mobile' },
         // { title: "类型", coulmn: 'type' },
         { title: "出入时间", coulmn: 'createdTime' },
         { title: "进入原因", coulmn: 'comeReason' },
diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
index ce1deb070..3ef9a9ae6 100644
--- a/src/views/modules/workSys/operAuth.vue
+++ b/src/views/modules/workSys/operAuth.vue
@@ -40,7 +40,7 @@
                       size="small"
                       class="list_item_width_1"
                       clearable
-                      placeholder="请输入手机号">
+                      placeholder="请输入联系电话">
             </el-input>
 
           </el-form-item>
@@ -90,7 +90,7 @@
         <el-table-column prop="operatorMobile"
                          header-align="center"
                          align="center"
-                         label="手机号"
+                         label="联系电话"
                          min-width="110">
         </el-table-column>
 
@@ -167,7 +167,7 @@ export default {
       formData: {
         category: 'data_tm',
         operatorName: '',//姓名
-        operatorMobile: '',//手机号
+        operatorMobile: '',//联系电话
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
       },
@@ -270,7 +270,7 @@ export default {
       this.formData = {
         category: 'data_tm',
         operatorName: '',//姓名
-        operatorMobile: '',//手机号
+        operatorMobile: '',//联系电话
         startTime: '',//检测开始时间yyyy-MM-dd HH:mm
         endTime: '',//检测结束时间yyyy-MM-dd HH:mm
       }
diff --git a/src/views/pages/login.vue b/src/views/pages/login.vue
index 6225fb7e6..6f4d58eb0 100644
--- a/src/views/pages/login.vue
+++ b/src/views/pages/login.vue
@@ -138,7 +138,7 @@ export default {
   computed: {
     dataRule() {
       return {
-        phone: [{ required: true, message: "手机号不能为空", trigger: "blur" }],
+        phone: [{ required: true, message: "联系电话不能为空", trigger: "blur" }],
         password: [
           { required: true, message: "密码不能为空", trigger: "blur" },
         ],