fix：订单详情中获取支付方式添加会员角色字段，订单内部/外部流转记录更新

src/constants/index.ts

@@ -630,6 +630,73 @@ export const SaleOrderInsideWorkStateTexts = {
   27: '手工发货'
 }
 
+// 订单流转记录外部状态
+export const OrderTransformOutWorkStateTexts = {
+  "-1": '取消订单',
+  1: '待确认',
+  2: '待确认电子合同',
+  3: '待支付',
+  4: '待确认支付结果',
+  5: '待新增销售发货单',
+  6: '待新增物流单',
+  7: '待确认发货订单',
+  8: '待新增采购入库单',
+  9: '待确认收货订单',
+  10: '待确认收货订单',
+
+  11: '待确认回单',
+  12: '待归档',
+  13: '待归档',
+  14: '不接受订单',
+  15: '确认未到账',
+  16: '待新增采购入库单',
+  17: '手工确认发货'
+}
+
+// 采购订单流转记录内部状态
+export const PurchaseOrderTransformInsideWorkStateTexts = {
+  "-1": '取消订单',
+  1: '待提交审核',
+  2: '提交审核通过',
+  3: '审核通过',
+  4: '审核通过',
+  5: '审核通过',
+  6: '已确认电子合同',
+  7: '审核不通过',
+  8: '审核不通过',
+  9: '支付成功',
+  10: '支付失败',
+
+  11: '已审核采购入库单',
+  12: '已确认收货',
+  13: '订单归档完成',
+  14: '修改订单',
+  15: '手工收货'
+}
+
+// 销售订单流转记录内部状态
+export const SaleOrderTransformInsideWorkStateTexts = {
+  "-1": '取消订单',
+  0: '完成订单',
+  1: '审核通过',
+  2: '审核通过',
+  3: '审核通过',
+  4: '接受订单',
+  5: '确认到账',
+  6: '已审核销售发货单',
+  7: '接受物流单',
+  8: '已确认发货',
+  9: '已确认回单',
+  10: '已归档',
+
+  11: '审核不通过',
+  12: '审核不通过',
+  13: '不接受订单',
+  14: '确认未到账',
+  15: '审核不通过',
+  16: '不接受物流单'
+}
+
 export const PayOutWorkStateTexts = {
   1: '待支付',
   2: '待确认支付结果',

src/pages/orderSystem/components/StatusColors/index.tsx

 import React from 'react'
 import { Tag } from 'antd'
-import { PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts, PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState, SaleOrderInsideWorkState, SaleOrderInsideWorkStateTexts, PayOutWorkStateTexts, DeliverySideState, DeliverySideStateTexts, InquiryStateTexts } from '@/constants'
+import { PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts, PurchaseOrderInsideWorkState, PurchaseOrderOutWorkState, SaleOrderInsideWorkState, SaleOrderInsideWorkStateTexts, PayOutWorkStateTexts, DeliverySideState, DeliverySideStateTexts, InquiryStateTexts, OrderTransformOutWorkStateTexts, PurchaseOrderTransformInsideWorkStateTexts, SaleOrderTransformInsideWorkStateTexts } from '@/constants'
 
 export interface IStatusColor {
   [key: string]: {
@@ -12,7 +12,7 @@ export interface IStatusColor {
 // 用于标签状态控制
 export interface StatusColorsProps {
   status: number,
-  type: 'out' | 'inside' | 'saleInside' | 'payOut' | 'deliveInside' | 'inquiry'
+  type: 'out' | 'inside' | 'saleInside' | 'payOut' | 'deliveInside' | 'inquiry' | 'transformInside' |'transformOut'
 }
 
 export enum ORDER_EXAMINE_ENUM {
@@ -94,6 +94,9 @@ const typeMaps = {
   'payOut': PayOutWorkStateTexts,
   'deliveInside': DeliverySideStateTexts,
   'inquiry': InquiryStateTexts,
+  'transformOut': OrderTransformOutWorkStateTexts,
+  'transformInside': PurchaseOrderTransformInsideWorkStateTexts,
+  'transformSaleInside': SaleOrderTransformInsideWorkStateTexts,
 }
 
 // 订单内部状态显示
@@ -110,4 +113,4 @@ const StatusColors:React.FC<StatusColorsProps> = (props) => {
 
 StatusColors.defaultProps = {}
 
-export default StatusColors
\ No newline at end of file
+export default StatusColors

src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx

@@ -49,7 +49,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
   const [payList, setPaylist] = useState<any[]>([])
 
   useEffect(() => {
-    PublicApi.getPayPayWayList({memberId: data.supplyMembersId}).then(res => {
+    PublicApi.getPayPayWayList({memberId: data.supplyMembersId, memberRoleId: data.supplyMembersRoleId}).then(res => {
       const { code, data } = res
       if (code === 1000) {
         setPaylist(data)
@@ -80,4 +80,4 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
 
 OrderPayTabs.defaultProps = {}
 
-export default OrderPayTabs
\ No newline at end of file
+export default OrderPayTabs

src/pages/orderSystem/orderDetail/components/orderTransformRecord/index.tsx

@@ -26,7 +26,7 @@ const outOrderCols: any[] = [
     dataIndex: 'state',
     align: 'center',
     key: 'state',
-    render: text => <StatusColors status={text} type='out'/>
+    render: text => <StatusColors status={text} type='transformOut'/>
     // @todo 需传递工作流状态重新render
   },
   {
@@ -80,7 +80,7 @@ const sideOrderCols: any[] = [
     dataIndex: 'state',
     align: 'center',
     key: 'state',
-    render: text => <StatusColors status={text} type='inside'/>
+    render: text => <StatusColors status={text} type='transformInside'/>
   },
   {
     title: '操作',
@@ -108,7 +108,7 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = (props) => {
   return (
     <>
       {
-        (externalProcurementOrderLogResponses?.length>0 || interiorProcurementOrderLogResponses?.length>0) && 
+        (externalProcurementOrderLogResponses?.length>0 || interiorProcurementOrderLogResponses?.length>0) &&
         <MellowCard style={{marginTop: 24}} bordered={false}>
           <Tabs defaultActiveKey="1" animated={false}>
             {
@@ -140,4 +140,4 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = (props) => {
 
 OrderTransformRecord.defaultProps = {}
 
-export default OrderTransformRecord
\ No newline at end of file
+export default OrderTransformRecord