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

config/routes/tranactionRoute.ts

@@ -308,11 +308,11 @@ const TranactionRoute = {
         },
         // 订单详情
         {
-          path: '/memberCenter/tranactionAbility/saleOrder/orderDetail',
-          name: 'orderDetail',
+          path: '/memberCenter/tranactionAbility/saleOrder/orderPreview',
+          name: 'orderPreview',
           hideInMenu: true,
           noMargin: true,
-          component: '@/pages/transaction/saleOrder/orderDetail'
+          component: '@/pages/transaction/saleOrder/orderPreview'
         },
         // 一级审核
         {
@@ -338,6 +338,36 @@ const TranactionRoute = {
           name: 'readyPayResult',
           component: '@/pages/transaction/saleOrder/readyPayResult'
         },
+        // 新增销售发货单列表
+        {
+          path: '/memberCenter/tranactionAbility/saleOrder/addSaleDelevedOrder',
+          name: 'addSaleDelevedOrder',
+          component: '@/pages/transaction/saleOrder/addSaleDelevedOrder'
+        },
+        // 待新增物流单
+        {
+          path: '/memberCenter/tranactionAbility/saleOrder/readyAddLogisticsOrder',
+          name: 'readyAddLogisticsOrder',
+          component: '@/pages/transaction/saleOrder/readyAddLogisticsOrder'
+        },
+        // 待确认发货单
+        {
+          path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmDelevedOrder',
+          name: 'readyConfirmDelevedOrder',
+          component: '@/pages/transaction/saleOrder/readyConfirmDelevedOrder'
+        },
+        // 待确认回单
+        {
+          path: '/memberCenter/tranactionAbility/saleOrder/readyConfirmReturnOrder',
+          name: 'readyConfirmReturnOrder',
+          component: '@/pages/transaction/saleOrder/readyConfirmReturnOrder'
+        },
+        // 待归档订单
+        {
+          path: '/memberCenter/tranactionAbility/saleOrder/readyReturnDocument',
+          name: 'readyReturnDocument',
+          component: '@/pages/transaction/saleOrder/readyReturnDocument'
+        },
       ]
     },
     // 交易规则

src/components/OverflowText/index.less

+.overflow-text {
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
\ No newline at end of file

src/components/OverflowText/index.tsx

+import React from 'react'
+import style from './index.less'
+import { Tooltip } from 'antd'
+
+export interface OverflowTextProps {
+  [key: string]: any
+}
+
+const OverflowText:React.FC<OverflowTextProps> = ({children, ...props}) => {
+  return (
+    <Tooltip placement='topLeft' title={children} arrowPointAtCenter>
+      <div className={style['overflow-text']} {...props}>
+        {children}
+      </div>
+    </Tooltip>
+  )
+}
+
+OverflowText.defaultProps = {}
+
+export default OverflowText
\ No newline at end of file

src/constants/index.ts

@@ -687,12 +687,22 @@ export enum SaleOrderInsideWorkState {
   /**
     *  确认回单
     */
-  CONFIRM_RECEIPT,
+  CONFIRM_RECEIPT = 23,
 
   /**
    *  订单归档
    */
   FILLING_ORDER,
+
+  /**
+   * 销售发货单待审核
+   */
+  READY_DELEVED_APPROVED,
+
+  /**
+   * 销售发货单审核成功
+   */
+  DELIVERY_APPROVED_SUCCESS
 }
 
 // 支付外部状态
@@ -748,7 +758,7 @@ export const SaleOrderInsideWorkStateTexts = {
   2: '一级审核订单',
   3: '二级审核订单',
   4: '确认订单',
-  5: '不接受订单',
+  5: '接受订单',
   6: '不接受订单',
   7: '提交一级审核订单不通过',
   8: '提交二级审核订单不通过',
@@ -758,8 +768,10 @@ export const SaleOrderInsideWorkStateTexts = {
   18: '发货单创建',
   19: '新增物流单',
   20: '订单发货确认',
-  21: '确认回单',
-  22: '订单归档',
+  23: '确认回单',
+  24: '订单归档',
+  25: '待审核发货单',
+  26: '发货单审核成功'
 }
 
 export const PayOutWorkStateTexts = {

src/locales/zh-CN/menu.ts

@@ -161,11 +161,18 @@ export default {
   'menu.tranactionAbility.saleOrder': '销售订单',
   'menu.tranactionAbility.saleOrder.saleOrderSearch': '订单查询',
   'menu.tranactionAbility.saleOrder.readyApprovedOrder': '待审核订单',
-  'menu.tranactionAbility.saleOrder.orderDetail': '订单详情',
+  'menu.tranactionAbility.saleOrder.orderPreview': '查看订单',
   'menu.tranactionAbility.saleOrder.firstApprovedOrder': '待审核订单（一级）',
   'menu.tranactionAbility.saleOrder.secondApprovedOrder': '待审核订单（二级）',
   'menu.tranactionAbility.saleOrder.readyConfirmOrder': '待确认订单',
   'menu.tranactionAbility.saleOrder.readyPayResult': '待确认支付结果',
+  'menu.tranactionAbility.saleOrder.addSaleDelevedOrder': '待新增销售发货单',
+  'menu.tranactionAbility.saleOrder.addSaleDelevedOrderDetail': '新增销售发货单',
+  'menu.tranactionAbility.saleOrder.readyAddLogisticsOrder': '待新增物流单',
+  'menu.tranactionAbility.saleOrder.readyConfirmDelevedOrder': '待确认发货订单',
+  'menu.tranactionAbility.saleOrder.readyConfirmReturnOrder': '待确认回单',
+  'menu.tranactionAbility.saleOrder.readyReturnDocument': '待确认归档',
+  
 
   //需求报价
   'menu.tranactionAbility.enquiryOffer': '需求报价',

src/pages/logistics/components/orderSearchDetail.tsx

@@ -63,8 +63,8 @@ const detailInfo: React.FC<{}> = () => {
     pageSize: 10
   })
   const [detailData, setDetailData] = useState<any>({
+    current: 0,
     step: {
-      current: 0,
       title: '外部流转',
       items: [
         {
@@ -231,7 +231,7 @@ const detailInfo: React.FC<{}> = () => {
         }else if(res.data.status == 3 || res.data.status == 4){
           current = 1
         }
-        setDetailData({...detailData,'step.current': current})
+        setDetailData({...detailData,current: current})
       })
     }
 
@@ -241,11 +241,12 @@ const detailInfo: React.FC<{}> = () => {
         setdataInfo(res.data)
         let current = 0
         if(res.data.status <= 2){
-          current = 0
-        }else if(res.data.status == 3 || res.data.status == 4){
           current = 1
+        }else if(res.data.status == 3 || res.data.status == 4){
+          console.log(2112)
+          current = 2
         }
-        setDetailData({...detailData,'step.current': current})
+        setDetailData({...detailData,current: current})
       })
     }
 
@@ -263,7 +264,7 @@ const detailInfo: React.FC<{}> = () => {
         }else if(res.data.status == 3 || res.data.status == 4){
           current = 1
         }
-        setDetailData({...detailData,'step.current': current})
+        setDetailData({...detailData,current: current})
       })
     }
 
@@ -339,8 +340,8 @@ const detailInfo: React.FC<{}> = () => {
               {
                 dataInfo.status == 1?<><span style={statuStyle.default}>待提交</span></>:
                 dataInfo.status == 2?<><span style={statuStyle.confirm}>待确认</span></>:
-                dataInfo.status == 3?<><span style={statuStyle.success}>不接受物流单</span></>:
-                <><span style={statuStyle.warn}>接受物流单</span></>
+                dataInfo.status == 3?<><span style={statuStyle.warn}>不接受物流单</span></>:
+                <><span style={statuStyle.success}>接受物流单</span></>
               }
               </div>
             </div>
@@ -357,7 +358,7 @@ const detailInfo: React.FC<{}> = () => {
           <Steps
             style={{ padding: '34px 0' }}
             progressDot
-            current={detailData.step.current}
+            current={detailData.current}
           >
             {detailData.step.items.map((item, index) => {
               return (

src/pages/logistics/components/pageOrderLog.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-09-23 10:24:42
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-23 18:07:31
+ * @LastEditTime: 2020-09-24 14:21:32
  * 外部流转记录
  */
 import React, { Component,useRef,ReactNode } from 'react';
@@ -70,18 +70,20 @@ export interface Params{
 const Log: React.FC<Params> = (props) => {
   const ref = useRef<any>({})
   const fetchData = (params: any) => {
-    if(!props.id){
-      return
-    }
+
 
     //待提交新增物流单
     if(props.type === 'Submit' ){
       return new Promise((resolve, reject) => {
-        PublicApi.getLogisticsOrderWaitSubmitPageOrderLog({...params,orderId:props.id}).then(res => {
-          if(res.code === 1000){
-            resolve(res.data)
-          }
-        })
+        if(!props.id){
+         resolve([])
+        }else{
+          PublicApi.getLogisticsOrderWaitSubmitPageOrderLog({...params,orderId:props.id}).then(res => {
+            if(res.code === 1000){
+              resolve(res.data)
+            }
+          })
+        }
       });
     }
     //物流单提交-物流单查询
@@ -117,7 +119,7 @@ const Log: React.FC<Params> = (props) => {
 
   };
   return <StandardTable
-    tableProps={{rowKey:'id'}}
+    tableProps={{rowKey:'operatorRoleId'}}
     currentRef={ref}
     columns={columns}
     fetchTableData={(params: any) => fetchData(params)}

src/pages/logistics/logisticsSubmit/toOrderSubmitDetail.tsx

@@ -3,11 +3,11 @@
  * @Date: 2020-07-28 11:25:30
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-23 16:17:29
+ * @LastEditTime: 2020-09-24 10:37:51
  */
 
 import React, { Component, useEffect, useRef, useState, ReactNode } from 'react'
-import { Card, Row, Col, Tabs, Button, Input as SelectInput, Badge } from 'antd'
+import { Card, Row, Col, Tabs, Button, Input as SelectInput, Badge,message } from 'antd'
 import { LinkOutlined, PlusOutlined } from '@ant-design/icons'
 import ModalTable, { ModalTableProps } from '@/components/ModalTable'
 import { StandardTable } from 'god'
@@ -16,6 +16,9 @@ import { PageHeaderWrapper } from '@ant-design/pro-layout'
 import { PATTERN_MAPS } from '@/constants/regExp'
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
 import { PageStatus, usePageStatus } from '@/hooks/usePageStatus'
+import {FORM_FILTER_PATH} from '@/formSchema/const'
+import {useStateFilterSearchLinkageEffect} from '@/formSchema/effects/useFilterSearch'
+import SearchSelect from '@/components/NiceForm/components/SearchSelect'
 import ListMadal from '../components/sumbitOrderModal'
 import OrderLog from '../components/pageOrderLog'
 import { PublicApi } from '@/services/api'
@@ -46,6 +49,7 @@ import ReturnEle from '@/components/ReturnEle'
 import style from '../components/index.less'
 import { history } from 'umi'
 import { values, action } from 'mobx'
+import Search from '@/components/NiceForm/components/Search'
 const actions = createFormActions()
 
 const { onFieldChange$, onFieldValueChange$ } = FormEffectHooks
@@ -288,15 +292,65 @@ const Deatail: React.FC<{}> = () => {
 
   // const detailData;// = form.getFieldValue('detailList')
 
-
+  //具体可以看 formProduct
   const formSearch: ISchema = {
     type: 'object',
     properties: {
-      name: {
+      productName: {
         type: 'string',
-        "x-component": 'Search',
-        "x-component-props": {
-          placeholder: '请输入会员名称'
+        'x-component': 'ModalSearch',
+        'x-component-props': {
+          placeholder: '请输入商品名称',
+          align: 'flex-left',
+        },
+      },
+      [FORM_FILTER_PATH]: {
+        type: 'object',
+        'x-component': 'flex-layout',
+        'x-component-props': {
+          rowStyle: {
+            flexWrap: 'nowrap',
+            style: {
+              marginRight: 0
+            }
+          },
+          colStyle: {
+            marginTop: 20,
+          },
+        },
+        properties: {
+          category: {
+            type: 'string',
+            "x-component": 'Input',
+            "x-component-props": {
+              placeholder: '请输入品类',
+              // className: 'fixed-ant-selected-down', // 该类强制将显示的下拉框出现在select下, 只有这里出现问题, ??
+              // fetchSearch: PublicApi.getProductSelectGetSelectCustomerCategory,
+              style: {
+                width: 160
+              }
+            }
+          },
+          brand: {
+            type: 'string',
+            "x-component": 'Input',
+            "x-component-props": {
+              placeholder: '请输入品牌',
+              // fetchSearch: PublicApi.getProductSelectGetSelectBrand,
+              style: {
+                width: 160
+              }
+            }
+          },
+          submit: {
+            "x-component": 'Submit',
+            "x-mega-props": {
+              span: 1
+            },
+            "x-component-props": {
+              children: '查询'
+            }
+          }
         }
       }
     }
@@ -503,21 +557,22 @@ const Deatail: React.FC<{}> = () => {
    * @return {type} 
    */
   const fetchProductList = async (params) => {
-    // if(shipmentOrderID === null){
-    //   return
-    // }
-    // const res = await PublicApi.getOrderProcurementOrderProductList({...params,id: shipmentOrderID })
-    // return res.data
-    return new Promise((resolve, reject) => {
-      const queryResult = data.find(v => v.key === params.keywords)
-      setTimeout(() => {
-        resolve({
-          code: 200,
-          message: '',
-          data: queryResult ? [queryResult] : data2
-        })
-      }, 1000)
-    })
+    if(shipmentOrderID === null){//发货单id
+      // message.error('请先选择发货单')
+      return
+    }
+    const res = await PublicApi.getOrderProcurementOrderProductPageList({...params,id: shipmentOrderID })
+    return res.data
+    // return new Promise((resolve, reject) => {
+    //   const queryResult = data.find(v => v.key === params.keywords)
+    //   setTimeout(() => {
+    //     resolve({
+    //       code: 200,
+    //       message: '',
+    //       data: queryResult ? [queryResult] : data2
+    //     })
+    //   }, 1000)
+    // })
   }
 
 
@@ -581,6 +636,10 @@ const Deatail: React.FC<{}> = () => {
                       {({ state, mutators }) => {
                         // const onAdd = () => mutators.push()
                         const selectGoods = () => {
+                          if(!shipmentOrderID){
+                             message.error('请先选择发货单')
+                             return
+                          }
                           setvisibleObj({ ...visibleObj, ModalSeletOrder3: true })
                         }
                         return (
@@ -762,7 +821,18 @@ const Deatail: React.FC<{}> = () => {
           fetchTableData={params => fetchProductList(params)}
           formilyProps={
             {
-              ctx: { schema: formSearch }
+              ctx: {
+                 schema: formSearch ,
+                 components:{ModalSearch:Search,SearchSelect,Submit,Input},
+                 effects: ($, actions) => {
+                  useStateFilterSearchLinkageEffect(
+                    $,
+                    actions,
+                    'productName',
+                    FORM_FILTER_PATH,
+                  );
+                }
+              }
             }
           }
           tableProps={{

src/pages/transaction/enquiryOffer/components/productModal.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-08-28 10:07:45
  * @LastEditors: LeeJiancong
  * @Copyright: 1549414730@qq.com
- * @LastEditTime: 2020-09-18 11:18:40
+ * @LastEditTime: 2020-09-24 11:25:03
  */
 import React, { Component, useState,useRef, useEffect,useImperativeHandle } from 'react';
 import { Modal, Button,Space, Form, Radio, AutoComplete, Badge,Tabs, Input, Select, Checkbox } from 'antd'
@@ -49,7 +49,7 @@ const layout = {
  * @return {type} 
  */
 const fetchData = async (params) => {
-  const res = await PublicApi.getProductCommodityCommonGetCommodityDetailList({ ...params, environment: 1, shopType: 1 })
+  const res = await PublicApi.getProductCommodityCommonGetCommodityListBySeller({ ...params,priceTypeList:[1,2], environment: 1, shopType: 1 })
   return res.data
 }
 

src/pages/transaction/purchaseOrder/orderPreview/components/orderPayModal/index.tsx

@@ -103,7 +103,7 @@ const OrderPayModal:React.FC<OrderPayModalProps> = (props) => {
 
     const params = {
       id: Number(id),
-      payOrderUrls,
+      payOrderUrls: payOrderUrls.join(','),
       paymentInformationId
     }
 

src/pages/transaction/saleOrder/addSaleDelevedOrder/model/useSelfTable.tsx

@@ -4,7 +4,7 @@ import { Button, Row, Col } from 'antd'
 import { PublicApi } from '@/services/api'
 import EyePreview from '@/components/EyePreview'
 import { formatTimeString } from '@/utils'
-import { ORDER_TYPE } from '@/constants'
+import { ORDER_TYPE, PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
 import StatusColors from '@/pages/transaction/components/StatusColors'
 import { FieldTimeOutlined } from '@ant-design/icons'
 import {
@@ -19,39 +19,6 @@ import {
 } from 'bizcharts';
 import DataSet from "@antv/data-set";
 
-// 圆形环状金额显示
-const CircleChart = props => {
-  const { sumPrice = 100, alreadyPay = 10 } = props
-  const { DataView } = DataSet;
-  const dv = new DataView();
-
-  const userData = [
-    { type: '总金额', value: sumPrice - alreadyPay },
-    { type: '已支付', value: alreadyPay }
-  ];
-
-  const userDv = new DataView();
-    userDv.source(userData).transform({
-      type: 'percent',
-      field: 'value',
-      dimension: 'type',
-      as: 'percent',
-    });
-  return <Chart placeholder={false} height={40} autoFit>
-    <Legend visible={false} />
-    {/* 绘制图形 */}
-    <View data={userDv.rows}>
-      <Coordinate type="theta" innerRadius={0.75} />
-      <Interval
-        position="percent"
-        adjust="stack"
-        color={['type', ['#EBECF0', '#41CC9E']]}
-        tooltip={false}
-      />
-    </View>
-  </Chart>
-}
-
 // 业务hooks, 待支付订单
 export const useSelfTable = () => {
   const ref = useRef<any>({})
@@ -64,7 +31,7 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
-        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=-1&id=${record.id}&preview=1`}>
+        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
         {text}
         </EyePreview>
       }
@@ -114,9 +81,9 @@ export const useSelfTable = () => {
     {
       title: '内部状态',
       align: 'center',
-      dataIndex: 'interiorState',
-      key: 'interiorState',
-      render: (text) => <StatusColors status={text} type='inside'/>
+      dataIndex: 'purchaseOrderInteriorState',
+      key: 'purchaseOrderInteriorState',
+      render: (text) => <StatusColors status={text} type='saleInside'/>
     },
     {
       title: '操作',
@@ -124,19 +91,23 @@ export const useSelfTable = () => {
       dataIndex: 'ctl',
       key: 'ctl',
       render: (text, record) => <>
-        <Button type='link' onClick={() => handleConfirm(record)}>审核</Button>
-        <Button type='link' onClick={() => handleCancel(record.id)}>发货</Button>
+        {/* 支付结果确认到账= 待审核状态 */}
+        { record.purchaseOrderInteriorState ===  SaleOrderInsideWorkState.READY_DELEVED_APPROVED && 
+          <Button type='link' onClick={() => handleConfirm(record)}>审核</Button>
+        }
+        { record.purchaseOrderInteriorState === SaleOrderInsideWorkState.SALE_CREATE_DELIVED_ORDER && 
+          <Button type='link' onClick={() => handleAdd(record)}>新增发货单</Button>
+        }
       </>
     }
   ]
 
   const handleConfirm = async (record) => {
-    history.push(`/memberCenter/tranactionAbility/saleOrder/orderDetail?page_type=4&id=${record.id}&preview=0`)
+    history.push(`/memberCenter/tranactionAbility/saleOrder/addSaleDelevedOrder/detail?id=${record.id}&preview=0`)
   }
 
-  const handleCancel = async (id) => {
-    await PublicApi.postOrderPurchaseOrderCancel({id})
-    ref.current.reload()
+  const handleAdd = async (record) => {
+    history.push(`/memberCenter/tranactionAbility/stockSellStorage/addBills?relevanceInvoicesId=${record.id}&invoicesTypeId=S002&relevanceInvoices=1`)
   }
 
   return {

src/pages/transaction/saleOrder/constant/index.tsx

@@ -13,7 +13,7 @@ export const baseOrderListColumns: any[] = [
     key: 'orderNo',
     render: (text, record) => {
       // 查看订单, 需根据状态显示不同schema
-      return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=-1&id=${record.id}&preview=1`}>
+      return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
       {text}
       </EyePreview>
     }

src/pages/transaction/saleOrder/context/index.ts

 import { createContext } from 'react';
 
-export const ReadyAddOrderDetailContext = createContext<any>({})
\ No newline at end of file
+export const ReadyAddOrderDetailContext = createContext<any>({})
+
+export const OrderDetailByIdContext = createContext<any>({})
\ No newline at end of file

src/pages/transaction/saleOrder/firstApprovedOrder/model/useSelfTable.tsx

@@ -13,7 +13,7 @@ export const useSelfTable = () => {
 
   const handleSubmit = async (record) => {
     if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) {
-      history.push(`/memberCenter/tranactionAbility/saleOrder/orderDetail?id=${record.id}&preview=0&page_type=1`)
+      history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=1`)
     }
   }
   const secondColumns: any[] = baseOrderListColumns.concat([

src/pages/transaction/saleOrder/orderDetail/components/orderPayResultModal/index.tsx → src/pages/transaction/saleOrder/orderPreview/components/orderPayResultModal/index.tsx

@@ -5,6 +5,7 @@ import { OrderDetailContext } from '../../context'
 import { PayOutWorkState } from '@/constants'
 import { PublicApi } from '@/services/api'
 import { history, Link } from 'umi'
+import OverflowText from '@/components/OverflowText'
 
 export interface OrderPayResultModalProps {
   type: 'default' | 'preview',
@@ -16,6 +17,8 @@ const OrderPayResultModal:React.FC<OrderPayResultModalProps> = ({type, currentRe
   const { id } = usePageStatus()
   const [visible, setVisible] = useState(false)
   const canCtlData = data.paymentInformationResponses.find(v => v.externalState === PayOutWorkState.READY_CONFIRM_RESULT) || {}
+
+  const transData = canCtlData.payOrderUrls?.split(',') || []
   useEffect(() => {
     if (currentRef) {
       currentRef.current = {
@@ -32,7 +35,7 @@ const OrderPayResultModal:React.FC<OrderPayResultModalProps> = ({type, currentRe
   const handleConfirm = async (isReady) => {
     const params = {
       state: isReady,
-      id,
+      id: Number(id),
       paymentInformationId: canCtlData.id
     }
 
@@ -46,7 +49,8 @@ const OrderPayResultModal:React.FC<OrderPayResultModalProps> = ({type, currentRe
     <Modal
       title={type === 'default' ? '确认支付结果' : '查看支付结果'}
       visible={visible}
-      footer={(type === 'default' && canCtlData.payOrderUrls) ? <Space>
+      onCancel={handleCancel}
+      footer={(type === 'default' && transData) ? <Space>
         <Button onClick={handleCancel}>取消</Button>
         <Button onClick={() => handleConfirm(0)} type='dashed'>确认未到账</Button>
         <Button onClick={() => handleConfirm(1)} type='primary'>确认到账</Button>
@@ -54,10 +58,12 @@ const OrderPayResultModal:React.FC<OrderPayResultModalProps> = ({type, currentRe
     >
       <List
         itemLayout="horizontal"
-        dataSource={canCtlData.payOrderUrls || []}
-        renderItem={item => (
-          <List.Item extra={<Link to={item} target='_blank'>预览</Link>}>
-            {item}
+        dataSource={transData || []}
+        renderItem={(item: string) => (
+          <List.Item  style={{fontSize: 12}} extra={<a href={item} target='_blank'>预览</a>}>
+            <OverflowText style={{flex: '.9'}}>
+              {item}
+            </OverflowText>
           </List.Item>
         )}
       />

src/pages/transaction/saleOrder/orderDetail/components/orderPayTabs/index.tsx → src/pages/transaction/saleOrder/orderPreview/components/orderPayTabs/index.tsx

@@ -27,7 +27,7 @@ const TabHeader = ({dataSource}) => {
     <Row justify='space-between' align='middle' style={{width: '100%'}}>
       <Col className={style.smallnumber}>￥{dataSource.payPrice || 0}</Col>
       <Col>
-        { dataSource.externalState === PayOutWorkState.READY_PAY && <a onClick={() => {
+        { dataSource.externalState === PayOutWorkState.READY_CONFIRM_RESULT && <a onClick={() => {
           setPayResultType('preview')
           payResultVisible.current.setVisible(true)
         }}>查看</a> }

src/pages/transaction/saleOrder/orderDetail/components/orderProductTable/index.tsx → src/pages/transaction/saleOrder/orderPreview/components/orderProductTable/index.tsx

@@ -9,6 +9,8 @@ import styled from 'styled-components'
 import ModalForm from '@/components/ModalForm'
 import { createFormActions } from '@formily/antd'
 import MellowCard from '@/components/MellowCard'
+import { SALE_ORDER_STATUS } from '../../constant'
+import { usePageStatus } from '@/hooks/usePageStatus'
 
 export interface OrderProductTableProps {}
 
@@ -39,7 +41,7 @@ const RowStyle = styled(props => <Row style={{marginTop: 12}} justify='end' {...
 
 const modalPriceActions = createFormActions()
 // 总计金额联动框
-export const MoneyTotalBox = ({ dataSource }) => {
+export const MoneyTotalBox = ({ dataSource, isEditData }) => {
   const { orderProductRequests = [], receiverAddressId  } = dataSource || {}
   const sum = orderProductRequests.reduce((prev, next) => prev + parseInt((next.price || 0)), 0)
   const modelRef = useRef<any>({})
@@ -79,7 +81,7 @@ export const MoneyTotalBox = ({ dataSource }) => {
       <div>{sum}</div>
     </Col>
     <Col span={2}>
-      <div>运费 <SettingOutlined style={{marginLeft: 8}} onClick={handleSetting}/></div>
+      <div>运费 { isEditData && <SettingOutlined style={{marginLeft: 8}} onClick={handleSetting}/>}</div>
       <div>{freePrice}</div>
     </Col>
     <Col span={2}>
@@ -207,8 +209,10 @@ const EditableCell: React.FC<EditableCellProps> = ({
 
 const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
   const { ctl, data } = useContext(OrderDetailContext)
+  const { page_type } = usePageStatus()
   const { orderProductRequests = [] } = data || {}
-
+  // 判断是否可操作当前表格
+  const isEditData = SALE_ORDER_STATUS.READY_APPROVED_ORDER === parseInt(page_type)
   const productComponents = {
     body: {
       row: EditableRow,
@@ -297,7 +301,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
       dataIndex: 'price',
       align: 'left',
       key: 'price',
-      editable: true
+      editable: isEditData
     },
     {
       title: '会员折扣',
@@ -368,7 +372,7 @@ const OrderProductTable:React.FC<OrderProductTableProps> = (props) => {
         rowKey='id'
         pagination={false}
       />
-      <MoneyTotalBox dataSource={data}/>
+      <MoneyTotalBox dataSource={data} isEditData={isEditData}/>
     </MellowCard>
   )
 }

src/pages/transaction/saleOrder/readyAddLogisticsOrder/index.tsx

+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { DatePicker } from '@formily/antd-components'
+
+// 待新增物流单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderLogisticsOrderList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns
+  } = useSelfTable()
+
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        columns={columns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder
\ No newline at end of file

src/pages/transaction/saleOrder/readyAddLogisticsOrder/model/useSelfTable.tsx

+import React, { useRef } from 'react'
+import { history, Link } from 'umi'
+import { Button, Row, Col } from 'antd'
+import { PublicApi } from '@/services/api'
+import EyePreview from '@/components/EyePreview'
+import { formatTimeString } from '@/utils'
+import { ORDER_TYPE, PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+import StatusColors from '@/pages/transaction/components/StatusColors'
+import { FieldTimeOutlined } from '@ant-design/icons'
+import {
+  Chart,
+  Interval,
+  Axis,
+  Tooltip,
+  Coordinate,
+  Legend,
+  View,
+  Annotation,
+} from 'bizcharts';
+import DataSet from "@antv/data-set";
+
+// 业务hooks, 待支付订单
+export const useSelfTable = () => {
+  const ref = useRef<any>({})
+
+  const customOrderColumns: any[] = [
+    {
+      title: '订单号',
+      align: 'center',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      render: (text, record) => {
+        // 查看订单, 需根据状态显示不同schema
+        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
+        {text}
+        </EyePreview>
+      }
+    },
+    {
+      title: '订单商品摘要/下单时间',
+      align: 'center',
+      dataIndex: 'orderThe',
+      key: 'orderThe',
+      render: (text, record) => <>
+        <div>{record.orderThe}</div>
+        <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
+      </>,
+      width: 200
+    },
+    {
+      title: '采购会员',
+      align: 'left',
+      dataIndex: 'supplyMembersName',
+      key: 'supplyMembersName',
+    },
+    {
+      title: '总金额/已支付(元)',
+      align: 'center',
+      dataIndex: 'sumPrice',
+      key: 'sumPrice',
+      render: text => '￥' + text
+    },
+    { title: '发货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => `第${text}次` },
+    // @todo 发货单号跳转
+    { title: '发货单号', align: 'center', dataIndex: 'invoiceNumber', key: 'invoiceNumber', render: text => <Link to={'/'}>{text}</Link> },
+    { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) =>  text},
+    {
+      title: '订单类型',
+      align: 'center',
+      dataIndex: 'type',
+      key: 'type',
+      render: (text) => ORDER_TYPE[text]
+    },
+    {
+      title: '外部状态',
+      align: 'center',
+      dataIndex: 'externalState',
+      key: 'externalState',
+      render: text => <StatusColors status={text} type='out'/>
+    },
+    {
+      title: '内部状态',
+      align: 'center',
+      dataIndex: 'purchaseOrderInteriorState',
+      key: 'purchaseOrderInteriorState',
+      render: (text) => <StatusColors status={text} type='saleInside'/>
+    },
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'ctl',
+      key: 'ctl',
+      render: (text, record) => <>
+        {/* 支付结果确认到账= 待审核状态 */}
+        { record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ADD_LOGISTICS_ORDER && 
+          <Button type='link' onClick={() => handleConfirm(record.id)}>新增物流单</Button>
+        }
+      </>
+    }
+  ]
+
+  const handleConfirm = async (record) => {
+    history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
+  }
+
+  return {
+    columns: customOrderColumns
+  }
+}

src/pages/transaction/saleOrder/readyAddLogisticsOrder/schema/index.ts

+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+/**
+ * 除了订单必填字段, 默认
+ */
+export const tableListSchema: ISchema = {
+  type: 'object',
+  properties: {
+    orderNo: {
+      type: 'string',
+      "x-component": 'SearchFilter',
+      'x-component-props': {
+        placeholder: '请输入订单编号',
+        align: 'flex-start',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        inline: true,
+        colStyle: {
+          marginRight: 20
+        }
+      },
+      properties: {
+        orderThe: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入订单摘要',
+          }
+        },
+        "supplyMembersName": {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '请输入供应会员名称'
+          }
+        },
+        "[startCreateTime,endCreateTime]": {
+          type: 'array',
+          "x-component": 'daterangepicker',
+          'x-component-props': {
+            placeholder: ['开始时间','结束时间'],
+          },
+        },
+        submit: {
+          'x-component': 'Submit',
+          'x-component-props': {
+            children: '查询',
+          },
+        },
+      },
+    },
+  }
+}
\ No newline at end of file

src/pages/transaction/saleOrder/readyApprovedOrder/model/useSelfTable.tsx

@@ -12,7 +12,7 @@ export const useSelfTable = () => {
   const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
 
   const handleSubmit = async (id) => {
-    history.push(`/memberCenter/tranactionAbility/saleOrder/orderDetail?page_type=0&id=${id}&preview=0`)
+    history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=0&id=${id}&preview=0`)
   }
 
   const secondColumns: any[] = baseOrderListColumns.concat([

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/index.tsx

+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { DatePicker } from '@formily/antd-components'
+
+// 待确认发货单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderConfirmShipmentOrderList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns
+  } = useSelfTable()
+
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        columns={columns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder
\ No newline at end of file

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx

+import React, { useRef } from 'react'
+import { history, Link } from 'umi'
+import { Button, Row, Col } from 'antd'
+import { PublicApi } from '@/services/api'
+import EyePreview from '@/components/EyePreview'
+import { formatTimeString } from '@/utils'
+import { ORDER_TYPE, PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+import StatusColors from '@/pages/transaction/components/StatusColors'
+import { FieldTimeOutlined } from '@ant-design/icons'
+import {
+  Chart,
+  Interval,
+  Axis,
+  Tooltip,
+  Coordinate,
+  Legend,
+  View,
+  Annotation,
+} from 'bizcharts';
+import DataSet from "@antv/data-set";
+
+// 业务hooks, 待支付订单
+export const useSelfTable = () => {
+  const ref = useRef<any>({})
+
+  const customOrderColumns: any[] = [
+    {
+      title: '订单号',
+      align: 'center',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      render: (text, record) => {
+        // 查看订单, 需根据状态显示不同schema
+        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
+        {text}
+        </EyePreview>
+      }
+    },
+    {
+      title: '订单商品摘要/下单时间',
+      align: 'center',
+      dataIndex: 'orderThe',
+      key: 'orderThe',
+      render: (text, record) => <>
+        <div>{record.orderThe}</div>
+        <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
+      </>,
+      width: 200
+    },
+    {
+      title: '采购会员',
+      align: 'left',
+      dataIndex: 'supplyMembersName',
+      key: 'supplyMembersName',
+    },
+    {
+      title: '总金额/已支付(元)',
+      align: 'center',
+      dataIndex: 'sumPrice',
+      key: 'sumPrice',
+      render: text => '￥' + text
+    },
+    { title: '发货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => `第${text}次` },
+    // @todo 发货单号跳转
+    { title: '发货单号', align: 'center', dataIndex: 'invoiceNumber', key: 'invoiceNumber', render: text => <Link to={'/'}>{text}</Link> },
+    { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) =>  text},
+    {
+      title: '订单类型',
+      align: 'center',
+      dataIndex: 'type',
+      key: 'type',
+      render: (text) => ORDER_TYPE[text]
+    },
+    {
+      title: '外部状态',
+      align: 'center',
+      dataIndex: 'externalState',
+      key: 'externalState',
+      render: text => <StatusColors status={text} type='out'/>
+    },
+    {
+      title: '内部状态',
+      align: 'center',
+      dataIndex: 'purchaseOrderInteriorState',
+      key: 'purchaseOrderInteriorState',
+      render: (text) => <StatusColors status={text} type='saleInside'/>
+    },
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'ctl',
+      key: 'ctl',
+      render: (text, record) => <>
+        {/* 支付结果确认到账= 待审核状态 */}
+        { record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ADD_LOGISTICS_ORDER && 
+          <Button type='link' onClick={() => handleConfirm(record.id)}>新增物流单</Button>
+        }
+      </>
+    }
+  ]
+
+  const handleConfirm = async (record) => {
+    history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
+  }
+
+  return {
+    columns: customOrderColumns
+  }
+}

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/schema/index.ts

+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+/**
+ * 除了订单必填字段, 默认
+ */
+export const tableListSchema: ISchema = {
+  type: 'object',
+  properties: {
+    orderNo: {
+      type: 'string',
+      "x-component": 'SearchFilter',
+      'x-component-props': {
+        placeholder: '请输入订单编号',
+        align: 'flex-start',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        inline: true,
+        colStyle: {
+          marginRight: 20
+        }
+      },
+      properties: {
+        orderThe: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入订单摘要',
+          }
+        },
+        "supplyMembersName": {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '请输入供应会员名称'
+          }
+        },
+        "[startCreateTime,endCreateTime]": {
+          type: 'array',
+          "x-component": 'daterangepicker',
+          'x-component-props': {
+            placeholder: ['开始时间','结束时间'],
+          },
+        },
+        submit: {
+          'x-component': 'Submit',
+          'x-component-props': {
+            children: '查询',
+          },
+        },
+      },
+    },
+  }
+}
\ No newline at end of file

src/pages/transaction/saleOrder/readyConfirmOrder/model/useSelfTable.tsx

@@ -6,7 +6,7 @@ import { baseOrderListColumns } from '../../constant'
 // 业务hooks, 待新增订单
 export const useSelfTable = () => {
   const handleConfirm = async (record) => {
-    history.push(`/memberCenter/tranactionAbility/saleOrder/orderDetail?page_type=3&id=${record.id}&preview=1`)
+    history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=3&id=${record.id}&preview=1`)
   }
   const secondColumns: any[] = baseOrderListColumns.concat([
     {

src/pages/transaction/saleOrder/readyConfirmReturnOrder/index.tsx

+import React from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { DatePicker } from '@formily/antd-components'
+
+// 待新增物流单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderReceiptOrderConfirmedList(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns
+  } = useSelfTable()
+
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        columns={columns}
+        rowKey={'orderNo'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder
\ No newline at end of file

src/pages/transaction/saleOrder/readyConfirmReturnOrder/model/useSelfTable.tsx

+import React, { useRef } from 'react'
+import { history, Link } from 'umi'
+import { Button, Row, Col } from 'antd'
+import { PublicApi } from '@/services/api'
+import EyePreview from '@/components/EyePreview'
+import { formatTimeString } from '@/utils'
+import { ORDER_TYPE, PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+import StatusColors from '@/pages/transaction/components/StatusColors'
+import { FieldTimeOutlined } from '@ant-design/icons'
+import {
+  Chart,
+  Interval,
+  Axis,
+  Tooltip,
+  Coordinate,
+  Legend,
+  View,
+  Annotation,
+} from 'bizcharts';
+import DataSet from "@antv/data-set";
+
+// 业务hooks, 待支付订单
+export const useSelfTable = () => {
+  const ref = useRef<any>({})
+
+  const customOrderColumns: any[] = [
+    {
+      title: '订单号',
+      align: 'center',
+      dataIndex: 'orderNo',
+      key: 'orderNo',
+      render: (text, record) => {
+        // 查看订单, 需根据状态显示不同schema
+        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
+        {text}
+        </EyePreview>
+      }
+    },
+    {
+      title: '订单商品摘要/下单时间',
+      align: 'center',
+      dataIndex: 'orderThe',
+      key: 'orderThe',
+      render: (text, record) => <>
+        <div>{record.orderThe}</div>
+        <div><FieldTimeOutlined />{formatTimeString(record.createTime)}</div>
+      </>,
+      width: 200
+    },
+    {
+      title: '采购会员',
+      align: 'left',
+      dataIndex: 'supplyMembersName',
+      key: 'supplyMembersName',
+    },
+    {
+      title: '总金额/已支付(元)',
+      align: 'center',
+      dataIndex: 'sumPrice',
+      key: 'sumPrice',
+      render: text => '￥' + text
+    },
+    { title: '发货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => `第${text}次` },
+    // @todo 发货单号跳转
+    { title: '发货单号', align: 'center', dataIndex: 'invoiceNumber', key: 'invoiceNumber', render: text => <Link to={'/'}>{text}</Link> },
+    { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) =>  text},
+    {
+      title: '订单类型',
+      align: 'center',
+      dataIndex: 'type',
+      key: 'type',
+      render: (text) => ORDER_TYPE[text]
+    },
+    {
+      title: '外部状态',
+      align: 'center',
+      dataIndex: 'externalState',
+      key: 'externalState',
+      render: text => <StatusColors status={text} type='out'/>
+    },
+    {
+      title: '内部状态',
+      align: 'center',
+      dataIndex: 'purchaseOrderInteriorState',
+      key: 'purchaseOrderInteriorState',
+      render: (text) => <StatusColors status={text} type='saleInside'/>
+    },
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'ctl',
+      key: 'ctl',
+      render: (text, record) => <>
+        {/* 支付结果确认到账= 待审核状态 */}
+        { record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ADD_LOGISTICS_ORDER && 
+          <Button type='link' onClick={() => handleConfirm(record.id)}>新增物流单</Button>
+        }
+      </>
+    }
+  ]
+
+  const handleConfirm = async (record) => {
+    history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
+  }
+
+  return {
+    columns: customOrderColumns
+  }
+}

src/pages/transaction/saleOrder/readyConfirmReturnOrder/schema/index.ts

+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+/**
+ * 除了订单必填字段, 默认
+ */
+export const tableListSchema: ISchema = {
+  type: 'object',
+  properties: {
+    orderNo: {
+      type: 'string',
+      "x-component": 'SearchFilter',
+      'x-component-props': {
+        placeholder: '请输入订单编号',
+        align: 'flex-start',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        inline: true,
+        colStyle: {
+          marginRight: 20
+        }
+      },
+      properties: {
+        orderThe: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入订单摘要',
+          }
+        },
+        "supplyMembersName": {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '请输入供应会员名称'
+          }
+        },
+        "[startCreateTime,endCreateTime]": {
+          type: 'array',
+          "x-component": 'daterangepicker',
+          'x-component-props': {
+            placeholder: ['开始时间','结束时间'],
+          },
+        },
+        submit: {
+          'x-component': 'Submit',
+          'x-component-props': {
+            children: '查询',
+          },
+        },
+      },
+    },
+  }
+}
\ No newline at end of file

src/pages/transaction/saleOrder/readyPayResult/model/useSelfTable.tsx

@@ -64,7 +64,7 @@ export const useSelfTable = () => {
       key: 'orderNo',
       render: (text, record) => {
         // 查看订单, 需根据状态显示不同schema
-        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderDetail?page_type=-1&id=${record.id}&preview=1`}>
+        return <EyePreview url={`/memberCenter/tranactionAbility/purchaseOrder/orderPreview?page_type=-1&id=${record.id}&preview=1`}>
         {text}
         </EyePreview>
       }
@@ -138,7 +138,7 @@ export const useSelfTable = () => {
   ]
 
   const handleConfirm = async (record) => {
-    history.push(`/memberCenter/tranactionAbility/saleOrder/orderDetail?page_type=4&id=${record.id}&preview=0`)
+    history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?page_type=4&id=${record.id}&preview=0`)
   }
 
   const handleCancel = async (id) => {

src/pages/transaction/saleOrder/readyReturnDocument/index.tsx

+import React, { useRef } from 'react'
+import { history } from 'umi'
+import { Card, Button, Space, Dropdown, Menu, message } from 'antd'
+import { StandardTable } from 'god'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { PublicApi } from '@/services/api'
+import { useSelfTable } from './model/useSelfTable'
+import { PlusCircleOutlined, DownOutlined, DeleteOutlined } from '@ant-design/icons'
+import DropDeleteDown from '@/components/DropDeleteDown'
+import { tableListSchema } from './schema'
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch'
+import { FORM_FILTER_PATH } from '@/formSchema/const'
+import Submit from '@/components/NiceForm/components/Submit'
+import { DatePicker } from '@formily/antd-components'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+
+// 待确认回单
+
+export interface FirstApprovedOrderProps {}
+
+const fetchTableData = async (params) => {
+  const { data } = await PublicApi.getOrderListOfOrdersToBeFiled(params)
+  return data
+}
+
+// TODO
+const FirstApprovedOrder:React.FC<FirstApprovedOrderProps> = (props) => {
+  const {
+    columns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  } = useSelfTable()
+
+  const handleSubmitBatch = async () => {
+    if (rowSelectionCtl.selectRow.length === 0) {
+      message.error('请先勾选订单')
+      return ;
+    }
+    const canBitch = !rowSelectionCtl.selectRow.some(v => v.purchaseOrderInteriorState !== SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER)
+    if (canBitch) {
+      await PublicApi.postOrderSubmittedReviewOrderOneAll({ids: rowSelectionCtl.selectedRowKeys})
+      ref.current.reload()      
+    } else {
+      message.error('只能批量提交内部状态为审核中的订单')
+    }
+  }
+  return <PageHeaderWrapper>
+    <Card>
+      <StandardTable
+        fetchTableData={params => fetchTableData(params)}
+        rowSelection={rowSelection}
+        columns={columns}
+        currentRef={ref}
+        rowKey={'id'}
+        formilyLayouts={{
+          justify: 'space-between'
+        }}
+        formilyProps={{
+          ctx: {
+            inline: false,
+            schema: tableListSchema,
+            effects: ($, actions) => {
+              useStateFilterSearchLinkageEffect(
+                $,
+                actions,
+                'orderNo',
+                FORM_FILTER_PATH,
+              );
+            },
+            components: {
+              DateRangePicker: DatePicker.RangePicker,
+              Submit
+            }
+          },
+          layouts: {
+            order: 2,
+            span: 16
+          }
+        }}
+        formilyChilds={{
+          children: <Space>
+            <Button onClick={handleSubmitBatch}>批量提交审核</Button>
+          </Space>,
+          layouts: {
+            span: 8
+          }
+        }}
+      />
+    </Card>
+  </PageHeaderWrapper>
+}
+
+FirstApprovedOrder.defaultProps = {}
+
+export default FirstApprovedOrder
\ No newline at end of file

src/pages/transaction/saleOrder/readyReturnDocument/model/useSelfTable.tsx

+import React, { useRef } from 'react'
+import { Button } from 'antd'
+import { baseOrderListColumns } from '../../constant'
+import { history } from 'umi'
+import { PublicApi } from '@/services/api'
+import { useRowSelectionTable } from '@/hooks/useRowSelectionTable'
+import { PurchaseOrderInsideWorkState, SaleOrderInsideWorkState } from '@/constants'
+
+// 业务hooks, 待新增订单
+export const useSelfTable = () => {
+  const ref = useRef<any>({})
+  const [rowSelection, rowSelectionCtl] = useRowSelectionTable({customKey: 'id'})
+
+  const handleSubmit = async (record) => {
+    if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER) {
+      history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=1`)
+    }
+  }
+  const secondColumns: any[] = baseOrderListColumns.concat([
+    {
+      title: '操作',
+      align: 'center',
+      dataIndex: 'ctl',
+      key: 'ctl',
+      render: (text, record) => <>
+      {
+        record.purchaseOrderInteriorState === SaleOrderInsideWorkState.ONE_LEVEL_AUDIT_ORDER &&
+        <Button type='link' onClick={() => handleSubmit(record)}>提交审核</Button>
+      }
+      </>
+    }
+  ])
+
+  return {
+    columns: secondColumns,
+    ref,
+    rowSelection,
+    rowSelectionCtl
+  }
+}

src/pages/transaction/saleOrder/readyReturnDocument/schema/index.ts

+import { ISchema } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+
+/**
+ * 除了订单必填字段, 默认
+ */
+export const tableListSchema: ISchema = {
+  type: 'object',
+  properties: {
+    orderNo: {
+      type: 'string',
+      "x-component": 'SearchFilter',
+      'x-component-props': {
+        placeholder: '请输入订单编号',
+        align: 'flex-end',
+      },
+    },
+    [FORM_FILTER_PATH]: {
+      type: 'object',
+      'x-component': 'flex-layout',
+      'x-component-props': {
+        inline: true,
+        colStyle: {
+          marginLeft: 20
+        }
+      },
+      properties: {
+        orderThe: {
+          type: 'string',
+          'x-component-props': {
+            placeholder: '请输入订单摘要',
+          }
+        },
+        "supplyMembersName": {
+          type: 'string',
+          "x-component-props": {
+            placeholder: '请输入供应会员名称'
+          }
+        },
+        "[startCreateTime,endCreateTime]": {
+          type: 'array',
+          "x-component": 'daterangepicker',
+          'x-component-props': {
+            placeholder: ['开始时间','结束时间'],
+          },
+        },
+        submit: {
+          'x-component': 'Submit',
+          'x-component-props': {
+            children: '查询',
+          },
+        },
+      },
+    },
+  }
+}
\ No newline at end of file

src/pages/transaction/saleOrder/secondApprovedOrder/model/useSelfTable.tsx

@@ -10,7 +10,7 @@ export const useSelfTable = () => {
   const ref = useRef<any>({})
   const handleSubmit = async (record) => {
     if (record.purchaseOrderInteriorState === SaleOrderInsideWorkState.TWO_LEVEL_AUDIT_ORDER) {
-      history.push(`/memberCenter/tranactionAbility/saleOrder/orderDetail?id=${record.id}&preview=0&page_type=2`)
+      history.push(`/memberCenter/tranactionAbility/saleOrder/orderPreview?id=${record.id}&preview=0&page_type=2`)
     }
   }
   const secondColumns: any[] = baseOrderListColumns.concat([

src/pages/transaction/transactionRules/components/RuleSetting.tsx

@@ -235,17 +235,18 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
 
   useEffect(() => {
     async function getInitValue() {
-      const { data } = await PublicApi.getOrderTradingRulesDetails({id: id});
+      const { data } = await PublicApi.getOrderTradingRulesDetails({id: id})
       if(data.isTacitlyApprove === 2) {
-        const res = await getBindingProducts({id: id.toString(), current: '1', pageSize: '10'});
-        addSchemaAction.setFieldState('products', (state) => {
+        const res = await getBindingProducts({id: id.toString(), current: '1', pageSize: '10'})
+        addSchemaAction.setFieldState('products', state => {
           state.value = res.data
         })
-        setProductsLength(res.totalCount);
+        setProductsLength(res.totalCount)
       }
-      addSchemaAction.setFieldValue('isElectronicContract', data?.isElectronicContract ? true : false)
-      addSchemaAction.setFieldValue('transactionProcesssId', data?.transactionProcesssId)
-      addSchemaAction.setFieldValue('isTacitlyApprove', data?.isTacitlyApprove)
+      addSchemaAction.setFieldValue('isElectronicContract', data.isElectronicContract ? true : false)
+      addSchemaAction.setFieldValue('transactionProcesssId', data.transactionProcesssId)
+      console.log(data)
+      addSchemaAction.setFieldValue('isTacitlyApprove', data.isTacitlyApprove)
       setInitialValue(data)
     }
     if(id != '') {
@@ -263,7 +264,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
     if(id !== '') {
       const result = await getBindingProducts({id, current: page.toString(), pageSize: size.toString()})
       addSchemaAction.setFieldValue('products', result.data)
-    } 
+    }
   }
 
   return (
@@ -291,7 +292,7 @@ const RuleSetting:React.FC<RuleSettingProps> = (props) => {
               state.visible = parentState.value
             })
           })
-          $('onFieldValueChange', 'shopIds').subscribe(parentState => {
+          $('onFieldInputChange', 'shopIds').subscribe(parentState => {
             setFieldState('isTacitlyApprove', state => {
               state.value = 1
             })