Merge branch 'dev' into test

src/constants/index.ts

@@ -828,7 +828,7 @@ export const SaleOrderInsideWorkStateTexts = {
   19: '待新增物流单',
   20: '订单发货待确认',
   23: '待确认回单',
-  24: '订单待归档',
+  24: '订单归档',
   25: '待审核发货单',
   26: '待审核物流单',
   27: '待手工发货'

src/pages/payandSettle/amountAccountManage/paymentWithdraw/index.tsx

@@ -71,7 +71,6 @@ const PaymentWithdraw: React.FC<{}> = () => {
   ]
 
   const fetchData = (params: any) => {
-    console.log(params)
     return new Promise((resolve, reject) => {
       let obj = { ...params }
       PublicApi.getPayMemberAssetAccountGetPayCashOutList(obj).then(res => {

src/pages/transaction/_public/order/constant.ts

 import { ISchema } from '@formily/antd'
 import { FORM_FILTER_PATH } from '@/formSchema/const'
+import moment from 'moment'
 
 export const orderTypeLabel = ['', 
   '询价采购',
@@ -62,7 +63,7 @@ export const tableListSchema: ISchema = {
         "supplyMembersName": {
           type: 'string',
           "x-component-props": {
-            placeholder: '请输入供应会员名称'
+            placeholder: '请输入采购会员名称'
           }
         },
         "[startCreateTime,endCreateTime]": {

src/pages/transaction/_public/order/effects/useOrderDetail.tsx

@@ -28,7 +28,7 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
   const dataRef = useRef<any>([
     { label: '对应报价单号', name: 'quotationNo', span: 8, render: text => <Link to={'/'}>{text}</Link> },
     { label: '订单摘要', name: 'orderThe', span: 8 },
-    { label: '供应会员', name: 'supplyMembersName', span: 8 },
+    { label: type === 'saleOrder' ? '采购会员' : '供应会员', name: type === 'saleOrder' ? 'createMemberName' : 'supplyMembersName', span: 8 },
     { label: '下单模式', name: 'orderModel', span: 8, render: text => GlobalConfig.web.orderMode.find(v => v.value === text)?.label || '' },
     { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
@@ -64,6 +64,8 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
       const { code, data } = res
       if (code === 1000) {
         setPaylist(data)
+      } else {
+        message.error(res.message)
       }
     })
   }

src/pages/transaction/components/orderPayTabs/index.tsx

@@ -17,7 +17,7 @@ const TabHeader = ({dataSource}) => {
       <div className={style.smallnumber}>￥{dataSource.payPrice || 0}</div>
     </Col>
     <Col>
-      <StatusColors status={dataSource.externalState} type='out'/>
+      <StatusColors status={dataSource.externalState} type='payOut'/>
     </Col>
   </Row>
 }

src/pages/transaction/components/orderTransformRecord/index.tsx

@@ -162,9 +162,13 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = ({type}) => {
   const { data } = useContext(OrderDetailContext)
   const { externalProcurementOrderLogResponses, interiorProcurementOrderLogResponses } = data
   return (
+    <>
+      {
+        (externalProcurementOrderLogResponses?.length > 0 || interiorProcurementOrderLogResponses?.length > 0) && 
         <MellowCard style={{marginTop: 24}} bordered={false}>
           <Tabs defaultActiveKey="1">
-        <Tabs.TabPane tab='外部订单流转记录' key="1">
+            {
+              externalProcurementOrderLogResponses?.length > 0 && <Tabs.TabPane tab='外部订单流转记录' key="1">
                 <Table
                   columns={outOrderCols}
                   dataSource={externalProcurementOrderLogResponses}
@@ -172,7 +176,9 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = ({type}) => {
                   rowKey="id"
                 />
               </Tabs.TabPane>
-        <Tabs.TabPane tab='内部订单流转记录' key="2">
+            }
+            {
+              interiorProcurementOrderLogResponses?.length > 0 && <Tabs.TabPane tab='内部订单流转记录' key="2">
                 <Table
                   columns={type === 'saleOrder' ? SaleSideOrderCols : PurchaseSideOrderCols}
                   dataSource={interiorProcurementOrderLogResponses}
@@ -180,8 +186,11 @@ const OrderTransformRecord:React.FC<OrderTransformRecordProps> = ({type}) => {
                   rowKey="id"
                 />
               </Tabs.TabPane>
+            }
           </Tabs>
         </MellowCard>
+      }
+    </>
   )
 }
 

src/pages/transaction/purchaseOrder/index.tsx

@@ -17,6 +17,7 @@ import Submit from '@/components/NiceForm/components/Submit'
 export interface PurchaseOrderProps { }
 
 const fetchTableData = async (params) => {
+  console.log(params,'params')
   const { data } = await PublicApi.getOrderProcurementOrderList(params)
   return data
 }

src/pages/transaction/purchaseOrder/orderCollect/effects/index.ts

-import { productColumns } from './../../../../afterService/exchangeGoods/waitAddLogisticsOrder/opration/component/selectProductModal.tsx/index';
 import { ISchemaFormActions, FormEffectHooks, IFieldState, ISchemaFormAsyncActions, createEffectHook } from '@formily/antd';
 import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
 import { useLinkageUtils } from '@/utils/formEffectUtils';

src/pages/transaction/purchaseOrder/orderCollect/model/usePaymentInfo.tsx

@@ -4,6 +4,7 @@ import { ISchemaFormActions, ISchemaFormAsyncActions } from '@formily/antd'
 import { useEffect, useState, useRef, useContext } from 'react'
 import { PublicApi } from '@/services/api'
 import { ReadyAddOrderDetailContext } from '../../context'
+import { message } from 'antd'
 
 export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions, memberId: any): any => {
   const paywayData = useRef<any>({})
@@ -84,6 +85,8 @@ export const usePaymentInfo = (ctx: ISchemaFormActions | ISchemaFormAsyncActions
         paywayData.current = data
 
         setColumns(newColumns)
+      } else {
+        message.error(res.message)
       }
     })
   }

src/pages/transaction/saleOrder/index.tsx

@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const'
 import { DatePicker } from '@formily/antd-components'
 import Submit from '@/components/NiceForm/components/Submit'
+import moment from 'moment'
 
 // 销售订单查询