diff --git a/src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue b/src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue index d50b53b..f97e76e 100644 --- a/src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue +++ b/src/views/modules/supplierPerformance/myPerformanceEvaluateRequest.vue @@ -2,7 +2,7 @@
- + @@ -36,13 +36,11 @@ - - - - - - - + @@ -54,7 +52,7 @@ - + @@ -80,7 +78,7 @@
- 季度供应商绩效评级请求 + 考核单
@@ -113,7 +111,7 @@ - + @@ -135,7 +133,7 @@ - @@ -152,7 +150,7 @@ 指标信息 - + @@ -296,6 +294,10 @@ import { } from '@/api/supplierPerformance/performanceEvaluateRequestBuild.js' import Chooselist from '@/views/modules/common/Chooselist_eam' import {getTemplateIndicators} from "../../../api/supplierPerformance/performanceIndicatorTemplate"; +import { + PERF_TASK_STATUS_OPTIONS, + PERF_TASK_STATUS_DEFAULT +} from './supplierPerformanceStatusOptions.js' export default { components: { @@ -310,6 +312,7 @@ export default { pageIndex: 1, pageSize: 20, totalPage: 0, + taskStatusOptions: PERF_TASK_STATUS_OPTIONS, searchData: { site: this.$store.state.user.site, username: this.$store.state.user.name, @@ -401,7 +404,7 @@ export default { calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, getList() { this.loading = true - if (this.searchData.statusList.length === 0) this.searchData.statusList = ['未开始','进行中','已完成','已审核','待审批','审批通过','审批拒绝'] + if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_TASK_STATUS_DEFAULT] const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 1 } searchEvaluateRequestList(params).then(({data}) => { if (data && (data.code === 0 || data.code === '0')) { @@ -486,10 +489,10 @@ export default { } const hasScored = indicators.some(i => Number(i.score) > 0) if (hasScored) { - this.$message.error('该请求存在已评分指标 ,禁止删除') + this.$message.error('该考核任务存在已评分指标,禁止删除') return } - this.$confirm('确认删除该请求: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => { + this.$confirm('确认删除该考核任务: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => { deleteEvaluateRequest({ id: row.id, site }).then(({data: delData}) => { if (delData && (delData.code === 0 || delData.code === '0')) { this.$message.success('删除成功'); this.getList() } else { this.$message.error((delData && delData.msg) || '删除失败') } diff --git a/src/views/modules/supplierPerformance/perMyScore.vue b/src/views/modules/supplierPerformance/perMyScore.vue index 70dc3ba..d8bf6c8 100644 --- a/src/views/modules/supplierPerformance/perMyScore.vue +++ b/src/views/modules/supplierPerformance/perMyScore.vue @@ -2,7 +2,7 @@
- + @@ -35,13 +35,11 @@ - - - - - - - + @@ -58,7 +56,7 @@ 评分 - + @@ -75,7 +73,7 @@
- 季度供应商绩效评级请求 + 考核单
@@ -93,7 +91,7 @@ - + @@ -109,7 +107,7 @@ - 季度供应商绩效评级请求 + 考核单
@@ -176,6 +174,10 @@ import { } from "../../../api/supplierPerformance/performanceIndicatorTemplate"; import {getEvaluateRequestIndicatorsOfScore} from "../../../api/supplierPerformance/myPerformanceEvaluateRequest"; import { saveEvaluateRequestIndicatorScore } from '@/api/supplierPerformance/myPerformanceEvaluateRequest.js' +import { + PERF_TASK_STATUS_OPTIONS, + PERF_TASK_STATUS_DEFAULT +} from './supplierPerformanceStatusOptions.js' export default { components: { @@ -190,6 +192,7 @@ export default { pageIndex: 1, pageSize: 20, totalPage: 0, + taskStatusOptions: PERF_TASK_STATUS_OPTIONS, searchData: { site: this.$store.state.user.site, username: this.$store.state.user.name, @@ -304,7 +307,7 @@ export default { calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, getList() { this.loading = true - if (this.searchData.statusList.length === 0) this.searchData.statusList = ['未开始','进行中','已完成','已审核','待审批','审批通过','审批拒绝'] + if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_TASK_STATUS_DEFAULT] const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 3 } searchEvaluateRequestList(params).then(({data}) => { if (data && (data.code === 0 || data.code === '0')) { @@ -374,7 +377,7 @@ export default { }, saveScore(saveType) { if (this.createSaving) return - if (!this.currentRequest || !this.currentRequest.id) { this.$message.warning('缺少当前请求'); return } + if (!this.currentRequest || !this.currentRequest.id) { this.$message.warning('缺少当前考核单'); return } if (!this.canScore(this.currentRequest)) { this.$message.warning('当前状态不允许评分'); return } // 过滤有效评分(非空且非0) const scored = (this.indicatorList||[]).filter(it => it && it.indicatorCode && it.score !== '' && it.score !== null && Number(it.score) !== 0) diff --git a/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue b/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue index 94500d4..4d0fa43 100644 --- a/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue +++ b/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue @@ -2,7 +2,7 @@
- + @@ -35,13 +35,11 @@ - - - - - - - + @@ -60,7 +58,7 @@ - + @@ -77,7 +75,7 @@
- 季度供应商绩效评级请求 + 考核单
@@ -110,7 +108,7 @@ - + @@ -132,7 +130,7 @@ - @@ -149,7 +147,7 @@ Indicator Info - + @@ -262,6 +260,10 @@ import { } from '@/api/supplierPerformance/performanceEvaluateRequestBuild.js' import Chooselist from '@/views/modules/common/Chooselist_eam' import {getTemplateIndicators} from "../../../api/supplierPerformance/performanceIndicatorTemplate"; +import { + PERF_TASK_STATUS_OPTIONS, + PERF_TASK_STATUS_DEFAULT +} from './supplierPerformanceStatusOptions.js' export default { components: { @@ -276,6 +278,7 @@ export default { pageIndex: 1, pageSize: 20, totalPage: 0, + taskStatusOptions: PERF_TASK_STATUS_OPTIONS, searchData: { site: this.$store.state.user.site, username: this.$store.state.user.name, @@ -367,7 +370,7 @@ export default { calcHeight() { this.$nextTick(()=> { this.height = window.innerHeight - 40 }) }, getList() { this.loading = true - if (this.searchData.statusList.length === 0) this.searchData.statusList = ['未开始','进行中','已完成','已审核','待审批','审批通过','审批拒绝'] + if (this.searchData.statusList.length === 0) this.searchData.statusList = [...PERF_TASK_STATUS_DEFAULT] const params = { ...this.searchData, statusList: this.searchData.statusList, page: this.pageIndex, limit: this.pageSize,selectType: 2 } searchEvaluateRequestList(params).then(({data}) => { if (data && (data.code === 0 || data.code === '0')) { @@ -452,10 +455,10 @@ export default { } const hasScored = indicators.some(i => Number(i.score) > 0) if (hasScored) { - this.$message.error('该请求存在已评分指标 ,禁止删除') + this.$message.error('该考核任务存在已评分指标,禁止删除') return } - this.$confirm('确认删除该请求: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => { + this.$confirm('确认删除该考核任务: ' + row.requestNo + ' ?', '提示', { type: 'warning' }).then(() => { deleteEvaluateRequest({ id: row.id, site }).then(({data: delData}) => { if (delData && (delData.code === 0 || delData.code === '0')) { this.$message.success('删除成功'); this.getList() } else { this.$message.error((delData && delData.msg) || '删除失败') } diff --git a/src/views/modules/supplierPerformance/performanceEvaluateRequestApprove.vue b/src/views/modules/supplierPerformance/performanceEvaluateRequestApprove.vue index 7bfaf4c..4f9be86 100644 --- a/src/views/modules/supplierPerformance/performanceEvaluateRequestApprove.vue +++ b/src/views/modules/supplierPerformance/performanceEvaluateRequestApprove.vue @@ -2,7 +2,7 @@
- + @@ -35,9 +35,11 @@ - - - + @@ -53,7 +55,7 @@ Approve - + @@ -75,7 +77,7 @@
- 请求 + 考核单
@@ -107,7 +109,7 @@ - + @@ -139,6 +141,10 @@ - - + + + + + + \ No newline at end of file diff --git a/src/views/modules/supplierPerformance/supplierPerformanceStatusOptions.js b/src/views/modules/supplierPerformance/supplierPerformanceStatusOptions.js new file mode 100644 index 0000000..710c7bf --- /dev/null +++ b/src/views/modules/supplierPerformance/supplierPerformanceStatusOptions.js @@ -0,0 +1,19 @@ +/** 绩效管理 - 考核任务状态下拉(静态,不含上级审批流程状态) */ +export const PERF_TASK_STATUS_OPTIONS = [ + { label: '未开始', value: '未开始' }, + { label: '进行中', value: '进行中' }, + { label: '已完成', value: '已完成' }, + { label: '已审核', value: '已审核' }, + { label: '已作废', value: '已作废' } +] + +export const PERF_TASK_STATUS_DEFAULT = ['未开始', '进行中', '已完成', '已审核', '已作废'] + +/** 绩效审核页状态下拉 */ +export const PERF_REVIEW_STATUS_OPTIONS = [ + { label: '已完成', value: '已完成' }, + { label: '已审核', value: '已审核' }, + { label: '已作废', value: '已作废' } +] + +export const PERF_REVIEW_STATUS_DEFAULT = ['已完成', '已审核', '已作废']