Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev

src/constants/index.ts

@@ -565,6 +565,7 @@ export enum DeliverySideState {
 // 采购订单外部显示文案
 export const PurchaseOrderOutWorkStateTexts = {
   "-1": "取消订单",
+  0: '完成订单',
   1: '提交订单',
   2: '确认订单',
   3: '确认电子合同',
@@ -636,6 +637,7 @@ export const SaleOrderInsideWorkStateTexts = {
 // 订单流转记录外部状态
 export const OrderTransformOutWorkStateTexts = {
   "-1": '取消订单',
+  0: '完成订单',
   1: '待确认',
   2: '待确认电子合同',
   3: '待支付',
@@ -659,6 +661,7 @@ export const OrderTransformOutWorkStateTexts = {
 // 采购订单流转记录内部状态
 export const PurchaseOrderTransformInsideWorkStateTexts = {
   "-1": '取消订单',
+  0: '完成订单',
   1: '待提交审核',
   2: '提交审核通过',
   3: '审核通过',

src/pages/orderSystem/orderDetail/index.tsx

@@ -20,7 +20,7 @@ import OrderDeleveRecord from './components/orderDeleveRecord'
 export interface CommonOrderDetailProps {}
 
 const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
-  
+
   const [formData, setFormData] = useState<any>(null)
   let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus()
   page_type = Number(page_type)
@@ -50,7 +50,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
       setData: setFormData
     }
   }
-  
+
   const detailList = [
     { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
     { label: '订单摘要', name: 'orderThe', span: 8 },
@@ -59,7 +59,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(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 ? {
     picName: '单',
@@ -74,12 +74,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
         <OrderDetailWrapper>
           <div className='gray-wrap'>
             {/* 工作流进度 */}
-            { pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess 
+            { pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
               customTitleKey='operationalProcess'
               customKey='state'
-              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)} 
-              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)} 
-              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []} 
+              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
+              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
+              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
               innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
             ></AuditProcess> }
 
@@ -106,4 +106,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
 
 CommonOrderDetail.defaultProps = {}
 
-export default CommonOrderDetail
\ No newline at end of file
+export default CommonOrderDetail

src/pages/orderSystem/readyConfirmPayList/detail.tsx

@@ -23,7 +23,7 @@ import OrderDeleveRecord from '../orderDetail/components/orderDeleveRecord'
 export interface CommonOrderDetailProps {}
 
 const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
-  
+
   const [formData, setFormData] = useState<any>(null)
   let { id, pageStatus, page_type = SALE_ORDER_STATUS.READY_APPROVED_ORDER } = usePageStatus()
   page_type = Number(page_type)
@@ -63,7 +63,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
   const renderExtra = () => {
     return <Button type='primary' onClick={startPush}>确认支付结果</Button>
   }
-  
+
   const detailList = [
     { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
     { label: '订单摘要', name: 'orderThe', span: 8 },
@@ -72,7 +72,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(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 ? {
     picName: '单',
@@ -87,12 +87,12 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
         <OrderDetailWrapper>
           <div className='gray-wrap'>
             {/* 工作流进度 */}
-            { pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess 
+            { pageStatus !== PageStatus.ADD && formData && formData.externalWorkflowFlowRecordLogResponses && <AuditProcess
               customTitleKey='operationalProcess'
               customKey='state'
-              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)} 
-              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)} 
-              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []} 
+              outerVerifyCurrent={findLastIndexFlowState(formData.externalWorkflowFlowRecordLogResponses)}
+              innerVerifyCurrent={findLastIndexFlowState(formData.interiorWorkflowFlowRecordLogResponses)}
+              outerVerifySteps={formData.externalWorkflowFlowRecordLogResponses || []}
               innerVerifySteps={formData.interiorWorkflowFlowRecordLogResponses || []}
             ></AuditProcess> }
 
@@ -120,4 +120,4 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
 
 CommonOrderDetail.defaultProps = {}
 
-export default CommonOrderDetail
\ No newline at end of file
+export default CommonOrderDetail