-
+ {
+ console.log(result)
+ if (result.status === 0) {
+ this.$message.success(result.data)
+ this.isSubmit = false
+ this.init()
+ } else {
+ this.$message.error(result.data)
+ }
+ })
+ },
+ //审核
+ addExpApply (a) {
+ this.isSubmit = true
+ this.isExamine = a
},
init () {
this.reimburseId = this.$route.params.id
@@ -101,10 +154,14 @@ export default {
Api.ProjectManagements.getIndicators(param.pageNoUtil).then(result => {
console.log('result', result)
if (result.status === 0) {
+ this.pageLoading = false
this.tableRowsData.splice(0, this.tableRowsData.length)
for (let i = 0; i < result.data.ls.length; i++) {
let project = {}
$.extend(true, project, result.data.ls[i])
+ project.execution = project.ext.execution
+ project.selfEvaluation = project.ext.selfEvaluation
+ project.adminScoring = project.ext.adminScoring
this.tableRowsData.push(project)
this.tableTotalPage = result.data.total
}
@@ -161,14 +218,17 @@ export default {
},
{
label: '指标完成情况',
+ prop: 'execution',
show: true
},
{
label: '自评定级',
+ prop: 'selfEvaluation',
show: true
},
{
label: '所项目管理员打分',
+ prop: 'adminScoring',
show: true
}
]
@@ -179,8 +239,11 @@ export default {
},
tableSingleCheck (index) {
this.$router.push({
- name: 'ProjectBudgetApplyDetail',
- params: {id: this.tableRowsData[index].id}
+ name: 'quarterlyEvaluationDetail',
+ params: {
+ id: this.tableRowsData[index].id,
+ pid: this.reimburseId
+ }
})
},
tableSingleEdit (index) {
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
new file mode 100644
index 0000000..bb0d2b0
--- /dev/null
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue
@@ -0,0 +1,473 @@
+
+
+ 审核
+ 驳回
+
+
+
+
+
+
+
diff --git a/kehui-oa-front/src/router/index.js b/kehui-oa-front/src/router/index.js
index 6369f21..1642647 100644
--- a/kehui-oa-front/src/router/index.js
+++ b/kehui-oa-front/src/router/index.js
@@ -328,7 +328,7 @@ const DepartmentWeeklyList = r => require.ensure([], () => r(require('../pages/p
//季度考核管理
const quarterlyAssessmentApply = r => require.ensure([], () => r(require('../pages/projectManagements/quarterlyAssessment/quarterlyAssessmentApply.vue')), 'quarterlyAssessmentApply')
const quarterlyAssessmentDetail = r => require.ensure([], () => r(require('../pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue')), 'quarterlyAssessmentDetail')
-
+const quarterlyEvaluationDetail = r => require.ensure([], () => r(require('../pages/projectManagements/quarterlyAssessment/quarterlyEvaluationDetail.vue')), 'quarterlyEvaluationDetail')
const DepartmentWeeklyEdit = r => require.ensure([], () => r(require('../pages/projectManagements/departmentWeekly/DepartmentWeeklyEdit.vue')), 'DepartmentWeeklyEdit')
const DepartmentWorkloadEdit = r => require.ensure([], () => r(require('../pages/projectManagements/departmentWeekly/DepartmentWorkloadEdit.vue')), 'DepartmentWorkloadEdit')
@@ -2382,13 +2382,23 @@ export default new Router({
{
// 项目管理-->季度审核管理-->季度审核页面->季度页面
name: 'quarterlyAssessmentDetail',
- path: '/project/managements/quarterlyAssessment/expenses/claim/apply/quarter',
+ path: '/project/managements/quarterlyAssessment/expenses/claim/apply/quarter/:id',
component: quarterlyAssessmentDetail,
meta: {
info: 'quarterlyAssessmentDetail',
module: 'project'
}
},
+ {
+ // 项目管理-->季度审核管理-->季度审核页面->季度详情页面
+ name: 'quarterlyEvaluationDetail',
+ path: '/project/managements/quarterlyAssessment/expenses/claim/edit/:id',
+ component: quarterlyEvaluationDetail,
+ meta: {
+ info: 'quarterlyEvaluationDetail',
+ module: 'finance'
+ }
+ },
//
// {
// //项目管理-->项目立项
diff --git a/kehui-oa-front/src/server/projectManagements/index.js b/kehui-oa-front/src/server/projectManagements/index.js
index 9cb5922..d89e0c1 100644
--- a/kehui-oa-front/src/server/projectManagements/index.js
+++ b/kehui-oa-front/src/server/projectManagements/index.js
@@ -59,6 +59,9 @@ export default {
getQuarterExamine: (param) => Ax('post', '/api/project/quarterExamine', param),
//获取季度列表
getIndicators: (param) => Ax('post', '/api/project/quarterExamine/list', param),
+ //自评/管理员打分
+ updateQuarterly: (param) => Ax('post', '/api/project/quarterExamine/update', param),
+ examine: (param) => Ax('post', '/api/project/quarterExamine/examine', param),
/**
* 部门周报填报管理
* */
+
+
+
+
+
+
+
+
+
+
+
+
+ 季度评价打分
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+