wq

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);
     }

ruoyi-ui/src/views/evaluate/evaluate/index.vue

@@ -17,22 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="职位" prop="position">
-        <el-input
-          v-model="queryParams.position"
-          placeholder="请输入职位"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="考核周期" prop="checkCycle">
         <el-select v-model="queryParams.checkCycle" placeholder="请选择考核周期" clearable>
           <el-option
@@ -43,22 +27,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="完成率" prop="completionRate">
-        <el-input
-          v-model="queryParams.completionRate"
-          placeholder="请输入完成率"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="评分" prop="checkScore">
-        <el-input
-          v-model="queryParams.checkScore"
-          placeholder="请输入评分"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="评分等级" prop="checkLv">
         <el-select v-model="queryParams.checkLv" placeholder="请选择评分等级" clearable>
           <el-option
@@ -69,16 +37,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="主管签字" prop="signatureSupervisor">
-        <el-input
-          v-model="queryParams.signatureSupervisor"
-          placeholder="请输入主管签字"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -116,24 +76,11 @@
           v-hasPermi="['evaluate:evaluate:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['evaluate:evaluate:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="evaluateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="删除标志" align="center" prop="status" />
       <el-table-column label="员工编号" align="center" prop="employeeNum" />
       <el-table-column label="姓名" align="center" prop="name" />
       <el-table-column label="部门名称" align="center" prop="deptName" />
@@ -153,6 +100,7 @@
         </template>
       </el-table-column>
       <el-table-column label="主管签字" align="center" prop="signatureSupervisor" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -169,6 +117,13 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['evaluate:evaluate:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDecal(scope.row)"
+            v-hasPermi="['evaluate:evaluate:edit']"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -182,25 +137,22 @@
     />
 
     <!-- 添加或修改绩效评价信息对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
         <el-form-item label="员工编号" prop="employeeNum">
-          <el-input v-model="form.employeeNum" placeholder="请输入员工编号" />
+          <el-input v-model="form.employeeNum" placeholder="请输入员工编号" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="姓名" prop="name">
-          <el-input v-model="form.name" placeholder="请输入姓名" />
+          <el-input v-model="form.name" placeholder="请输入姓名" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="部门名称" prop="deptName">
-          <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+          <el-input v-model="form.deptName" placeholder="请输入部门名称" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="职位" prop="position">
-          <el-input v-model="form.position" placeholder="请输入职位" />
+          <el-input v-model="form.position" placeholder="请输入职位" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="考核周期" prop="checkCycle">
-          <el-select v-model="form.checkCycle" placeholder="请选择考核周期">
+          <el-select v-model="form.checkCycle" placeholder="请选择考核周期" :disabled="disabled">
             <el-option
               v-for="dict in dict.type.khzq_check"
               :key="dict.value"
@@ -210,19 +162,19 @@
           </el-select>
         </el-form-item>
         <el-form-item label="工作目标" prop="workGoal">
-          <el-input v-model="form.workGoal" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.workGoal" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="完成情况" prop="completionDecl">
-          <el-input v-model="form.completionDecl" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.completionDecl" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="完成率" prop="completionRate">
-          <el-input v-model="form.completionRate" placeholder="请输入完成率" />
+          <el-input v-model="form.completionRate" placeholder="请输入完成率" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="评分" prop="checkScore">
-          <el-input v-model="form.checkScore" placeholder="请输入评分" />
+          <el-input v-model="form.checkScore" placeholder="请输入评分" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="评分等级" prop="checkLv">
-          <el-select v-model="form.checkLv" placeholder="请选择评分等级">
+          <el-select v-model="form.checkLv" placeholder="请选择评分等级" :disabled="disabled">
             <el-option
               v-for="dict in dict.type.jxdj_check"
               :key="dict.value"
@@ -232,11 +184,14 @@
           </el-select>
         </el-form-item>
         <el-form-item label="主管签字" prop="signatureSupervisor">
-          <el-input v-model="form.signatureSupervisor" placeholder="请输入主管签字" />
+          <el-input v-model="form.signatureSupervisor" placeholder="请输入主管签字" :disabled="disabled"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="!disabled">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -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 => {

ruoyi-ui/src/views/evaluationrules/evaluationrules/index.vue

@@ -19,33 +19,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="考核对象" prop="checkObject">
+      <el-form-item label="等级划分" prop="checkLv" >
-        <el-input
-          v-model="queryParams.checkObject"
-          placeholder="请输入考核对象"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="考核指标" prop="checkTarget">
-        <el-input
-          v-model="queryParams.checkTarget"
-          placeholder="请输入考核指标"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="权重分配规则" prop="weightAllocationRule">
-        <el-select v-model="queryParams.weightAllocationRule" placeholder="请选择权重分配规则" clearable>
-          <el-option
-            v-for="dict in dict.type.qzfp_rule"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="绩效等级划分" prop="checkLv">
         <el-select v-model="queryParams.checkLv" placeholder="请选择绩效等级划分" clearable>
           <el-option
             v-for="dict in dict.type.jxdj_check"
@@ -55,32 +29,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="结果应用说明" prop="declare">
-        <el-input
-          v-model="queryParams.declare"
-          placeholder="请输入结果应用说明"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="生效日期" prop="takeeffectTime">
-        <el-date-picker clearable
-          v-model="queryParams.takeeffectTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择生效日期">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="失效日期" prop="loseEfficacy">
-        <el-input
-          v-model="queryParams.loseEfficacy"
-          placeholder="请输入失效日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -118,24 +68,11 @@
           v-hasPermi="['evaluationrules:evaluationrules:remove']"
         >删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['evaluationrules:evaluationrules:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="evaluationrulesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="删除标志" align="center" prop="status" />
       <el-table-column label="规则名称" align="center" prop="ruleName" />
       <el-table-column label="考核周期" align="center" prop="checkCycle">
         <template slot-scope="scope">
@@ -164,6 +101,7 @@
         </template>
       </el-table-column>
       <el-table-column label="失效日期" align="center" prop="loseEfficacy" />
+      <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -180,6 +118,13 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['evaluationrules:evaluationrules:remove']"
           >删除</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleDecal(scope.row)"
+            v-hasPermi="['evaluate:evaluate:edit']"
+          >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -193,16 +138,13 @@
     />
 
     <!-- 添加或修改绩效评价规则对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
         <el-form-item label="规则名称" prop="ruleName">
-          <el-input v-model="form.ruleName" placeholder="请输入规则名称" />
+          <el-input v-model="form.ruleName" placeholder="请输入规则名称" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="考核周期" prop="checkCycle">
-          <el-select v-model="form.checkCycle" placeholder="请选择考核周期">
+          <el-select v-model="form.checkCycle" placeholder="请选择考核周期" :disabled="disabled">
             <el-option
               v-for="dict in dict.type.khzq_check"
               :key="dict.value"
@@ -212,13 +154,13 @@
           </el-select>
         </el-form-item>
         <el-form-item label="考核对象" prop="checkObject">
-          <el-input v-model="form.checkObject" placeholder="请输入考核对象" />
+          <el-input v-model="form.checkObject" placeholder="请输入考核对象" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="考核指标" prop="checkTarget">
-          <el-input v-model="form.checkTarget" placeholder="请输入考核指标" />
+          <el-input v-model="form.checkTarget" placeholder="请输入考核指标" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="权重分配规则" prop="weightAllocationRule">
-          <el-select v-model="form.weightAllocationRule" placeholder="请选择权重分配规则">
+          <el-select v-model="form.weightAllocationRule" placeholder="请选择权重分配规则" :disabled="disabled">
             <el-option
               v-for="dict in dict.type.qzfp_rule"
               :key="dict.value"
@@ -228,10 +170,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="考核标准说明" prop="checkDetails">
-          <el-input v-model="form.checkDetails" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.checkDetails" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="绩效等级划分" prop="checkLv">
-          <el-select v-model="form.checkLv" placeholder="请选择绩效等级划分">
+          <el-select v-model="form.checkLv" placeholder="请选择绩效等级划分" :disabled="disabled">
             <el-option
               v-for="dict in dict.type.jxdj_check"
               :key="dict.value"
@@ -241,28 +183,38 @@
           </el-select>
         </el-form-item>
         <el-form-item label="特殊情况处理" prop="conduct">
-          <el-input v-model="form.conduct" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.conduct" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="考核者要求" prop="demand">
-          <el-input v-model="form.demand" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.demand" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="结果应用说明" prop="declare">
-          <el-input v-model="form.declare" placeholder="请输入结果应用说明" />
+          <el-input v-model="form.declare" placeholder="请输入结果应用说明" :disabled="disabled"/>
         </el-form-item>
         <el-form-item label="生效日期" prop="takeeffectTime">
           <el-date-picker clearable
             v-model="form.takeeffectTime"
+            :disabled="disabled"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择生效日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="失效日期" prop="loseEfficacy">
-          <el-input v-model="form.loseEfficacy" placeholder="请输入失效日期" />
+          <el-date-picker clearable
+            v-model="form.loseEfficacy"
+            :disabled="disabled"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择失效日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="disabled"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="!disabled">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -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 => {