From c9ef6dfaa6ae75b042f5a621e56270fef962dbbb Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Mon, 18 Dec 2023 12:23:21 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-=E6=97=B6=E9=97=B4=E7=BA=BF=E4=B8=AD?=
 =?UTF-8?q?=EF=BC=8C=E6=9D=A1=E4=BB=B6=E8=8A=82=E7=82=B9=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1015863333847040]工单处理-时间线中，条件节点信息回显异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1015863333847040
---
 src/resources/components/FormItems/select.vue               | 6 +++---
 .../processdetail/workorder/activity/item/rule-handler.vue  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/resources/components/FormItems/select.vue b/src/resources/components/FormItems/select.vue
index ef772929..05e86a26 100644
--- a/src/resources/components/FormItems/select.vue
+++ b/src/resources/components/FormItems/select.vue
@@ -63,13 +63,13 @@ export default {
       if (setting.dataSource == 'matrix') {
         let param = { matrixUuid: setting.matrixUuid };
         param.keywordColumn = setting.mapping.text;
-        param.valueField = this.setting.mapping.value;
-        param.textField = this.setting.mapping.text;
+        param.valueField = setting.mapping.value;
+        param.textField = setting.mapping.text;
         json.rootName = 'dataList';
         json = this.defaultSelfJson;
         json.params = param;
         json.dynamicUrl = json.defaultUrl;
-        json.showName = 'html';
+        // json.showName = 'html';
         json.readonlyClass = setting.readonlyClass;
         json.sperateText = setting.sperateText;
       } else {
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/rule-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/rule-handler.vue
index d186a99d..87f57a0c 100644
--- a/src/views/pages/process/task/processdetail/workorder/activity/item/rule-handler.vue
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/rule-handler.vue
@@ -54,7 +54,7 @@
                   <span>{{ $t('term.process.alwaystransfer') }}</span>
                 </div>
                 <div v-if="item.type=='negative'" class="text-overflow">
-                  <span>$t('term.process.nottransfer')</span>
+                  <span>{{ $t('term.process.nottransfer') }}</span>
                 </div>
               </div>
               <div class="condition-text">
-- 
Gitee