diff --git a/src/views/modules/conflict/conflictmediate-add-or-update.vue b/src/views/modules/conflict/conflictmediate-add-or-update.vue
new file mode 100644
index 0000000..f62d199
--- /dev/null
+++ b/src/views/modules/conflict/conflictmediate-add-or-update.vue
@@ -0,0 +1,194 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="提交人ID" prop="userId">
+          <el-input v-model="dataForm.userId" placeholder="提交人ID"></el-input>
+      </el-form-item>
+          <el-form-item label="矛盾纠纷类型" prop="conflictType">
+          <el-input v-model="dataForm.conflictType" placeholder="矛盾纠纷类型"></el-input>
+      </el-form-item>
+          <el-form-item label="行成原因" prop="conflictReason">
+          <el-input v-model="dataForm.conflictReason" placeholder="行成原因"></el-input>
+      </el-form-item>
+          <el-form-item label="涉及人数" prop="involvedNum">
+          <el-input v-model="dataForm.involvedNum" placeholder="涉及人数"></el-input>
+      </el-form-item>
+          <el-form-item label="挑头骨干人员" prop="mainstayLeader">
+          <el-input v-model="dataForm.mainstayLeader" placeholder="挑头骨干人员"></el-input>
+      </el-form-item>
+          <el-form-item label="责任单位" prop="responsibleDept">
+          <el-input v-model="dataForm.responsibleDept" placeholder="责任单位"></el-input>
+      </el-form-item>
+          <el-form-item label="责任人" prop="responsiblePeople">
+          <el-input v-model="dataForm.responsiblePeople" placeholder="责任人"></el-input>
+      </el-form-item>
+          <el-form-item label="主要采取措施" prop="majorMeasures">
+          <el-input v-model="dataForm.majorMeasures" placeholder="主要采取措施"></el-input>
+      </el-form-item>
+          <el-form-item label="目前稳控情况" prop="currentSituation">
+          <el-input v-model="dataForm.currentSituation" placeholder="目前稳控情况"></el-input>
+      </el-form-item>
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
+      </el-form-item>
+          <el-form-item label="提报时间" prop="submitTime">
+          <el-input v-model="dataForm.submitTime" placeholder="提报时间"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        userId: '',
+        conflictType: '',
+        conflictReason: '',
+        involvedNum: '',
+        mainstayLeader: '',
+        responsibleDept: '',
+        responsiblePeople: '',
+        majorMeasures: '',
+        currentSituation: '',
+        remark: '',
+        submitTime: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        userId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        conflictType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        conflictReason: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        involvedNum: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mainstayLeader: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        responsibleDept: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        responsiblePeople: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        majorMeasures: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        currentSituation: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        remark: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        submitTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/property/conflictmediate/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/property/conflictmediate/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/conflict/conflictmediate.vue b/src/views/modules/conflict/conflictmediate.vue
new file mode 100644
index 0000000..7e75278
--- /dev/null
+++ b/src/views/modules/conflict/conflictmediate.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__conflictmediate}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="社区">
+          <el-cascader
+                  :options="options"
+                  @change="handleChange"
+                  clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-cascader
+                  :options="gridOptions"
+                  @change="handleChangeGrid"
+                  clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="开始时间"
+                      prop="startTime">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('conflict:conflictmediate:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('conflict:conflictmediate:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="userName" label="上报网格长" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属机构" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="conflictType" label="矛盾纠纷类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="conflictReason" label="行成原因" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="involvedNum" label="涉及人数" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="mainstayLeader" label="挑头骨干人员" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="responsibleDept" label="责任单位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="responsiblePeople" label="责任人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="majorMeasures" label="主要采取措施" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="currentSituation" label="目前稳控情况" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="remark" label="备注" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="submitTime" label="提报时间" header-align="center" align="center"></el-table-column>
+
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('conflict:conflictmediate:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('conflict:conflictmediate:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './conflictmediate-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/property/conflictmediate/page',
+        getDataListIsPage: true,
+        deleteURL: '/property/conflictmediate',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      },
+      options: [],
+      gridOptions: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.startTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal).getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.endTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal).getTime()
+          }
+        }
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  mounted () {
+    // 获取下拉菜单
+    this.getByLoginUser()
+    // 获取下拉菜单
+    this.getGridByLoginUser()
+  },
+  methods: {
+    handleChange (value) {
+      this.dataForm.comm = value.slice(-1).shift()
+    },
+    handleChangeGrid (value) {
+      this.dataForm.grid = value.slice(-1).shift()
+    },
+    getByLoginUser () {
+      this.$http
+              .get(`/sys/user/deptOptions/getMiddleByLoginUser`)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.options = res.data.options
+              })
+              .catch(() => {
+              })
+    },
+    getGridByLoginUser () {
+      this.$http
+              .get(`/sys/user/deptOptions/getBusinessDeptByUser`)
+              .then(({ data: res }) => {
+                if (res.code !== 0) {
+                  return this.$message.error(res.msg)
+                }
+                this.gridOptions = res.data.options
+              })
+              .catch(() => {
+              })
+    },
+  }
+}
+</script>