diff --git a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
index bdb2180..fc11de8 100644
--- a/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
+++ b/kehui-oa-front/src/pages/projectManagement/AddProjectApply.vue
@@ -1026,7 +1026,7 @@ export default {
})
this.$router.go(-1)
} else {
- this.$message.error(result.msg)
+ this.$message.error(result.data)
}
})
},
diff --git a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
index 155c012..5a4f07f 100644
--- a/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
+++ b/kehui-oa-front/src/pages/projectManagements/quarterlyAssessment/quarterlyAssessmentDetail.vue
@@ -3,7 +3,7 @@
-
+
@@ -61,7 +61,7 @@ import PageLoading from '../../../components/PageLoading.vue'
import DataForm from '../../../components/form/DataForm.vue'
import DataTable from '../../../components/DataTable.vue'
import Api from '../../../server/index.js'
-import {getItem} from '../../../config/mUtils'
+import {getItem, setItem} from '../../../config/mUtils'
export default {
computed: {
@@ -76,6 +76,7 @@ export default {
},
data () {
return {
+ isOffice: false,
isExamine: 0,
isSubmit: false,
formData: {
@@ -105,10 +106,26 @@ export default {
}
},
created () {
+ this.getOffice()
this.initTableColumns()
this.init()
},
methods: {
+ getOffice () {
+ let id = this.$route.params.id
+ Api.ProjectManagements.getOffice(id).then(result => {
+ console.log('getoffice', result)
+ if (result.status === 0) {
+ if (result.data === "0") {
+ this.isOffice = true
+ } else {
+ this.isOffice = false
+ }
+ } else {
+ this.$message.error(result.data)
+ }
+ })
+ },
close () {
this.isSubmit = false
this.formData.spyj = ''
@@ -170,71 +187,121 @@ export default {
}
}
})
- // Api.ProjectManagements.getProject(param).then(result => {
- // console.log('result', result)
- // if (result.status === 0) {
- // 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])
- // console.log('project', project)
- // project.difficultyFactor = project.ext.difficultyFactor
- // project.draftDeptName = project.ext.draftDeptName
- // this.tableRowsData.push(project)
- // this.tableTotalPage = result.data.total
- // }
- // }
- // })
},
//初始化tableColumns
initTableColumns () {
- this.tableColumnsData = [
- {
- label: '季度',
- prop: 'quarter',
- show: true
- },
- {
- label: '指标名称',
- prop: 'indexName',
- show: true
- },
- {
- label: 'A档',
- prop: 'levelA',
- show: true
- },
- {
- label: 'B档',
- prop: 'levelB',
- show: true
- },
- {
- label: 'C档',
- prop: 'levelC',
- show: true
- },
- {
- label: 'D档',
- prop: 'levelD',
- show: true
- },
- {
- label: '指标完成情况',
- prop: 'execution',
- show: true
- },
- {
- label: '自评定级',
- prop: 'selfEvaluation',
- show: true
- },
- {
- label: '所项目管理员打分',
- prop: 'adminScoring',
- show: true
- }
- ]
+ if (this.isOffice) {
+ this.tableColumnsData = [
+ {
+ label: '季度',
+ prop: 'quarter',
+ show: true
+ },
+ {
+ label: '指标名称',
+ prop: 'indexName',
+ show: true
+ },
+ {
+ label: 'A档',
+ prop: 'levelA',
+ show: true
+ },
+ {
+ label: 'B档',
+ prop: 'levelB',
+ show: true
+ },
+ {
+ label: 'C档',
+ prop: 'levelC',
+ show: true
+ },
+ {
+ label: 'D档',
+ prop: 'levelD',
+ show: true
+ },
+ {
+ label: '指标完成情况',
+ prop: 'execution',
+ show: true
+ },
+ {
+ label: '自评定级',
+ prop: 'selfEvaluation',
+ show: true
+ },
+ {
+ label: '所项目管理员打分',
+ prop: 'adminScoring',
+ show: true
+ }
+ ]
+ } else {
+ this.tableColumnsData = [
+ {
+ label: '季度',
+ prop: 'quarter',
+ show: true
+ },
+ {
+ label: '指标名称',
+ prop: 'indexName',
+ show: true
+ },
+ {
+ label: 'A档',
+ prop: 'levelA',
+ show: true
+ },
+ {
+ label: 'B档',
+ prop: 'levelB',
+ show: true
+ },
+ {
+ label: 'C档',
+ prop: 'levelC',
+ show: true
+ },
+ {
+ label: 'D档',
+ prop: 'levelD',
+ show: true
+ },
+ {
+ label: '指标完成情况',
+ prop: 'execution',
+ show: true
+ },
+ {
+ label: '战略规划部评级',
+ prop: 'strategyScoring',
+ show: true
+ },
+ {
+ label: '平台建设部评级',
+ prop: 'platformScoring',
+ show: true
+ },
+ {
+ label: '市场发展部评级',
+ prop: 'marketScoring',
+ show: true
+ },
+ {
+ label: '服务产品部评级',
+ prop: 'serviceScoring',
+ show: true
+ },
+ {
+ label: '项目平均分',
+ // prop: '',
+ show: true
+ }
+ ]
+ }
},
tableSelectPage (param) {
this.pageNo = param
diff --git a/kehui-oa-front/src/server/projectManagements/index.js b/kehui-oa-front/src/server/projectManagements/index.js
index 90b1999..1a1476c 100644
--- a/kehui-oa-front/src/server/projectManagements/index.js
+++ b/kehui-oa-front/src/server/projectManagements/index.js
@@ -62,6 +62,7 @@ export default {
//自评/管理员打分
updateQuarterly: (param) => Ax('post', '/api/project/quarterExamine/update', param),
examine: (param) => Ax('post', '/api/project/quarterExamine/examine', param),
+ getOffice: (id) => Ax('get', `/api/project/quarterExamine/getOffice/${id}`, id),
/**
* 部门周报填报管理
* */