From cec91d13116154243b444fd950e59f628b355981 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期二, 18 八月 2026 11:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/task/data.ts | 18 +++++++++++++++++-
src/api/mes/pro/task/index.ts | 1 +
src/api/system/user/index.ts | 7 +++++++
3 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 5afe094..a059e1c 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -56,6 +56,7 @@
remark?: string; // 澶囨敞
pauseRecords?: PauseRecord[]; // 鍋滃伐璁板綍
reportableQuantity?: number; // 鍙姤宸ユ暟閲�
+ assigneeUserIds?: number[]; // 鎶ュ伐浜�
}
/** MES 鐢熶骇浠诲姟鍒嗛〉鏌ヨ鍙傛暟 */
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 1f49036..cc7ce13 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -114,3 +114,10 @@
params: { nickname },
});
}
+
+/** 閫氳繃瑙掕壊鏍囪瘑鑾峰彇鐢ㄦ埛绮剧畝淇℃伅鍒楄〃 */
+export function getSimpleUserListByRoleCode(code: string) {
+ return requestClient.get<SystemUserApi.UserSimple[]>('/system/user/list-by-role-code', {
+ params: { code },
+ });
+}
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index c5fec1a..aeb9868 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -1,5 +1,7 @@
-锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import { z } from '#/adapter/form';
+import { getSimpleUserListByRoleCode } from '#/api/system/user';
import type { MesProTaskApi } from '#/api/mes/pro/task';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
@@ -468,6 +470,20 @@
},
},
{
+ fieldName: 'assigneeUserIds',
+ label: '鎶ュ伐浜�',
+ component: 'ApiSelect',
+ componentProps: {
+ placeholder: '璇烽�夋嫨鎶ュ伐浜�',
+ api: getSimpleUserListByRoleCode,
+ params: { code: 'production_submit_work' },
+ labelField: 'nickname',
+ valueField: 'id',
+ mode: 'multiple',
+ },
+ rules: z.array(z.number()).min(1, '璇烽�夋嫨鎶ュ伐浜�').default([]),
+ },
+ {
fieldName: 'remark',
label: '澶囨敞',
component: 'Textarea',
--
Gitblit v1.9.3