Merge remote-tracking branch 'origin/v3' into v3.10_xsy

Halo1236 · Aug 22, 2024 · 9f6a2ed · 9f6a2ed
2 parents 824b9de + d561701
commit 9f6a2ed
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
@@ -1931,6 +1931,7 @@
     "CheckViewAcceptor": "View more acceptor",
     "Assignees": "Assignees",
     "Close": "Close",
+    "CancelTicket": "Cancel Ticket",
     "OpenStatus": "Open",
     "CloseStatus": "Close",
     "Comment": "Comment",

diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
@@ -1927,6 +1927,7 @@
     "Assignee": "処理者",
     "Assignees": "処理待ち",
     "Close": "閉じる",
+    "CancelTicket": "作業指示をキャンセルする",
     "OpenStatus": "オン",
     "CloseStatus": "閉じる",
     "Comment": "備考",

diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
@@ -1913,6 +1913,7 @@
     "Assignee": "处理人",
     "Assignees": "待处理人",
     "Close": "关闭",
+    "CancelTicket": "取消工单",
     "OpenStatus": "审批中",
     "CloseStatus": "已完成",
     "Comment": "备注",

diff --git a/src/i18n/langs/zh_Hant.json b/src/i18n/langs/zh_Hant.json
@@ -1913,6 +1913,7 @@
     "Assignee": "處理人",
     "Assignees": "待處理人",
     "Close": "關閉",
+    "CancelTicket": "取消工單",
     "OpenStatus": "審批中",
     "CloseStatus": "已完成",
     "Comment": "備註",

diff --git a/src/views/tickets/TicketFlow/FlowRuleField.vue b/src/views/tickets/TicketFlow/FlowRuleField.vue
@@ -48,7 +48,12 @@ export default {
         }
       ],
       select2Option: {
-        url: '/api/v1/users/users/?oid=root'
+        url: '/api/v1/users/users/?oid=root',
+        ajax: {
+          transformOption: (item) => {
+            return { label: item.name + '(' + item.username + ')', value: item.id }
+          }
+        }
       },
       fields: [
       ]

diff --git a/src/views/tickets/components/Comments.vue b/src/views/tickets/components/Comments.vue
@@ -50,7 +50,7 @@
           type="danger"
           @click="handleClose"
         >
-          <i class="fa fa-times" /> {{ $t('tickets.Close') }}
+          <i class="fa fa-times" /> {{ $t('tickets.CancelTicket') }}
         </el-button>
         <el-button
           :disabled="object.status.value === 'closed'"