From 6d050f89d69f129e4d31328df835fe5511c38ee7 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Sat, 23 Dec 2023 10:24:42 +0800
Subject: [PATCH] 评优任务更新
---
src/api/evaluate/evaluateResult.js | 3 ++-
src/views/evaluate/components/addDialog.vue | 5 +++--
src/views/evaluate/evaluateTask.vue | 7 +++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/api/evaluate/evaluateResult.js b/src/api/evaluate/evaluateResult.js
index c551c9a..a8cd3a2 100755
--- a/src/api/evaluate/evaluateResult.js
+++ b/src/api/evaluate/evaluateResult.js
@@ -3,12 +3,13 @@
export const getList = (current, size, params) => {
return request({
// url: '/evaluate/evaluateResult/list',
- url: 'evaluate/evaluateTaskSet/list',
+ url: 'evaluate/evaluateTaskSet/page',
method: 'get',
params: {
...params,
current,
size,
+ descs: 'vote_num'
}
})
}
diff --git a/src/views/evaluate/components/addDialog.vue b/src/views/evaluate/components/addDialog.vue
index a2bd4fc..b1ce0b8 100644
--- a/src/views/evaluate/components/addDialog.vue
+++ b/src/views/evaluate/components/addDialog.vue
@@ -50,10 +50,10 @@
controls-position="right" :placeholder="`请输入评优数量（最多不可超过${maxEvaluateNum}）`"
class="evaluateNum-input"></el-input-number>
</el-form-item>
- <!-- <el-form-item label="评优截止日期:" prop="evaluateCutoffTime">
+ <el-form-item label="评优截止日期:" prop="evaluateCutoffTime" v-if="params.type">
<el-date-picker v-model="addForm.evaluateCutoffTime" type="datetime" placeholder="请选择截止时间"
format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" style="width: 100%;" />
- </el-form-item> -->
+ </el-form-item>
</el-form>
</div>
<template #footer>
@@ -200,6 +200,7 @@
},
handleSubmit() {
this.$refs.addFormRef.validate(valid => {
+ this.addForm.evaluateState = 1
add(this.addForm).then(
() => {
this.$message({
diff --git a/src/views/evaluate/evaluateTask.vue b/src/views/evaluate/evaluateTask.vue
index 04b0bd6..6e4011b 100644
--- a/src/views/evaluate/evaluateTask.vue
+++ b/src/views/evaluate/evaluateTask.vue
@@ -15,7 +15,7 @@
<template #menu="{ size, row, index }">
<el-button type="primary" text plain icon="el-icon-edit" @click="editDialog(row)">编辑</el-button>
<el-button type="primary" text plain icon="el-icon-position" @click="publicTimeBtn(row)"
- v-if="row.status === 2">发布</el-button>
+ v-if="row.candidateState === 2">发布</el-button>
<!-- <el-button type="primary" v-if="row.type === 0" text plain icon="el-icon-plus" @click="addCandidateHandle(row)">新增候选人</el-button> -->
<el-button type="primary" text plain icon="el-icon-download">导出</el-button>
</template>
@@ -306,6 +306,7 @@
};
getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
+ console.log(data.records);
this.page.total = data.total;
this.data = data.records;
this.loading = false;
@@ -335,9 +336,11 @@
const { id } = this.rowData;
const params = {
id,
+ // candidateState: 1,
+ evaluateState: 1,
evaluateCutoffTime: this.publicForm.publicData,
};
- add(params).then(
+ update(params).then(
res => {
this.$message({
type: 'success',
--
Gitblit v1.9.3