From 1e653db94c24389cc7615fd4a7ef1d63b00af534 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:39:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/requirement/modules/ToolsModal.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/tms/requirement/modules/ToolsModal.vue b/src/views/tms/requirement/modules/ToolsModal.vue
index 8b6e337..a8e1f42 100644
--- a/src/views/tms/requirement/modules/ToolsModal.vue
+++ b/src/views/tms/requirement/modules/ToolsModal.vue
@@ -70,7 +70,7 @@
columns: [{
title: '宸ュ叿缂栫爜',
align: 'center',
- dataIndex: 'toolCode'
+ dataIndex: 'toolId'
},
{
title: '宸ュ叿绫诲瀷',
@@ -90,7 +90,7 @@
{
title: '宸ュ叿鍙傛暟鏍囪瘑',
align: 'center',
- dataIndex: 'paramaTableName'
+ dataIndex: 'paramaTableName_dictText'
},
{
title: '鍨嬪彿/鍥惧彿',
@@ -198,7 +198,7 @@
this.close()
},
handleOk() {
- this.$bus.$emit('selectionRows', this.selectionRows)
+ this.$emit('sendSelectionRows', this.selectionRows[0])
this.close()
},
}
--
Gitblit v1.9.3