From 12c8999bab7206bc652fd69ac4f364d84c9e7153 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 12 六月 2026 18:07:46 +0800
Subject: [PATCH] 不合格处理：支持多生产批次提交oa；oa流程查看调整
---
src/views/performance/rewardAndPunishment/index.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/src/views/performance/rewardAndPunishment/index.vue b/src/views/performance/rewardAndPunishment/index.vue
index ace57bc..a1bfbf6 100644
--- a/src/views/performance/rewardAndPunishment/index.vue
+++ b/src/views/performance/rewardAndPunishment/index.vue
@@ -95,7 +95,7 @@
}"
:cell-style="{ textAlign: 'center' }"
border
- height="66.5vh"
+ :height="'calc( 100vh - 240px)'"
style="width: 100%"
>
<el-table-column label="搴忓彿" type="index" width="80"></el-table-column>
@@ -197,7 +197,12 @@
:visible.sync="dialogVisible"
title="濂栨儵璁板綍"
width="50%"
- @open="getUserList"
+ @open="
+ () => {
+ this.getUserList();
+ this.getRewardPunishNameList();
+ }
+ "
>
<div style="height: 40vh">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
@@ -214,7 +219,7 @@
<el-col :span="12">
<el-form-item label="鍛樺伐濮撳悕" prop="userId">
<el-select
- :disabled="form.id"
+ :disabled="form.id && form.id+''!==''"
v-model="form.userId"
placeholder="璇烽�夋嫨鍛樺伐濮撳悕"
size="small"
@@ -235,25 +240,31 @@
<el-row>
<el-col :span="12">
<el-form-item label="濂栨儵鍚嶇О" prop="rewardPunishName">
- <el-input
- placeholder="璇疯緭鍏ュ鎯╁悕绉�"
- type="textarea"
- :rows="1"
- v-model="form.rewardPunishName"
+ <el-select
size="small"
- ></el-input>
+ placeholder="璇疯緭鍏ュ鎯╁悕绉�"
+ v-model="form.rewardPunishName"
+ style="width: 100%"
+ >
+ <el-option
+ :key="index"
+ v-for="(item, index) in rewardPunishNameList"
+ :label="item.dictLabel"
+ :value="item.dictValue"
+ />
+ </el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="濂栨儵鏃堕棿" prop="rewardPunishTime">
<el-date-picker
v-model="form.rewardPunishTime"
- format="yyyy-MM-dd"
+ format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鏃ユ湡"
size="small"
style="width: 100%"
- type="date"
- value-format="yyyy-MM-dd"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
>
</el-date-picker>
</el-form-item>
@@ -278,7 +289,6 @@
controls-position="right"
:precision="2"
style="width: 100%"
- :min="0"
v-model="form.rewardPunishSum"
size="small"
placeholder="璇疯緭鍏ュ鎯╅噾棰�"
@@ -318,6 +328,7 @@
} from "@/api/cnas/personal/personRewardPunishmentRecord";
import { selectUserListByPerformance } from "@/api/system/user";
import { transformExcel } from "@/utils/file";
+import { getDicts } from "@/api/system/dict/data";
export default {
data() {
@@ -392,7 +403,7 @@
{
required: true,
message: "璇疯緭鍏ュ鎯╁悕绉�",
- trigger: "blur",
+ trigger: "change",
},
],
rewardPunishTime: [
@@ -411,13 +422,21 @@
],
},
responsibleOptions: [],
+ rewardPunishNameList: [],
};
},
mounted() {
this.getPersonnelTraining();
this.getUserList();
+ this.getRewardPunishNameList();
},
methods: {
+ getRewardPunishNameList() {
+ this.rewardPunishNameList = [];
+ getDicts("sys_rewardandpunishment_type").then((res) => {
+ this.rewardPunishNameList = res.data;
+ });
+ },
refreshTable() {
this.search.userName = "";
this.search.searchTimeList = [];
@@ -487,7 +506,6 @@
const index = this.responsibleOptions.findIndex(
(item) => item.id === val
);
- console.log(val, index);
if (index > -1) {
this.form.userName = this.responsibleOptions[index].name;
this.form.account = this.responsibleOptions[index].account;
--
Gitblit v1.9.3