diff --git a/src/api/assessment.js b/src/api/assessment.js index 58f4ea6..cbe7442 100644 --- a/src/api/assessment.js +++ b/src/api/assessment.js @@ -71,3 +71,12 @@ export function apiSaveapproval (query) { params: query }) } + +// 获取3.75分等级列表 - +export function apiGet375 (query) { + return request({ + url: '/lz_management/resultGrade/get375', + method: 'get', + params: query + }) +} diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue index ef5c5a3..5e090d3 100644 --- a/src/views/kpi/assessment/goals/index.vue +++ b/src/views/kpi/assessment/goals/index.vue @@ -168,11 +168,14 @@ export default { async handleSaveDetail (params = this.obj) { let res = await apiSaveDetail(params) if (res.code !== 200) { - this.$message.error = res.msg + this.$message.error(res.msg) return } + this.$message({ + message: res.msg, + type: 'success' + }) this.handleGetTbale() - console.log('res: ', res) }, // 获取维度类型 async handleGetDimensions () { diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue index 0fd7b44..7eb8414 100644 --- a/src/views/kpi/assessment/performance/components/UseButton/index.vue +++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue @@ -6,9 +6,9 @@ 制定目标 同 意 驳 回 - 跳过 + 跳过 转 交 - + { - if (v) { - const params = Object.assign({}, this.form, { - resultRecordId: this.$route.query.id || '', - status: status, - menuName: menuName - }) - let res = await apiSaveapproval(params) - if (res.code !== 200) { - this.$message.error(res.msg) - } - this.form = {} - this.$message({ - message: res.msg, - type: 'success' - }) - this.bohui = false - } - }) + async handleAgree () { + let res = await this.handlApiSaveapproval({status: 1, menuName: '同意了'}) + this.dialogFormVisible = !!res }, // 驳回 handleBohui () { this.ruleForm = {} this.bohui = true }, - handleSubmit () { - this.handlApiSaveapproval({status: 5, menuName: '驳回了'}) - }, - handleCancel () { - this.bohui = false - }, - cb (info) { - console.log(info) - }, // 跳过 - handleJump (item) { - console.log('item: ', item) + handleJump () { + if (!this.info) return + console.log('item: ', this.info) this.$confirm('确认跳过该人员?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }).then(() => { + }).then(async () => { + const obj = {status: 4, menuName: '跳过了'} + if (this.info) obj.flowRecordId = this.info.flowRecordId + const params = Object.assign({}, this.form, {resultRecordId: this.$route.query.id || ''}, obj) + let res = await apiSaveapproval(params) + if (res.code !== 200) { + this.$message.error(res.msg) + return + } + this.form = {} this.$message({ - type: 'success', - message: '删除成功!' + message: res.msg, + type: 'success' }) + history.go(0) }).catch(() => { this.$message({ type: 'info', - message: '已取消删除' + message: '取消跳过' }) }) }, @@ -169,6 +150,51 @@ export default { id: 267 || this.$route.query.id } }) + }, + async handleSubmit () { + let res = await this.handlApiSaveapproval({status: 5, menuName: '驳回了'}) + console.log('!!res: ', !!res) + this.bohui = !!res + }, + handleCancel () { + this.bohui = false + }, + async cb (info) { + const obj = {status: 8, menuName: '转交了', transferStaffId: info.value} + if (this.info) obj.flowRecordId = this.info.flowRecordId + const params = Object.assign({}, this.form, {resultRecordId: this.$route.query.id || ''}, obj) + let res = await apiSaveapproval(params) + if (res.code !== 200) { + this.$message.error(res.msg) + return + } + this.form = {} + this.$message({ + message: res.msg, + type: 'success' + }) + history.go(0) + }, + // 封装请求 + handlApiSaveapproval (obj = {}) { + return new Promise((resolve, reject) => { + this.$refs.form.validate(async v => { + if (v) { + const params = Object.assign({}, this.form, {resultRecordId: this.$route.query.id || ''}, obj) + let res = await apiSaveapproval(params) + if (res.code !== 200) { + this.$message.error(res.msg) + resolve(1) + } + this.form = {} + this.$message({ + message: res.msg, + type: 'success' + }) + resolve(0) + } + }) + }) } }, watch: {} diff --git a/src/views/kpi/assessment/performance/components/table copy.vue b/src/views/kpi/assessment/performance/components/table copy.vue deleted file mode 100644 index c794872..0000000 --- a/src/views/kpi/assessment/performance/components/table copy.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - diff --git a/src/views/kpi/assessment/performance/components/table.vue b/src/views/kpi/assessment/performance/components/table.vue index f2cd52e..8754d9b 100644 --- a/src/views/kpi/assessment/performance/components/table.vue +++ b/src/views/kpi/assessment/performance/components/table.vue @@ -5,7 +5,7 @@ border="1"> - 维度 + 维度 名称 考核标准 结果值 @@ -22,7 +22,7 @@
+ 取消 暂存 - 提交 + {{tableInfo.result?'提交结果值':'提交评分'}}
+ + +