From 8d541eed8bb02d5a9b32b706cde9665df9a83aec Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期四, 29 十月 2026 11:47:49 +0800
Subject: [PATCH] refactor(safety): 人员与车间字段改用员工选择器与车间下拉
---
src/views/safety/hazard/index.vue | 61 +++++++++++++++++++++---------
1 files changed, 42 insertions(+), 19 deletions(-)
diff --git a/src/views/safety/hazard/index.vue b/src/views/safety/hazard/index.vue
index b35da73..884a359 100644
--- a/src/views/safety/hazard/index.vue
+++ b/src/views/safety/hazard/index.vue
@@ -37,6 +37,7 @@
updateHazard,
uploadSafetyFiles,
} from '#/api/safety';
+import HrmEmployeeSelect from '#/views/hrm/employee/components/select.vue';
import {
HAZARD_LEVEL_COLOR,
@@ -82,7 +83,9 @@
location: '',
description: '',
photoUrls: '',
- reporter: '',
+ reporterId: undefined,
+ // 涓婃姤浜哄鍚嶄负鍚庣鍥炲~鐨勫揩鐓у瓧娈碉紝浠呯敤浜庡睍绀�
+ reporter: undefined,
reportTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
rectifyDeadline: undefined,
remark: '',
@@ -92,13 +95,13 @@
const editRules = {
title: [{ required: true, whitespace: true, message: '璇疯緭鍏ラ殣鎮f爣棰�' }],
- reporter: [{ required: true, whitespace: true, message: '璇疯緭鍏ヤ笂鎶ヤ汉' }],
+ reporterId: [{ required: true, message: '璇烽�夋嫨涓婃姤浜�' }],
};
const assignOpen = ref(false);
-const assignModel = reactive<{ id: number; assignee: string; rectifyDeadline?: string; remark?: string }>({
+const assignModel = reactive<{ id: number; assigneeId?: number; rectifyDeadline?: string; remark?: string }>({
id: 0,
- assignee: '',
+ assigneeId: undefined,
});
const rectifyOpen = ref(false);
@@ -109,11 +112,14 @@
const rectifyPhotos = ref<string[]>([]);
const recheckOpen = ref(false);
-const recheckModel = reactive<{ id: number; rechecker: string; recheckResult: string; recheckRemark?: string }>({
+const recheckModel = reactive<{ id: number; recheckerId?: number; recheckResult: string; recheckRemark?: string }>({
id: 0,
- rechecker: '',
+ recheckerId: undefined,
recheckResult: 'PASSED',
});
+
+/** 褰撳墠澶嶆煡鐨勯殣鎮o紝鐢ㄤ簬鏍¢獙銆屽鏌ヤ汉涓嶈兘涓庢暣鏀硅矗浠讳汉涓哄悓涓�浜恒�� */
+const recheckRow = ref<SafetyApi.Hazard>();
const detailOpen = ref(false);
const detailRow = ref<null | SafetyApi.Hazard>(null);
@@ -193,9 +199,10 @@
const data = {
...model,
title: model.title.trim(),
- reporter: model.reporter.trim(),
photoUrls: photoList.value.join(','),
};
+ // 涓婃姤浜哄鍚嶄负鍙蹇収锛屼笉鍐嶆彁浜�
+ delete data.reporter;
await (data.id ? updateHazard(data) : createHazard(data));
message.success('闅愭偅宸蹭繚瀛�');
editOpen.value = false;
@@ -207,20 +214,25 @@
function openAssign(row: SafetyApi.Hazard) {
assignModel.id = row.id!;
- assignModel.assignee = row.assignee ?? '';
+ assignModel.assigneeId = row.assigneeId;
assignModel.rectifyDeadline = row.rectifyDeadline;
assignModel.remark = '';
assignOpen.value = true;
}
async function saveAssign() {
- if (!assignModel.assignee.trim()) {
- message.warning('璇峰~鍐欐暣鏀硅矗浠讳汉');
+ if (!assignModel.assigneeId) {
+ message.warning('璇烽�夋嫨鏁存敼璐d换浜�');
return;
}
saving.value = true;
try {
- await assignHazard({ ...assignModel, assignee: assignModel.assignee.trim() });
+ await assignHazard({
+ id: assignModel.id,
+ assigneeId: assignModel.assigneeId,
+ rectifyDeadline: assignModel.rectifyDeadline,
+ remark: assignModel.remark,
+ });
message.success('宸插垎娲�');
assignOpen.value = false;
await load();
@@ -258,20 +270,30 @@
function openRecheck(row: SafetyApi.Hazard) {
recheckModel.id = row.id!;
- recheckModel.rechecker = '';
+ recheckModel.recheckerId = undefined;
recheckModel.recheckResult = 'PASSED';
recheckModel.recheckRemark = '';
+ recheckRow.value = row;
recheckOpen.value = true;
}
async function saveRecheck() {
- if (!recheckModel.rechecker.trim()) {
- message.warning('璇峰~鍐欏鏌ヤ汉');
+ if (!recheckModel.recheckerId) {
+ message.warning('璇烽�夋嫨澶嶆煡浜�');
+ return;
+ }
+ if (recheckModel.recheckerId === recheckRow.value?.assigneeId) {
+ message.warning('澶嶆煡浜轰笉鑳戒笌鏁存敼璐d换浜轰负鍚屼竴浜�');
return;
}
saving.value = true;
try {
- await recheckHazard({ ...recheckModel, rechecker: recheckModel.rechecker.trim() });
+ await recheckHazard({
+ id: recheckModel.id,
+ recheckerId: recheckModel.recheckerId,
+ recheckResult: recheckModel.recheckResult,
+ recheckRemark: recheckModel.recheckRemark,
+ });
message.success(recheckModel.recheckResult === 'PASSED' ? '澶嶆煡閫氳繃锛岄殣鎮e凡闂幆' : '澶嶆煡涓嶉�氳繃锛屽凡閫�鍥炴暣鏀�');
recheckOpen.value = false;
await load();
@@ -435,8 +457,8 @@
<FormItem label="鏁存敼鏈熼檺" name="rectifyDeadline">
<DatePicker v-model:value="model.rectifyDeadline" value-format="YYYY-MM-DD" class="w-full" />
</FormItem>
- <FormItem label="涓婃姤浜�" name="reporter">
- <Input v-model:value="model.reporter" :maxlength="50" placeholder="璇疯緭鍏ュ鍚�" />
+ <FormItem label="涓婃姤浜�" name="reporterId">
+ <HrmEmployeeSelect v-model="model.reporterId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨涓婃姤浜�" />
</FormItem>
<FormItem label="涓婃姤鏃堕棿" name="reportTime">
<DatePicker
@@ -472,7 +494,7 @@
<Modal v-model:open="assignOpen" title="鍒嗘淳鏁存敼璐d换浜�" :confirm-loading="saving" ok-text="纭鍒嗘淳" cancel-text="鍙栨秷" @ok="saveAssign">
<Form layout="vertical" class="mt-4">
<FormItem label="鏁存敼璐d换浜�" required>
- <Input v-model:value="assignModel.assignee" :maxlength="50" placeholder="璇疯緭鍏ユ暣鏀硅矗浠讳汉濮撳悕" />
+ <HrmEmployeeSelect v-model="assignModel.assigneeId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨鏁存敼璐d换浜�" />
</FormItem>
<FormItem label="鏁存敼鏈熼檺">
<DatePicker v-model:value="assignModel.rectifyDeadline" value-format="YYYY-MM-DD" class="w-full" />
@@ -506,7 +528,8 @@
<Modal v-model:open="recheckOpen" title="闅愭偅澶嶆煡" :confirm-loading="saving" ok-text="鎻愪氦澶嶆煡" cancel-text="鍙栨秷" @ok="saveRecheck">
<Form layout="vertical" class="mt-4">
<FormItem label="澶嶆煡浜�" required>
- <Input v-model:value="recheckModel.rechecker" :maxlength="50" placeholder="璇疯緭鍏ュ鏌ヤ汉濮撳悕锛堜笉鑳戒笌鏁存敼璐d换浜虹浉鍚岋級" />
+ <HrmEmployeeSelect v-model="recheckModel.recheckerId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨澶嶆煡浜�" />
+ <div class="text-muted-foreground mt-1 text-xs">澶嶆煡浜轰笉鑳戒笌鏁存敼璐d换浜轰负鍚屼竴浜恒��</div>
</FormItem>
<FormItem label="澶嶆煡缁撹" required>
<Select v-model:value="recheckModel.recheckResult" :options="recheckOptions" />
--
Gitblit v1.9.3