diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index cbd58b039..5bab55912 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -474,7 +474,7 @@ export default {
         this.resetData()
         this.$emit('dialogOk')
         this.btnDisable = false
-      } else {
+      } else if (code>=8000){
         this.btnDisable = false
         this.$message.error(msg)
       }
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index d8f8f764f..a129cdfa4 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -1,20 +1,15 @@
 <template>
-    <div class="div_main">
+    <div class="g-main">
       <div>
-        <div class="div_search">
+        <div class="m-search">
           <el-form :inline="true"
                    :model="formData"
                    ref="ref_searchform"
-                   :label-width="'80px'">
-            <div>
-
-              <el-form-item label="服务类别"
-
-                            prop="serviceType">
-                <div class="f-flex">
+                   :label-width="'100px'">
                   <el-form-item prop="serviceType"
-                                class="u-item-width-communitycascader f-bto0">
-                    <el-select class="cell-width-1"
+                                label="服务类别"
+                               >
+                    <el-select class="u-item-width-normal"
                                v-model.trim="formData.serviceTypeLevel1Id"
                                placeholder="请选择"
                                clearable>
@@ -26,9 +21,8 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                  <el-form-item prop="serviceType"
-                                class="u-item-width-communitycascader f-bto0">
-                    <el-select class="cell-width-1"
+                  <el-form-item prop="serviceType">
+                    <el-select class="u-item-width-normal"
                                v-model.trim="formData.serviceTypeLevel2Id"
                                placeholder="请选择"
                                clearable>
@@ -40,24 +34,22 @@
                       </el-option>
                     </el-select>
                   </el-form-item>
-                </div>
-              </el-form-item>
 
               <el-form-item label="服务时间"
                             prop="serviceTimeStart">
                 <el-date-picker v-model="formData.serviceTimeStart"
                                 :picker-options="startPickerOptions"
-                                class="item_width_2"
+                                class="u-item-width-daterange"
                                 size="small"
                                 type="date"
                                 value-format="yyyy-MM-dd"
                                 value="yyyy-MM-dd"
                                 placeholder="开始时间">
                 </el-date-picker>
-                <span class="data-tag">至</span>
+                <span class="u-data-tag">至</span>
                 <el-date-picker v-model="formData.serviceTimeEnd"
                                 :picker-options="endPickerOptions"
-                                class="item_width_2 data-tag"
+                                class="u-item-width-daterange u-data-tag"
                                 size="small"
                                 type="date"
                                 value-format="yyyy-MM-dd"
@@ -70,7 +62,7 @@
               <el-form-item label="服务事项"
                             prop="serviceName">
                 <el-input v-model="formData.serviceName"
-                          class="item_width_1"
+                          class="u-item-width-normal"
                           size="small"
                           clearable
                           placeholder="请输入">
@@ -80,7 +72,7 @@
               <el-form-item label="服务组织"
                             prop="serviceOrgType">
                 <el-select v-model="formData.serviceOrgType"
-                           class="input-width-small"
+                           class="u-item-width-normal"
                            placeholder="请选择"
                            clearable
                            @change="handleServiceChange('add', $event)">
@@ -90,9 +82,8 @@
                              :value="item.value">
                   </el-option>
                 </el-select>
-                -
                 <el-select v-model="formData.serviceOrgId"
-                           class="input-width-middle"
+                           class="u-item-width-normal u-data-tag"
                            filterable
                            placeholder="请选择"
                            clearable>
@@ -108,7 +99,7 @@
 
               <el-form-item label="服务状态"
                             prop="serviceStatus">
-                <el-select class="item_width_2"
+                <el-select class="u-item-width-normal"
                            v-model="formData.serviceStatus"
                            placeholder="全部"
                            size="small"
@@ -123,7 +114,7 @@
               </el-form-item>
               <el-form-item label="满意度"
                             prop="satisfaction">
-                <el-select class="item_width_2"
+                <el-select class="u-item-width-normal"
                            v-model="formData.satisfaction"
                            placeholder="全部"
                            size="small"
@@ -136,25 +127,31 @@
                 </el-select>
 
               </el-form-item>
+              <el-row type="flex" >
+            <el-col :span="24" align="right">
               <el-button style="margin-left:30px"
                          size="small"
-                         class="diy-button--search"
+                         type="primary "
                          @click="handleSearch">查询</el-button>
               <el-button style="margin-left:10px"
+                         type="primary"
                          size="small"
-                         class="diy-button--reset"
                          @click="resetSearch">重置</el-button>
-            </div>
+            </el-col>
+          </el-row>
+             
           </el-form>
         </div>
 
-        <div class="div_table">
-
+        <div class="m-table">
           <div class="div_btn">
-            <el-button class="diy-button--add"
+            <div class="div_btn_left">
+              <el-button 
                        size="small"
-                       @click="handleAdd">发起服务</el-button>
-
+                       @click="handleAdd"
+                       type="primary"
+                       >发起服务</el-button>
+            </div>
             <!-- <el-button @click="handleExport"
                        class="diy-button--reset"
                        size="small">导出</el-button> -->
@@ -163,8 +160,7 @@
           <el-table :data="tableData"
                     border
                     v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                    class="table"
+                    class="m-table-item"
                     style="width: 100%"
                     :height="maxTableHeight">
             <el-table-column label="序号"
@@ -222,27 +218,27 @@
                 <el-button @click="handleDetail(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--detail">查看</el-button>
+                          >查看</el-button>
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleEdit(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--edit">编辑</el-button>
+                           >编辑</el-button>
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleFeedback(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--edit">反馈</el-button>
+                           >反馈</el-button>
                 <el-button v-if="scope.row.policyId"
                            @click="handlePersonList(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--edit">人员名单</el-button>
+                           >人员名单</el-button>
                 <el-button v-if="scope.row.serviceStatus==='in_service'"
                            @click="handleDel(scope.row)"
                            type="text"
                            size="small"
-                           class="div-table-button--delete">取消</el-button>
+                         >取消</el-button>
 
               </template>
             </el-table-column>
@@ -380,7 +376,7 @@
         tableLoading: false,
         user: {},
         agencyId: '',
-
+        searchH:170,
         tableData: [],
 
         statusArray: [
@@ -452,9 +448,10 @@
     },
     computed: {
       maxTableHeight () {
-        return this.$store.state.inIframe
-          ? this.clientHeight - 410 + this.iframeHeigh
-          : this.clientHeight - 410;
+        const h =
+				this.clientHeight - this.searchH - 275 + this.iframeHeight;
+        const _h = this.clientHeight - 275 - this.searchH;
+        return this.$store.state.inIframe ? h : _h;
       },
       ...mapGetters(["clientHeight", "iframeHeight"]),
     },
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
new file mode 100644
index 000000000..6c263a8d5
--- /dev/null
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -0,0 +1,590 @@
+<template>
+    <div>
+        <el-form
+           ref="label_form"
+          :inline="true"
+          :model="formData"
+          class="div_form"
+          :rules="rules"
+        >
+            <el-form-item
+            label="标签名称"
+            label-width="100px"
+            prop="tagName"
+            >
+                <el-input v-model="formData.tagName" placeholder="请输入内容"  clearable ></el-input>
+
+            </el-form-item>
+         
+        </el-form>
+        <p style="margin-left: 15px;"> <b style="color:#F56C6C">*</b> 匹配数据</p>
+        <el-table
+             border
+            :data="tableData"
+             style="width: 100%"
+             height="200"
+             >  
+             <el-table-column  label="选择数据源" align="center" width="120">
+                    <template slot-scope="scope">
+                            <el-select
+                            v-model="scope.row.dataSource"
+                            placeholder="请选择"
+                            @change="handleChangeSource(scope.row,scope.$index)"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in dataSourceOpction" 
+                                :label="item.label" 
+                                :value="item.value"
+                                :key="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+               <!-- || scope.$index == scope._self._data.tableData.length-1  -->
+
+             <el-table-column  label="字段类别" align="center" width="120">
+                    <template slot-scope="scope" v-if="scope.row.dataSource=='resi'">
+                            <el-select
+                            v-model="scope.row.itemGroupId"
+                            placeholder="请选择"
+                            clearable
+                            @change="handleChangeFieldsType(scope.row,scope.$index)"
+                            >
+                                <el-option
+                                v-for="item in scope.row.itemGroupIdOpction" 
+                                :label="item.label" 
+                                :value="item.id"
+                                :key="item.id"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+                    <!-- <template v-else>
+                        <el-select
+                            :placeholder="scope.row.dataSource=='house'?'房屋信息':'统计信息'"
+                            :disabled="true"
+                            >
+                            </el-select>
+                    </template> -->
+             </el-table-column>
+             <el-table-column  label="字段名称" align="center" width="120">
+                    <template slot-scope="scope">
+                            <el-select
+                            v-model="scope.row.itemId"
+                            placeholder="请选择"
+                            @change="handleChangeFieldsName(scope.row,scope.$index)"
+                            @clear="handleClearItemId(scope.row,scope.$index)"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in scope.row.itemIdOpction" 
+                                :label="item.label" 
+                                :value="scope.row.dataSource=='resi'?item.itemId:item.colKey"
+                                :key="scope.row.dataSource=='resi'?item.itemId:item.colKey"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+             <el-table-column  label="比较符" align="center" width="120">
+                    <template slot-scope="scope">
+                            <el-select
+                            v-model="scope.row.queryType"
+                            placeholder="请选择"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in queryTypeOpction" 
+                                :label="item.label" 
+                                :value="item.value"
+                                :key="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+             <el-table-column  label="对应值" align="center" width="155">
+                    <template slot-scope="scope"    >
+                        <template v-for="item in scope.row.correspondingOpction" >
+                            <el-select
+                            v-if="item.itemType == 'select'||item.itemType == 'radio'||item.itemType =='checkbox'"
+                           v-model="scope.row.colVal"
+                           placeholder="请选择"
+                           clearable
+                           >
+                               <el-option
+                               v-for="items in item.options"
+                               :label="items.label" 
+                               :value="items.value"
+                               :key="items.label"
+                               >
+                               </el-option>
+                           </el-select>
+                           <el-input
+                            v-else-if="item.itemType === 'input'||item.itemType === 'textarea'"
+                           v-model="scope.row.colVal"
+                           placeholder="请输入"
+                           clearable
+                           >
+                           </el-input>
+                           <el-input-number v-else-if="item.itemType==='inputNum'"
+                           class="item_width_2"
+                           v-model="scope.row.colVal"
+                           :min="0"
+                           size="mini"
+                           label="请输入"></el-input-number>
+                        <el-date-picker v-else-if="item.itemType==='datepicker'||item.itemType==='date'"
+                                        v-model="scope.row.colVal"
+                                        class="item_width_2"
+                                        type="datetime"
+                                        value-format="yyyy-MM-dd HH:mm:ss"
+                                        value="yyyy-MM-dd HH:mm:ss"
+                                        placeholder="开始时间">
+                        </el-date-picker>
+                        <el-input v-else
+                        class="item_width_2"
+                        size="mini"
+                        placeholder="请输入"
+                        v-model="personItem.colVal">
+                       </el-input>
+                        </template>
+                          
+                    </template>
+             </el-table-column>
+             <el-table-column  label="条件关系" align="center" width="120">
+                    <template slot-scope="scope" v-if="scope.$index!=tableData.length-1">
+                            <el-select
+                            v-model="scope.row.nextLogicalRel"
+                            placeholder="请选择"
+                            clearable
+                            >
+                                <el-option
+                                v-for="item in nextLogicalRelOpction" 
+                                :label="item.label" 
+                                :value="item.value"
+                                :key="item.value"
+                                >
+                                </el-option>
+                            </el-select>
+                    </template>
+             </el-table-column>
+            <el-table-column fixed="right" label="操作" align="center" width="120">
+                    <template slot-scope="scope">
+                        <img src="@/assets/img/icon-del.png"  
+                          v-show="scope.$index!=tableData.length-1"
+                          @click="handleClickDelete(scope.$index)" 
+                          class="imgBtn"
+                          >
+
+                        <img src="@/assets/img/icon-add.png"
+                          @click="handleClickAddRow"
+                          v-show="scope.$index==tableData.length-1"
+                          class="imgBtn">
+                        <!-- <el-button
+                            
+                            size="small"
+                            type="text"
+                          
+                            >增加</el-button
+                        >
+                        <el-button
+                          
+                            size="small"
+                            type="text"
+                            @click="handleClickDelete(scope.$index)"
+                            >删除</el-button
+                        > -->
+                    </template>
+                 </el-table-column>
+
+         </el-table> 
+        <div class="div_btn">
+        <el-button size="small" @click="handleCancle">取 消</el-button>
+        <el-button
+          size="small"
+          type="primary"
+          @click="handleComfirm"
+          >确 定</el-button
+        >
+      </div>
+    </div>
+</template>
+
+<script>
+  import { requestPost,requestGet } from "@/js/dai/request";
+  export default {
+    data() {
+        return {
+            formData:{
+                tagName:"",
+            },
+            FormType:"",
+            rules:{
+            tagName:[{ required: true, message: '请输入标签名称', trigger: 'change' }]
+            },
+            tableData:[{
+                dataSource:"",//数据源
+                itemGroupId:"",//字段类别
+                itemId:"",//字段名称
+                queryType:"",//比较符
+                colVal:"",//对应值
+                nextLogicalRel:"",//条件关系,
+                tableName:"",//数据库表名
+                colKey:"",
+                itemIdOpction:[],
+                itemGroupIdOpction:[],
+                correspondingOpction:[]
+            }],
+            formType:'',
+            dataSourceOpction:[{label:'人员信息',value:'resi'},{label:'房屋信息',value:'house'},{label:'统计信息',value:'stat'}],
+            queryTypeOpction:[{}],
+            nextLogicalRelOpction:[{label:'并且',value:'and'},{label:'或者',value:'or'}],
+        };
+    },
+    created() {},
+    methods: {
+        async initForm(type,row) {
+            console.log(type);
+            this.FormType = type
+            await this.getFormEdit(row.tagId)
+            this.tagId = row.tagId
+            console.log( this.tableData);
+            this.formType = type
+            for(let i in this.tableData){
+                this.handleChangeSource(this.tableData[i],[i],type)
+                this.handleChangeFieldsType(this.tableData[i],[i],type)
+                setTimeout(() => {
+                this.handleChangeFieldsName(this.tableData[i],[i],type)
+                }, 300);
+            }
+           this.formData.tagName = row.tagName
+        },
+      
+        // 选择数据源
+        async handleChangeSource(row,index,type){
+        console.log(row);
+            if(row.dataSource == 'resi'){
+                let url = "/oper/customize/icformitemgroup/list"
+                let params={
+                    formCode: "resi_base_info",
+                    policyFlag: "1"
+                }
+                let {data,code,msg} = await requestPost(url,params)
+                if(code == 0){
+                    this.$set(this.tableData[index],'itemGroupIdOpction',data)
+                    console.log(this.tableData[index].itemGroupIdOpction);
+                }else {
+                this.$message.error(msg) 
+                }
+                this.hadeleClearForm(this.tableData[index],index)
+                if(!type){
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                    this.tableData[index].itemIdOpction = []
+                }
+            }else if( row.dataSource == 'house') {
+                let url = "/governance/policy/item-list/house"
+                let params={}
+                let {data,code,msg} = await requestPost(url,params)
+                if(code == 0){
+                    this.tableData[index].itemIdOpction = data
+
+                }else{
+                    this.$message.error(msg)
+                }
+                this.hadeleClearForm(this.tableData[index],index)
+                if(!type){
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+            } else if(row.dataSource == "stat"){
+                let url = "/governance/policy/item-list/stat"
+                let params={}
+                let {data,code,msg} = await requestPost(url,params)
+                if(code == 0){
+                    this.tableData[index].itemIdOpction = data
+
+                }else{
+                    this.$message.error(msg)
+                }
+                this.hadeleClearForm(this.tableData[index],index)
+                if(!type){
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+            }else{
+                this.hadeleClearForm(this.tableData[index],index)
+                    this.tableData[index].itemGroupId = ""
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                    this.tableData[index].itemIdOpction = []
+            }
+
+            this.getCompareList()
+           
+        },
+       
+        // 字段类别修改
+        async handleChangeFieldsType(row,index,type){
+            console.log(row,index,'字段类别row');
+            if(row.dataSource != "resi") return
+            const url = "/oper/customize/icformitem/getItemListV2"
+            let params={
+                groupId: row.itemGroupId,
+                policyFlag: "1"
+            }
+            this.hadeleClearForm(this.tableData[index],index)
+            if(!type){
+                    this.tableData[index].itemId = ""
+                    this.tableData[index].colKey = ""
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                    this.tableData[index].itemIdOpction = []
+                }
+            let {data,code,msg} = await requestPost(url,params)
+            if(code == 0){
+                this.$set(this.tableData[index],'itemIdOpction',data)
+                console.log(this.tableData[index].itemIdOpction ,'see');
+            }else {
+               this.$message.error(msg) 
+            }
+        },
+        // 字段名称修改
+        async handleChangeFieldsName(row,index,type){
+            console.log(row,'字段名称row');
+            var arr = []
+            // 人的信息中colKey的字段是columnName要做一下判断
+            if(row.dataSource == 'house' || row.dataSource == 'stat'){
+                arr =  row.itemIdOpction.filter(item=>item.colKey == row.itemId)
+                this.tableData[index].tableName = arr[0].tableName
+                this.tableData[index].colKey = arr[0].colKey
+                if(!type){
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+                // this.tableData[index].colVal = ''
+                // this.tableData[index].queryType = ''
+            }else if(row.dataSource == 'resi'&&row.itemId!=""){
+                    arr =  row.itemIdOpction.filter(item=>item.itemId == row.itemId)
+                    this.tableData[index].tableName = arr[0].tableName
+                    this.tableData[index].colKey = arr[0].columnName
+                    if(!type){
+                    this.tableData[index].colVal = ""
+                    this.tableData[index].nextLogicalRel = ""
+                    this.tableData[index].queryType = ""
+                }
+                    // this.tableData[index].colVal = ''
+                    // this.tableData[index].queryType = ''
+            }
+             console.log(arr,'arr是筛选出来的');
+             if(row.itemId=="")return
+            //  列表对应值的option有的是通过接口获取的就需要再通过optionSourceType判断下
+            console.log(arr[0].optionSourceType);
+             if(arr[0].optionSourceType== "remote"){
+                let url = ""
+                let params = {}
+                if(row.dataSource == 'house'){
+                    url = arr[0].optionSourceUrl
+                    params = JSON.parse(arr[0].optionSourceParam) 
+                }else{
+                    url = arr[0].optionSourceValue
+                }
+               
+                const { data, code, msg } = await requestPost(url, params)
+               if(code == 0 ){
+                arr[0].options = data
+                this.$set( this.tableData[index],'correspondingOpction',arr)
+               }else{
+                this.$message.error(msg)
+               }
+             }else{
+                this.$set( this.tableData[index],'correspondingOpction',arr)
+             }
+
+             console.log( this.tableData);
+          
+        },
+        async getCompareList(){
+            const url = "/sys/dict/data/dictlist"
+            let params = {
+                dictType: "sql_query_type"
+            }
+            let {data,code,msg} = await requestPost(url,params)
+            if(code == 0){
+                this.queryTypeOpction = data
+            }else if(code>=8000){
+                this.$message.error(msg)
+            }
+        },
+         // 选中标签其他清空
+        hadeleClearForm(row,index){
+            let obj = {}
+             obj = {
+                            dataSource:row.dataSource?row.dataSource:'',
+                            itemId:row.itemId?row.itemId:'',
+                            queryType:row.queryType?row.queryType:'',
+                            colVal:row.colVal?row.colVal:'',
+                            colKey:row.colKey?row.colKey:'',
+                            nextLogicalRel:row.nextLogicalRel?row.nextLogicalRel:'',
+                            tableName:row.tableName?row.tableName:'',
+                            itemGroupId:row.itemGroupId?row.itemGroupId:'',
+                            itemIdOpction:row.itemIdOpction?row.itemIdOpction:[],
+                            itemGroupIdOpction:row.itemGroupIdOpction?row.itemGroupIdOpction:[]
+                        }
+            this.$set(this.tableData,index,obj)
+        },
+        async getFormEdit(id){
+            const url = `/governance/resiSearchTag/listResiSearchRulesByTagId?tagId=${id}`
+            let {code,msg,data} = await requestGet(url)
+            if(code == 0){
+                console.log(data,'获取到的详情信息');
+               this.tableData = data
+            }else if(code>=8000){
+                this.$message.error(msg)
+            }
+        },
+        async handleComfirm(){
+          this.$refs.label_form.validate((flag)=>{
+            if(flag){
+                let messageObj = {}
+                messageObj =  this.validateRule(this.tableData)
+                console.log(messageObj);
+                if(messageObj){
+                    this.$message.error(messageObj)
+                    return
+                }
+              for(let i in this.tableData){
+                    for(let j in this.tableData[i]){
+                        if(typeof this.tableData[i][j] != "string"&&typeof this.tableData[i][j] != "number"){
+                            this.$delete(this.tableData[i],j)
+                        }
+                    }
+                 }
+                 this.addSubmit()
+            }else{
+                return false
+            }
+          })
+               
+        },
+       async addSubmit(){
+               let url = ""
+               let params = {
+                }
+                 if(this.FormType == "edit"){
+                    url = "/governance/resiSearchTag/updateResiSearchTag"
+                    params = {
+                        tagName:this.formData.tagName,
+                        rules: this.tableData,
+                        tagId:this.tagId
+                    }
+                 }else {
+                    url = "/governance/resiSearchTag/addResiSearchTag"
+                    params = {
+                        tagName:this.formData.tagName,
+                        rules: this.tableData,
+                    }
+                 }
+              
+                let {data,msg,code} = await requestPost(url,params)
+                if(code==0){
+                    this.$message.success('新增成功')
+                    this.$emit('dialogOk')
+                }else if(code>=8000){
+                    this.$message.error(msg)
+                } 
+        },
+        handleCancle(){
+            this.$emit('dialogCancle')
+        },
+        validateRule(tabList){
+            console.log(tabList);
+            let message = ""
+            tabList.forEach((item,index)=>{
+                if (item.itemGroupId === '' && item.dataSource=='resi'||
+                    item.itemId === '' ||
+                    item.queryType === '' ||
+                    item.colKey === ''
+                ) {
+
+                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
+                    return message
+                }
+                if ((index != this.tableData.length - 1) && item.nextLogicalRel === '') {
+                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
+                    console.log(item);
+                    return message
+                }
+                if ((item.queryType !== 'is_null' && item.queryType !== 'is_not_null') && item.colVal === '') {
+                    message = `匹配规则${item.dataSource=='resi'?'人员':item.dataSource=='house'?'房屋':item.dataSource=='stat'?'统计':''}信息不完整，请填写完整 !`
+
+                    return message
+                }
+
+            })
+            return message
+        },
+        handleClickAddRow(){
+            if(this.tableData == undefined){
+                this.tableData = []
+            }
+            let obj = {}
+                obj.dataSource="";
+                obj.itemGroupId="";
+                obj.itemId="";
+                obj.queryType="";
+                obj.colVal="";
+                obj.nextLogicalRel=""
+                obj.itemIdOpction = []
+                this.tableData.push(obj)
+
+        },
+        // 删除一行
+        handleClickDelete(index){
+            this.tableData.splice(index,1)
+        },
+        handleClearItemId(row,index){
+            this.tableData[index].colVal = ''
+            this.tableData[index].queryType = ''
+        },
+    },
+    props:{},
+    computed:{},
+    watch: {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+.imgBtn {
+  width: 25px;
+  height: 25px;
+  margin-top: 3px;
+  cursor: pointer;
+}
+.div_btn{
+    display: flex;
+    justify-content: right;
+    margin-right: 16px;
+    margin-top: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
new file mode 100644
index 000000000..a9709c2ea
--- /dev/null
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -0,0 +1,236 @@
+<template>
+    <div class="g-main">
+        <div class="m-search">
+            <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'120px'">
+        <el-form-item label="标签名称"
+                      prop="tagName">
+          <el-input v-model="formData.tagName"
+                    size="small"
+                    class="u-item-width-normal"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+
+        </el-form-item>
+          <el-row type="flex" >
+            <el-col :span="24" align="right">
+                <el-button style="margin-left:30px"
+                   size="small"
+                   type="primary "
+                   @click="handleSearchFrom">查询</el-button>
+            </el-col>
+          </el-row>
+        
+
+      </el-form>
+        </div>
+        <div class="m-table">
+            <div class="div_btn">
+                <el-button
+                    style="height:32px;"
+                    size="small"
+                    @click="handleAdd({},'add')"
+                    type="primary"
+                    icon="el-icon-plus"
+                >
+                    新增</el-button
+                >
+             </div> 
+             <el-table
+             ref="config_table"
+             border
+            :data="tableData"
+             v-loading="tableLoading"
+             style="width: 100%"
+             :height="tableHeight"
+             >  
+                 <el-table-column
+                    label="标签名称"
+                    prop="tagName"
+                    fixed="left"
+                    align="center"
+                    key="tagName"
+                />
+                <el-table-column fixed="right" label="操作" align="center" width="200">
+                    <template slot-scope="scope">
+                        <el-button
+                            style="margin-right: 10px"
+                            @click="handleAdd(scope.row,'edit')"
+                            size="small"
+                            type="text"
+                            >修改</el-button
+                        >
+                        <!--   按钮权限-->
+                        <template >
+                       
+                        <el-popconfirm
+                            title="删除之后无法回复，确认删除？"
+                            @onConfirm="handleDel(scope.row)"
+                        >
+                            <el-button
+                            size="small"
+                            type="text"
+                            slot="reference"
+                            >删除</el-button
+                            >
+                        </el-popconfirm>
+                        </template>
+                    </template>
+                 </el-table-column>
+
+             </el-table> 
+
+             <div class="div-flex">
+                <div class="m-page">
+                    <el-pagination
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                        :current-page.sync="pageNo"
+                        :page-sizes="[20, 50, 100, 200]"
+                        :page-size="pageSize"
+                        layout="sizes, prev, pager, next, total"
+                        :total="total"
+                    >
+                    </el-pagination>
+                 </div>
+             </div>
+        </div>
+        <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               destroy-on-close
+               width="900px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose"
+               
+               >
+             <add-form 
+                        v-if="formShow"
+                        ref="Config_form"
+                       :row-obj="rowObj"
+                      @dialogCancle="addFormCancle"
+                      @dialogOk="addFormOk"></add-form>
+    </el-dialog>
+    </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from "vuex";
+import addForm from "./addForm.vue"
+import nextTick from "dai-js/tools/nextTick";
+export default {
+    name:"labelConfig",
+    data(){
+        return{
+            formData:{
+                tagName:""
+            },
+            tableData:[],
+            pageNo:1,
+            pageSize:20,
+            tableLoading:true,
+            total:0,
+            searchH:100,
+            formShow:false,
+            formTitle:"",
+            rowObj:{}
+        }
+
+    },
+    created(){
+    },
+    components:{addForm},
+    methods:{
+      async getlabelConfigList(){
+          const url = "/governance/resiSearchTag/listResiSearchTags"   
+          let params = {
+            pageNo:this.pageNo,
+            pageSize:this.pageSize,
+            tagName:this.formData.tagName
+          } 
+          let {data,msg,code} = await requestPost(url,params)
+          this.tableLoading = false
+          if(code == 0 ){
+            this.tableData = data.list
+            this.total = data.total
+          }else{
+            this.$message.error(msg)
+          }
+        },
+        addFormCancle () {
+            this.formShow = false
+        },
+        addFormOk () {
+            this.formShow = false
+            this.getlabelConfigList()
+        },
+        handleAdd (row,type) {
+            if(type=="add"){
+            this.formTitle = '新增标签'
+            this.formShow = true
+            // this.$nextTick(() => {
+            // this.$refs.Config_form.initForm(type, row)
+            // })
+            }else {
+            this.formTitle = '修改标签'
+            this.formShow = true
+            console.log(row);
+            this.rowObj = row
+            this.$nextTick(() => {
+            this.$refs.Config_form.initForm(type, row)
+            })
+            }
+      },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`);
+            this.pageSize = val;
+            this.getlabelConfigList()
+        },
+        async handleDel(row){
+            const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`
+            let {code,msg} = await requestPost(url)
+            if(code == 0 ){
+                this.$message.success('删除成功')
+            }else {
+                this.$message.error(msg)
+                
+            }
+            this.getlabelConfigList()
+        },
+        handleSearchFrom(){
+            this.getlabelConfigList()
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.getlabelConfigList();
+        },
+        diaClose () {
+            this.formShow = false
+        },  
+    },
+    async mounted(){
+          this.getlabelConfigList()
+    },
+    computed:{
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+        tableHeight() {
+            const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+            const _h = this.clientHeight - 275 - this.searchH;
+            return this.$store.state.inIframe ? h : _h;
+        },
+    },
+    watch:{}
+}
+</script>
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+.div_btn{
+    margin-bottom: 12px;
+}
+</style>
diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 2fdc5b230..c8ee5d574 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -1050,7 +1050,7 @@ export default {
 
         if (data.projectStatus == "pending") {
           this.getMyDepartmentList();
-          this.getAssistanceUnitList();
+          // this.getAssistanceUnitList();
           if (data.returnable) {
             this.getReturnableList();
           }
@@ -1094,19 +1094,19 @@ export default {
     },
 
     //加载组织数据
-    async getAssistanceUnitList () {
-      const url = "/heart/icpartyunit/assistanceUnitList";
-
-      const { data, code, msg } = await requestPost(url, {
-        // projectId: this.projectIdCopy,
-      });
-
-      if (code === 0) {
-        this.assistanceUnitList = data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
+    // async getAssistanceUnitList () {
+    //   const url = "/heart/icpartyunit/assistanceUnitList";
+
+    //   const { data, code, msg } = await requestPost(url, {
+    //     // projectId: this.projectIdCopy,
+    //   });
+
+    //   if (code === 0) {
+    //     this.assistanceUnitList = data;
+    //   } else {
+    //     this.$message.error(msg);
+    //   }
+    // },
 
     //加载组织数据
     async getIssueInfo () {