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

src/global/config/global.d.ts

@@ -50,7 +50,7 @@ export interface ShopInfo {
 	type: number;
 	environment: number;
 	logoUrl: string;
-	describe?: any;
+	describe: string;
 	state: number;
 	url: string;
 }

src/pages/member/memberPr1/index.tsx

@@ -180,9 +180,9 @@ const MemberPr1: React.FC<{}> = props => {
       const { 
         memberTypes = [], 
         status = [], 
-        roles = [], 
-        levels = [], 
-        sources = [], 
+        memberRoles = [], 
+        memberLevels = [], 
+        source = [], 
       } = data;
 
       const newColumns = columns.slice();
@@ -199,9 +199,9 @@ const MemberPr1: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })), 
-        roleId: roles.map(item => ({ label: item.roleName, value: item.roleId })), 
-        level: levels.map(item => ({ label: item.level, value: item.levelTag })), 
-        source: sources.map(item => ({ label: item.text, value: item.id })), 
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })), 
+        level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })), 
+        source: source.map(item => ({ label: item.text, value: item.id })), 
       };
     }
     return {};

src/pages/member/memberPr2/index.tsx

@@ -180,9 +180,9 @@ const MemberPr2: React.FC<{}> = props => {
       const { 
         memberTypes = [], 
         status = [], 
-        roles = [], 
-        levels = [], 
-        sources = [], 
+        memberRoles = [], 
+        memberLevels = [], 
+        source = [], 
       } = data;
 
       const newColumns = columns.slice();
@@ -199,9 +199,9 @@ const MemberPr2: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })), 
-        roleId: roles.map(item => ({ label: item.roleName, value: item.roleId })), 
-        level: levels.map(item => ({ label: item.level, value: item.levelTag })), 
-        source: sources.map(item => ({ label: item.text, value: item.id })), 
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })), 
+        level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })), 
+        source: source.map(item => ({ label: item.text, value: item.id })), 
       };
     }
     return {};

src/pages/member/memberPrConfirm/index.tsx

@@ -186,9 +186,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
       const { 
         memberTypes = [], 
         status = [], 
-        roles = [], 
-        levels = [], 
-        sources = [], 
+        memberRoles = [], 
+        memberLevels = [], 
+        source = [], 
       } = data;
 
       const newColumns = columns.slice();
@@ -205,9 +205,9 @@ const MemberPrConfirm: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })), 
-        roleId: roles.map(item => ({ label: item.roleName, value: item.roleId })), 
-        level: levels.map(item => ({ label: item.level, value: item.levelTag })), 
-        source: sources.map(item => ({ label: item.text, value: item.id })), 
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })), 
+        level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })), 
+        source: source.map(item => ({ label: item.text, value: item.id })),  
       };
     }
     return {};

src/pages/member/memberPrSubmit/index.tsx

@@ -180,9 +180,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
       const { 
         memberTypes = [], 
         memberStatus = [], 
-        roles = [], 
-        levels = [], 
-        sources = [], 
+        memberRoles = [], 
+        memberLevels = [], 
+        source = [], 
         status = [], 
       } = data;
 
@@ -200,9 +200,9 @@ const MemberPrSubmit: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })), 
-        roleId: roles.map(item => ({ label: item.roleName, value: item.roleId })), 
-        level: levels.map(item => ({ label: item.level, value: item.levelTag })), 
-        source: sources.map(item => ({ label: item.text, value: item.id })), 
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })), 
+        level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })), 
+        source: source.map(item => ({ label: item.text, value: item.id })), 
       };
     }
     return {};

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

@@ -241,26 +241,35 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
     
   }
   return (
-    <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
-      <Tabs defaultActiveKey="2" animated={false}>
-        <Tabs.TabPane tab='订单收货统计' key="1">
-          <Table
-            columns={outOrderCols}
-            dataSource={orderReceivingStatisticsResponses}
-            pagination={false}
-            rowKey="productId"
-          />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab='订单收货明细' key="2">
-          <NestTable
-            NestColumns={[sideOrderCols, sideChildrenCols]}
-            rowKey='id'
-            childrenDataKey='orderDeliveryProducts'
-            dataSource={orderDeliveryDetailsResponses}
-          />
-        </Tabs.TabPane>
-      </Tabs>
-    </MellowCard>
+    <>
+      {
+        (orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
+        <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
+          <Tabs defaultActiveKey="2" animated={false}>
+            {
+              orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单收货统计' key="1">
+                <Table
+                  columns={outOrderCols}
+                  dataSource={orderReceivingStatisticsResponses}
+                  pagination={false}
+                  rowKey="productId"
+                />
+              </Tabs.TabPane>
+            }
+            {
+              orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单收货明细' key="2">
+                <NestTable
+                  NestColumns={[sideOrderCols, sideChildrenCols]}
+                  rowKey='id'
+                  childrenDataKey='orderDeliveryProducts'
+                  dataSource={orderDeliveryDetailsResponses}
+                />
+              </Tabs.TabPane>
+            }
+          </Tabs>
+        </MellowCard>
+      }
+    </>
   )
 }
 

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().then(res => {
+    PublicApi.getPayPayWayList({memberId: data.supplyMembersId}).then(res => {
       const { code, data } = res
       if (code === 1000) {
         setPaylist(data)

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

@@ -13,6 +13,7 @@ import { SALE_ORDER_STATUS } from '../../constant'
 import { usePageStatus } from '@/hooks/usePageStatus'
 import ModalTable from '@/components/ModalTable'
 import { formatTimeString } from '@/utils'
+import { DELIVERY_TYPE } from '@/constants'
 
 export interface OrderProductTableProps {}
 
@@ -388,7 +389,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       dataIndex: 'logistics',
       align: 'center',
       key: 'logistics',
-      render: text => (text && text.render) || ''
+      render: (text) => text && text.deliveryType && DELIVERY_TYPE[text.deliveryType]
     },
     {
       title: '仓位库存扣减记录',

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

@@ -106,26 +106,35 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = (props) => {
   const { data } = useContext(OrderDetailContext)
   const { externalProcurementOrderLogResponses, interiorProcurementOrderLogResponses } = data
   return (
-    <MellowCard style={{marginTop: 24}} bordered={false}>
-      <Tabs defaultActiveKey="1" animated={false}>
-        <Tabs.TabPane tab='外部订单流转记录' key="1">
-          <Table
-            columns={outOrderCols}
-            dataSource={externalProcurementOrderLogResponses}
-            pagination={false}
-            rowKey="id"
-          />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab='内部订单流转记录' key="2">
-          <Table
-            columns={sideOrderCols}
-            dataSource={interiorProcurementOrderLogResponses}
-            pagination={false}
-            rowKey="id"
-          />
-        </Tabs.TabPane>
-      </Tabs>
-    </MellowCard>
+    <>
+      {
+        (externalProcurementOrderLogResponses?.length>0 || interiorProcurementOrderLogResponses?.length>0) && 
+        <MellowCard style={{marginTop: 24}} bordered={false}>
+          <Tabs defaultActiveKey="1" animated={false}>
+            {
+              externalProcurementOrderLogResponses?.length>0 && <Tabs.TabPane tab='外部订单流转记录' key="1">
+                <Table
+                  columns={outOrderCols}
+                  dataSource={externalProcurementOrderLogResponses}
+                  pagination={false}
+                  rowKey="id"
+                />
+              </Tabs.TabPane>
+            }
+            {
+              interiorProcurementOrderLogResponses?.length>0 && <Tabs.TabPane tab='内部订单流转记录' key="2">
+                <Table
+                  columns={sideOrderCols}
+                  dataSource={interiorProcurementOrderLogResponses}
+                  pagination={false}
+                  rowKey="id"
+                />
+              </Tabs.TabPane>
+            }
+          </Tabs>
+        </MellowCard>
+      }
+    </>
   )
 }
 

src/pages/platformSettlement/corporateAccount/index.tsx

@@ -156,8 +156,8 @@ const CorporateAccount = () => {
             name: '银行账号',
             dataIndex: 'bankAccount',
             image: bank_account,
-            value: data.bankAccount,
-            cacheValue: data.bankAccount,
+            value:  data && data.bankAccount || '',
+            cacheValue: data &&  data.bankAccount || '',
             isEdit: false,
             canEdit: true,
             pattern: /^([1-9]{1})(\d{14}|\d{18})$/,
@@ -167,8 +167,8 @@ const CorporateAccount = () => {
             name: '开户行',
             dataIndex: 'bankDeposit',
             image: bank,
-            value: data.bankDeposit,
-            cacheValue: data.bankDeposit,
+            value:  data && data.bankDeposit || '',
+            cacheValue:  data && data.bankDeposit || '',
             isEdit: false,
             canEdit: true,
             pattern: /^[\u4e00-\u9fa5]{0,50}|[0-9a-zA-Z]{0,100}$/,