Commit 604e404b authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:处理订单详情流转状态显示异常

parent 0a575d43
...@@ -565,6 +565,7 @@ export enum DeliverySideState { ...@@ -565,6 +565,7 @@ export enum DeliverySideState {
// 采购订单外部显示文案 // 采购订单外部显示文案
export const PurchaseOrderOutWorkStateTexts = { export const PurchaseOrderOutWorkStateTexts = {
"-1": "取消订单", "-1": "取消订单",
0: '完成订单',
1: '提交订单', 1: '提交订单',
2: '确认订单', 2: '确认订单',
3: '确认电子合同', 3: '确认电子合同',
...@@ -636,6 +637,7 @@ export const SaleOrderInsideWorkStateTexts = { ...@@ -636,6 +637,7 @@ export const SaleOrderInsideWorkStateTexts = {
// 订单流转记录外部状态 // 订单流转记录外部状态
export const OrderTransformOutWorkStateTexts = { export const OrderTransformOutWorkStateTexts = {
"-1": '取消订单', "-1": '取消订单',
0: '完成订单',
1: '待确认', 1: '待确认',
2: '待确认电子合同', 2: '待确认电子合同',
3: '待支付', 3: '待支付',
...@@ -659,6 +661,7 @@ export const OrderTransformOutWorkStateTexts = { ...@@ -659,6 +661,7 @@ export const OrderTransformOutWorkStateTexts = {
// 采购订单流转记录内部状态 // 采购订单流转记录内部状态
export const PurchaseOrderTransformInsideWorkStateTexts = { export const PurchaseOrderTransformInsideWorkStateTexts = {
"-1": '取消订单', "-1": '取消订单',
0: '完成订单',
1: '待提交审核', 1: '待提交审核',
2: '提交审核通过', 2: '提交审核通过',
3: '审核通过', 3: '审核通过',
......
...@@ -20,7 +20,7 @@ import OrderDeleveRecord from './components/orderDeleveRecord' ...@@ -20,7 +20,7 @@ import OrderDeleveRecord from './components/orderDeleveRecord'
export interface CommonOrderDetailProps {} export interface CommonOrderDetailProps {}
const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
const [formData, setFormData] = useState<any>(null) const [formData, setFormData] = useState<any>(null)
let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus() let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus()
page_type = Number(page_type) page_type = Number(page_type)
...@@ -50,7 +50,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -50,7 +50,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
setData: setFormData setData: setFormData
} }
} }
const detailList = [ const detailList = [
{ label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> }, { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
{ label: '订单摘要', name: 'orderThe', span: 8 }, { label: '订单摘要', name: 'orderThe', span: 8 },
...@@ -59,7 +59,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -59,7 +59,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
{ label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] }, { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
{ label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) }, { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
{ label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> }, { label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
{ label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> }, // { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
] ]
const headerTiTle = formData ? { const headerTiTle = formData ? {
picName: '单', picName: '单',
...@@ -74,12 +74,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -74,12 +74,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
<OrderDetailWrapper> <OrderDetailWrapper>
<div className='gray-wrap'> <div className='gray-wrap'>
{/* 工作流进度 */} {/* 工作流进度 */}
{ pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess { pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
customTitleKey='operationalProcess' customTitleKey='operationalProcess'
customKey='state' customKey='state'
outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)} outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)} innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []} outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []} innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
></AuditProcess> } ></AuditProcess> }
...@@ -106,4 +106,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -106,4 +106,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
CommonOrderDetail.defaultProps = {} CommonOrderDetail.defaultProps = {}
export default CommonOrderDetail export default CommonOrderDetail
\ No newline at end of file
...@@ -23,7 +23,7 @@ import OrderDeleveRecord from '../orderDetail/components/orderDeleveRecord' ...@@ -23,7 +23,7 @@ import OrderDeleveRecord from '../orderDetail/components/orderDeleveRecord'
export interface CommonOrderDetailProps {} export interface CommonOrderDetailProps {}
const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
const [formData, setFormData] = useState<any>(null) const [formData, setFormData] = useState<any>(null)
let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus() let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus()
page_type = Number(page_type) page_type = Number(page_type)
...@@ -63,7 +63,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -63,7 +63,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
const renderExtra = () => { const renderExtra = () => {
return <Button type='primary' onClick={startPush}>确认支付结果</Button> return <Button type='primary' onClick={startPush}>确认支付结果</Button>
} }
const detailList = [ const detailList = [
{ label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> }, { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
{ label: '订单摘要', name: 'orderThe', span: 8 }, { label: '订单摘要', name: 'orderThe', span: 8 },
...@@ -72,7 +72,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -72,7 +72,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
{ label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] }, { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
{ label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) }, { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
{ label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> }, { label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
{ label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> }, // { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
] ]
const headerTiTle = formData ? { const headerTiTle = formData ? {
picName: '单', picName: '单',
...@@ -87,12 +87,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -87,12 +87,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
<OrderDetailWrapper> <OrderDetailWrapper>
<div className='gray-wrap'> <div className='gray-wrap'>
{/* 工作流进度 */} {/* 工作流进度 */}
{ pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess { pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
customTitleKey='operationalProcess' customTitleKey='operationalProcess'
customKey='state' customKey='state'
outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)} outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)} innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []} outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []} innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
></AuditProcess> } ></AuditProcess> }
...@@ -120,4 +120,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => { ...@@ -120,4 +120,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
CommonOrderDetail.defaultProps = {} CommonOrderDetail.defaultProps = {}
export default CommonOrderDetail export default CommonOrderDetail
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment