From b4a1607dd02113aaa4ab48480cc830ffd169e76e Mon Sep 17 00:00:00 2001 From: leewand Date: Tue, 1 Sep 2020 08:55:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E8=AF=84=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/parExamPlan.js | 34 ++- src/config/router.config.js | 10 +- src/views/par/examPlan/ParExamCate.vue | 9 +- src/views/par/examPlan/ParExamItem.vue | 40 ++- src/views/par/examPlan/ParExamPlan.vue | 6 +- .../par/examPlan/ParExamPlanPersonnel.vue | 250 ++++++++++++++++++ src/views/par/examPlan/PlanItem.vue | 107 +++++--- 7 files changed, 404 insertions(+), 52 deletions(-) create mode 100644 src/views/par/examPlan/ParExamPlanPersonnel.vue diff --git a/src/api/parExamPlan.js b/src/api/parExamPlan.js index 667d395..5fd0064 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 77faad0..0491d1c 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -139,7 +139,15 @@ export const asyncRouterMap = [ name: 'ParExamPlan', component: () => import(/* webpackChunkName: "parExamPlan" */ '@/views/par/examPlan/ParExamPlan.vue'), meta: { - title: '绩效基础数据' + 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 3b0f89d..426c7e4 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 b4a4ea8..5c80a5c 100644 --- a/src/views/par/examPlan/ParExamItem.vue +++ b/src/views/par/examPlan/ParExamItem.vue @@ -26,7 +26,7 @@ + diff --git a/src/views/par/examPlan/PlanItem.vue b/src/views/par/examPlan/PlanItem.vue index b7f767a..3c3c9f7 100644 --- a/src/views/par/examPlan/PlanItem.vue +++ b/src/views/par/examPlan/PlanItem.vue @@ -12,7 +12,7 @@ - + 各层级单位 + + + + {{ kpzq.NAME }} + + +