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/permit/index.vue | 107 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 80 insertions(+), 27 deletions(-)
diff --git a/src/views/safety/permit/index.vue b/src/views/safety/permit/index.vue
index 9508182..5fa509f 100644
--- a/src/views/safety/permit/index.vue
+++ b/src/views/safety/permit/index.vue
@@ -29,6 +29,7 @@
} from 'ant-design-vue';
import dayjs from 'dayjs';
+import { getWorkshopSimpleList } from '#/api/mes/md/workstation/workshop';
import {
approveWorkPermit,
cancelWorkPermit,
@@ -43,6 +44,7 @@
updateWorkPermit,
uploadSafetyFiles,
} from '#/api/safety';
+import HrmEmployeeSelect from '#/views/hrm/employee/components/select.vue';
import {
PERMIT_STATUS_COLOR,
@@ -60,6 +62,8 @@
const loading = ref(false);
const pagination = reactive({ current: 1, pageSize: 10, total: 0, showSizeChanger: true });
+const workshopOptions = ref<{ label: string; value: number }[]>([]);
+
const editOpen = ref(false);
const saving = ref(false);
const formRef = ref<FormInstance>();
@@ -69,15 +73,15 @@
const initial = (): SafetyApi.WorkPermit => ({
permitType: 'HOT_WORK',
title: '',
- workshopName: '',
+ workshopId: undefined,
location: '',
workContent: '',
- applicant: '',
+ applicantId: undefined,
planStartTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
planEndTime: dayjs().add(4, 'hour').format('YYYY-MM-DD HH:mm:ss'),
riskLevel: 'NORMAL',
safetyMeasures: '',
- guardian: '',
+ guardianId: undefined,
remark: '',
});
@@ -86,7 +90,7 @@
const editRules = {
permitType: [{ required: true, message: '璇烽�夋嫨浣滀笟绫诲瀷' }],
title: [{ required: true, whitespace: true, message: '璇疯緭鍏ヤ綔涓氬悕绉�' }],
- applicant: [{ required: true, whitespace: true, message: '璇疯緭鍏ョ敵璇蜂汉' }],
+ applicantId: [{ required: true, message: '璇烽�夋嫨鐢宠浜�' }],
planStartTime: [{ required: true, message: '璇烽�夋嫨璁″垝寮�濮嬫椂闂�' }],
planEndTime: [{ required: true, message: '璇烽�夋嫨璁″垝缁撴潫鏃堕棿' }],
};
@@ -101,14 +105,24 @@
/* 瀹℃壒 */
const approveOpen = ref(false);
-const approveModel = reactive({ id: 0, approver: '', decision: 'APPROVED', approveComment: '' });
+const approveModel = reactive<{
+ id: number;
+ approverId?: number;
+ decision: string;
+ approveComment: string;
+}>({ id: 0, approverId: undefined, decision: 'APPROVED', approveComment: '' });
/* 璇︽儏鎶藉眽 */
const detailOpen = ref(false);
const detailRow = ref<null | SafetyApi.WorkPermit>(null);
const monitors = ref<SafetyApi.WorkPermitMonitor[]>([]);
const monitorLoading = ref(false);
-const monitorForm = reactive<SafetyApi.WorkPermitMonitor>({ permitId: 0, guardian: '', monitorContent: '', abnormal: '' });
+const monitorForm = reactive<SafetyApi.WorkPermitMonitor>({
+ permitId: 0,
+ guardianId: undefined,
+ monitorContent: '',
+ abnormal: '',
+});
const monitorPhotos = ref<string[]>([]);
const columns = [
@@ -116,6 +130,7 @@
{ title: '浣滀笟绫诲瀷', dataIndex: 'permitType', width: 130 },
{ title: '浣滀笟鍚嶇О', dataIndex: 'title', minWidth: 200, ellipsis: true },
{ title: '浣滀笟鍦扮偣', dataIndex: 'location', width: 160, ellipsis: true },
+ { title: '浣滀笟杞﹂棿', dataIndex: 'workshopName', width: 130, ellipsis: true },
{ title: '鐢宠浜�', dataIndex: 'applicant', width: 100 },
{ title: '璁″垝寮�濮�', dataIndex: 'planStartTime', width: 165 },
{ title: '璁″垝缁撴潫', dataIndex: 'planEndTime', width: 165 },
@@ -141,6 +156,15 @@
rows.value = [];
} finally {
loading.value = false;
+ }
+}
+
+async function loadWorkshops() {
+ try {
+ const list = await getWorkshopSimpleList();
+ workshopOptions.value = (list || []).map((w) => ({ label: w.name!, value: w.id! }));
+ } catch {
+ workshopOptions.value = [];
}
}
@@ -180,7 +204,7 @@
}
async function saveEdit() {
- if (guardianRequired.value && !model.guardian?.trim()) {
+ if (guardianRequired.value && !model.guardianId) {
message.warning('鍔ㄧ伀 / 楂樺帇甯︾數 / 鏈夐檺绌洪棿浣滀笟蹇呴』鎸囧畾鐩戞姢浜�');
return;
}
@@ -190,9 +214,13 @@
const data = {
...model,
title: model.title.trim(),
- applicant: model.applicant.trim(),
photoUrls: photoList.value.join(','),
};
+ // 鐢宠浜� / 瀹℃壒浜� / 鐩戞姢浜� / 杞﹂棿鍚嶇О鍧囦负鍚庣鍥炲~鐨勫揩鐓у瓧娈碉紝涓嶅弬涓庢彁浜�
+ delete data.applicant;
+ delete data.approver;
+ delete data.guardian;
+ delete data.workshopName;
await (data.id ? updateWorkPermit(data) : createWorkPermit(data));
message.success(data.id ? '浣滀笟绁ㄥ凡鏇存柊' : '浣滀笟绁ㄥ凡鎻愪氦锛岀瓑寰呭鎵�');
editOpen.value = false;
@@ -204,21 +232,33 @@
/* ---------- 瀹℃壒 ---------- */
function openApprove(row: SafetyApi.WorkPermit) {
+ // 璁板綍瀹℃壒鐩爣琛岋紝鐢ㄤ簬鏍¢獙鈥滅敵璇蜂汉涓嶈兘瀹℃壒鑷繁鐨勪綔涓氱エ鈥�
+ detailRow.value = row;
approveModel.id = row.id!;
- approveModel.approver = '';
+ approveModel.approverId = undefined;
approveModel.decision = 'APPROVED';
approveModel.approveComment = '';
approveOpen.value = true;
}
async function saveApprove() {
- if (!approveModel.approver.trim()) {
- message.warning('璇峰~鍐欏鎵逛汉');
+ const { approverId } = approveModel;
+ if (!approverId) {
+ message.warning('璇烽�夋嫨瀹℃壒浜�');
+ return;
+ }
+ if (approverId === detailRow.value?.applicantId) {
+ message.warning('鐢宠浜轰笉鑳藉鎵硅嚜宸辩殑浣滀笟绁�');
return;
}
saving.value = true;
try {
- await approveWorkPermit({ ...approveModel, approver: approveModel.approver.trim() });
+ await approveWorkPermit({
+ id: approveModel.id,
+ approverId,
+ decision: approveModel.decision,
+ approveComment: approveModel.approveComment,
+ });
message.success(approveModel.decision === 'APPROVED' ? '宸叉壒鍑�' : '宸查┏鍥�');
approveOpen.value = false;
await load();
@@ -251,7 +291,7 @@
detailRow.value = row;
detailOpen.value = true;
monitorForm.permitId = row.id!;
- monitorForm.guardian = row.guardian ?? '';
+ monitorForm.guardianId = row.guardianId;
monitorForm.monitorContent = '';
monitorForm.abnormal = '';
monitorPhotos.value = [];
@@ -286,15 +326,15 @@
}
async function saveMonitor() {
- if (!monitorForm.guardian.trim()) {
- message.warning('璇峰~鍐欑洃鎶や汉');
+ if (!monitorForm.guardianId) {
+ message.warning('璇烽�夋嫨鐩戞姢浜�');
return;
}
saving.value = true;
try {
await createMonitor({
...monitorForm,
- guardian: monitorForm.guardian.trim(),
+ guardianId: monitorForm.guardianId,
monitorTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
photoUrls: monitorPhotos.value.join(','),
});
@@ -320,7 +360,10 @@
await load();
}
-onMounted(() => load());
+onMounted(() => {
+ void load();
+ void loadWorkshops();
+});
</script>
<template>
@@ -365,7 +408,7 @@
row-key="id"
:loading="loading"
:pagination="pagination"
- :scroll="{ x: 1750 }"
+ :scroll="{ x: 1900 }"
size="middle"
:cell-style="{ padding: '12px 16px' }"
@change="tableChange"
@@ -382,6 +425,10 @@
</template>
<template v-else-if="column.dataIndex === 'riskLevel'">
<Tag :color="RISK_LEVEL_COLOR[record.riskLevel ?? '']">{{ record.riskLevelName }}</Tag>
+ </template>
+ <template v-else-if="column.dataIndex === 'applicant'">
+ <span v-if="record.applicant">{{ record.applicant }}</span>
+ <span v-else class="text-gray-300">-</span>
</template>
<template v-else-if="column.dataIndex === 'guardian'">
<span v-if="record.guardian">{{ record.guardian }}</span>
@@ -457,8 +504,14 @@
<FormItem label="浣滀笟鍚嶇О" name="title" class="col-span-full">
<Input v-model:value="model.title" :maxlength="200" placeholder="濡� 2#涓诲彉 10kV 寮�鍏虫煖妫�淇姩鐏�" />
</FormItem>
- <FormItem label="浣滀笟鍖哄煙/杞﹂棿" name="workshopName">
- <Input v-model:value="model.workshopName" :maxlength="100" placeholder="濡� 鐢垫皵杞﹂棿" />
+ <FormItem label="浣滀笟鍖哄煙/杞﹂棿" name="workshopId">
+ <Select
+ v-model:value="model.workshopId"
+ :options="workshopOptions"
+ show-search
+ :filter-option="(i: string, o: any) => String(o.label).includes(i)"
+ placeholder="璇烽�夋嫨杞﹂棿"
+ />
</FormItem>
<FormItem label="浣滀笟鍦扮偣" name="location">
<Input v-model:value="model.location" :maxlength="200" placeholder="濡� 2#楂樺帇閰嶇數瀹�" />
@@ -469,11 +522,11 @@
<FormItem label="璁″垝缁撴潫鏃堕棿" name="planEndTime">
<DatePicker v-model:value="model.planEndTime" show-time format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" class="w-full" />
</FormItem>
- <FormItem label="鐢宠浜�" name="applicant">
- <Input v-model:value="model.applicant" :maxlength="50" placeholder="璇疯緭鍏ュ鍚�" />
+ <FormItem label="鐢宠浜�" name="applicantId">
+ <HrmEmployeeSelect v-model="model.applicantId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨鐢宠浜�" />
</FormItem>
- <FormItem label="鐩戞姢浜�" name="guardian">
- <Input v-model:value="model.guardian" :maxlength="50" :placeholder="guardianRequired ? '鍔ㄧ伀/楂樺帇甯︾數/鏈夐檺绌洪棿蹇呭~' : '閫夊~'" />
+ <FormItem label="鐩戞姢浜�" name="guardianId">
+ <HrmEmployeeSelect v-model="model.guardianId" :placeholder="guardianRequired ? '鍔ㄧ伀/楂樺帇甯︾數/鏈夐檺绌洪棿蹇呴��' : '閫夊~'" />
</FormItem>
<FormItem label="浣滀笟鍐呭涓庤寖鍥�" name="workContent" class="col-span-full">
<Input.TextArea v-model:value="model.workContent" :maxlength="2000" :rows="3" show-count placeholder="璇存槑浣滀笟鍐呭銆佹秹鍙婅澶囦笌浣滀笟鑼冨洿" />
@@ -502,7 +555,7 @@
<Modal v-model:open="approveOpen" title="浣滀笟绁ㄥ鎵�" :confirm-loading="saving" ok-text="鎻愪氦瀹℃壒" cancel-text="鍙栨秷" @ok="saveApprove">
<Form layout="vertical" class="mt-4">
<FormItem label="瀹℃壒浜�" required>
- <Input v-model:value="approveModel.approver" :maxlength="50" placeholder="璇疯緭鍏ュ鎵逛汉濮撳悕锛堜笉鑳戒笌鐢宠浜虹浉鍚岋級" />
+ <HrmEmployeeSelect v-model="approveModel.approverId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨瀹℃壒浜猴紙涓嶈兘涓庣敵璇蜂汉鐩稿悓锛�" />
</FormItem>
<FormItem label="瀹℃壒缁撹" required>
<Select
@@ -535,7 +588,7 @@
<Descriptions.Item label="浣滀笟鍚嶇О" :span="2">{{ detailRow.title }}</Descriptions.Item>
<Descriptions.Item label="浣滀笟鍖哄煙">{{ detailRow.workshopName || '-' }}</Descriptions.Item>
<Descriptions.Item label="浣滀笟鍦扮偣">{{ detailRow.location || '-' }}</Descriptions.Item>
- <Descriptions.Item label="鐢宠浜�">{{ detailRow.applicant }}</Descriptions.Item>
+ <Descriptions.Item label="鐢宠浜�">{{ detailRow.applicant || '-' }}</Descriptions.Item>
<Descriptions.Item label="鐢宠鏃堕棿">{{ detailRow.applyTime ? String(detailRow.applyTime).replace('T', ' ') : '-' }}</Descriptions.Item>
<Descriptions.Item label="璁″垝寮�濮�">{{ detailRow.planStartTime ? String(detailRow.planStartTime).replace('T', ' ') : '-' }}</Descriptions.Item>
<Descriptions.Item label="璁″垝缁撴潫">{{ detailRow.planEndTime ? String(detailRow.planEndTime).replace('T', ' ') : '-' }}</Descriptions.Item>
@@ -561,7 +614,7 @@
<div class="mb-2 text-sm font-semibold">娣诲姞鐩戞姢璁板綍</div>
<Form layout="vertical">
<FormItem label="鐩戞姢浜�">
- <Input v-model:value="monitorForm.guardian" :maxlength="50" placeholder="濮撳悕" />
+ <HrmEmployeeSelect v-model="monitorForm.guardianId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨鐩戞姢浜�" />
</FormItem>
<FormItem label="鐩戞姢鍐呭涓庢儏鍐�">
<Input.TextArea v-model:value="monitorForm.monitorContent" :maxlength="1000" :rows="2" placeholder="璁板綍鐩戞姢鏃剁殑鐜板満鎯呭喌" />
--
Gitblit v1.9.3