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/inspection/point/index.vue | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/views/safety/inspection/point/index.vue b/src/views/safety/inspection/point/index.vue
index b0e3d70..e9e9486 100644
--- a/src/views/safety/inspection/point/index.vue
+++ b/src/views/safety/inspection/point/index.vue
@@ -23,12 +23,14 @@
Tag,
} from 'ant-design-vue';
+import { getWorkshopSimpleList } from '#/api/mes/md/workstation/workshop';
import {
createInspectionPoint,
deleteInspectionPoint,
getInspectionPointPage,
updateInspectionPoint,
} from '#/api/safety';
+import HrmEmployeeSelect from '#/views/hrm/employee/components/select.vue';
import { INSPECT_CYCLE_OPTIONS, POINT_TYPE_OPTIONS } from '../../shared';
@@ -47,16 +49,34 @@
code: '',
name: '',
pointType: 'HIGH_VOLTAGE_ROOM',
- workshopName: '',
+ workshopId: undefined,
+ // 杞﹂棿 / 璐d换浜轰负鍚庣鍥炲~鐨勫揩鐓у瓧娈碉紝浠呯敤浜庡睍绀�
+ workshopName: undefined,
location: '',
inspectItems: '1. 闂ㄩ攣涓庤绀烘爣璇嗗畬濂絓n2. 缁濈紭宸ュ櫒鍏峰湪鏈夋晥鏈熷唴\n3. 娑堥槻鍣ㄦ潗鍦ㄤ綅鍙敤\n4. 璁板綍鏈~鍐欏畬鏁�',
inspectCycle: 'DAILY',
- ownerName: '',
+ ownerId: undefined,
+ ownerName: undefined,
status: 0,
remark: '',
});
const model = reactive<SafetyApi.InspectionPoint>(initial());
+
+/** 杞﹂棿涓嬫媺閫夐」锛堟潵婧愶細MES 杞﹂棿涓绘暟鎹級 */
+const workshopOptions = ref<{ label: string; value: number }[]>([]);
+
+async function loadWorkshops() {
+ try {
+ const list = await getWorkshopSimpleList();
+ workshopOptions.value = (list || []).map((w) => ({
+ label: w.name!,
+ value: w.id!,
+ }));
+ } catch {
+ message.error('鍔犺浇杞﹂棿鍒楄〃澶辫触');
+ }
+}
const rules = {
code: [{ required: true, whitespace: true, message: '璇疯緭鍏ョ偣浣嶇紪鐮�' }],
@@ -118,6 +138,9 @@
saving.value = true;
try {
const data = { ...model, code: model.code.trim(), name: model.name.trim() };
+ // 杞﹂棿鍚嶇О / 璐d换浜哄鍚嶄负鍙蹇収锛屼笉鍐嶆彁浜�
+ delete data.workshopName;
+ delete data.ownerName;
await (data.id ? updateInspectionPoint(data) : createInspectionPoint(data));
message.success('宸℃鐐逛綅宸蹭繚瀛�');
open.value = false;
@@ -133,7 +156,10 @@
await load();
}
-onMounted(() => load());
+onMounted(() => {
+ void loadWorkshops();
+ void load();
+});
</script>
<template>
@@ -271,11 +297,17 @@
<FormItem label="宸℃鍛ㄦ湡" name="inspectCycle">
<Select v-model:value="model.inspectCycle" :options="INSPECT_CYCLE_OPTIONS" />
</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="璐d换浜�" name="ownerName">
- <Input v-model:value="model.ownerName" :maxlength="50" placeholder="璇疯緭鍏ュ鍚�" />
+ <FormItem label="璐d换浜�" name="ownerId">
+ <HrmEmployeeSelect v-model="model.ownerId" placeholder="浠庡憳宸ユ。妗堜腑閫夋嫨璐d换浜�" />
</FormItem>
<FormItem label="鍏蜂綋浣嶇疆" name="location" class="col-span-full">
<Input v-model:value="model.location" :maxlength="200" placeholder="濡� 鍘傚尯瑗垮寳瑙� 1 鍙烽厤鐢垫埧" />
--
Gitblit v1.9.3