From d07a84faf15a6fe22dd4d420c38161a6c26671db Mon Sep 17 00:00:00 2001
From: 13233904609 <13233904609@163.cm>
Date: Tue, 2 Jul 2024 18:21:03 +0800
Subject: [PATCH] wq
---
.../impl/ProjectEvaluateServiceImpl.java | 2 +-
.../src/views/evaluate/evaluate/index.vue | 115 ++++++---------
.../evaluationrules/evaluationrules/index.vue | 131 +++++++-----------
3 files changed, 90 insertions(+), 158 deletions(-)
diff --git a/ruoyi-server/src/main/java/com/ruoyi/server/evaluate/service/impl/ProjectEvaluateServiceImpl.java b/ruoyi-server/src/main/java/com/ruoyi/server/evaluate/service/impl/ProjectEvaluateServiceImpl.java
index 6a82a79..6642f04 100644
--- a/ruoyi-server/src/main/java/com/ruoyi/server/evaluate/service/impl/ProjectEvaluateServiceImpl.java
+++ b/ruoyi-server/src/main/java/com/ruoyi/server/evaluate/service/impl/ProjectEvaluateServiceImpl.java
@@ -57,7 +57,7 @@ public class ProjectEvaluateServiceImpl implements IProjectEvaluateService
public int insertProjectEvaluate(ProjectEvaluate projectEvaluate)
{
projectEvaluate.setId(IdUtils.simpleUUID());
- projectEvaluate.setUpdateBy(getUsername());
+ projectEvaluate.setCreateBy(getUsername());
projectEvaluate.setCreateTime(DateUtils.getNowDate());
return projectEvaluateMapper.insertProjectEvaluate(projectEvaluate);
}
diff --git a/ruoyi-ui/src/views/evaluate/evaluate/index.vue b/ruoyi-ui/src/views/evaluate/evaluate/index.vue
index 0ab1174..5fd5fa6 100644
--- a/ruoyi-ui/src/views/evaluate/evaluate/index.vue
+++ b/ruoyi-ui/src/views/evaluate/evaluate/index.vue
@@ -17,22 +17,6 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
+ 查询
重置
@@ -116,24 +76,11 @@
v-hasPermi="['evaluate:evaluate:remove']"
>删除
-
- 导出
-
-
-
-
@@ -153,6 +100,7 @@
+
删除
+ 查看
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
@@ -259,7 +214,7 @@ export default {
single: true,
// 非多个禁用
multiple: true,
- // 显示搜索条件
+ // 显示查询条件
showSearch: true,
// 总条数
total: 0,
@@ -269,6 +224,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ disabled: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -335,7 +291,7 @@ export default {
};
this.resetForm("form");
},
- /** 搜索按钮操作 */
+ /** 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
@@ -355,6 +311,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
+ this.disabled = false;
this.title = "添加绩效评价信息";
},
/** 修改按钮操作 */
@@ -364,9 +321,21 @@ export default {
getEvaluate(id).then(response => {
this.form = response.data;
this.open = true;
+ this.disabled = false;
this.title = "修改绩效评价信息";
});
},
+ /** 修改按钮操作 */
+ handleDecal(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getEvaluate(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.disabled = true;
+ this.title = "查看绩效评价信息";
+ });
+ },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
diff --git a/ruoyi-ui/src/views/evaluationrules/evaluationrules/index.vue b/ruoyi-ui/src/views/evaluationrules/evaluationrules/index.vue
index 4c6b1ed..7ae5759 100644
--- a/ruoyi-ui/src/views/evaluationrules/evaluationrules/index.vue
+++ b/ruoyi-ui/src/views/evaluationrules/evaluationrules/index.vue
@@ -19,33 +19,7 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
- 搜索
+ 查询
重置
@@ -118,24 +68,11 @@
v-hasPermi="['evaluationrules:evaluationrules:remove']"
>删除
-
- 导出
-
-
-
-
@@ -164,6 +101,7 @@
+
删除
+ 查看
-
+
-
+
-
-
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
@@ -285,7 +237,7 @@ export default {
single: true,
// 非多个禁用
multiple: true,
- // 显示搜索条件
+ // 显示查询条件
showSearch: true,
// 总条数
total: 0,
@@ -295,6 +247,7 @@ export default {
title: "",
// 是否显示弹出层
open: false,
+ disabled: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -363,7 +316,7 @@ export default {
};
this.resetForm("form");
},
- /** 搜索按钮操作 */
+ /** 查询按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
@@ -395,6 +348,16 @@ export default {
this.title = "修改绩效评价规则";
});
},
+ /** 修改按钮操作 */
+ handleDecal(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getEvaluationrules(id).then(response => {
+ this.form = response.data;
+ this.open = true;
+ this.title = "修改绩效评价规则";
+ });
+ },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {