From b64a0deae5b5d33f9e20671a68936b27f0b9b00b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 七月 2026 18:03:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pro/andon/record/data.ts | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/mes/pro/andon/record/data.ts b/src/views/mes/pro/andon/record/data.ts
index 23d9a1d..6c8496b 100644
--- a/src/views/mes/pro/andon/record/data.ts
+++ b/src/views/mes/pro/andon/record/data.ts
@@ -1,17 +1,17 @@
-import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProAndonConfigApi } from '#/api/mes/pro/andon/config';
import type { MesProAndonRecordApi } from '#/api/mes/pro/andon/record';
import { markRaw } from 'vue';
-import { DICT_TYPE, MesProWorkOrderStatusEnum } from '..\..\..\..\..\packages\constants\src';
-import { getDictOptions } from '..\..\..\..\..\packages\effects\hooks\src';
+import { DICT_TYPE, MesProWorkOrderStatusEnum } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
import { getSimpleUserList } from '#/api/system/user';
import { getRangePickerDefaultProps } from '#/utils';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
-import { ProProcessSelect } from '#/views/mes/pro/process/components';
+import { ProProcessSelect } from '#/views/mes/process-design/process/components';
import { ProWorkOrderSelect } from '#/views/mes/pro/workorder/components';
import { AndonConfigSelect } from '../config/components';
@@ -82,7 +82,7 @@
return [
{ field: 'workstationCode', title: '宸ヤ綔绔欑紪鐮�', width: 140 },
{ field: 'workstationName', title: '宸ヤ綔绔欏悕绉�', minWidth: 140 },
- { field: 'workOrderCode', title: '宸ュ崟缂栫爜', width: 140 },
+ { field: 'workOrderCode', title: '璁㈠崟缂栫爜', width: 140 },
{ field: 'processName', title: '宸ュ簭鍚嶇О', width: 140 },
{ field: 'userNickname', title: '鍙戣捣浜�', width: 110 },
{
@@ -129,7 +129,7 @@
/**
* 鏂板/澶勭疆/璇︽儏瀹夌伅鍛煎彨璁板綍鐨勮〃鍗�
*
- * - create锛氬綍鍏ュ懠鍙富浣撲俊鎭紙宸ヤ綔绔�/鍙戣捣浜�/宸ュ崟/宸ュ簭/鍛煎彨鍘熷洜/澶囨敞锛�
+ * - create锛氬綍鍏ュ懠鍙富浣撲俊鎭紙宸ヤ綔绔�/鍙戣捣浜�/璁㈠崟/宸ュ簭/鍛煎彨鍘熷洜/澶囨敞锛�
* - update锛氬懠鍙富浣撳彧璇诲睍绀哄垱寤烘椂鐨勫揩鐓у瓧娈碉紙workstationName/workOrderCode/processName/reason锛夛紝缂栬緫澶勭疆鏃堕棿/澶勭疆浜�/澶囨敞
* - detail锛氭墍鏈夊瓧娈靛彧璇�
*/
@@ -187,16 +187,16 @@
isCreate
? {
fieldName: 'workOrderId',
- label: '鐢熶骇宸ュ崟',
+ label: '鐢熶骇璁㈠崟',
component: markRaw(ProWorkOrderSelect),
componentProps: {
- placeholder: '璇烽�夋嫨宸ュ崟锛堝彲閫夛級',
+ placeholder: '璇烽�夋嫨璁㈠崟锛堝彲閫夛級',
status: MesProWorkOrderStatusEnum.CONFIRMED,
},
}
: {
fieldName: 'workOrderCode',
- label: '鐢熶骇宸ュ崟',
+ label: '鐢熶骇璁㈠崟',
component: 'Input',
componentProps: {
disabled: true,
--
Gitblit v1.9.3