fix: 待支付订单列表

src/pages/procurement/callForBids/readyCheckedConfirmFirst/components/remarkBidReport/index.tsx

@@ -23,8 +23,8 @@ export interface RemarkBidReportProps {
 const RemarkBidReport: React.FC<RemarkBidReportProps> = ({cardTitle}) => {
   const { data, submitData, submitCtl } = useContext(ReadyConfirmBidContext)
   const [transferRadio, setTransferRadio] = useState<number>(0)
-  const { fileList, recommandList, childTableData } = submitData
-  const { setFileList, setRecommandList, setChildrenTableData } = submitCtl
+  const { recommandList, childTableData } = submitData
+  const { setRecommandList, setChildrenTableData } = submitCtl
 
   const [evaluationRecord, setEvaluationRecord] = useState<any>([])
   const [childTableColumns, setChildrenTableColumns] = useState<any>([])

src/pages/procurement/callForBids/readyPassBid/index.tsx

@@ -10,7 +10,6 @@ import { FORM_FILTER_PATH } from '@/formSchema/const'
 import Submit from '@/components/NiceForm/components/Submit'
 import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
 import '../../constants/index.less'
-import { BidInsideWorkState, BidOuterWorkState } from '@/constants/procurement'
 
 // 待确认定标 招标
 

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

@@ -9,8 +9,8 @@ import { message } from 'antd'
 import { history } from 'umi'
 
 interface OrderDetailHookProps {
-  // 采购、销售、待收货、待确认发货
-  type: 'purchaseOrder' | 'saleOrder' | 'p_readyReceiveOrder' | 's_readyConfirmDelevedOrder'
+  // 采购、销售、待收货、待确认发货、待支付
+  type: 'purchaseOrder' | 'saleOrder' | 'p_readyReceiveOrder' | 's_readyConfirmDelevedOrder' | 'p_readyPayOrder'
 }
 
 // 订单详情, 支持两种订单模式
@@ -63,6 +63,8 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
       break;
       case 's_readyConfirmDelevedOrder': api = PublicApi.getOrderVendorValidateDeliveryDetail;
       break;
+      case 'p_readyPayOrder': api = PublicApi.getOrderBuyerValidatePayDetail;
+      break;
       default:
         api = PublicApi.getOrderBuyerDetail;
     }
@@ -71,7 +73,6 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
 
   const reloadFormData = useCallback(() => {
     if (id || orderNo) {
-      // const fn = type === 'purchaseOrder' ? PublicApi.getOrderBuyerDetail : PublicApi.getOrderVendorDetail
       const fn = getDetailsApi(type)
       // @ts-ignore
       fn( id ? { orderId: id } : { orderNo }, { ctlType: "none" }).then(res => {
@@ -108,7 +109,6 @@ export const useOrderDetail = (options: OrderDetailHookProps) => {
   }
 
 
-
   return {
     formContext,
     id,

src/pages/transaction/purchaseOrder/index.tsx

@@ -127,13 +127,13 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
    const renderOptionButton = (record: any) => {
     const buttonGroup = {
       '取消订单': record.showCancel,
-      // '售后': record.showAfterSales,
+      '售后': record.showAfterSales,
       '评价': record.showComment
     }
 
     const operationHandler = {
       '取消订单': () => handleCancel(record.orderId),
-      // '售后': () => handleSaleAfter(record),
+      '售后': () => handleSaleAfter(record),
       '评价': () => handleEvaluate(record.orderId),
     }
 

src/pages/transaction/purchaseOrder/readyPayOrder/detail/index.tsx

@@ -10,7 +10,7 @@ import OrderDetailSection from '../../../components/orderDetailSection';
 import OrderPayModal from '@/pages/transaction/components/orderPayModal';
 
 const ReadyConfirmContract: React.FC = () => {
-  const { formContext, id, detailList } = useOrderDetail({type: 'purchaseOrder'})
+  const { formContext, id, detailList } = useOrderDetail({type: 'p_readyPayOrder'})
   const {data, currentPayInfoId} = formContext
   const payRef = useRef<any>({})
 

src/pages/transaction/purchaseOrder/readyPayOrder/index.tsx

@@ -16,7 +16,7 @@ import '../index.less'
 export interface ReadyPayOrderProps {}
 
 const fetchTableData = async (params) => {
-  const { data } = await PublicApi.getOrderBuyerPage({...params, outerStatus: 6})
+  const { data } = await PublicApi.getOrderBuyerValidatePayPage(params)
   return data
 }
 

src/pages/transaction/purchaseOrder/readyPayOrder/schema/index.ts

@@ -30,7 +30,7 @@ export const tableListSchema: any = () => {
             }
           },
           properties: {
-            digest: {
+            "digest": {
               type: 'string',
               'x-component-props': {
                 placeholder: '请输入订单摘要',
@@ -53,7 +53,7 @@ export const tableListSchema: any = () => {
               }))
             },
             "[startDate,endDate]": {
-              type: 'datarange',
+              type: 'daterange',
               // "x-component": 'DateRangePickerUnix',
               'x-component-props': {
                 placeholder: ['开始时间','结束时间'],