diff --git a/src/views/modules/custom/evaluatedept.vue b/src/views/modules/custom/evaluatedept.vue
index 79c3dd1a..49e147aa 100644
--- a/src/views/modules/custom/evaluatedept.vue
+++ b/src/views/modules/custom/evaluatedept.vue
@@ -28,7 +28,7 @@
           <template slot-scope="scope">
             <el-button v-if="$hasPermission('custom:evaluatedept:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="$hasPermission('custom:evaluatedept:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
-            <el-button type="text" size="small" @click="manageHandle(scope.row.id,scope.row.deptId)">管理</el-button>
+            <el-button type="text" size="small" @click="manageHandle(scope.row.deptId)">管理</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -73,9 +73,9 @@ export default {
     Evaluateofficer
   },
   methods: {
-    manageHandle (id, deptId) {
+    manageHandle (deptId) {
       this.$parent.selectComponent = 'Evaluateofficer'
-      this.$router.push({ path: '/custom-evaluateofficer', query: { id: id, deptId: deptId } })
+      this.$router.push({ path: '/custom-evaluateofficer', query: { deptId: deptId } })
     }
   }
 }
diff --git a/src/views/modules/custom/evaluateofficer-add-or-update.vue b/src/views/modules/custom/evaluateofficer-add-or-update.vue
index cc88d4bc..7b40d359 100644
--- a/src/views/modules/custom/evaluateofficer-add-or-update.vue
+++ b/src/views/modules/custom/evaluateofficer-add-or-update.vue
@@ -1,44 +1,30 @@
 <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 部门表主键ID" prop="deptId">
+      <el-form-item v-if=false label="街道名称" prop="deptId">
           <el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
       </el-form-item>
           <el-form-item label="姓名" prop="fullName">
           <el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
       </el-form-item>
-          <el-form-item label="性别(0-女，1-男)" prop="sex">
-          <el-input v-model="dataForm.sex" placeholder="性别(0-女，1-男)"></el-input>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
-          <el-form-item label="职位" prop="position">
-          <el-input v-model="dataForm.position" placeholder="职位"></el-input>
+      <el-form-item label="单位职务" prop="position">
+          <el-input v-model="dataForm.position" placeholder="单位职务"></el-input>
       </el-form-item>
-          <el-form-item label="点赞次数" prop="likesCount">
+          <!-- <el-form-item label="点赞次数" prop="likesCount">
           <el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
       </el-form-item>
           <el-form-item label="被踩次数" prop="opposeCount">
           <el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
-      </el-form-item>
-          <el-form-item label="排序" prop="sort">
-          <el-input v-model="dataForm.sort" placeholder="排序"></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="删除标识 0：否，1：是" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0：否，1：是"></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-item label="排序" prop="sort">
+          <!-- <el-input v-model="dataForm.sort" placeholder="排序"></el-input> -->
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -69,7 +55,11 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: ''
-      }
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
     }
   },
   computed: {
diff --git a/src/views/modules/custom/evaluateofficer-add.vue b/src/views/modules/custom/evaluateofficer-add.vue
new file mode 100644
index 00000000..a1ca7739
--- /dev/null
+++ b/src/views/modules/custom/evaluateofficer-add.vue
@@ -0,0 +1,160 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('add')" :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 v-if=false label="街道ID" prop="deptId">
+          <el-input v-model="dataForm.deptId" placeholder="部门ID 部门表主键ID"></el-input>
+      </el-form-item>
+          <el-form-item label="姓名" prop="fullName">
+          <el-input v-model="dataForm.fullName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="dataForm.sex" placeholder="性别">
+          <el-option v-for="item in sexFlagArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单位职务" prop="position">
+          <el-input v-model="dataForm.position" placeholder="单位职务"></el-input>
+      </el-form-item>
+          <!-- <el-form-item label="点赞次数" prop="likesCount">
+          <el-input v-model="dataForm.likesCount" placeholder="点赞次数"></el-input>
+      </el-form-item>
+          <el-form-item label="被踩次数" prop="opposeCount">
+          <el-input v-model="dataForm.opposeCount" placeholder="被踩次数"></el-input>
+      </el-form-item> -->
+      <el-form-item label="排序" prop="sort">
+          <!-- <el-input v-model="dataForm.sort" placeholder="排序"></el-input> -->
+          <el-input-number v-model="dataForm.sort" controls-position="right" :min="1" label="显示顺序" max=2000000000></el-input-number>
+      </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: '',
+        deptId: '',
+        fullName: '',
+        sex: '',
+        position: '',
+        likesCount: '',
+        opposeCount: '',
+        sort: '',
+        revision: '',
+        delFlag: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      },
+      sexFlagArr: [
+        { dictValue: '1', dictName: '男' },
+        { dictValue: '0', dictName: '女' }
+      ]
+    }
+  },
+  // mounted () {
+  //   // this.dataForm.id = this.$route.query.id
+  //   this.dataForm.deptId = this.$route.query.deptId
+  // },
+  computed: {
+    dataRule () {
+      return {
+        deptId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        fullName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sex: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        position: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        likesCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        opposeCount: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { 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(`/custom/evaluateofficer/${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']('/custom/evaluateofficer/', 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/custom/evaluateofficer.vue b/src/views/modules/custom/evaluateofficer.vue
index ff441729..86e82b0c 100644
--- a/src/views/modules/custom/evaluateofficer.vue
+++ b/src/views/modules/custom/evaluateofficer.vue
@@ -2,14 +2,54 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__evaluateofficer}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <!-- <el-form-item>
           <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item> -->
+        <el-form-item label="干部名称" prop="fullName">
+          <el-input v-model="dataForm.fullName" 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-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="evaluateofficerAddHandle(dataForm.deptId)">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('epdc:topic:export')" type="primary" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     v-loading="dataListLoading"
+                     :action="uploadUrl"
+                     :on-preview="handlePreview"
+                     multiple
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'>
+            <el-button type="primary">导入</el-button>
+          </el-upload>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('custom:evaluateofficer:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
@@ -17,9 +57,9 @@
       </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="fullName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sex" label="性别(0-女，1-男)" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="position" label="职位" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="fullName" label="干部姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sex" label="性别" header-align="center" align="center" :formatter="showFlagFormat"></el-table-column>
+        <el-table-column prop="position" label="单位职务" header-align="center" align="center"></el-table-column>
         <el-table-column prop="likesCount" label="点赞次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="opposeCount" label="被踩次数" header-align="center" align="center"></el-table-column>
         <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
@@ -42,6 +82,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <evaluateofficer-add v-if="evaluateofficerAddVisible" ref="evaluateofficerAdd" @refreshDataList="getDataList"></evaluateofficer-add>
     </div>
   </el-card>
 </template>
@@ -49,6 +90,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './evaluateofficer-add-or-update'
+import evaluateofficerAdd from './evaluateofficer-add'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -57,15 +99,39 @@ export default {
         getDataListURL: '/custom/evaluateofficer/page',
         getDataListIsPage: true,
         deleteURL: '/custom/evaluateofficer',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/custom/evaluateofficer/export'
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        deptId: ''
+      },
+      evaluateofficerAddVisible: false
     }
   },
+  mounted () {
+    // this.dataForm.id = this.$route.query.id
+    this.dataForm.deptId = this.$route.query.deptId
+  },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    evaluateofficerAdd
+  },
+  methods: {
+    showFlagFormat (row, column) {
+      if (row.sex === '0') {
+        return '女'
+      } else {
+        return '男'
+      }
+    },
+    evaluateofficerAddHandle (deptId) {
+      this.evaluateofficerAddVisible = true
+      this.$nextTick(() => {
+        this.$refs.evaluateofficerAdd.dataForm.deptId = deptId
+        this.$refs.evaluateofficerAdd.init()
+      })
+    }
   }
 }
 </script>