From 1e36aba92dc35c1ea98e5585ff8011376d7f71b5 Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Tue, 23 Jan 2024 15:44:12 +0800
Subject: [PATCH] update
---
src/views/assessment/components/addAssessor.vue | 1 +
src/views/evaluate/components/editIndividualTask.vue | 4 ++--
src/views/evaluate/components/firstRoundResult.vue | 3 ++-
src/views/evaluate/components/referrerPopover.vue | 7 ++++---
src/views/evaluate/components/votingDetails.vue | 5 ++++-
src/views/assessment/components/assessorDetails.vue | 1 +
src/views/evaluate/components/IndividualTaskPublic.vue | 2 +-
src/views/assessment/components/assessorDialog.vue | 5 ++++-
src/views/assessment/components/addWeight.vue | 1 +
src/views/evaluate/components/reissueSrCandiadate.vue | 4 ++--
src/views/evaluate/components/addEcCandidate.vue | 1 +
src/views/evaluate/components/secondRoundResult.vue | 2 +-
src/views/evaluate/components/editSectionTask.vue | 2 +-
src/views/evaluate/components/reissueSecondRound.vue | 2 +-
src/views/evaluate/components/candidateResult.vue | 1 +
src/views/evaluate/components/typeDetails.vue | 3 ++-
16 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/views/assessment/components/addAssessor.vue b/src/views/assessment/components/addAssessor.vue
index d182dd6..63c84bb 100644
--- a/src/views/assessment/components/addAssessor.vue
+++ b/src/views/assessment/components/addAssessor.vue
@@ -242,6 +242,7 @@
const dialogClose = () => {
formRef.value.resetFields()
+ userSelectOption.value = []
}
watch(() => props.dialogParams.visible, (val) => {
diff --git a/src/views/assessment/components/addWeight.vue b/src/views/assessment/components/addWeight.vue
index a381404..a7f7f26 100644
--- a/src/views/assessment/components/addWeight.vue
+++ b/src/views/assessment/components/addWeight.vue
@@ -257,6 +257,7 @@
const dialogClose = () => {
formRef.value.resetFields()
+ userSelectOption.value = []
}
watch(() => props.dialogParams.visible, (val) => {
diff --git a/src/views/assessment/components/assessorDetails.vue b/src/views/assessment/components/assessorDetails.vue
index cc9d734..7d52890 100644
--- a/src/views/assessment/components/assessorDetails.vue
+++ b/src/views/assessment/components/assessorDetails.vue
@@ -166,6 +166,7 @@
});
},
dialogOpen() {
+ this.page.currentPage = 1
this.onLoad(this.page)
},
handleViewDetails(row) {
diff --git a/src/views/assessment/components/assessorDialog.vue b/src/views/assessment/components/assessorDialog.vue
index 3b9acf6..dba7be5 100644
--- a/src/views/assessment/components/assessorDialog.vue
+++ b/src/views/assessment/components/assessorDialog.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog v-model="params.visible" :title="params.data?.assessmentNo ? `考核编号（${params.data.assessmentNo}）` : '考核人员详情'"
- width="70%" @open="dialogOpen">
+ width="70%" @open="dialogOpen" @close="dialogClose">
<avue-crud :option="option" :table-loading="loading" :data="data" v-model:page="page" @search-change="searchChange"
@search-reset="searchReset" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad">
@@ -250,6 +250,9 @@
dialogOpen() {
this.onLoad(this.page)
},
+ dialogClose() {
+ this.page.currentPage = 1
+ },
sendBack(row) {
this.$confirm("是否驳回当前记录?", {
confirmButtonText: "确定",
diff --git a/src/views/evaluate/components/IndividualTaskPublic.vue b/src/views/evaluate/components/IndividualTaskPublic.vue
index daeec8e..4275412 100644
--- a/src/views/evaluate/components/IndividualTaskPublic.vue
+++ b/src/views/evaluate/components/IndividualTaskPublic.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog v-model="params.visible" :title="`发布评优任务（${params.data?.taskName || ''}）`" width="65%" @open="openDialog"
- @close="dialogClose">
+ @close="dialogClose" destroy-on-close>
<div class="content">
<el-form :model="form" ref="formRef" :rules="rules" label-position="top">
<el-form-item prop="categoryEntities">
diff --git a/src/views/evaluate/components/addEcCandidate.vue b/src/views/evaluate/components/addEcCandidate.vue
index b545ae8..e42ae93 100644
--- a/src/views/evaluate/components/addEcCandidate.vue
+++ b/src/views/evaluate/components/addEcCandidate.vue
@@ -242,6 +242,7 @@
});
},
openDialog() {
+ this.page.currentPage = 1
this.onLoad(this.page);
}
}
diff --git a/src/views/evaluate/components/candidateResult.vue b/src/views/evaluate/components/candidateResult.vue
index 944fdc2..20e0933 100644
--- a/src/views/evaluate/components/candidateResult.vue
+++ b/src/views/evaluate/components/candidateResult.vue
@@ -107,6 +107,7 @@
},
methods: {
dialogOpen() {
+ this.page.currentPage = 1
this.onLoad(this.page)
},
currentChange(currentPage) {
diff --git a/src/views/evaluate/components/editIndividualTask.vue b/src/views/evaluate/components/editIndividualTask.vue
index d8de995..a07c891 100644
--- a/src/views/evaluate/components/editIndividualTask.vue
+++ b/src/views/evaluate/components/editIndividualTask.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog v-model="params.visible" :title="params.title || '编辑个人评优任务'" width="50%" @open="dialogOpen"
- @close="dialogClose">
+ @close="dialogClose" destroy-on-close>
<div class="content">
<el-form :model="form" ref="formRef" :rules="rules" label-position="top">
<el-form-item label="任务名称" prop="taskName">
@@ -52,7 +52,7 @@
</el-form-item>
</el-form>
<!-- 添加类别弹窗 -->
- <el-dialog v-model="innerVisible" width="40%" title="添加评优类别" append-to-body @close="innerDialogClose">
+ <el-dialog v-model="innerVisible" width="40%" title="添加评优类别" append-to-body destroy-on-close @close="innerDialogClose">
<el-form :model="taskTypeForm" :rules="taskTypeRules" ref="taskTypeFormRef" label-width="80px">
<el-form-item label="类别" prop="categoryName">
<el-input v-model="taskTypeForm.categoryName" placeholder="请输入类别名称"></el-input>
diff --git a/src/views/evaluate/components/editSectionTask.vue b/src/views/evaluate/components/editSectionTask.vue
index a8405a4..0273835 100644
--- a/src/views/evaluate/components/editSectionTask.vue
+++ b/src/views/evaluate/components/editSectionTask.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog v-model="params.visible" :title="params.title || '编辑部门评优任务'" width="50%" @open="openDialog"
- @close="dialogClose">
+ @close="dialogClose" destroy-on-close>
<div class="content">
<el-form :model="form" ref="formRef" :rules="rules" label-width="130px">
<el-form-item label="任务名称" prop="taskName">
diff --git a/src/views/evaluate/components/firstRoundResult.vue b/src/views/evaluate/components/firstRoundResult.vue
index 757ba6d..7e6600f 100644
--- a/src/views/evaluate/components/firstRoundResult.vue
+++ b/src/views/evaluate/components/firstRoundResult.vue
@@ -26,7 +26,7 @@
</div>
</li>
</ul>
- <el-dialog v-model="visible" :title="`第一轮候选结果(${currentCategory.categoryName})`" width="60%" @open="dialogOpen">
+ <el-dialog v-model="visible" :title="`第一轮候选结果(${currentCategory.categoryName})`" width="60%" @open="dialogOpen" destroy-on-close>
<avue-crud v-model:page="page" :option="option" :table-loading="loading" :data="dialogData"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template #menu="{ row }">
@@ -176,6 +176,7 @@
this.visible = true
},
dialogOpen() {
+ this.page.currentPage = 1
this.getDialogDetails()
},
getDialogDetails() {
diff --git a/src/views/evaluate/components/referrerPopover.vue b/src/views/evaluate/components/referrerPopover.vue
index d0e2ac2..b3f8356 100644
--- a/src/views/evaluate/components/referrerPopover.vue
+++ b/src/views/evaluate/components/referrerPopover.vue
@@ -87,11 +87,12 @@
const init = () => {
const { userId, evaluateTaskId, evaluateTaskCategoryId } = props.params
- getReferrer(page.currentPage, page.pageSize, evaluateTaskId, userId, evaluateTaskCategoryId).then(res => {
+ getReferrer(page.value.currentPage, page.value.pageSize, evaluateTaskId, userId, evaluateTaskCategoryId).then(res => {
const { data } = res
const referrerRes = _.cloneDeep(data.data)
- tableData.value = referrerRes
- page.value.total = data.data.total
+ console.log(referrerRes);
+ tableData.value = referrerRes.records
+ page.value.total = referrerRes.total
})
}
diff --git a/src/views/evaluate/components/reissueSecondRound.vue b/src/views/evaluate/components/reissueSecondRound.vue
index 92bced7..961b771 100644
--- a/src/views/evaluate/components/reissueSecondRound.vue
+++ b/src/views/evaluate/components/reissueSecondRound.vue
@@ -1,6 +1,6 @@
<template>
<el-dialog v-model="params.visible" :title="`下发任务（${params.data?.taskName || ''}）`" width="65%" @open="openDialog"
- @close="dialogClose">
+ @close="dialogClose" destroy-on-close>
<div class="content" v-loading="isLoading">
<el-form :model="form" ref="formRef" :rules="rules" label-position="top">
<el-form-item label="评优奖项" prop="categoryEntities">
diff --git a/src/views/evaluate/components/reissueSrCandiadate.vue b/src/views/evaluate/components/reissueSrCandiadate.vue
index dc07fc7..36f024a 100644
--- a/src/views/evaluate/components/reissueSrCandiadate.vue
+++ b/src/views/evaluate/components/reissueSrCandiadate.vue
@@ -1,6 +1,6 @@
<template>
- <el-dialog v-model="params.visible" :title="params.data?.categoryName || '添加类别候选人'" width="50%" destroy-on-close
- @close="cancel" @open="openDialog">
+ <el-dialog v-model="params.visible" :title="params.data?.categoryName || '添加类别候选人'" width="50%" @close="cancel"
+ @open="openDialog" destroy-on-close>
<avue-crud :option="option" v-model:search="search" v-model:page="page" v-model="form" :table-loading="loading"
:data="data" :before-open="beforeOpen" ref="crud" @row-update="rowUpdate" @row-del="rowDel"
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
diff --git a/src/views/evaluate/components/secondRoundResult.vue b/src/views/evaluate/components/secondRoundResult.vue
index 63a1b66..f655cf8 100644
--- a/src/views/evaluate/components/secondRoundResult.vue
+++ b/src/views/evaluate/components/secondRoundResult.vue
@@ -27,7 +27,7 @@
</div>
</li>
</ul>
- <el-dialog v-model="dialogParams.visible" :title="dialogParams.title">
+ <el-dialog v-model="dialogParams.visible" :title="dialogParams.title" destroy-on-close>
<avue-crud :option="dialogOption" :table-loading="dialogLoading" :data="dialogParams.data" @on-load="onLoad">
<template #menu-row>
<el-button type="success" plain @click="handleExport">导出当前数据</el-button>
diff --git a/src/views/evaluate/components/typeDetails.vue b/src/views/evaluate/components/typeDetails.vue
index 1670634..8007d1b 100644
--- a/src/views/evaluate/components/typeDetails.vue
+++ b/src/views/evaluate/components/typeDetails.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="params.visible" title="详情" @open="openDialog">
+ <el-dialog v-model="params.visible" title="详情" @open="openDialog" destroy-on-close>
<avue-crud v-model:page="page" :option="option" :table-loading="loading" :data="data"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
</avue-crud>
@@ -75,6 +75,7 @@
},
methods: {
openDialog() {
+ this.page.currentPage = 1
this.onLoad(this.page)
},
currentChange(currentPage) {
diff --git a/src/views/evaluate/components/votingDetails.vue b/src/views/evaluate/components/votingDetails.vue
index 9f71f35..3c9cdcc 100644
--- a/src/views/evaluate/components/votingDetails.vue
+++ b/src/views/evaluate/components/votingDetails.vue
@@ -216,9 +216,12 @@
})
},
selectedChange(value) {
+ this.page.currentPage = 1
this.onLoad(this.page);
},
- dialogOpen() { }
+ dialogOpen() {
+ this.page.currentPage = 1
+ }
},
watch: {
'params.visible': {
--
Gitblit v1.9.3