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/process-design/template/modules/parameter-select-dialog.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/mes/process-design/template/modules/parameter-select-dialog.vue b/src/views/mes/process-design/template/modules/parameter-select-dialog.vue
index b4f87c6..eacf9d5 100644
--- a/src/views/mes/process-design/template/modules/parameter-select-dialog.vue
+++ b/src/views/mes/process-design/template/modules/parameter-select-dialog.vue
@@ -4,7 +4,7 @@
import { nextTick, ref } from 'vue';
-import { DICT_TYPE } from '../../../../../packages/constants/src';
+import { DICT_TYPE } from '@vben/constants';
import { Button, message, Modal } from 'ant-design-vue';
@@ -57,7 +57,7 @@
formOptions: {
schema: [
{
- fieldName: 'code',
+ fieldName: 'paramCode',
label: '鍙傛暟缂栫爜',
component: 'Input',
componentProps: {
@@ -66,7 +66,7 @@
},
},
{
- fieldName: 'name',
+ fieldName: 'paramName',
label: '鍙傛暟鍚嶇О',
component: 'Input',
componentProps: {
@@ -79,10 +79,10 @@
gridOptions: {
columns: [
{ type: 'checkbox', width: 50 },
- { field: 'code', title: '鍙傛暟缂栫爜', minWidth: 150 },
- { field: 'name', title: '鍙傛暟鍚嶇О', minWidth: 180 },
+ { field: 'paramCode', title: '鍙傛暟缂栫爜', minWidth: 150 },
+ { field: 'paramName', title: '鍙傛暟鍚嶇О', minWidth: 180 },
{
- field: 'type',
+ field: 'paramType',
title: '鍙傛暟绫诲瀷',
width: 120,
cellRender: {
@@ -90,9 +90,9 @@
props: { type: DICT_TYPE.MES_PD_PARAM_TYPE },
},
},
- { field: 'unit', title: '鍗曚綅', width: 80 },
+ { field: 'unitMeasureName', title: '鍗曚綅', width: 80 },
{
- field: 'requiredFlag',
+ field: 'required',
title: '鏄惁蹇呭～',
width: 90,
cellRender: {
--
Gitblit v1.9.3