diff --git a/src/assets/img/icon-del.png b/src/assets/img/icon-del.png
new file mode 100644
index 000000000..e79000569
Binary files /dev/null and b/src/assets/img/icon-del.png differ
diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index f654f89f7..d44de3c73 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -10,9 +10,10 @@
                class="div_form">
 
         <el-form-item label="政策级别"
+                      style="display: block"
                       label-width="150px"
                       prop="policyLevel">
-          <el-select class="item_width_1"
+          <el-select class="item_width_2"
                      v-model="formData.policyLevel"
                      placeholder="全部"
                      clearable>
@@ -26,6 +27,7 @@
         </el-form-item>
 
         <el-form-item label="政策日期"
+                      style="display: block"
                       label-width="150px"
                       prop="startDate">
           <el-date-picker v-model="formData.startDate"
@@ -92,13 +94,13 @@
                         prop="principalName"
                         label-width="150px"
                         style="display: block">
-            <rule :ref="'ref_rule'+index"></rule>
+            <rule :ref="'ref_rule'+index"
+                  :formType="formType"></rule>
           </el-form-item>
           <div v-if="index===(ruleList.length-1)"
                class="btn-add-rule">
             <el-button type="primary"
                        size="mini"
-                       plain
                        @click="addRule">增加细则</el-button>
           </div>
         </div>
@@ -146,7 +148,7 @@
                  size="small"
                  type="primary"
                  :disabled="btnDisable"
-                 @click="handleComfirm">确 定</el-button>
+                 @click="handleAdd">确 定</el-button>
     </div>
   </div>
 </template>
@@ -287,9 +289,14 @@ export default {
 
         this.formData = data
 
+        if (data.attachmentList) {
+          this.fileList = data.attachmentList
+        }
+
 
         this.$nextTick(() => {
           data.ruleList.forEach((element, index) => {
+
             this.$refs['ref_rule' + index][0].setRule(element.resiRuleList, element.houseRuleList, element.statRuleList)
           });
         })
@@ -363,28 +370,66 @@ export default {
 
     },
 
-    async handleComfirm () {
-
-
-      this.handleAdd()
-
-    },
-
     async handleAdd () {
       let isOk = false
       this.ruleList.forEach((oneRule, index) => {
-        if (!oneRule.ruleName) {
-          this.$message.error('政策细则不能为空')
-          isOk = false
-        }
+        // if (!oneRule.ruleName) {
+        //   this.$message.error('政策细则不能为空')
+        //   isOk = false
+        // }
         let refObj = this.$refs['ref_rule' + index][0]
 
-        refObj.getRule()
+        refObj.getRule(true, true, true)
         if (refObj.okflag) {
           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
+
+          });
+
           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
+
+          });
+
           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
+
+          });
+
           isOk = true
 
         } else {
@@ -393,16 +438,21 @@ export default {
         }
       });
 
+
+
       if (!isOk) {
         return false
       }
 
       this.formData.ruleList = this.ruleList
+      console.log(this.formData.ruleList)
+
+
 
       this.btnDisable = true
       setTimeout(() => {
         this.btnDisable = false
-      }, 10000)
+      }, 5000)
       this.$refs['ref_form'].validate((valid, messageObj) => {
         if (!valid) {
           app.util.validateRule(messageObj)
@@ -418,6 +468,7 @@ export default {
 
     async addFuwu () {
       console.log(this.formData)
+      this.formData.attachmentList = [...this.fileList]
       let url = '/heart/policy/add'
 
       if (this.formType === 'add') {
@@ -440,6 +491,7 @@ export default {
         this.resetData()
         this.$emit('handleOk')
       } else {
+        this.btnDisable = false
         this.$message.error(msg)
       }
     },
@@ -616,8 +668,9 @@ export default {
 @import "@/assets/scss/modules/management/form-main.scss";
 
 .btn-add-rule {
+  margin-left: 150px;
   display: flex;
-  justify-content: center;
+  justify-content: flex-start;
   margin-bottom: 20px;
 }
 
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
index be4bf5663..e8d1ff80b 100644
--- a/src/views/modules/communityService/policy/personList.vue
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="div_main">
+  <div class="dialog-h-content scroll-h  div_main">
     <div v-for="(item,index) in ruleList"
          :key="index">
       <div class="div_name">{{'政策细则'+(index+1)}}：{{item.ruleName}}</div>
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
index e7c093cc7..d40cc82a7 100644
--- a/src/views/modules/communityService/policy/personListItem.vue
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -7,20 +7,15 @@
                ref="ref_searchform"
                :label-width="'90px'">
         <div>
-          <el-form-item label="所属网格"
+          <el-form-item label="所属组织"
                         prop="orgId">
-            <el-select v-model.trim="formData.orgId"
-                       placeholder="请选择"
-                       size="small"
-                       clearable
-                       class="item_width_2"
-                       @change="handleChangeGrid">
-              <el-option v-for="item in optionsG"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
+            <el-cascader class="customer_cascader"
+                         ref="myCascader"
+                         v-model="agencyIdArray"
+                         :options="orgOptions"
+                         :props="orgOptionProps"
+                         :show-all-levels="false"
+                         @change="handleChangeAgency"></el-cascader>
 
           </el-form-item>
 
@@ -127,7 +122,7 @@
                      class="diy-button--reset"
                      @click="resetSearch">重置</el-button>
           <el-button style="margin-left:10px"
-                     class="diy-button--reset"
+                     class="diy-button--add"
                      size="small"
                      @click="handleExport">导出</el-button>
         </div>
@@ -226,13 +221,16 @@ export default {
       ],
 
       formData: {
+        gridId: '',
+        agencyId: '',
+        orgId: '',
+        orgType: '',
         ruleId: '',
         ruleList: {},
         name: '',
         mobile: '',
         idCard: '',
-        remark: '',
-        reason: '',
+
         neighborHoodId: '',
         buildingId: '',
         unitId: '',
@@ -243,9 +241,18 @@ export default {
       optionsH: [],
       optionsD: [],
       optionsG: [],
-
+      orgOptions: [],
+      agencyIdArray: [],
       tableData: [],
 
+      orgOptionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        checkStrictly: true
+      }
+
     }
   },
   components: {
@@ -259,7 +266,7 @@ export default {
   },
   async mounted () {
 
-    this.getGridList()
+    this.getOrgTreeList()
 
     await this.loadTable()
 
@@ -274,7 +281,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/heart/policy/resiuserlist"
+      const url = "/data/aggregator/icuser/listByPolicyRules"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,
@@ -296,14 +303,38 @@ export default {
       this.tableLoading = false
     },
 
-    handleChangeGrid (val) {
-      console.log('val', val)
+
+    handleChangeAgency (val) {
+      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
+      if (obj) {
+        if (obj.level === 'grid') {
+          this.formData.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.formData.orgType = 'grid'
+          this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.formData.agencyId = ''
+
+
+        } else {
+          this.formData.orgId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.formData.orgType = 'agency'
+          this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
+          this.formData.gridId = ''
+        }
+
+      } else {
+        this.formData.orgId = ''
+        this.formData.orgType = ''
+        this.formData.agencyId = ''
+        this.formData.gridId = ''
+      }
+
       this.formData.neighborHoodId = ''
       this.formData.buildingId = ''
       this.formData.unitId = ''
       this.formData.houseId = ''
       this.getValiheList()
     },
+
     handleChangeV (val) {
       console.log('val', val)
       this.formData.buildingId = ''
@@ -324,16 +355,17 @@ export default {
       this.formData.houseId = ''
       this.getHouseList()
     },
-    getGridList () {
+    getOrgTreeList () {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .post('/gov/org/customeragency/agencygridtree', {})
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsG = res.data
+            console.log('获取组织树成功', res.data)
+            this.orgOptions = []
+            this.orgOptions.push(res.data)
           }
         })
         .catch(() => {
@@ -343,7 +375,7 @@ export default {
     getValiheList () {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { orgId: this.formData.GRID_ID, agencyId: user.agencyId })
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, agencyId: this.formData.agencyId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -405,15 +437,16 @@ export default {
 
     //重置搜索条件
     resetSearch () {
+      this.agencyIdArray = []
       this.formData = {
-
+        orgId: '',
+        orgType: '',
         ruleId: '',
-        ruleList: [],
+        ruleList: {},
         name: '',
         mobile: '',
         idCard: '',
-        remark: '',
-        reason: '',
+
         neighborHoodId: '',
         buildingId: '',
         unitId: '',
@@ -437,21 +470,41 @@ export default {
 
     //导出表格
     async handleExport () {
-      let title = '核酸检测关注名单'
-
-      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export"
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        ...this.formData
+      }
 
-      app.ajax.exportFilePost(
-        url,
-        this.formData,
-        (data, rspMsg) => {
 
-          this.download(data, title + '.xlsx')
-        },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
+      await this.$http({
+        method: 'POST',
+        url: '/heart/policy/export-resiuser',
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
 
     },
 
@@ -520,9 +573,9 @@ export default {
       required: ''
     },
     ruleList: {
-      type: Array,
+      type: Object,
       default () {
-        return []
+        return {}
       }
     },
 
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 8f3d29407..715957b07 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -131,7 +131,7 @@
               <el-button @click="handleDetail(scope.row)"
                          type="text"
                          size="small"
-                         class=".div-table-button--detail">详情</el-button>
+                         class="div-table-button--detail">详情</el-button>
               <el-button @click="handleEdit(scope.row)"
                          type="text"
                          size="small"
@@ -355,13 +355,13 @@ export default {
 
       this.policyId = row.policyId
 
-      this.$confirm("确认取消服务?", "提示", {
+      this.$confirm("确认删除政策?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       })
         .then(() => {
-          this.cancelFuwu()
+          this.delPolicy()
         })
         .catch(err => {
           if (err == "cancel") {
@@ -370,18 +370,14 @@ export default {
             //   message: "已取消删除"
             // });
           }
-
         });
 
-
-
     },
 
-    async cancelFuwu () {
+    async delPolicy () {
 
       const url = `/heart/policy/delete/${this.policyId}`;
 
-
       const { data, code, msg } = await requestPost(url, {});
 
       if (code === 0) {
diff --git a/src/views/modules/communityService/policy/rule.vue b/src/views/modules/communityService/policy/rule.vue
index 504446353..2ae98f17d 100644
--- a/src/views/modules/communityService/policy/rule.vue
+++ b/src/views/modules/communityService/policy/rule.vue
@@ -11,12 +11,17 @@
       <span @click="clickTab('static')"
             :class="['tab-title',{'tab-title-sel':staticSel}]">统计信息</span>
 
-      <el-button class="diy-button--search"
+      <el-button v-if="formType!=='detail'"
+                 class="diy-button--search"
                  @click="handlePreview"
+                 plain
+                 :disabled="formType!=='detail' "
                  size="mini">预览</el-button>
 
-      <el-button class="diy-button--add"
+      <el-button v-if="formType!=='detail'"
+                 class="diy-button--add"
                  @click="addRule"
+                 plain
                  size="mini">增加</el-button>
     </div>
 
@@ -27,8 +32,7 @@
         <el-select class="item_width_1"
                    v-model="personItem.itemGroupId"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in groupList"
                      @click.native="handleSelGroup(personIndex,item)"
                      :key="item.id"
@@ -39,8 +43,7 @@
         <el-select class="item_width_1"
                    v-model="personItem.itemId"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in personItem.itemList"
                      @click.native="handleSelGroupItem(personIndex,item)"
                      :key="item.itemId"
@@ -51,9 +54,9 @@
         <el-select class="item_width_1"
                    v-model="personItem.queryType"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in queryList"
+                     @click.native="handleSelPersonQuery(personIndex,item)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
@@ -65,9 +68,9 @@
                      class="item_width_1"
                      v-model="personItem.colVal"
                      size="mini"
-                     placeholder="全部"
-                     clearable>
+                     placeholder="全部">
             <el-option v-for="item in personItem.colOption"
+                       @click.native="handleSelPersonValue(personIndex,item)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -83,9 +86,9 @@
           <el-date-picker v-else-if="personItem.colType==='datepicker'||personItem.colType==='date'"
                           v-model="personItem.colVal"
                           class="item_width_1"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
+                          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
@@ -100,19 +103,19 @@
                    class="item_width_1"
                    v-model="personItem.nextLogicalRel"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in logicalList"
+                     @click.native="handleSelPersonLogical(personIndex,item)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
           </el-option>
         </el-select>
 
-        <el-button icon="el-icon-remove-outline"
-                   circle
-                   @click="delPerson(personIndex)"
-                   type="danger"></el-button>
+        <img v-if="formType!=='detail'"
+             class="img_del"
+             src="@/assets/img/icon-del.png"
+             @click="delPerson(personIndex)">
 
       </div>
 
@@ -126,13 +129,12 @@
                   size="mini"
                   placeholder="请输入"
                   :disabled="true"
-                  v-model="houseItem.titleName">
+                  v-model="houseTitleName">
         </el-input>
         <el-select class="item_width_1"
                    v-model="houseItem.colKey"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in houseItemList"
                      @click.native="handleSelHouseItem(houseIndex,item)"
                      :key="item.colKey"
@@ -143,9 +145,9 @@
         <el-select class="item_width_1"
                    v-model="houseItem.queryType"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in queryList"
+                     @click.native="handleSelHouseQuery(houseIndex,item)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
@@ -157,9 +159,9 @@
                      class="item_width_1"
                      v-model="houseItem.colVal"
                      size="mini"
-                     placeholder="全部"
-                     clearable>
+                     placeholder="全部">
             <el-option v-for="item in houseItem.colOption"
+                       @click.native="handleSelHouseValue(houseIndex,item)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -174,10 +176,10 @@
           <el-date-picker v-else-if="houseItem.colType==='datepicker'||houseItem.colType==='date'"
                           v-model="houseItem.colVal"
                           class="item_width_1"
-                          type="date"
+                          type="datetime"
                           size="mini"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          value="yyyy-MM-dd HH:mm:ss"
                           placeholder="开始时间">
           </el-date-picker>
           <el-input v-else
@@ -192,19 +194,23 @@
                    class="item_width_1"
                    v-model="houseItem.nextLogicalRel"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in logicalList"
+                     @click.native="handleSelHouseLogical(houseIndex,item)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
           </el-option>
         </el-select>
 
-        <el-button icon="el-icon-remove-outline"
+        <img v-if="formType!=='detail'"
+             class="img_del"
+             src="@/assets/img/icon-del.png"
+             @click="delHouse(houseIndex)">
+        <!-- <el-button icon="el-icon-remove-outline"
                    circle
                    @click="delHouse(houseIndex)"
-                   type="danger"></el-button>
+                   type="danger"></el-button> -->
 
       </div>
 
@@ -218,13 +224,12 @@
                   size="mini"
                   placeholder="请输入"
                   :disabled="true"
-                  v-model="staticItem.titleName">
+                  v-model="statTitleName">
         </el-input>
         <el-select class="item_width_1"
                    v-model="staticItem.colKey"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in staticItemList"
                      @click.native="handleSelStaticItem(staticIndex,item)"
                      :key="item.colKey"
@@ -235,9 +240,9 @@
         <el-select class="item_width_1"
                    v-model="staticItem.queryType"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in queryList"
+                     @click.native="handleSelStaticQuery(staticIndex,item)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
@@ -249,9 +254,9 @@
                      class="item_width_1"
                      v-model="staticItem.colVal"
                      size="mini"
-                     placeholder="全部"
-                     clearable>
+                     placeholder="全部">
             <el-option v-for="item in staticItem.colOption"
+                       @click.native="handleSelStaticValue(staticIndex,item)"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
@@ -266,9 +271,9 @@
           <el-date-picker v-else-if="staticItem.colType==='datepicker'||staticItem.colType==='date'"
                           v-model="staticItem.colVal"
                           class="item_width_1"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          value="yyyy-MM-dd"
+                          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
@@ -283,19 +288,19 @@
                    class="item_width_1"
                    v-model="staticItem.nextLogicalRel"
                    size="mini"
-                   placeholder="全部"
-                   clearable>
+                   placeholder="全部">
           <el-option v-for="item in logicalList"
+                     @click.native="handleSelStaticLogical(houseIndex,item)"
                      :key="item.value"
                      :label="item.label"
                      :value="item.value">
           </el-option>
         </el-select>
 
-        <el-button icon="el-icon-remove-outline"
-                   circle
-                   @click="delStatic(staticIndex)"
-                   type="danger"></el-button>
+        <img v-if="formType!=='detail'"
+             class="img_del"
+             src="@/assets/img/icon-del.png"
+             @click="delStatic(staticIndex)">
 
       </div>
     </div>
@@ -368,10 +373,16 @@ export default {
           itemList: [],
           colType: '',//详细参数的组件类型
           colOption: [],
+          itemGroupName: '',
+          itemLabel: '',
+          queryTypeName: '',
+          colValLabel: '',
+          nextLogicalRelName: '',
 
         }
       ],
       houseRuleList: [],
+      houseTitleName: '房屋信息',
       houseRuleList1: [
         {
           ruleDesc: '',
@@ -384,8 +395,14 @@ export default {
           titleName: '房屋信息',
           colType: '',//详细参数的组件类型
           colOption: [],
+          itemGroupName: '房屋信息',
+          itemLabel: '',
+          queryTypeName: '',
+          colValLabel: '',
+          nextLogicalRelName: '',
         }
       ],
+      statTitleName: '统计信息',
       statRuleList: [],
       statRuleList1: [
         {
@@ -399,13 +416,18 @@ export default {
           titleName: '统计信息',
           colType: '',//详细参数的组件类型
           colOption: [],
+          itemGroupName: '统计信息',
+          itemLabel: '',
+          queryTypeName: '',
+          colValLabel: '',
+          nextLogicalRelName: '',
 
         }
       ],
       okflag: false,
 
       showPersonList: false,
-      ruleList: []
+      ruleList: {}
 
     }
   },
@@ -414,69 +436,91 @@ export default {
 
   },
   components: { personListItem },
-  async mounted () {
-    this.loadPersonGroup()
-    this.loadHouseItem()
-    this.loadStaticItem()
-    this.loadDicOption()
+  async created () {
+    // this.startLoading()
+    await this.loadPersonGroup()
+    await this.loadHouseItem()
+    await this.loadStaticItem()
+    await this.loadDicOption()
+
+
   },
 
 
   methods: {
     async setRule (resiRuleList, houseRuleList, statRuleList) {
+      // this.startLoading()
+      if (this.groupList.length == 0 || this.houseItemList.length === 0 || this.staticItemList.length === 0) {
+        setTimeout(() => {
+          this.setRule(resiRuleList, houseRuleList, statRuleList);
+        }, 500);
+        return false
+      }
       this.resiRuleList = resiRuleList
+      if (this.resiRuleList && this.resiRuleList.length > 0) {
+        for (let i = 0; i < this.resiRuleList.length; i++) {
+          let element = this.resiRuleList[i]
 
+          let selGroup = this.groupList.filter((item) =>
+            element.itemGroupId === item.id
+          );
+          console.log(selGroup)
 
-      this.resiRuleList.forEach((element, index) => {
+          if (selGroup.length > 0) {
+            await this.handleSelGroup(i, selGroup[0], true)
 
-        let selGroup = this.groupList.filter((item) =>
-          element.itemGroupId === item.id
-        );
 
-        if (selGroup.length > 0) {
-          this.handleSelGroup(index, selGroup[0], true)
-        }
-
-      });
+            let selItem = element.itemList.filter((item) =>
+              element.itemId === item.itemId);
+            if (selItem.length > 0) {
+              await this.handleSelGroupItem(i, selItem[0], true)
+            }
 
+          }
+        }
+      }
 
       this.houseRuleList = houseRuleList
+      if (this.houseRuleList && this.houseRuleList.length > 0) {
+        this.houseRuleList.forEach((element, index) => {
 
-      this.houseRuleList.forEach((element, index) => {
-
-        let selHouseItem = this.houseItemList.filter((item) =>
-          element.colKey === item.colKey
-        );
+          let selHouseItem = this.houseItemList.filter((item) =>
+            element.colKey === item.colKey
+          );
 
-        if (selHouseItem.length > 0) {
-          this.handleSelHouseItem(index, selHouseItem[0], true)
-        }
-
-      });
+          if (selHouseItem.length > 0) {
+            this.handleSelHouseItem(index, selHouseItem[0], true)
+          }
 
+        });
+      }
       this.statRuleList = statRuleList
+      if (this.statRuleList && this.statRuleList.length > 0) {
+        this.statRuleList.forEach((element, index) => {
 
-      this.statRuleList.forEach((element, index) => {
+          let selStaticItem = this.staticItemList.filter((item) =>
+            element.colKey === item.colKey
+          );
 
-        let selStaticItem = this.staticItemList.filter((item) =>
-          element.colKey === item.colKey
-        );
+          if (selStaticItem.length > 0) {
+            this.handleSelStaticItem(index, selStaticItem[0], true)
+          }
 
-        if (selStaticItem.length > 0) {
-          this.handleSelStaticItem(index, selStaticItem[0], true)
-        }
+        });
+      }
 
-      });
+      // this.endLoading()
 
     },
 
-    getRule () {
+    getRule (valPerson, valHouse, valStatic) {
       this.okflag = false
-      let messageObj = this.validateRule()
 
-      console.log('resiRuleList', this.resiRuleList)
-      console.log('houseRuleList', this.houseRuleList)
-      console.log('statRuleList', this.statRuleList)
+      let messageObj = this.validateRule(valPerson, valHouse, valStatic)
+
+      // console.log('resiRuleList', this.resiRuleList)
+      // console.log('houseRuleList', this.houseRuleList)
+      // console.log('statRuleList', this.statRuleList)
 
       if (messageObj) {
         this.$message.error(messageObj)
@@ -500,212 +544,130 @@ export default {
 
     },
 
-    validateRule () {
+    validateRule (valPerson, valHouse, valStatic) {
 
       let message = ''
-
-      this.resiRuleList.forEach((item, index) => {
-
-        if (index === this.resiRuleList.length - 1) {
-          if (
-            item.ruleDesc === '' ||
-            item.itemGroupId === '' ||
-            item.itemId === '' ||
-            item.queryType === '' ||
-            item.colKey === '' ||
-            item.colVal === '') {
-
-            message = '人员信息不完整，请填写完整！'
-            return message
+      if (valPerson) {
+        this.resiRuleList.forEach((item, index) => {
+
+          if (index === this.resiRuleList.length - 1) {
+            if (item.itemGroupId === '' ||
+              item.itemId === '' ||
+              item.queryType === '' ||
+              item.colKey === '' ||
+              item.colVal === '') {
+
+              message = '人员信息不完整，请填写完整！'
+              return message
+            }
+          } else {
+            if (item.nextLogicalRel === '' ||
+              item.itemGroupId === '' ||
+              item.itemId === '' ||
+              item.queryType === '' ||
+              item.colKey === '' ||
+              item.colVal === '') {
+
+              message = '人员信息不完整，请填写完整！'
+              return message
+            }
           }
-        } else {
-          if (item.nextLogicalRel === '' ||
-            item.ruleDesc === '' ||
-            item.itemGroupId === '' ||
-            item.itemId === '' ||
-            item.queryType === '' ||
-            item.colKey === '' ||
-            item.colVal === '') {
-
-            message = '人员信息不完整，请填写完整！'
-            return message
-          }
-        }
 
-      });
-
-      this.houseRuleList.forEach((item, index) => {
+        });
+      }
 
-        if (index === this.houseRuleList.length - 1) {
+      if (valHouse) {
 
-          if (
 
-            item.ruleDesc === '' ||
-            item.queryType === '' ||
-            item.colKey === '' ||
-            item.colVal === '') {
+        this.houseRuleList.forEach((item, index) => {
 
-            message = '房屋信息不完整，请填写完整！'
-            return message
-          }
-        } else {
-          if (item.nextLogicalRel === '' ||
-            item.ruleDesc === '' ||
-            item.queryType === '' ||
-            item.colKey === '' ||
-            item.colVal === '') {
-
-            message = '房屋信息不完整，请填写完整！'
-            return message
-          }
-        }
-      });
+          if (index === this.houseRuleList.length - 1) {
 
-      this.statRuleList.forEach((item, index) => {
-        if (index === this.statRuleList.length - 1) {
-          if (
+            if (item.queryType === '' ||
+              item.colKey === '' ||
+              item.colVal === '') {
 
-            item.ruleDesc === '' ||
-            item.queryType === '' ||
-            item.colKey === '' ||
-            item.colVal === '') {
+              message = '房屋信息不完整，请填写完整！'
+              return message
+            }
+          } else {
+            if (item.nextLogicalRel === '' ||
+              item.queryType === '' ||
+              item.colKey === '' ||
+              item.colVal === '') {
 
-            message = '统计信息不完整，请填写完整！'
-            return message
+              message = '房屋信息不完整，请填写完整！'
+              return message
+            }
           }
-        } else {
-          if (
-            item.nextLogicalRel === '' ||
-            item.ruleDesc === '' ||
-            item.queryType === '' ||
-            item.colKey === '' ||
-            item.colVal === '') {
-
-            message = '统计信息不完整，请填写完整！'
-            return message
+        });
+      }
+
+      if (valStatic) {
+        this.statRuleList.forEach((item, index) => {
+          if (index === this.statRuleList.length - 1) {
+            if (item.queryType === '' ||
+              item.colKey === '' ||
+              item.colVal === '') {
+
+              message = '统计信息不完整，请填写完整！'
+              return message
+            }
+          } else {
+            if (item.nextLogicalRel === '' ||
+              item.queryType === '' ||
+              item.colKey === '' ||
+              item.colVal === '') {
+
+              message = '统计信息不完整，请填写完整！'
+              return message
+            }
           }
-        }
-      });
+        });
+      }
 
 
       return message
     },
 
     handlePreview () {
-      this.ruleList = {}
-      this.ruleList = {
-        resiRuleList: this.resiRuleList,
-        houseRuleList: this.houseRuleList,
-        statRuleList: this.statRuleList,
-      }
-
-      this.showPersonList = true
-    },
-
-    handleClose () {
-      this.showPersonList = false
-
-    },
-
-    clickTab (type) {
-      if (type === 'person') {
-        this.personSel = true
-        this.houseSel = false
-        this.staticSel = false
-      }
-      if (type === 'house') {
-        this.personSel = false
-        this.houseSel = true
-        this.staticSel = false
-      }
-      if (type === 'static') {
-        this.personSel = false
-        this.houseSel = false
-        this.staticSel = true
+      if (!this.personChecked && !this.houseChecked && !this.staticChecked) {
+        this.$message.info('请勾选要预览的规则')
+        return false
       }
-    },
 
-    addRule () {
-      if (this.personSel) {
-        this.addPerson()
+      this.getRule(this.personChecked, this.houseChecked, this.staticChecked)
+      if (!this.okflag) {
+        return false
       }
-
-      if (this.houseSel) {
-        this.addHouse()
+      this.ruleList = {}
+      this.ruleList = {
+        resiRuleList: [],
+        houseRuleList: [],
+        statRuleList: [],
       }
 
-      if (this.staticSel) {
-        this.addStatic()
+      if (this.personChecked) {
+        this.ruleList.resiRuleList = this.resiRuleList
       }
-    },
-
-    addPerson () {
-      let obj = {
-        ruleDesc: '',//规则描述文字，例如：基础信息性别等于女	
-        nextLogicalRel: 'and',//与上一条的关系；and、or	
-        itemGroupId: '',
-        itemId: '',
-        queryType: '',
-        colTable: '',
-        colKey: '',
-        colVal: '',
-
-        itemList: [],
-        colType: '',//详细参数的组件类型
-        colOption: [],
+      if (this.houseChecked) {
+        this.ruleList.houseRuleList = this.houseRuleList
       }
-
-      this.resiRuleList.push(obj)
-    },
-
-    delPerson (index) {
-      this.resiRuleList.splice(index, 1);
-    },
-
-    addHouse () {
-      let obj = {
-        ruleDesc: '房屋信息',
-        nextLogicalRel: 'and',//与上一条的关系；and、or	
-        queryType: '',
-        colTable: '',
-        colKey: '',
-        colVal: '',
-
-        titleName: '房屋信息',
-        colType: '',//详细参数的组件类型
-        colOption: [],
+      if (this.staticChecked) {
+        this.ruleList.statRuleList = this.statRuleList
       }
 
-      this.houseRuleList.push(obj)
-    },
-
-    delHouse (index) {
-      this.houseRuleList.splice(index, 1);
+      this.showPersonList = true
     },
 
-    addStatic () {
-      let obj = {
-        ruleDesc: '统计信息',
-        nextLogicalRel: 'and',//与上一条的关系；and、or	
-        queryType: '',
-        colTable: '',
-        colKey: '',
-        colVal: '',
-
-        titleName: '统计信息',
-        colType: '',//详细参数的组件类型
-        colOption: [],
-      }
+    handleClose () {
+      this.showPersonList = false
 
-      this.statRuleList.push(obj)
     },
 
-    delStatic (index) {
-      this.statRuleList.splice(index, 1);
-    },
 
     //选择人员信息第一列下拉框
-    async handleSelGroup (personIndex, item, isEdit) {
+    async handleSelGroup (personIndex, item, isSet) {
       const url = '/oper/customize/icformitem/getItemListV2'
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {
@@ -717,34 +679,41 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+
         let oneData = this.resiRuleList[personIndex]
-        oneData.ruleDesc = item.label
+        oneData.itemGroupName = item.label
         oneData.itemList = data
         oneData.colTable = item.tableName
-        this.$set(this.resiRuleList, personIndex, oneData)
 
-        if (isEdit) {
-          let selItem = oneData.itemList.filter((item) =>
-            oneData.itemId === item.itemId);
-          if (selItem.length > 0) {
-            this.handleSelGroupItem(personIndex, selItem[0])
-          }
+        if (!isSet) {//如果是详情，赋值，不需要置空
+          oneData.nextLogicalRel = ''
+          oneData.itemId = ''
+          oneData.queryType = ''
+          oneData.colKey = ''
+          oneData.colVal = ''
         }
+
+        this.$set(this.resiRuleList, personIndex, oneData)
+
       } else {
         this.$message.error(msg)
       }
     },
 
     //选择人员信息第二列下拉框
-    async handleSelGroupItem (personIndex, item) {
+    async handleSelGroupItem (personIndex, item, isSet) {
 
       let oneData = this.resiRuleList[personIndex]
 
       oneData.colKey = item.columnName
       oneData.colType = item.itemType
+      oneData.itemLabel = item.label
 
-      oneData.ruleDesc = oneData.ruleDesc + item.label
-
+      if (!isSet) {//如果是详情，赋值，不需要置空
+        oneData.nextLogicalRel = ''
+        oneData.queryType = ''
+        oneData.colVal = ''
+      }
 
       if (item.optionSourceType === 'remote') {
         const url = item.optionSourceValue
@@ -767,14 +736,49 @@ export default {
 
     },
 
+    //选择人员信息第三列
+    handleSelPersonQuery (personIndex, item) {
+      let oneData = this.resiRuleList[personIndex]
+      oneData.queryTypeName = item.label
+
+      oneData.nextLogicalRel = ''
+      oneData.colVal = ''
+      oneData.colValLabel = ''
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+    },
+    //选择人员信息第四列
+    handleSelPersonValue (personIndex, item) {
+      let oneData = this.resiRuleList[personIndex]
+
+      oneData.colValLabel = item.label
+      oneData.nextLogicalRel = ''
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+    },
+    //选择人员信息第五列
+    handleSelPersonLogical (personIndex, item) {
+      let oneData = this.resiRuleList[personIndex]
+
+      oneData.nextLogicalRelName = item.label
+
+      this.$set(this.resiRuleList, personIndex, oneData)
+    },
+
     //选择房屋信息第二列下拉框
-    async handleSelHouseItem (houseIndex, item) {
+    async handleSelHouseItem (houseIndex, item, isSet) {
 
       let oneData = this.houseRuleList[houseIndex]
 
       oneData.colTable = item.tableName
       oneData.colType = item.itemType
-      oneData.ruleDesc = oneData.ruleDesc + item.label
+      oneData.itemLabel = item.label
+
+      if (!isSet) {//如果是详情，赋值，不需要置空
+        oneData.nextLogicalRel = ''
+        oneData.queryType = ''
+        oneData.colVal = ''
+      }
 
       if (item.optionSourceType === 'remote') {
         const url = item.optionSourceUrl
@@ -796,18 +800,50 @@ export default {
         oneData.colOption = []
       }
 
+      this.$set(this.houseRuleList, houseIndex, oneData)
+
+    },
+
+    //选择房屋第三列
+    handleSelHouseQuery (houseIndex, item) {
+      let oneData = this.houseRuleList[houseIndex]
+      oneData.queryTypeName = item.label
+
+      oneData.nextLogicalRel = ''
+      oneData.colVal = ''
+      oneData.colValLabel = ''
 
       this.$set(this.houseRuleList, houseIndex, oneData)
+    },
+    //选择房屋第四列
+    handleSelHouseValue (houseIndex, item) {
+      let oneData = this.houseRuleList[houseIndex]
+      oneData.colValLabel = item.label
+      oneData.nextLogicalRel = ''
+
+      this.$set(this.houseRuleList, houseIndex, oneData)
+    },
+    //选择房屋第五列
+    handleSelHouseLogical (houseIndex, item) {
+      let oneData = this.houseRuleList[houseIndex]
+      oneData.nextLogicalRelName = item.label
 
+      this.$set(this.houseRuleList, houseIndex, oneData)
     },
     //选择统计信息第二列下拉框
-    async handleSelStaticItem (staticIndex, item) {
+    async handleSelStaticItem (staticIndex, item, isSet) {
 
       let oneData = this.statRuleList[staticIndex]
 
       oneData.colTable = item.tableName
       oneData.colType = item.itemType
-      oneData.ruleDesc = oneData.ruleDesc + item.label
+      oneData.itemLabel = item.label
+
+      if (!isSet) {//如果是详情，赋值，不需要置空
+        oneData.nextLogicalRel = ''
+        oneData.queryType = ''
+        oneData.colVal = ''
+      }
 
       if (item.optionSourceType === 'remote') {
         const url = item.optionSourceUrl
@@ -834,6 +870,145 @@ export default {
 
     },
 
+    //选择统计信息第三列
+    handleSelStaticQuery (staticIndex, item) {
+      let oneData = this.statRuleList[staticIndex]
+      oneData.queryTypeName = item.label
+
+      oneData.nextLogicalRel = ''
+      oneData.colVal = ''
+      oneData.colValLabel = ''
+
+      this.$set(this.statRuleList, staticIndex, oneData)
+    },
+    //选择统计信息第四列
+    handleSelStaticValue (staticIndex, item) {
+      let oneData = this.statRuleList[staticIndex]
+      oneData.colValLabel = item.label
+      oneData.nextLogicalRel = ''
+
+      this.$set(this.statRuleList, staticIndex, oneData)
+    },
+    //选择统计信息第五列
+    handleSelStaticLogical (staticIndex, item) {
+      let oneData = this.statRuleList[staticIndex]
+      oneData.nextLogicalRelName = item.label
+
+      this.$set(this.statRuleList, staticIndex, oneData)
+    },
+
+    clickTab (type) {
+      if (type === 'person') {
+        this.personSel = true
+        this.houseSel = false
+        this.staticSel = false
+      }
+      if (type === 'house') {
+        this.personSel = false
+        this.houseSel = true
+        this.staticSel = false
+      }
+      if (type === 'static') {
+        this.personSel = false
+        this.houseSel = false
+        this.staticSel = true
+      }
+    },
+
+    addRule () {
+      if (this.personSel) {
+        this.addPerson()
+      }
+
+      if (this.houseSel) {
+        this.addHouse()
+      }
+
+      if (this.staticSel) {
+        this.addStatic()
+      }
+    },
+
+    addPerson () {
+      let obj = {
+        ruleDesc: '',//规则描述文字，例如：基础信息性别等于女	
+        nextLogicalRel: 'and',//与上一条的关系；and、or	
+        itemGroupId: '',
+        itemId: '',
+        queryType: '',
+        colTable: '',
+        colKey: '',
+        colVal: '',
+
+        itemList: [],
+        colType: '',//详细参数的组件类型
+        colOption: [],
+        itemGroupName: '',
+        itemLabel: '',
+        queryTypeName: '',
+        colValLabel: '',
+        nextLogicalRelName: '',
+      }
+
+      this.resiRuleList.push(obj)
+    },
+
+    delPerson (index) {
+      this.resiRuleList.splice(index, 1);
+    },
+
+    addHouse () {
+      let obj = {
+        ruleDesc: '',
+        nextLogicalRel: 'and',//与上一条的关系；and、or	
+        queryType: '',
+        colTable: '',
+        colKey: '',
+        colVal: '',
+
+        titleName: '房屋信息',
+        colType: '',//详细参数的组件类型
+        colOption: [],
+        itemGroupName: '房屋信息',
+        itemLabel: '',
+        queryTypeName: '',
+        colValLabel: '',
+        nextLogicalRelName: '',
+      }
+
+      this.houseRuleList.push(obj)
+    },
+
+    delHouse (index) {
+      this.houseRuleList.splice(index, 1);
+    },
+
+    addStatic () {
+      let obj = {
+        ruleDesc: '',
+        nextLogicalRel: 'and',//与上一条的关系；and、or	
+        queryType: '',
+        colTable: '',
+        colKey: '',
+        colVal: '',
+
+        titleName: '统计信息',
+        colType: '',//详细参数的组件类型
+        colOption: [],
+        itemGroupName: '统计信息',
+        itemLabel: '',
+        queryTypeName: '',
+        colValLabel: '',
+        nextLogicalRelName: '',
+      }
+
+      this.statRuleList.push(obj)
+    },
+
+    delStatic (index) {
+      this.statRuleList.splice(index, 1);
+    },
+
     // 获取人员信息---第一列
     async loadPersonGroup () {
       const url = '/oper/customize/icformitemgroup/list'
@@ -962,6 +1137,10 @@ export default {
   },
   props: {
 
+    formType: {
+      type: String,
+      required: 'true'
+    },
 
   }
 }
@@ -996,4 +1175,11 @@ export default {
 /deep/.el-checkbox:last-of-type {
   margin-right: 10px;
 }
+
+.img_del {
+  width: 25px;
+  height: 25px;
+  margin-top: 6px;
+  cursor: pointer;
+}
 </style>