From f409d959d32336927273283d3e20387b1eec4b5d Mon Sep 17 00:00:00 2001
From: shj <1790240199@qq.com>
Date: 星期五, 12 八月 2022 11:47:35 +0800
Subject: [PATCH] 对接
---
src/views/goalManagement/performanceAppraisal/index.vue | 8 ++--
src/views/goalManagement/targetDecompositionYear/index.vue | 10 ++--
src/api/goalManagement/index.ts | 62 +++++++++++++++++++++++-------
src/views/goalManagement/targetDecompositionMonth/index.vue | 10 ++--
4 files changed, 61 insertions(+), 29 deletions(-)
diff --git a/src/api/goalManagement/index.ts b/src/api/goalManagement/index.ts
index 83745aa..4af9bc5 100644
--- a/src/api/goalManagement/index.ts
+++ b/src/api/goalManagement/index.ts
@@ -30,7 +30,7 @@
return request({
url: `/targetMng/delete`,
method: "post",
- data:params
+ data: params
})
},
// 目标指标分解-新增或者修改数据
@@ -76,7 +76,7 @@
return request({
url: `/targetDutyfileInfo/delete`,
method: "post",
- data:params
+ data: params
})
},
// 奖惩标准设定 分页查询数据
@@ -107,7 +107,7 @@
return request({
url: `/rewardPunishmentStandard/delete`,
method: "post",
- data:params
+ data: params
})
},
// 奖惩记录 分页查询数据
@@ -138,7 +138,7 @@
return request({
url: `/rewardPunishmentDetail/delete`,
method: "post",
- data:params
+ data: params
})
},
// 绩效考核管理 安全考核管理 分页查询数据
@@ -169,7 +169,7 @@
return request({
url: `/examineMng/delete`,
method: "post",
- data:params
+ data: params
})
},
// 绩效考核管理 考核标准设定 分页查询数据
@@ -200,7 +200,7 @@
return request({
url: `/examineTemplate/delete`,
method: "post",
- data:params
+ data: params
})
},
// 目标汇总 分页查询数据
@@ -248,10 +248,42 @@
data: params
})
},
- // 目标检查上报 (有疑问) 新增或者修改数据 ---???
- getworkApproveAddOrUpdate: (params: object) => {
+ // 目标检查上报 分页查询数据
+ getworkApproveList: (params: object) => {
return request({
- url: "/workApprove/submitApprove",
+ url: "/targetDutyWorkApprove/page/list",
+ method: "post",
+ data: params
+ })
+ },
+ // 目标检查上报 分页查询检查记录
+ getworkApproveListCheckData: (params: object) => {
+ return request({
+ url: "/targetDutyWorkApprove/page/listCheckData",
+ method: "post",
+ data: params
+ })
+ },
+ // 目标检查上报 查询单条数据
+ getworkApproveDetail: (params: any) => {
+ return request({
+ url: `/targetDutyWorkApprove/selectOne/${params}`,
+ method: "get",
+ })
+ },
+
+ // 目标检查上报 新增数据
+ getworkApproveAdd: (params: object) => {
+ return request({
+ url: "/targetDutySummary/addOrUpdate",
+ method: "post",
+ data: params
+ })
+ },
+ // 目标检查上报 删除
+ getworkApproveDelete: (params: any) => {
+ return request({
+ url: "/targetDutyWorkApprove/delete",
method: "post",
data: params
})
@@ -259,16 +291,16 @@
// 部门树
getTreedepartment: () => {
return request({
- url:"/department/list",
- method: "post"
- })
+ url: "/department/list",
+ method: "post"
+ })
},
// 人员
- getManName:(params:any)=>{
+ getManName: (params: any) => {
return request({
- url:`/account/dep/list?depId=${params}`,
- method:"get"
+ url: `/account/dep/list?depId=${params}`,
+ method: "get"
})
}
diff --git a/src/views/goalManagement/performanceAppraisal/index.vue b/src/views/goalManagement/performanceAppraisal/index.vue
index d47901e..08f7512 100644
--- a/src/views/goalManagement/performanceAppraisal/index.vue
+++ b/src/views/goalManagement/performanceAppraisal/index.vue
@@ -28,9 +28,9 @@
<el-table ref="multipleTableRef" :data="tableData" style="width: 100%" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<div class="tableC">
- <el-table :data="tableData.currentExamineDtoList" style="width: 100%">
+ <el-table :data="scope.row.currentExamineDtoList" style="width: 100%">
<el-table-column align="center" prop="itemDetail" label="考核项目" />
<el-table-column align="center" prop="content" label="考核内容" />
<el-table-column align="center" prop="number" label="考核分数" />
@@ -91,9 +91,9 @@
<el-table ref="multipleTableRef" :data="tableDatas" style="width: 100%" @selection-change="handleSelectionChanges">
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<div class="tableC">
- <el-table :data="tableDatas.examineItemList" style="width: 100%">
+ <el-table :data="scope.row.examineItemList" style="width: 100%">
<el-table-column align="center" prop="itemType" label="类型" />
<el-table-column align="center" prop="itemDetail" label="考核项目" />
<el-table-column align="center" prop="content" label="考核内容" />
diff --git a/src/views/goalManagement/targetDecompositionMonth/index.vue b/src/views/goalManagement/targetDecompositionMonth/index.vue
index 7787490..5bf0692 100644
--- a/src/views/goalManagement/targetDecompositionMonth/index.vue
+++ b/src/views/goalManagement/targetDecompositionMonth/index.vue
@@ -32,16 +32,16 @@
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<div class="tableC">
<el-tabs v-model="activeNames">
<el-tab-pane label="目标指标分解" name="1">
- <el-table :data="targetDivideDetailList" style="width: 100%">
- <el-table-column align="center" prop="dutyDepartmentId" label="责任部门" />
+ <el-table :data="scope.row.targetDivideDetailList" style="width: 100%">
+ <el-table-column align="center" prop="dutyDepartmentName" label="责任部门" />
<el-table-column align="center" prop="value" label="考核指标" />
- <el-table-column align="center" prop="makerDepartmentId" label="制定人部门" />
+ <el-table-column align="center" prop="makerDepartmentName" label="制定人部门" />
<el-table-column align="center" prop="makeDate" label="制定日期" />
- <el-table-column align="center" prop="commitPersonId" label="上报人" />
+ <el-table-column align="center" prop="commitPersonName" label="上报人" />
</el-table>
</el-tab-pane>
</el-tabs>
diff --git a/src/views/goalManagement/targetDecompositionYear/index.vue b/src/views/goalManagement/targetDecompositionYear/index.vue
index bbac767..4b37095 100644
--- a/src/views/goalManagement/targetDecompositionYear/index.vue
+++ b/src/views/goalManagement/targetDecompositionYear/index.vue
@@ -32,16 +32,16 @@
<el-table-column label="序号" align="center" type="index" width="70" />
<el-table-column type="selection" align="center" width="55" />
<el-table-column type="expand">
- <template #default>
+ <template #default="scope">
<div class="tableC">
<el-tabs v-model="activeNames">
<el-tab-pane label="目标指标分解" name="1">
- <el-table :data="tableData.targetDivideDetailList" style="width: 100%">
- <el-table-column align="center" prop="dutyDepartmentId" label="责任部门" />
+ <el-table :data="scope.row.targetDivideDetailList" style="width: 100%">
+ <el-table-column align="center" prop="dutyDepartmentName" label="责任部门" />
<el-table-column align="center" prop="value" label="考核指标" />
- <el-table-column align="center" prop="makerDepartmentId" label="制定人部门" />
+ <el-table-column align="center" prop="makerDepartmentName" label="制定人部门" />
<el-table-column align="center" prop="makeDate" label="制定日期" />
- <el-table-column align="center" prop="commitPersonId" label="上报人" />
+ <el-table-column align="center" prop="commitPersonName" label="上报人" />
</el-table>
</el-tab-pane>
</el-tabs>
--
Gitblit v1.9.2