diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx index 44b1f86fb..10dc51566 100644 --- a/client/src/components/dms-post-form/dms-post-form.component.jsx +++ b/client/src/components/dms-post-form/dms-post-form.component.jsx @@ -80,7 +80,8 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) { initialValues={{ story: t("jobs.labels.dms.defaultstory", { ro_number: job.ro_number, - area_of_damage: job.area_of_damage && job.area_of_damage.impact1, + area_of_damage: + (job.area_of_damage && job.area_of_damage.impact1) || "UNKNOWN", }).substr(0, 239), }} > @@ -174,6 +175,22 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) { + + + + + {(fields, { add, remove }) => { return ( diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index a9e6c1478..6ec415432 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -2032,6 +2032,8 @@ export const QUERY_JOB_EXPORT_DMS = gql` po_number clm_no job_totals + ded_amt + ded_status ownr_fn ownr_ln ownr_co_nm diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx index 48d3a69d3..8fc496718 100644 --- a/client/src/pages/dms/dms.container.jsx +++ b/client/src/pages/dms/dms.container.jsx @@ -13,7 +13,7 @@ import queryString from "query-string"; import React, { useEffect, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; -import { useHistory, useLocation } from "react-router-dom"; +import { useHistory, useLocation, Link } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import SocketIO from "socket.io-client"; import AlertComponent from "../../components/alert/alert.component"; @@ -138,13 +138,20 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) { + {`${ + data && data.jobs_by_pk && data.jobs_by_pk.ro_number + }`} + {` | ${data.jobs_by_pk.ownr_fn || ""} ${ + data.jobs_by_pk.ownr_ln || "" + } ${data.jobs_by_pk.ownr_co_nm || ""} | ${ + data.jobs_by_pk.v_model_yr || "" + } ${data.jobs_by_pk.v_make_desc || ""} ${ + data.jobs_by_pk.v_model_desc || "" + }`} + + } socket={socket} jobId={jobId} />