diff --git a/src/api/parExamPlan.js b/src/api/parExamPlan.js
index 667d395aa39db95696f966c853de7eb9bf5eae3f..5fd0064a5479a45c61a9f258f7e745d20908aae9 100644
--- a/src/api/parExamPlan.js
+++ b/src/api/parExamPlan.js
@@ -3,14 +3,18 @@ import $notification from 'ant-design-vue/es/notification'
 const api = {
   // 新增计划
   insertPlan: '/par/examPlan/insertPlan',
+  insertPlanPersonnel: '/par/examPlan/insertPlanPersonnel',
   updatePlan: '/par/examPlan/updatePlan',
   deletePlan: '/par/examPlan/deletePlan',
   queryPlan: '/par/examPlan/queryPlan',
+  queryPlanPersonnel: '/par/examPlan/queryPlanPersonnel',
   baseUrl: '/par/examPlan',
   queryOrg: '/par/examPlan/queryOrg',
   queryCate: '/par/examPlan/queryCate',
   queryItem: '/par/examPlan/queryCateItem',
-  insertItem: '/par/examPlan/insertItem'
+  queryItemPersonnel: '/par/examPlan/queryCateItemPersonnel',
+  insertItem: '/par/examPlan/insertItem',
+  queryPeriod: '/par/examPlan/queryPeriod'
 }
 /**
  * 新增计划
@@ -22,6 +26,13 @@ export function insertPlan (parameter) {
     data: parameter
   })
 }
+export function insertPlanPersonnel (parameter) {
+  return axios({
+    url: api.insertPlanPersonnel,
+    method: 'post',
+    data: parameter
+  })
+}
 export function updatePlan (parameter) {
   return axios({
     url: api.baseUrl,
@@ -43,6 +54,13 @@ export function queryPlan (parameter) {
     params: parameter
   })
 }
+export function queryPlanPersonnel (parameter) {
+  return axios({
+    url: api.queryPlanPersonnel,
+    method: 'get',
+    params: parameter
+  })
+}
 export function queryOrg (parameter) {
   return axios({
     url: api.queryOrg,
@@ -64,6 +82,13 @@ export function queryItem (parameter) {
     params: parameter
   })
 }
+export function queryItemPersonnel (parameter) {
+  return axios({
+    url: api.queryItemPersonnel,
+    method: 'get',
+    params: parameter
+  })
+}
 export function insertItem (parameter) {
   return axios({
     url: api.insertItem,
@@ -71,3 +96,10 @@ export function insertItem (parameter) {
     data: parameter
   })
 }
+export function queryPeriod (parameter) {
+  return axios({
+    url: api.queryPeriod,
+    method: 'get',
+    data: parameter
+  })
+}
diff --git a/src/config/router.config.js b/src/config/router.config.js
index c1ef224cba07232a00a2cabf04c8a9629defdf38..d04f81445861f21d7c0d0ccb199e572963cf35c7 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -157,6 +157,22 @@ export const asyncRouterMap = [
             meta: {
               title: '考评管理(个人)'
             }
+          },
+          {
+            path: 'par-exam-plan',
+            name: 'ParExamPlan',
+            component: () => import(/* webpackChunkName: "parExamPlan" */ '@/views/par/examPlan/ParExamPlan.vue'),
+            meta: {
+              title: '绩效考核计划（部门）'
+            }
+          },
+          {
+            path: 'par-exam-plan-personnel',
+            name: 'ParExamPlanPersonnel',
+            component: () => import(/* webpackChunkName: "parExamPlan" */ '@/views/par/examPlan/ParExamPlanPersonnel.vue'),
+            meta: {
+              title: '绩效考核计划（个人）'
+            }
           }
         ]
       },
diff --git a/src/views/par/examPlan/ParExamCate.vue b/src/views/par/examPlan/ParExamCate.vue
index 3b0f89d6cf923ec3e48b5ca299a73aa645810156..426c7e4423dd891cb5a106ad88e4c301a795c345 100644
--- a/src/views/par/examPlan/ParExamCate.vue
+++ b/src/views/par/examPlan/ParExamCate.vue
@@ -51,6 +51,7 @@ export default {
       },
       loading: true,
       param: {},
+      type: '',
       queryParam: {
         kpjhbid: '',
         pageNo: 1, // 第几页
@@ -69,6 +70,7 @@ export default {
         {
           title: '考评项目',
           dataIndex: 'kpxm',
+          ellipsis: true,
           customRender: function (text, record) {
             if (record.kpgzfl === undefined) {
               return record.kpdlname
@@ -78,7 +80,7 @@ export default {
           }
         },
         {
-          title: '操作', width: '280px', dataIndex: 'action', scopedSlots: { customRender: 'action' }
+          title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }
         }
       ]
       /* // 加载数据方法 必须为 Promise 对象
@@ -111,7 +113,8 @@ export default {
       this.queryParam.pageSize = pagination.pageSize
       this.loadData(this.queryParam)
     },
-    begin: function (record) {
+    begin: function (record, type) {
+      this.type = type
       this.editVisible = true
       this.queryParam.kpjhbid = record.id
       this.param = record
@@ -120,7 +123,7 @@ export default {
     handlePermission (record) {
       // record.kpdl = this.param.kpdl
       record.dwlx = this.param.dwlx
-      this.$refs.examItemModel.begin(record)
+      this.$refs.examItemModel.begin(record, this.type)
     },
     handleEditOk () {
       this.close()
diff --git a/src/views/par/examPlan/ParExamItem.vue b/src/views/par/examPlan/ParExamItem.vue
index b4a4ea824745eaf87234299e3cfdbdeb8048eac4..5c80a5cc0f9270844fe80a63fcb5efff304e0cd8 100644
--- a/src/views/par/examPlan/ParExamItem.vue
+++ b/src/views/par/examPlan/ParExamItem.vue
@@ -26,7 +26,7 @@
 
 <script>
 import { STable } from '@/components'
-import { insertItem, queryItem } from '@/api/parExamPlan'
+import { insertItem, queryItem, queryItemPersonnel } from '@/api/parExamPlan'
 export default {
   name: 'Rolelist',
   components: {
@@ -37,6 +37,7 @@ export default {
     return {
       // 编辑弹出框
       param: {},
+      type: '',
       // 页码
       pagination: {
         total: 0,
@@ -95,16 +96,29 @@ export default {
   methods: {
     // 加载数据方法
     loadData (parameter) {
-      queryItem(parameter).then(res => {
-        this.itemList = res.result.data
-        const pagination = { ...this.pagination }
-        pagination.total = res.result.totalCount
-        this.pagination = pagination
-        this.loading = false
-        if (this.param.kpxm !== '' && this.param.kpxm !== null && this.param.kpxm !== undefined) {
-          this.selectedRowKeys = this.param.kpxmid.split(',')
-        }
-      })
+      if (this.type === 'org') {
+        queryItem(parameter).then(res => {
+          this.itemList = res.result.data
+          const pagination = { ...this.pagination }
+          pagination.total = res.result.totalCount
+          this.pagination = pagination
+          this.loading = false
+          if (this.param.kpxm !== '' && this.param.kpxm !== null && this.param.kpxm !== undefined) {
+            this.selectedRowKeys = this.param.kpxmid.split(',')
+          }
+        })
+      } else if (this.type === 'personnel') {
+        queryItemPersonnel(parameter).then(res => {
+          this.itemList = res.result.data
+          const pagination = { ...this.pagination }
+          pagination.total = res.result.totalCount
+          this.pagination = pagination
+          this.loading = false
+          if (this.param.kpxm !== '' && this.param.kpxm !== null && this.param.kpxm !== undefined) {
+            this.selectedRowKeys = this.param.kpxmid.split(',')
+          }
+        })
+      }
     },
     handleTableChange (pagination) {
       this.pagination.current = pagination.current
@@ -113,14 +127,14 @@ export default {
       this.queryParam.pageSize = pagination.pageSize
       this.loadData(this.queryParam)
     },
-    begin: function (record) {
+    begin: function (record, type) {
+      this.type = type
       this.editVisible = true
       this.param = record
       this.queryParam.dwlx = record.dwlx
       this.queryParam.kpdl = record.kpgzfl
       this.queryParam.id = record.id
       this.loadData(this.queryParam)
-      debugger
       this.selectedRowKeys = record.kpxmid.split(',')
     },
     onSelectChange (selectedRowKeys, selectedRows) {
diff --git a/src/views/par/examPlan/ParExamPlan.vue b/src/views/par/examPlan/ParExamPlan.vue
index 2ec56e4fcf2f88f41fabbf822fdb82d38af05c97..bb1390880ad53312418c2d9ea4c4647bc06b5ae3 100644
--- a/src/views/par/examPlan/ParExamPlan.vue
+++ b/src/views/par/examPlan/ParExamPlan.vue
@@ -227,21 +227,21 @@ export default {
     handleEdit (record) {
       this.mdl = Object.assign({}, record)
       this.mdl.inOrUp = 'update'
-      this.$refs.planItemModel.begin(this.mdl)
+      this.$refs.planItemModel.begin(this.mdl, 'org')
     },
     /**
      * 新增弹出框
      */
     handleAdd () {
       this.mdl.inOrUp = 'insert'
-      this.$refs.planItemModel.begin(this.mdl)
+      this.$refs.planItemModel.begin(this.mdl, 'org')
     },
     /**
      * 编辑弹出框
      */
     handleCate (record) {
       this.mdl = Object.assign({}, record)
-      this.$refs.examCateModel.begin(this.mdl)
+      this.$refs.examCateModel.begin(this.mdl, 'org')
     },
     /**
      * 列表刷新
diff --git a/src/views/par/examPlan/ParExamPlanPersonnel.vue b/src/views/par/examPlan/ParExamPlanPersonnel.vue
new file mode 100644
index 0000000000000000000000000000000000000000..a4ee8715285e2722c6f1b5acf7d96ca9ed80cce7
--- /dev/null
+++ b/src/views/par/examPlan/ParExamPlanPersonnel.vue
@@ -0,0 +1,250 @@
+<template>
+  <a-card :bordered="false">
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline">
+        <a-row class="form-row" justify="space-around" align="middle" type="flex" style="margin-top: 10px">
+          <a-col :span="6" :offset="1">
+            <a-form-item label="考评名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input placeholder="请输入" v-model="queryParam.kpjhmc" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" :offset="1">
+            <a-form-item label="单位类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select placeholder="请选择" v-model="queryParam.dwlx">
+                <a-select-option value="1">机关</a-select-option>
+                <a-select-option value="2">层级单位</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <a-row class="form-row" justify="space-around" align="middle" type="flex">
+          <a-col :span="6" :offset="1">
+            <a-form-item label="考评时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                v-model="timeDate"
+                :show-time="{ format: 'HH:mm' }"
+                format="YYYY-MM-DD HH:mm"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="6" :offset="1">
+            <span class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchPlan">查询</a-button>
+              <a-button style="margin-left: 8px" @click="resetPlan">重置</a-button>
+              <a-button
+                type="primary"
+                style="margin-left: 30px"
+                @click="handleAdd()"
+              >新建计划</a-button>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+
+    <s-table ref="stable" size="default" :columns="columns" :data="loadData">
+      <span slot="action" slot-scope="text, record">
+        <a @click="handleCate(record)" >制定考评项</a>
+        <a-divider type="vertical" />
+        <a v-if="record.zt == 2" @click="handleDelete('start',record)">启用</a>
+        <a v-if="record.zt == 1" @click="handleDelete('start',record)">禁用</a>
+        <a-divider type="vertical" />
+        <a @click="handleEdit(record)">编辑</a>
+        <a-divider type="vertical" />
+        <a @click="handleDelete('delete',record)">删除</a>
+      </span>
+    </s-table>
+    <plan-item ref="planItemModel" @success="refreshPlan"></plan-item>
+    <par-exam-cate ref="examCateModel"></par-exam-cate>
+  </a-card>
+</template>
+
+<script>
+import { STable } from '@/components'
+import { queryPlanPersonnel, updatePlan } from '@/api/parExamPlan'
+import PlanItem from '@/views/par/examPlan/PlanItem'
+import ParExamCate from '@/views/par/examPlan/ParExamCate'
+import moment from 'moment'
+export default {
+  name: 'Rolelist',
+  components: {
+    STable,
+    // RoleAuth,
+    PlanItem,
+    ParExamCate
+  },
+  data () {
+    return {
+      // 编辑弹出框
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      editForm: this.$form.createForm(this),
+      // 角色行信息
+      mdl: {},
+      // 查询参数
+      queryParam: {},
+      timeDate: [],
+      // 表头
+      columns: [
+        {
+          title: '考评名称',
+          dataIndex: 'kpjhmc'
+        },
+        {
+          title: '考评开始时间',
+          dataIndex: 'kssj'
+        },
+        {
+          title: '考评结束时间',
+          dataIndex: 'jssj'
+        },
+        {
+          title: '考评单位',
+          dataIndex: 'kprName'
+        },
+        {
+          title: '检查方式',
+          dataIndex: 'jcfs',
+          customRender: function (text) {
+            if (text === '1') {
+              return '四不两直检查'
+            } else {
+              return '定期检查'
+            }
+          }
+        },
+        {
+          title: '创建人',
+          dataIndex: 'crtName'
+        },
+        {
+          title: '创建时间',
+          dataIndex: 'crtTime'
+        },
+        { title: '操作', width: '280px', dataIndex: 'action', scopedSlots: { customRender: 'action' }
+        }
+      ],
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return queryPlanPersonnel(parameter, { scbj: '0' }).then(res => {
+          return res.result
+        })
+      }
+    }
+  },
+  methods: {
+    /**
+     * CheckBox选择事件
+     * 多选框绑定值修改时对应调整this.mdl内容
+     * 用于向后台传递数据
+     * 这里用中间值tempSelected绑定多选框，是为了解决无法多选框无法点击的问题
+     */
+    onChange (value, dateString) {
+      console.log('Selected Time: ', value)
+      console.log('Formatted Selected Time: ', dateString)
+    },
+    /**
+     * 权限分配弹出框
+     */
+    handleDelete (flag, record) {
+      let param = {}
+      if (flag === 'delete') {
+        param = { id: record.id, scbj: '1' }
+      } else if (flag === 'start') {
+        param = { id: record.id, zt: record.zt === '1' ? '2' : '1' }
+      }
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: flag === 'delete' ? '是否删除?' : ('是否' + (record.zt === '1' ? '禁用' : '启用')),
+        onOk () {
+          return updatePlan(param)
+            .then(res => {
+              if (res.status === 200) {
+                _this.$notification['success']({
+                  message: '操作成功',
+                  duration: 2
+                })
+                // 关闭编辑框
+                _this.editVisible = false
+                // 刷新列表
+                // this.$refs.stable.refresh(true)
+                _this.$refs.stable.refresh(true)
+              } else {
+                _this.$notification['error']({
+                  message: res.message,
+                  duration: 4
+                })
+              }
+            })
+            .catch(() =>
+              this.$notification['error']({
+                message: '出现异常，请联系系统管理员',
+                duration: 4
+              })
+            )
+            .finally(() => {
+              // this.confirmLoading = false
+            })
+        },
+        onCancel () {}
+      })
+    },
+    /**
+     * 搜索
+     */
+    searchPlan () {
+      console.log(this.queryParam)
+      // eslint-disable-next-line use-isnan
+      if (this.timeDate !== [] && this.timeDate.length !== 0) {
+        this.queryParam.kssj = moment(this.timeDate[0], 'YYYY-MM-DD HH:mm:ss').valueOf()
+        this.queryParam.jssj = moment(this.timeDate[1], 'YYYY-MM-DD HH:mm:ss').valueOf()
+      }
+      this.$refs.stable.loadData({}, this.queryParam, {})
+    },
+    resetPlan () {
+      this.queryParam = {}
+      this.timeDate = []
+    },
+    /**
+     * 编辑弹出框
+     */
+    handleEdit (record) {
+      this.mdl = Object.assign({}, record)
+      this.mdl.inOrUp = 'update'
+      this.$refs.planItemModel.begin(this.mdl, 'personnel')
+    },
+    /**
+     * 新增弹出框
+     */
+    handleAdd () {
+      this.mdl.inOrUp = 'insert'
+      this.$refs.planItemModel.begin(this.mdl, 'personnel')
+    },
+    /**
+     * 编辑弹出框
+     */
+    handleCate (record) {
+      this.mdl = Object.assign({}, record)
+      this.$refs.examCateModel.begin(this.mdl, 'personnel')
+    },
+    /**
+     * 列表刷新
+     */
+    refreshPlan () {
+      this.$refs.stable.refresh(true)
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue
index b7f767a25d9c29618d87c8c7336aeb36ae8209c1..3c3c9f7c6858cc5d14ff28300bdd607859949c0c 100644
--- a/src/views/par/examPlan/PlanItem.vue
+++ b/src/views/par/examPlan/PlanItem.vue
@@ -12,7 +12,7 @@
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评名称">
         <a-input v-decorator="['kpjhmc',{ rules: [{ required: true, message: '请填写考评单位类型' }] }]" />
       </a-form-item>
-      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评单位类型" hasFeedback>
+      <a-form-item v-if="type === 'org'" :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评单位类型" hasFeedback>
         <a-select
           :disabled="inOrUp=='update'?'disabled':false"
           v-decorator="['dwlx', { rules: [{ required: true, message: '请填写考评单位类型' }] }]"
@@ -21,6 +21,16 @@
           <a-select-option value="2">各层级单位</a-select-option>
         </a-select>
       </a-form-item>
+      <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期" hasFeedback>
+        <a-select
+          size="default"
+          v-decorator="['kpzqid', { rules: [{ required: true, message: '请填写考评周期' }] }]"
+        >
+          <a-select-option v-for="kpzq in kpzqList" :value="kpzq.ID" :key="kpzq.ID">
+            {{ kpzq.NAME }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
       <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="检查方式" hasFeedback>
         <a-select
           v-decorator="['jcfs',{ rules: [{ required: true, message: '请填写考评单位类型' }] }]"
@@ -42,7 +52,7 @@
   </a-modal>
 </template>
 <script>
-import { insertPlan, queryOrg, updatePlan } from '@/api/parExamPlan'
+import { insertPlan, insertPlanPersonnel, updatePlan, queryPeriod } from '@/api/parExamPlan'
 import moment from 'moment'
 export default {
   name: 'PlanItem',
@@ -53,6 +63,7 @@ export default {
       editVisible: false,
       editForm: this.$form.createForm(this),
       inOrUp: '',
+      type: '',
       confirmLoading: false,
       labelCol: {
         xs: { span: 24 },
@@ -62,13 +73,16 @@ export default {
         xs: { span: 24 },
         sm: { span: 16 }
       },
-      id: ''
+      id: '',
+      kpzqList: []
     }
   },
   created () {
   },
   methods: {
-    begin: function (record) {
+    begin: function (record, type) {
+      this.type = type
+      this.queryPeriod()
       this.inOrUp = record.inOrUp
       if (record.inOrUp === 'update') {
         this.id = record.id
@@ -94,12 +108,12 @@ export default {
           })
         }, 0)
       }
-      this.queryOrgs()
       this.editVisible = true
     },
-    queryOrgs () {
-      queryOrg(null).then(res => {
-        // todo 查询部门
+    queryPeriod () {
+      queryPeriod(null).then(res => {
+        this.kpzqList = res.result.data
+        debugger
       })
     },
     /**
@@ -112,34 +126,65 @@ export default {
           values.kssj = moment(values.kssj, 'YYYY-MM-DD HH:mm:ss').valueOf()
           values.jssj = moment(values.jssj, 'YYYY-MM-DD HH:mm:ss').valueOf()
           if (this.inOrUp === 'insert') {
-            return insertPlan(values)
-              .then(res => {
-                if (res.status === 200) {
-                  this.$notification['success']({
-                    message: '创建计划成功',
-                    duration: 2
+            if (this.type === 'org') {
+              return insertPlan(values)
+                .then(res => {
+                  if (res.status === 200) {
+                    this.$notification['success']({
+                      message: '创建计划成功',
+                      duration: 2
+                    })
+                    // 关闭编辑框
+                    this.editVisible = false
+                    // 刷新列表
+                    // this.$refs.stable.refresh(true)
+                    this.$emit('success')
+                  } else {
+                    this.$notification['error']({
+                      message: res.message,
+                      duration: 4
+                    })
+                  }
+                })
+                .catch(() =>
+                  this.$notification['error']({
+                    message: '出现异常，请联系系统管理员',
+                    duration: 4
                   })
-                  // 关闭编辑框
-                  this.editVisible = false
-                  // 刷新列表
-                  // this.$refs.stable.refresh(true)
-                  this.$emit('success')
-                } else {
+                )
+                .finally(() => {
+                  this.confirmLoading = false
+                })
+            } else {
+              return insertPlanPersonnel(values)
+                .then(res => {
+                  if (res.status === 200) {
+                    this.$notification['success']({
+                      message: '创建计划成功',
+                      duration: 2
+                    })
+                    // 关闭编辑框
+                    this.editVisible = false
+                    // 刷新列表
+                    // this.$refs.stable.refresh(true)
+                    this.$emit('success')
+                  } else {
+                    this.$notification['error']({
+                      message: res.message,
+                      duration: 4
+                    })
+                  }
+                })
+                .catch(() =>
                   this.$notification['error']({
-                    message: res.message,
+                    message: '出现异常，请联系系统管理员',
                     duration: 4
                   })
-                }
-              })
-              .catch(() =>
-                this.$notification['error']({
-                  message: '出现异常，请联系系统管理员',
-                  duration: 4
+                )
+                .finally(() => {
+                  this.confirmLoading = false
                 })
-              )
-              .finally(() => {
-                this.confirmLoading = false
-              })
+            }
           } else if (this.inOrUp === 'update') {
             values.id = this.id
             return updatePlan(values)