diff --git a/src/views/modules/communityService/policy/addPolicy.vue b/src/views/modules/communityService/policy/addPolicy.vue
index b7344abb..f654f89f 100644
--- a/src/views/modules/communityService/policy/addPolicy.vue
+++ b/src/views/modules/communityService/policy/addPolicy.vue
@@ -6,6 +6,7 @@
                :inline="true"
                :model="formData"
                :rules="dataRule"
+               :disabled="formType==='detail'"
                class="div_form">
 
         <el-form-item label="政策级别"
@@ -141,7 +142,8 @@
     <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button size="small"
+      <el-button v-if="formType!=='detail'"
+                 size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -275,7 +277,24 @@ export default {
       const { data, code, msg } = await requestPost(url, params)
 
       if (code === 0) {
+        this.demandIdArray = []
+        data.categoryList.forEach(element => {
+          let arr = element.codePath.split(',')
+          this.demandIdArray.push(arr)
+        });
+        this.ruleList = data.ruleList
+
+
         this.formData = data
+
+
+        this.$nextTick(() => {
+          data.ruleList.forEach((element, index) => {
+            this.$refs['ref_rule' + index][0].setRule(element.resiRuleList, element.houseRuleList, element.statRuleList)
+          });
+        })
+
+
       } else {
         this.$message.error(msg)
       }
@@ -327,6 +346,7 @@ export default {
 
 
     handleCateSlect (val) {
+      debugger
       console.log("val", val);
       let arr = []
       val.forEach((item) => {
@@ -343,8 +363,6 @@ export default {
 
     },
 
-
-
     async handleComfirm () {
 
 
@@ -353,16 +371,13 @@ export default {
     },
 
     async handleAdd () {
-
-      let ruleList = []
-      let _this = this
-
+      let isOk = false
       this.ruleList.forEach((oneRule, index) => {
         if (!oneRule.ruleName) {
           this.$message.error('政策细则不能为空')
-          return false
+          isOk = false
         }
-        let refObj = _this.$refs['ref_rule' + index][0]
+        let refObj = this.$refs['ref_rule' + index][0]
 
         refObj.getRule()
         if (refObj.okflag) {
@@ -370,11 +385,18 @@ export default {
           oneRule.houseRuleList = refObj.houseRuleList
           oneRule.statRuleList = refObj.statRuleList
 
+          isOk = true
+
         } else {
-          return false
+          isOk = false
+
         }
       });
 
+      if (!isOk) {
+        return false
+      }
+
       this.formData.ruleList = this.ruleList
 
       this.btnDisable = true
@@ -396,10 +418,15 @@ export default {
 
     async addFuwu () {
       console.log(this.formData)
+      let url = '/heart/policy/add'
 
+      if (this.formType === 'add') {
+        url = '/heart/policy/add'
+      } else {
+        url = '/heart/policy/update'
+        this.formData.policyId = this.policyId
+      }
 
-
-      const url = '/heart/policy/add'
       // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icServiceProject/service/initiate'
       let params = {
 
@@ -558,6 +585,9 @@ export default {
         title: [
           { required: true, message: '政策标题不能为空', trigger: 'change' }
         ],
+        content: [
+          { required: true, message: '政策内容不能为空', trigger: 'change' }
+        ],
 
 
       }
diff --git a/src/views/modules/communityService/policy/personList.vue b/src/views/modules/communityService/policy/personList.vue
new file mode 100644
index 00000000..be4bf566
--- /dev/null
+++ b/src/views/modules/communityService/policy/personList.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="div_main">
+    <div v-for="(item,index) in ruleList"
+         :key="index">
+      <div class="div_name">{{'政策细则'+(index+1)}}：{{item.ruleName}}</div>
+      <person-list-item :ruleId="item.id"> </person-list-item>
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import personListItem from './personListItem'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      agencyId: '',
+      initLoading: false,
+
+      tableArray: [
+
+      ],
+
+
+
+    }
+  },
+  components: {
+    personListItem
+  },
+  async created () {
+
+  },
+  activated () {
+    // this.$refs['ref_table'].doLayout()
+  },
+  async mounted () {
+
+
+  },
+
+  methods: {
+
+
+
+
+
+
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+
+  },
+  watch: {
+
+  },
+  props: {
+    policyId: {
+      type: String,
+      required: ''
+    },
+    ruleList: {
+      type: Array,
+      required: true,
+      default () {
+        return []
+      }
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/list-main.scss";
+
+.div_name {
+  padding: 5px 20px;
+  font-size: 16px;
+}
+</style>
+
+
+
diff --git a/src/views/modules/communityService/policy/personListItem.vue b/src/views/modules/communityService/policy/personListItem.vue
new file mode 100644
index 00000000..4a277e8e
--- /dev/null
+++ b/src/views/modules/communityService/policy/personListItem.vue
@@ -0,0 +1,564 @@
+<template>
+  <div class="div_main">
+
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+          <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-form-item>
+
+          <el-form-item label="所属房屋">
+
+            <el-form-item prop="neighborHoodId">
+              <el-select v-model.trim="formData.neighborHoodId"
+                         placeholder="小区"
+                         size="small"
+                         clearable
+                         class="item_width_2"
+                         @change="handleChangeV">
+                <el-option v-for="item in optionsV"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="buildingId">
+              <el-select v-model.trim="formData.buildingId"
+                         placeholder="楼号"
+                         :disabled="!this.formData.neighborHoodId"
+                         size="small"
+                         clearable
+                         class="item_width_2 item_width_2-middle item_width_2"
+                         @change="handleChangeB">
+                <el-option v-for="item in optionsB"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="unitId">
+              <el-select v-model.trim="formData.unitId"
+                         placeholder="单元"
+                         size="small"
+                         :disabled="!this.formData.buildingId"
+                         clearable
+                         class="item_width_2 item_width_2-middle item_width_2"
+                         @change="handleChangeD">
+                <el-option v-for="item in optionsD"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="houseId">
+              <el-select v-model.trim="formData.houseId"
+                         placeholder="房号"
+                         :disabled="!this.formData.unitId"
+                         size="small"
+                         clearable
+                         class="item_width_2 item_width_2-middle item_width_2">
+                <el-option v-for="item in optionsH"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+
+          </el-form-item>
+
+          <el-form-item label="姓名"
+                        prop="name">
+            <el-input v-model="formData.name"
+                      size="small"
+                      class="item_width_2"
+                      clearable
+                      placeholder="请输入姓名">
+            </el-input>
+
+          </el-form-item>
+          <el-form-item label="手机号"
+                        prop="mobile">
+            <el-input v-model="formData.mobile"
+                      size="small"
+                      class="item_width_2"
+                      clearable
+                      placeholder="请输入手机号">
+            </el-input>
+
+          </el-form-item>
+
+          <el-form-item label="身份证"
+                        prop="mobile">
+            <el-input v-model="formData.idCard"
+                      size="small"
+                      class="item_width_2"
+                      clearable
+                      placeholder="请输入身份证">
+            </el-input>
+
+          </el-form-item>
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+          <el-button style="margin-left:10px"
+                     class="diy-button--reset"
+                     size="small"
+                     @click="handleExport">导出</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+        <el-table-column type="selection"
+                         width="55"></el-table-column>
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         width="170">
+        </el-table-column>
+        <el-table-column prop="neighborHoodName"
+                         header-align="center"
+                         align="center"
+                         label="所属小区"
+                         min-width="200">
+        </el-table-column>
+        <el-table-column prop="age"
+                         header-align="center"
+                         align="center"
+                         label="年龄"
+                         width="80">
+        </el-table-column>
+
+      </el-table>
+      <div>
+        <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>
+
+</template>
+
+<script>
+
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      agencyId: '',
+      initLoading: false,
+
+      tableArray: [
+
+      ],
+
+      formData: {
+        ruleId: '',
+        ruleList: {},
+        name: '',
+        mobile: '',
+        idCard: '',
+        remark: '',
+        reason: '',
+        neighborHoodId: '',
+        buildingId: '',
+        unitId: '',
+        houseId: ''
+      },
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      tableData: [],
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+  async mounted () {
+
+    this.getGridList()
+
+    await this.loadTable()
+
+  },
+
+  methods: {
+    handleSearch () {
+      this.loadTable()
+    },
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/heart/policy/resiuserlist"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData,
+        ruleId: this.ruleId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+    handleChangeGrid (val) {
+      console.log('val', val)
+      this.formData.neighborHoodId = ''
+      this.formData.buildingId = ''
+      this.formData.unitId = ''
+      this.formData.houseId = ''
+      this.getValiheList()
+    },
+    handleChangeV (val) {
+      console.log('val', val)
+      this.formData.buildingId = ''
+      this.formData.unitId = ''
+      this.formData.houseId = ''
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.formData.unitId = ''
+      this.formData.houseId = ''
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeD () {
+      this.formData.houseId = ''
+      this.getHouseList()
+    },
+    getGridList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsG = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', { orgId: this.formData.GRID_ID, agencyId: user.agencyId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    getBuildList () {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.neighborHoodId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList () {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildingId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList () {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    //重置搜索条件
+    resetSearch () {
+      this.formData = {
+
+        ruleId: '',
+        ruleList: [],
+        name: '',
+        mobile: '',
+        idCard: '',
+        remark: '',
+        reason: '',
+        neighborHoodId: '',
+        buildingId: '',
+        unitId: '',
+        houseId: ''
+      }
+
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+    //导出表格
+    async handleExport () {
+      let title = '核酸检测关注名单'
+
+      const url = "/epmetuser/icEpidemicSpecialAttention/vaccination-export"
+
+      app.ajax.exportFilePost(
+        url,
+        this.formData,
+        (data, rspMsg) => {
+
+          this.download(data, title + '.xlsx')
+        },
+        (rspMsg, data) => {
+          this.$message.error(rspMsg);
+        }
+      );
+
+    },
+
+    // 下载文件
+    download (data, fileName) {
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a');
+        document.body.appendChild(a);
+        a.style = 'display: none';
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+
+    },
+
+
+
+
+
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return 400
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+    ruleId: {
+      type: String,
+      required: ''
+    },
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+.div_main {
+  width: 100%;
+
+  .div_search {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 20px 20px 5px 15px;
+    .item_width_2 {
+      width: 160px;
+    }
+  }
+}
+
+.div_table {
+  background: #ffffff;
+
+  border-radius: 4px;
+
+  padding: 0 20px;
+  position: relative;
+
+  .table {
+    .img-voice {
+      width: 30px;
+      height: 30px;
+    }
+  }
+
+  .div_notice {
+    position: absolute;
+    left: 15px;
+    bottom: 0;
+  }
+}
+</style>
+
+
+
diff --git a/src/views/modules/communityService/policy/policyList.vue b/src/views/modules/communityService/policy/policyList.vue
index 118cb54e..ed89fb26 100644
--- a/src/views/modules/communityService/policy/policyList.vue
+++ b/src/views/modules/communityService/policy/policyList.vue
@@ -136,7 +136,7 @@
                          type="text"
                          size="small"
                          class="div-table-button--edit">编辑</el-button>
-              <el-button @click="handleFeedback(scope.row)"
+              <el-button @click="handlePersonList(scope.row)"
                          type="text"
                          size="small"
                          class="div-table-button--edit">人员名单</el-button>
@@ -178,21 +178,22 @@
                   @handleOk="handleOk"
                   @handleClose="handleClose"></add-policy>
     </el-dialog>
-    <el-dialog v-if="showDetail"
-               :visible.sync="showDetail"
+    <el-dialog v-if="showPersonList"
+               :visible.sync="showPersonList"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
-               :title="detailDiaTitle"
-               width="850px"
+               :title="'人员名单'"
+               width="1150px"
                top="5vh"
                class="dialog-h"
-               @closed="showDetail = false">
-      <detail-form ref="ref_detail_form"
+               @closed="showPersonList = false">
+      <person-list ref="ref_detail_form"
                    :policyId="policyId"
+                   :ruleList="ruleList"
                    @handleOk="handleOk"
                    @handleClose="handleClose"
                    :formType="formType">
-      </detail-form>
+      </person-list>
     </el-dialog>
 
   </div>
@@ -205,11 +206,11 @@ import { mapGetters } from "vuex";
 // import eventInfo from "./cpts/event-info";
 import axios from "axios";
 import addPolicy from "./addPolicy";
-import detailForm from "./detailForm";
+import personList from "./personList";
 
 
 export default {
-  components: { addPolicy, detailForm },
+  components: { addPolicy, personList },
 
   data () {
 
@@ -247,11 +248,13 @@ export default {
       serviceProjectName: '',
 
       showAdd: false,
-      showDetail: false,
-      showFeedback: false,
+
       formType: 'add',
       addDiaTitle: '新增政策',
-      detailDiaTitle: '服务详情',
+
+      showPersonList: false,
+      ruleList: []
+
 
     };
   },
@@ -281,8 +284,6 @@ export default {
       this.getTableData();
     },
 
-
-
     async handleAdd () {
       this.addDiaTitle = '新增政策'
       this.formType = 'add'
@@ -291,26 +292,43 @@ export default {
 
     async handleDetail (row) {
       this.policyId = row.policyId
-
+      this.addDiaTitle = '政策详情'
       this.formType = 'detail'
-      this.showDetail = true
+      this.showAdd = true
 
     },
     async handleEdit (row) {
       this.policyId = row.policyId
+      this.addDiaTitle = '编辑政策'
       this.formType = 'edit'
       this.showAdd = true;
 
     },
 
     //加载组织数据
-    async handleFeedback (row) {
+    async handlePersonList (row) {
 
       this.policyId = row.policyId
-      this.serviceProjectName = row.serviceProjectName
-      this.addDiaTitle = '服务反馈'
-      this.formType = 'feedback'
-      this.showAdd = true;
+      await this.loadRuleList()
+      this.formType = 'personList'
+      this.showPersonList = true;
+    },
+
+    async loadRuleList () {
+
+      const url = "/heart/policy/rulelist/" + this.policyId
+
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.ruleList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
     },
 
 
@@ -319,7 +337,8 @@ export default {
       this.formType = ''
 
       this.showAdd = false
-      this.showDetail = false
+      this.showPersonList = false
+
 
 
     },
@@ -359,13 +378,13 @@ export default {
 
     async cancelFuwu () {
 
-      const url = `/heart/icServiceProject/service/cancel/${this.policyId}`;
+      const url = `/heart/policy/delete/${this.policyId}`;
 
 
       const { data, code, msg } = await requestPost(url, {});
 
       if (code === 0) {
-        this.$message.success("取消成功！");
+        this.$message.success("删除成功！");
         this.getTableData();
       } else {
         this.$message.error("操作失败！");
diff --git a/src/views/modules/communityService/policy/rule.vue b/src/views/modules/communityService/policy/rule.vue
index 61dc1990..a0499aae 100644
--- a/src/views/modules/communityService/policy/rule.vue
+++ b/src/views/modules/communityService/policy/rule.vue
@@ -73,6 +73,7 @@
             </el-option>
           </el-select>
           <el-input-number v-else-if="personItem.colType==='inputNum'"
+                           class="item_width_1"
                            v-model="personItem.colVal"
                            :min="0"
                            size="mini"
@@ -96,7 +97,7 @@
 
         <el-select v-if="personIndex<(resiRuleList.length-1)"
                    class="item_width_1"
-                   v-model="personItem.lastLogicalRel"
+                   v-model="personItem.nextLogicalRel"
                    size="mini"
                    placeholder="全部"
                    clearable>
@@ -164,6 +165,7 @@
             </el-option>
           </el-select>
           <el-input-number v-else-if="houseItem.colType==='inputNum'"
+                           class="item_width_1"
                            v-model="houseItem.colVal"
                            :min="0"
                            size="mini"
@@ -187,7 +189,7 @@
 
         <el-select v-if="houseIndex<(houseRuleList.length-1)"
                    class="item_width_1"
-                   v-model="houseItem.lastLogicalRel"
+                   v-model="houseItem.nextLogicalRel"
                    size="mini"
                    placeholder="全部"
                    clearable>
@@ -255,6 +257,7 @@
             </el-option>
           </el-select>
           <el-input-number v-else-if="staticItem.colType==='inputNum'"
+                           class="item_width_1"
                            v-model="staticItem.colVal"
                            :min="0"
                            size="mini"
@@ -277,7 +280,7 @@
 
         <el-select v-if="staticIndex<(statRuleList.length-1)"
                    class="item_width_1"
-                   v-model="staticItem.lastLogicalRel"
+                   v-model="staticItem.nextLogicalRel"
                    size="mini"
                    placeholder="全部"
                    clearable>
@@ -336,7 +339,7 @@ export default {
       resiRuleList1: [
         {
           ruleDesc: '',//规则描述文字，例如：基础信息性别等于女	
-          lastLogicalRel: '',//与上一条的关系；and、or	
+          nextLogicalRel: '',//与上一条的关系；and、or	
           itemGroupId: '',
           itemId: '',
           queryType: '',
@@ -354,7 +357,7 @@ export default {
       houseRuleList1: [
         {
           ruleDesc: '',
-          lastLogicalRel: '',//与上一条的关系；and、or	
+          nextLogicalRel: '',//与上一条的关系；and、or	
           queryType: '',
           colTable: '',
           colKey: '',
@@ -369,7 +372,7 @@ export default {
       statRuleList1: [
         {
           ruleDesc: '',
-          lastLogicalRel: '',//与上一条的关系；and、or	
+          nextLogicalRel: '',//与上一条的关系；and、or	
           queryType: '',
           colTable: '',
           colKey: '',
@@ -399,6 +402,53 @@ export default {
 
 
   methods: {
+    async setRule (resiRuleList, houseRuleList, statRuleList) {
+      this.resiRuleList = resiRuleList
+
+
+      this.resiRuleList.forEach((element, index) => {
+
+        let selGroup = this.groupList.filter((item) =>
+          element.itemGroupId === item.id
+        );
+
+        if (selGroup.length > 0) {
+          this.handleSelGroup(index, selGroup[0], true)
+        }
+
+      });
+
+
+      this.houseRuleList = houseRuleList
+
+      this.houseRuleList.forEach((element, index) => {
+
+        let selHouseItem = this.houseItemList.filter((item) =>
+          element.colKey === item.colKey
+        );
+
+        if (selHouseItem.length > 0) {
+          this.handleSelHouseItem(index, selHouseItem[0], true)
+        }
+
+      });
+
+      this.statRuleList = statRuleList
+
+      this.statRuleList.forEach((element, index) => {
+
+        let selStaticItem = this.staticItemList.filter((item) =>
+          element.colKey === item.colKey
+        );
+
+        if (selStaticItem.length > 0) {
+          this.handleSelStaticItem(index, selStaticItem[0], true)
+        }
+
+      });
+
+    },
+
     getRule () {
       this.okflag = false
       let messageObj = this.validateRule()
@@ -411,6 +461,19 @@ export default {
         this.$message.error(messageObj)
 
       } else {
+
+        if (this.resiRuleList.length > 0) {
+          this.resiRuleList[this.resiRuleList.length - 1].nextLogicalRel = ''
+        }
+
+        if (this.houseRuleList.length > 0) {
+          this.houseRuleList[this.houseRuleList.length - 1].nextLogicalRel = ''
+        }
+
+        if (this.statRuleList.length > 0) {
+          this.statRuleList[this.statRuleList.length - 1].nextLogicalRel = ''
+        }
+
         this.okflag = true
       }
 
@@ -421,8 +484,9 @@ export default {
       let message = ''
 
       this.resiRuleList.forEach((item, index) => {
+
         if (index === this.resiRuleList.length - 1) {
-          if (item.lastLogicalRel === '' ||
+          if (
             item.ruleDesc === '' ||
             item.itemGroupId === '' ||
             item.itemId === '' ||
@@ -434,7 +498,7 @@ export default {
             return message
           }
         } else {
-          if (
+          if (item.nextLogicalRel === '' ||
             item.ruleDesc === '' ||
             item.itemGroupId === '' ||
             item.itemId === '' ||
@@ -464,7 +528,7 @@ export default {
             return message
           }
         } else {
-          if (item.lastLogicalRel === '' ||
+          if (item.nextLogicalRel === '' ||
             item.ruleDesc === '' ||
             item.queryType === '' ||
             item.colKey === '' ||
@@ -490,7 +554,7 @@ export default {
           }
         } else {
           if (
-            item.lastLogicalRel === '' ||
+            item.nextLogicalRel === '' ||
             item.ruleDesc === '' ||
             item.queryType === '' ||
             item.colKey === '' ||
@@ -541,7 +605,7 @@ export default {
     addPerson () {
       let obj = {
         ruleDesc: '',//规则描述文字，例如：基础信息性别等于女	
-        lastLogicalRel: 'and',//与上一条的关系；and、or	
+        nextLogicalRel: 'and',//与上一条的关系；and、or	
         itemGroupId: '',
         itemId: '',
         queryType: '',
@@ -564,7 +628,7 @@ export default {
     addHouse () {
       let obj = {
         ruleDesc: '房屋信息',
-        lastLogicalRel: 'and',//与上一条的关系；and、or	
+        nextLogicalRel: 'and',//与上一条的关系；and、or	
         queryType: '',
         colTable: '',
         colKey: '',
@@ -585,7 +649,7 @@ export default {
     addStatic () {
       let obj = {
         ruleDesc: '统计信息',
-        lastLogicalRel: 'and',//与上一条的关系；and、or	
+        nextLogicalRel: 'and',//与上一条的关系；and、or	
         queryType: '',
         colTable: '',
         colKey: '',
@@ -604,7 +668,7 @@ export default {
     },
 
     //选择人员信息第一列下拉框
-    async handleSelGroup (personIndex, item) {
+    async handleSelGroup (personIndex, item, isEdit) {
       const url = '/oper/customize/icformitem/getItemListV2'
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {
@@ -621,6 +685,14 @@ export default {
         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])
+          }
+        }
       } else {
         this.$message.error(msg)
       }
@@ -660,7 +732,7 @@ export default {
 
     //选择房屋信息第二列下拉框
     async handleSelHouseItem (houseIndex, item) {
-      // debugger
+
       let oneData = this.houseRuleList[houseIndex]
 
       oneData.colTable = item.tableName
@@ -727,10 +799,11 @@ export default {
 
     // 获取人员信息---第一列
     async loadPersonGroup () {
-      const url = '/oper/customize//icformitemgroup/list'
+      const url = '/oper/customize/icformitemgroup/list'
       // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/isServiceProject/service/serviceScopeTree'
       let params = {
-        formCode: 'resi_base_info'
+        formCode: 'resi_base_info',
+        policyFlag: '1'
       }
 
       const { data, code, msg } = await requestPost(url, params)