diff --git a/src/views/modules/events/item-deal-detail-view.vue b/src/views/modules/events/item-deal-detail-view.vue
index 63eb2b4..90d076b 100644
--- a/src/views/modules/events/item-deal-detail-view.vue
+++ b/src/views/modules/events/item-deal-detail-view.vue
@@ -108,10 +108,20 @@
                  style="width: 720px;"
                  :model="dataForm"
                  :rules="dataRule">
+          <el-form-item label="操作人部门" prop="handlerDeptIdRule">
+            <el-cascader
+              ref="name"
+              v-model="dataForm.handlerDeptIdRule"
+              :options="options"
+              :props="{ multiple: false, checkStrictly: true }"
+              @change="changeHandle"
+            >
+            </el-cascader>
+          </el-form-item>
           <el-form-item label="处理:"
                         prop="handleCategory">
             <el-select v-model="postDataForm.handleCategory"
-                       placeholder="请选择">
+                       placeholder="请选择" @visible-change="visibleChange">
               <el-option v-for="handleResultDTO in dataForm.handleResultDTOS"
                          :key="handleResultDTO.processResult"
                          :label="handleResultDTO.processName"
@@ -136,12 +146,16 @@
                         prop="outHandleAdvice">
             <el-input v-model="postDataForm.outHandleAdvice"
                       type="textarea"
+                      maxlength="100"
+                      show-word-limit
                       placeholder="请您选择居民诉求的处理情况及答复意见，向居民公开展示"></el-input>
           </el-form-item>
           <el-form-item label="项目处理意见:"
                         prop="handleAdvice">
             <el-input v-model="postDataForm.handleAdvice"
                       type="textarea"
+                      maxlength="100"
+                      show-word-limit
                       placeholder="请您填写项目的实际办理情况(自己处理、吹哨报道、内部协调)，便于相关部门了解项目的实际情况"></el-input>
           </el-form-item>
           <el-form-item label="满意度评价:"
@@ -252,7 +266,8 @@ export default {
         outHandleAdvice: '',
         handleCategory: '',
         issueLatitude: '',
-        issueLongitude: ''
+        issueLongitude: '',
+        handlerDeptIdRule: ''
       },
       isAble: false,
       previewImgList: [],
@@ -271,11 +286,13 @@ export default {
       },
       deptResultDTOSVisible: false,
       evaluateDeptDTOSVisible: false,
-      timeLineList: []
+      timeLineList: [],
+      options: []
     }
   },
   mounted () {
     this.dataForm.id = this.$route.query.id
+    this.getOptions()
     this.init()
   },
   filters: {
@@ -342,6 +359,9 @@ export default {
         ],
         evaluateDeptDTOS: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        handlerDeptIdRule: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
@@ -379,6 +399,45 @@ export default {
     backToItemDeal () {
       this.$parent.selectComponent = 'ItemDeal'
     },
+    getOptions () {
+      this.$http
+        .get(`/sys/user/deptOptions/getDeptAuthByUser`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.options = res.data.options
+        })
+        .catch(() => {})
+    },
+    visibleChange (val) {
+      if (this.dataForm.handleResultDTOS.length === 0 && this.dataForm.handlerDeptIdRule === '' && val === true) {
+        return this.$message.error('请先选择操作人部门！')
+      }
+    },
+    changeHandle (value, selectedData) {
+      this.postDataForm.handlerDept = this.$refs['name'].getCheckedNodes()[0].label
+      this.postDataForm.handlerDeptId = this.$refs['name'].getCheckedNodes()[0].value
+      this.getHandleResultDTOS()
+    },
+    // 获取处理项
+    getHandleResultDTOS () {
+      this.dataForm.handleResultDTOS = []
+      this.dataForm.deptResultDTOS = []
+      this.dataForm.evaluateDeptDTOS = []
+      this.postDataForm.handleCategory = ''
+      this.postDataForm.deptResultDTOS = []
+      this.postDataForm.evaluateDeptDTOS = []
+      this.deptResult = []
+      this.$http.post(`/events/item/getHandleResultDTOS`, { itemId: this.dataForm.id, deptId: this.postDataForm.handlerDeptId }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm.handleResultDTOS = res.data.handleResultDTOS
+        this.dataForm.deptResultDTOS = res.data.deptResultDTOS
+        this.dataForm.evaluateDeptDTOS = res.data.evaluateDeptDTOS
+      }).catch(() => { })
+    },
     initBmap (latitude, longitude) {
       this.map = new BMap.Map('map')
       const point = new BMap.Point(longitude, latitude)
@@ -388,6 +447,7 @@ export default {
       this.map.enableScrollWheelZoom(true)
     },
     init () {
+      this.isAble = false
       this.$nextTick(() => {
         if (this.dataForm.id) {
           this.postDataForm.handleAdvice = ''
@@ -450,19 +510,27 @@ export default {
       }).catch(() => { })
     },
     deleteComment (val) {
-      this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).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.getCommentList()
+      this.$confirm('确定要屏蔽该评论吗？屏蔽后不可恢复。', '提示', {
+      confirmButtonText: '确定',
+      cancelButtonText: '取消',
+      type: 'warning'
+      }).then(() => {
+          this.$http['post']('/events/item/deleteComment', { commentIds: [val] }).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           }
-        })
-      }).catch(() => { })
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.getCommentList()
+            }
+          })
+        }).catch(() => { })
+      }).catch(() => {
+
+      })
     },
     pageSizeChangeHandleNew (val) {
       this.pageIndex = 1
@@ -530,8 +598,8 @@ export default {
       this.isAble = true
       this.$http['post'](
         '/events/item/itemHandleSubmit', this.postDataForm).then(({ data: res }) => {
-        this.isAble = false
         if (res.code !== 0) {
+          this.isAble = false
           return this.$message.error(res.msg)
         }
         this.$message({
diff --git a/src/views/modules/events/item-deal-list.vue b/src/views/modules/events/item-deal-list.vue
index 00533ab..78d98c7 100644
--- a/src/views/modules/events/item-deal-list.vue
+++ b/src/views/modules/events/item-deal-list.vue
@@ -1,254 +1,325 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-item__item}">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="getDataList()"
-      >
-        <el-form-item label="所属机构">
-          <el-cascader
-            v-model="ids"
-            :options="options"
-            :props="{ checkStrictly: true }"
-            clearable
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="项目编号" prop="itemCode">
-          <el-input
-            v-model="dataForm.itemCode"
-            placeholder="请输入项目编号"
-            clearable
-          ></el-input>
-        </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="至" label-width="25px" 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>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%;"
-      >
-        <el-table-column
-          label="序号"
-          type="index"
-          align="center"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          prop="itemContent"
-          label="项目内容"
-          header-align="center"
-          min-width="400"
-          align="left"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="itemCode"
-          label="项目编号"
-          header-align="center"
-          width="142"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="createdTime"
-          label="转成项目时间"
-          header-align="center"
-          width="152"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="nickName"
-          label="提交人"
-          header-align="center"
-          min-width="180"
-          show-overflow-tooltip
-          align="left"
-        ></el-table-column>
-        <el-table-column
-          prop="participantsNum"
-          label="参与人数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="approveNum"
-          label="支持人数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="opposeNum"
-          label="不支持人数"
-          header-align="center"
-          width="95"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="commentNum"
-          label="评论人数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="browseNum"
-          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('events:item:deal')"
-              type="text"
-              size="small"
-              @click="dealAction(scope.row.id)"
-              >{{ $t('deal') }}</el-button
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-item__item}">
+            <el-form
+                    :inline="true"
+                    :model="dataForm"
+                    @keyup.enter.native="getDataListSearch()"
             >
-          </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>
-      <!-- 弹窗, 新增 / 修改 -->
-      <detail
-        v-if="detailVisible"
-        ref="detail"
-        @refreshDataList="getDataList"
-      ></detail>
-    </div>
-  </el-card>
+                <el-form-item label="所属机构" label-width="100px">
+                    <el-cascader
+                            v-model="ids"
+                            :options="options"
+                            :props="{ checkStrictly: true }"
+                            clearable
+                            style="width:250px;"
+                    >
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="项目编号" prop="itemCode" label-width="100px">
+                    <el-input
+                            v-model="dataForm.itemCode"
+                            placeholder="请输入项目编号"
+                            clearable
+                            @keyup.native="btKeyUpItemCode"
+                            style="width:250px;"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="项目内容" prop="itemCode">
+                    <el-input
+                            v-model="dataForm.itemContent"
+                            placeholder="请输入项目内容"
+                            clearable
+                            @keyup.native="btKeyUpItemContent"
+                            style="width:200px;"
+                    ></el-input>
+                </el-form-item>
+                <br>
+                <el-form-item label="提交人" prop="itemCode" label-width="100px">
+                    <el-input
+                            v-model="dataForm.nickName"
+                            placeholder="请输入提交人"
+                            clearable
+                            @keyup.native="btKeyUpNickName"
+                            style="width:250px;"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="提交人手机号" prop="itemCode">
+                    <el-input
+                            v-model="dataForm.mobile"
+                            placeholder="请输入提交人手机号"
+                            clearable
+                            @keyup.native="btKeyUpMobile"
+                            style="width:250px;"
+                    ></el-input>
+                </el-form-item>
+                <br>
+                <div>
+                    <el-form-item label="转成项目时间" prop="startTime" label-width="100px">
+                        <el-date-picker
+                                v-model="dataForm.startTime"
+                                type="date"
+                                :picker-options="pickerBeginDateBefore"
+                                value-format="yyyy-MM-dd"
+                                format="yyyy-MM-dd"
+                                placeholder="选择日期时间"
+                                style="width:250px;" @change="changeTime"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="至" label-width="25px" prop="endTime">
+                        <el-date-picker
+                                v-model="dataForm.endTime"
+                                type="date"
+                                :picker-options="pickerBeginDateAfter"
+                                value-format="yyyy-MM-dd"
+                                format="yyyy-MM-dd"
+                                placeholder="选择日期时间"
+                                style="width:250px;" @change="changeTime"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                    </el-form-item>
+                </div>
+            </el-form>
+            <el-table
+                    v-loading="dataListLoading"
+                    :data="dataList"
+                    border
+                    @selection-change="dataListSelectionChangeHandle"
+                    style="width: 100%;"
+            >
+                <el-table-column
+                        label="序号"
+                        type="index"
+                        show-overflow-tooltip
+                        align="center"
+                        width="50"
+                ></el-table-column>
+                <el-table-column
+                        prop="itemContent"
+                        label="项目内容"
+                        header-align="center"
+                        min-width="400"
+                        align="left"
+                        show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                        prop="itemCode"
+                        label="项目编号"
+                        header-align="center"
+                        width="150"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="createdTime"
+                        label="转成项目时间"
+                        header-align="center"
+                        width="180"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="nickName"
+                        label="提交人"
+                        header-align="center"
+                        min-width="200"
+                        align="center"
+                        show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                        prop="mobile"
+                        label="提交人手机号"
+                        header-align="center"
+                        min-width="200"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="participantsNum"
+                        label="参与人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="approveNum"
+                        label="支持人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="opposeNum"
+                        label="不支持人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="commentNum"
+                        label="评论人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="browseNum"
+                        label="浏览数"
+                        header-align="center"
+                        width="100"
+                        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('events:item:deal')"
+                                type="text"
+                                size="small"
+                                @click="dealAction(scope.row.id)"
+                        >{{ $t('deal') }}
+                        </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>
+            <!-- 弹窗, 新增 / 修改 -->
+            <detail
+                    v-if="detailVisible"
+                    ref="detail"
+                    @refreshDataList="getDataList"
+            ></detail>
+        </div>
+    </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './item-deal-detail'
-export default {
-  mixins: [mixinViewModule],
-  name: 'ItemDealList',
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/page',
-        getDataListIsPage: true
-      },
-      detailVisible: false,
-      dataForm: {
-        id: '',
-        itemState: '0',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: ''
-      },
-      ids: [],
-      options: [],
-      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()
-          }
+    import mixinViewModule from '@/mixins/view-module'
+    import Detail from './item-deal-detail'
+
+    export default {
+        mixins: [mixinViewModule],
+        name: 'ItemDealList',
+        data() {
+            return {
+                mixinViewModuleOptions: {
+                    getDataListURL: '/events/item/page',
+                    getDataListIsPage: true
+                },
+                detailVisible: false,
+                dataForm: {
+                    id: '',
+                    itemState: '0',
+                    startTime: '',
+                    endTime: '',
+                    streetId: '',
+                    communityId: '',
+                    gridId: '',
+                    itemCode: '',
+                    itemContent: '',
+                    nickName: '',
+                    mobile: ''
+
+                },
+                ids: [],
+                options: [],
+            pickerBeginDateBefore: {
+                disabledDate: (time) => {
+                let beginDateVal = this.dataForm.endTime;
+                if (beginDateVal) {
+                    return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                }
+                }
+            },
+            pickerBeginDateAfter: {
+                disabledDate: (time) => {
+                let EndDateVal = this.dataForm.startTime;
+                if (EndDateVal) {
+                    return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                }
+                }
+            },
+            }
+        },
+        components: {
+            Detail
+        },
+        created: function () {
+            this.getOptions()
+        },
+        watch: {
+            ids: function (val) {
+                if (val.length === 0) {
+                    this.dataForm.streetId = ''
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 1) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 2) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = this.ids[1]
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 3) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = this.ids[1]
+                    this.dataForm.gridId = this.ids[2]
+                }
+            }
+        },
+        methods: {
+            dealAction(id) {
+                this.$parent.selectComponent = 'ItemDealDetailView'
+                this.$router.push({path: '/events-item-deal', query: {id: id}})
+            },
+            getOptions() {
+                this.$http
+                    .get(`/sys/user/deptOptions/getByLoginUser`)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        }
+                        this.options = res.data.options
+                    })
+                    .catch(() => {
+                    })
+            },
+            btKeyUpItemCode (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.itemCode = e.target.value
+            },
+            btKeyUpItemContent (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.itemContent = e.target.value
+            },
+            btKeyUpNickName (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.nickName = e.target.value
+            },
+            btKeyUpMobile (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.mobile = e.target.value
+            }
         }
-      }
-    }
-  },
-  components: {
-    Detail
-  },
-  created: function () {
-    this.getOptions()
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    dealAction (id) {
-      this.$parent.selectComponent = 'ItemDealDetailView'
-      this.$router.push({ path: '/events-item-deal', query: { id: id } })
-    },
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {})
     }
-  }
-}
 </script>
diff --git a/src/views/modules/events/item-end-list.vue b/src/views/modules/events/item-end-list.vue
index b0f4227..404d83a 100644
--- a/src/views/modules/events/item-end-list.vue
+++ b/src/views/modules/events/item-end-list.vue
@@ -1,260 +1,330 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-item__item}">
-      <el-form
-        :inline="true"
-        :model="dataForm"
-        @keyup.enter.native="getDataList()"
-      >
-        <el-form-item label="所属机构">
-          <el-cascader
-            v-model="ids"
-            :options="options"
-            :props="{ checkStrictly: true }"
-            clearable
-          >
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="项目编号" prop="itemCode">
-          <el-input
-            v-model="dataForm.itemCode"
-            placeholder="请输入项目编号"
-            clearable
-          ></el-input>
-        </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="至" label-width="25px" 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>
-      <el-table
-        v-loading="dataListLoading"
-        :data="dataList"
-        border
-        @selection-change="dataListSelectionChangeHandle"
-        style="width: 100%;"
-      >
-        <el-table-column
-          label="序号"
-          type="index"
-          align="center"
-          width="50"
-        ></el-table-column>
-        <el-table-column
-          prop="itemContent"
-          label="项目内容"
-          header-align="center"
-          min-width="400"
-          align="left"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="itemCode"
-          label="项目编号"
-          header-align="center"
-          width="142"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="createdTime"
-          label="转成项目时间"
-          header-align="center"
-          width="152"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="nickName"
-          label="提交人"
-          header-align="center"
-          min-width="180"
-          show-overflow-tooltip
-          align="left"
-        ></el-table-column>
-        <el-table-column
-          prop="participantsNum"
-          label="参与人数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="approveNum"
-          label="支持人数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="opposeNum"
-          label="不支持人数"
-          header-align="center"
-          width="95"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="commentNum"
-          label="评论人数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="browseNum"
-          label="浏览数"
-          header-align="center"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="evaluationScore"
-          label="评价"
-          header-align="center"
-          width="80"
-          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('events:item:look')"
-              type="text"
-              size="small"
-              @click="detailAction1(scope.row.id)"
-              >{{ $t('look') }}</el-button
+    <el-card shadow="never" class="aui-card--fill">
+        <div class="mod-item__item}">
+            <el-form
+                    :inline="true"
+                    :model="dataForm"
+                    @keyup.enter.native="getDataListSearch()"
             >
-          </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>
-      <detail
-        v-if="detailVisible"
-        ref="detailRef"
-        @refreshDataList="getDataList"
-      ></detail>
-    </div>
-  </el-card>
+                <el-form-item label="所属机构" label-width="100px">
+                    <el-cascader
+                            v-model="ids"
+                            :options="options"
+                            :props="{ checkStrictly: true }"
+                            clearable
+                            style="width:250px;"
+                    >
+                    </el-cascader>
+                </el-form-item>
+                <el-form-item label="项目编号" prop="itemCode" label-width="100px">
+                    <el-input
+                            v-model="dataForm.itemCode"
+                            placeholder="请输入项目编号"
+                            clearable
+                            @keyup.native="btKeyUpItemCode"
+                            style="width:250px;"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="项目内容" prop="itemCode">
+                    <el-input
+                            v-model="dataForm.itemContent"
+                            placeholder="请输入项目内容"
+                            clearable
+                            @keyup.native="btKeyUpItemContent"
+                            style="width:200px;"
+                    ></el-input>
+                </el-form-item>
+                <br>
+                <el-form-item label="提交人" prop="itemCode" label-width="100px">
+                    <el-input
+                            v-model="dataForm.nickName"
+                            placeholder="请输入提交人"
+                            clearable
+                            @keyup.native="btKeyUpNickName"
+                            style="width:250px;"
+                    ></el-input>
+                </el-form-item>
+                <el-form-item label="提交人手机号" prop="itemCode" >
+                    <el-input
+                            v-model="dataForm.mobile"
+                            placeholder="请输入提交人手机号"
+                            clearable
+                            @keyup.native="btKeyUpMobile"
+                            style="width:250px;"
+                    ></el-input>
+                </el-form-item>
+                <br>
+                <div>
+                    <el-form-item label="转成项目时间" prop="startTime" label-width="100px">
+                        <el-date-picker
+                                v-model="dataForm.startTime"
+                                type="date"
+                                :picker-options="pickerBeginDateBefore"
+                                value-format="yyyy-MM-dd"
+                                format="yyyy-MM-dd"
+                                placeholder="选择日期时间"
+                                style="width:250px;" @change="changeTime"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label="至" label-width="25px" prop="endTime">
+                        <el-date-picker
+                                v-model="dataForm.endTime"
+                                type="date"
+                                :picker-options="pickerBeginDateAfter"
+                                value-format="yyyy-MM-dd"
+                                format="yyyy-MM-dd"
+                                placeholder="选择日期时间"
+                                style="width:250px;" @change="changeTime"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+                    </el-form-item>
+                </div>
+            </el-form>
+            <el-table
+                    v-loading="dataListLoading"
+                    :data="dataList"
+                    border
+                    @selection-change="dataListSelectionChangeHandle"
+                    style="width: 100%;"
+            >
+                <el-table-column
+                        label="序号"
+                        type="index"
+                        show-overflow-tooltip
+                        align="center"
+                        width="50"
+                ></el-table-column>
+                <el-table-column
+                        prop="itemContent"
+                        label="项目内容"
+                        header-align="center"
+                        min-width="400"
+                        align="left"
+                        show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                        prop="itemCode"
+                        label="项目编号"
+                        header-align="center"
+                        width="150"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="createdTime"
+                        label="转成项目时间"
+                        header-align="center"
+                        width="180"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="nickName"
+                        label="提交人"
+                        header-align="center"
+                        width="200"
+                        align="center"
+                        show-overflow-tooltip
+                ></el-table-column>
+                <el-table-column
+                        prop="mobile"
+                        label="提交人手机号"
+                        header-align="center"
+                        min-width="200"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="participantsNum"
+                        label="参与人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="approveNum"
+                        label="支持人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="opposeNum"
+                        label="不支持人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="commentNum"
+                        label="评论人数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="browseNum"
+                        label="浏览数"
+                        header-align="center"
+                        width="100"
+                        align="center"
+                ></el-table-column>
+                <el-table-column
+                        prop="evaluationScore"
+                        label="评价"
+                        header-align="center"
+                        width="120"
+                        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('events:item:look')"
+                                type="text"
+                                size="small"
+                                @click="detailAction1(scope.row.id)"
+                        >{{ $t('look') }}
+                        </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>
+            <detail
+                    v-if="detailVisible"
+                    ref="detailRef"
+                    @refreshDataList="getDataList"
+            ></detail>
+        </div>
+    </el-card>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import Detail from './item-detail'
-export default {
-  mixins: [mixinViewModule],
-  name: 'ItemEndList',
-  data () {
-    return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/events/item/page',
-        getDataListIsPage: true
-      },
-      dataForm: {
-        id: '',
-        itemState: '10',
-        startTime: '',
-        endTime: '',
-        streetId: '',
-        communityId: '',
-        gridId: '',
-        itemCode: ''
-      },
-      detailVisible: false,
-      ids: [],
-      options: [],
-      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()
-          }
+    import mixinViewModule from '@/mixins/view-module'
+    import Detail from './item-detail'
+
+    export default {
+        mixins: [mixinViewModule],
+        name: 'ItemEndList',
+        data() {
+            return {
+                mixinViewModuleOptions: {
+                    getDataListURL: '/events/item/page',
+                    getDataListIsPage: true
+                },
+                dataForm: {
+                    id: '',
+                    itemState: '10',
+                    startTime: '',
+                    endTime: '',
+                    streetId: '',
+                    communityId: '',
+                    gridId: '',
+                    itemCode: '',
+                    itemContent: '',
+                    nickName: '',
+                    mobile: ''
+                },
+                detailVisible: false,
+                ids: [],
+                options: [],
+             pickerBeginDateBefore: {
+                    disabledDate: (time) => {
+                        let beginDateVal = this.dataForm.endTime;
+                        if (beginDateVal) {
+                            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                        }
+                    }
+                    },
+                pickerBeginDateAfter: {
+                    disabledDate: (time) => {
+                        let EndDateVal = this.dataForm.startTime;
+                        if (EndDateVal) {
+                            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                        }
+                    }
+                },
+            }
+        },
+        components: {
+            Detail
+        },
+        created: function () {
+            this.getOptions()
+        },
+        watch: {
+            ids: function (val) {
+                if (val.length === 0) {
+                    this.dataForm.streetId = ''
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 1) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = ''
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 2) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = this.ids[1]
+                    this.dataForm.gridId = ''
+                }
+                if (val.length === 3) {
+                    this.dataForm.streetId = this.ids[0]
+                    this.dataForm.communityId = this.ids[1]
+                    this.dataForm.gridId = this.ids[2]
+                }
+            }
+        },
+        methods: {
+            detailAction1(id) {
+                this.$parent.selectComponent = 'ItemCloseDetailView'
+                this.$router.push({path: '/events-item-end', query: {id: id}})
+            },
+            getOptions() {
+                this.$http
+                    .get(`/sys/user/deptOptions/getByLoginUser`)
+                    .then(({data: res}) => {
+                        if (res.code !== 0) {
+                            return this.$message.error(res.msg)
+                        }
+                        this.options = res.data.options
+                    })
+                    .catch(() => {
+                    })
+            },
+            btKeyUpItemCode (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.itemCode = e.target.value
+            },
+            btKeyUpItemContent (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.itemContent = e.target.value
+            },
+            btKeyUpNickName (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.nickName = e.target.value
+            },
+            btKeyUpMobile (e) {
+                e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+                this.dataForm.mobile = e.target.value
+            }
         }
-      }
-    }
-  },
-  components: {
-    Detail
-  },
-  created: function () {
-    this.getOptions()
-  },
-  watch: {
-    ids: function (val) {
-      if (val.length === 0) {
-        this.dataForm.streetId = ''
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 1) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 2) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
-      }
-      if (val.length === 3) {
-        this.dataForm.streetId = this.ids[0]
-        this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
-      }
-    }
-  },
-  methods: {
-    detailAction1 (id) {
-      this.$parent.selectComponent = 'ItemCloseDetailView'
-      this.$router.push({ path: '/events-item-end', query: { id: id } })
-    },
-    getOptions () {
-      this.$http
-        .get(`/sys/user/deptOptions/getByLoginUser`)
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          }
-          this.options = res.data.options
-        })
-        .catch(() => {})
     }
-  }
-}
 </script>