@@ -307,6 +437,118 @@ const TicketAggent = ({ setRedirect, setRedirectUrl, t }) => {
+
+ {t('Ticket')};
+
+
+
+ {text}
+
+
+ {ticketStatus && ticketStatus.value && (
+
+
+ {ticketStatus.value
+ .filter(item => item.state_flow_log_list.length > 0)
+ .map((item, index) => {
+ let description_user = item.state_flow_log_list[0].participant_info.participant_alias;
+ let description_time = item.state_flow_log_list[0].gmt_created;
+ let description_operation = item.state_flow_log_list[0].transition.transition_name;
+ let description = "用户'" + description_user + "'发起了'" + description_operation + "'操作";
+ return (
+
+ {description}
+
+ );
+ })}
+
+
+ )}
+
+
+ {ticketStatus && ticketStatus.value && (
+
+ {ticketStatus.value.map((item, index) => {
+ let description = '';
+ if (index < ticketStatus.current_id) {
+ let description_user = item.state_flow_log_list[0].participant_info.participant_alias;
+ let description_operation = item.state_flow_log_list[0].gmt_created;
+ let description_time = item.state_flow_log_list[0].transition.transition_name;
+ description = description_user + description_operation + '@' + description_time;
+ }
+ return ;
+ })}
+
+ )}
+
+
+
+
+
+ );
+
+ case 55:
+ console.log('55');
+
+ return (
+
+
+ //
+ // {item.field_name}
+ //
+ //
+ );
+ break;
+ default:
+ console.log('default');
+ break;
+ }
+ })}
+
+
+
+
+
+ {ticketTransitionField &&
+ ticketTransitionField.value &&
+ ticketTransitionField.value.map((item, index) => {
+ if (item.alert_enable) {
+ return (
+
+
+
+ );
+ } else {
+ return (
+
+ );
+ }
+ })}
+
+
+
+
diff --git a/myems-web/src/components/MyEMS/Ticket/TicketApplication.js b/myems-web/src/components/MyEMS/Ticket/TicketApplication.js
index 406a4c55..3ac8f543 100644
--- a/myems-web/src/components/MyEMS/Ticket/TicketApplication.js
+++ b/myems-web/src/components/MyEMS/Ticket/TicketApplication.js
@@ -37,10 +37,10 @@ import { toast } from 'react-toastify';
import ButtonIcon from '../../common/ButtonIcon';
import { APIBaseURL } from '../../../config';
import { join } from 'lodash';
-import { Steps, Timeline } from 'antd';
+import { Steps, Timeline, Collapse } from 'antd';
const { Step } = Steps;
-
+const { Panel } = Collapse;
const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
useEffect(() => {
let is_logged_in = getCookieValue('is_logged_in');
@@ -504,6 +504,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
{ticketStatus && (
+
{ticketStatus.value
.filter(item => item.state_flow_log_list.length > 0)
.map((item, index) => {
@@ -517,7 +518,7 @@ const TicketApplication = ({ setRedirect, setRedirectUrl, t }) => {
);
})}
-
+
)}