修改询价模块详情step,修改物流待新增物流单模块

config/routes/logisticsRoutes.ts

@@ -18,7 +18,7 @@ const LogisticsRoute: RouterChild = {
       path: '/memberCenter/logisticsAbility/logistics',
       name: 'logistics',
       routes: [
-        // 物流公司管理
+        // // 物流公司管理
         {
           path: '/memberCenter/logisticsAbility/logistics/company',
           name: 'company',

src/pages/logistics/components/TableList.tsx

+import React, { useRef, ReactNode, useEffect } from 'react';
+import { StandardTable } from 'god';
+import { Row, Col, Space, Button, Card } from 'antd';
+import NiceForm from '@/components/NiceForm';
+import { createFormActions } from '@formily/antd';
+import { FORM_FILTER_PATH } from '@/formSchema/const';
+import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
+import { LogisticsOrderSubmitSearchSchema, LogisticsOrderToBeSubmitSearchSchema, LogisticsOrderProcessingSearchSchema, LogisticsOrderToBeConfirmedSearchSchema, None } from './schema';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+
+interface tableListParams {
+  columns?: any, // 表头
+  reloadRef?: any, // 处理刷新
+  fetchData?: Function, // 列表数据
+  schema?: boolean, // 是否显示schema 搜索
+  schemaType?: 'LogisticsOrderSubmitSearchSchema' | 'LogisticsOrderToBeSubmitSearchSchema' | 'LogisticsOrderProcessingSearchSchema' | 'LogisticsOrderToBeConfirmedSearchSchema' | 'none'
+}
+
+const formActions = createFormActions();
+
+const LogisticsTableList: React.FC<tableListParams> = (props) => {
+  const { columns, reloadRef, fetchData, schema = false, schemaType = 'none' } = props;
+  const ref = useRef<any>({});
+
+  const controllerBtns: ReactNode = <Row>
+    <Col>
+      <Button type='primary'>新建</Button>
+    </Col>
+  </Row>
+
+  const schemaRender = () => {
+    switch (schemaType) {
+      case 'LogisticsOrderSubmitSearchSchema': {
+        return LogisticsOrderSubmitSearchSchema
+      }
+      case 'LogisticsOrderToBeSubmitSearchSchema': {
+        return LogisticsOrderToBeSubmitSearchSchema
+      }
+      case 'LogisticsOrderProcessingSearchSchema': {
+        return LogisticsOrderProcessingSearchSchema
+      }
+
+      case 'LogisticsOrderToBeConfirmedSearchSchema': {
+        return LogisticsOrderToBeConfirmedSearchSchema
+      }
+      case 'none': {
+        return None
+      }
+    }
+  }
+
+  useEffect(() => {
+    if (reloadRef) {
+      const userAction = {
+        reload: () => ref.current.reload()
+      }
+      if (reloadRef && typeof reloadRef === 'function') {
+        reloadRef(userAction);
+      }
+      if (reloadRef && typeof reloadRef !== 'function') {
+        reloadRef.current = userAction;
+      }
+    }
+  })
+
+  return (
+    <PageHeaderWrapper>
+      <Card >
+        <StandardTable
+          columns={columns}
+          currentRef={ref}
+          tableProps={{ rowKey: 'id' }}
+          fetchTableData={(params: any) => fetchData(params)}
+          controlRender={
+            <NiceForm
+              actions={formActions}
+              effects={($, actions) => {
+                useStateFilterSearchLinkageEffect($, actions, 'logisticsOrderNo', FORM_FILTER_PATH)
+              }}
+              expressionScope={{ controllerBtns }}
+              schema={schemaRender()}
+            />
+          }
+        />
+      </Card>
+    </PageHeaderWrapper>
+
+  )
+}
+
+export default LogisticsTableList

src/pages/logistics/components/orderSearchList.tsx

@@ -189,8 +189,8 @@ const orderSearchList: React.FC<listProps> = (props) => {
     {
       title: ' 收货方',
       align: 'left',
-      dataIndex: 'receiverName',
-      key: 'receiverName'
+      dataIndex: 'receiverMemberName',
+      key: 'receiverMemberName'
     },
     {
       title: '总箱数',

src/pages/logistics/logisticsSubmit/detail/components/basicInfo.tsx

@@ -20,12 +20,13 @@ const layout: any = {
   labelAlign: "left"
 };
 export interface interfaceinfo {
-  parmas?: any,
-  handleRevise?: Function
+  set?: any,
+  currentRef?: any,
+  onGet?: Function
 }
 
 const BasicInfo: React.FC<interfaceinfo> = (props) => {
-  const { parmas, handleRevise } = props;
+  const { set, currentRef, onGet } = props;
   const [listcompany, setlistcompany] = useState<any>([]);//物流服务商
   const [shipperaddress, setshipperaddress] = useState<any>([]);//发货地址
   const [shippingvisible, setshippingvisible] = useState<boolean>(false);
@@ -109,21 +110,50 @@ const BasicInfo: React.FC<interfaceinfo> = (props) => {
   ]
   // 确定
   const handleShipping = (type:any, values:any, param:any) => {
-    console.log(values, 'handleShipping')
-    handleRevise(values[0], 1);
     form.setFieldsValue({
       shipmentOrderCode: values[0].invoicesNo
     })
+    onGet(values[0], 2);
     setshippingvisible(false);
   }
   const handleInvoices = (type:any, values:any, param:any) => {
-    console.log(values, 'handleInvoices')
-    handleRevise(values[0], 2);
     form.setFieldsValue({
       invoicesNo: values[0].orderNo
     })
+    onGet(values[0], 3);
     setinvoicesvisible(false);
   }
+
+  useEffect(() => {
+    currentRef.current = {
+      get: () => new Promise((resolve: any) => {
+        form.validateFields().then(res => {
+          resolve({
+            state: true,
+            name: 'basicInfo',
+            data: {
+              digest: res.digest,
+              companyId: res.companyId,
+              shipmentOrderCode: res.shipmentOrderCode,
+              invoicesNo: res.invoicesNo,
+              shipperAddressId: res.shipperAddressId,
+              companyName: set.companyName,
+              shipperFullAddress: set.shipperFullAddress,
+              receiverMemberId: set.receiverMemberId,
+              receiverMemberName: set.receiverMemberName,
+              receiverFullAddress: set.receiverFullAddress,
+              receiverName: set.receiverName,
+              receiverPhone: set.receiverPhone,
+
+            }
+          })
+        }).catch(error => {
+          console.log(error)
+        })
+      })
+    }
+  })
+
   return (
     <>
       <Form
@@ -134,7 +164,7 @@ const BasicInfo: React.FC<interfaceinfo> = (props) => {
           <Input />
         </Form.Item>
         <Form.Item label="物流服务商" name="companyId" rules={[{ required: true, message: '请选择流服务商' }]}>
-          <Select allowClear>
+          <Select allowClear onChange={(value, option) => onGet(option, 1)}>
             {
               listcompany.map((item: any, index: number) => (
                 <Option key={item.id} value={item.id}>{item.name}</Option>
@@ -144,20 +174,20 @@ const BasicInfo: React.FC<interfaceinfo> = (props) => {
         </Form.Item>
         <Form.Item label="物流单号" name='receiverName1'><span></span></Form.Item>
         <Form.Item label='对应发货单号' name='shipmentOrderCode'>
-          <Search value={parmas.shipmentOrderCode || undefined} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={()=>setshippingvisible(true)} />
+          <Search readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={()=>setshippingvisible(true)} />
           {/* <Button type='link'>查看单号详情</Button> */}
         </Form.Item>
         <Form.Item label='对应订单号/售后单' name='invoicesNo'>
-          <Search  value={parmas.invoicesNo || undefined} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={()=>setinvoicesvisible(true)} />
+          <Search readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={()=>setinvoicesvisible(true)} />
           {/* <Button type='link'>查看单号详情</Button> */}
         </Form.Item>
-        <Form.Item label="收货方" name='receiverName'><span>{parmas.receiverName}</span></Form.Item>
+        <Form.Item label="收货方" name='receiverName'><span>{set.receiverName}</span></Form.Item>
         <Form.Item label="收货地址" name='receiverFullAddress'>
-          <div style={{ lineHeight: '36px' }}>{parmas.memberName}/{parmas.phone}</div>
-          <div>{parmas.receiverFullAddress}</div>
+          <div style={{ lineHeight: '36px' }}>{set.receiverName}/{set.receiverPhone}</div>
+          <div>{set.receiverFullAddress}</div>
         </Form.Item>
         <Form.Item label="发货地址" name="shipperAddressId">
-          <Select allowClear>
+          <Select allowClear onChange={(value, option) => onGet(option, 4)}>
             {
               shipperaddress.map((item: any, index: number) => (
                 <Option key={item.id} value={item.id}>{item.fullAddress}</Option>

src/pages/logistics/logisticsSubmit/detail/components/goods.tsx

@@ -4,7 +4,12 @@ import { ColumnType } from 'antd/lib/table/interface';
 import { PlusOutlined } from '@ant-design/icons';
 import ModalTable from '@/components/ModalTable'
 
-const AddGoods: React.FC<{}> = () => {
+interface goodsParamsProps {
+  currentRef?: any,
+  set?: any
+}
+
+const AddGoods: React.FC<goodsParamsProps> = (props) => {
   const columns: ColumnType<any>[] = [
     {
       title: 'ID',

src/pages/logistics/logisticsSubmit/detail/index.tsx

@@ -3,7 +3,7 @@
  * @Date: 2020-11-06
  * @Author: HJX
  */
-import React, { useState } from 'react';
+import React, { useState, useRef } from 'react';
 import { Button, Card, Tabs } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import ReturnEle from '@/components/ReturnEle';
@@ -14,6 +14,7 @@ import Goods from './components/goods';//物流单明细
 const { TabPane } = Tabs
 
 const AddEditLogistics: React.FC<{}> = () => {
+  const basic = useRef<any>();
   // 用于提交的
   const [parmas, setParmas] = useState<any>({
     digest: '',//单据摘要
@@ -31,33 +32,36 @@ const AddEditLogistics: React.FC<{}> = () => {
     detailList: [],//物流单明细列表 ,LogisticsOrderDetailRequest
   })
   const [data, setData] = useState<any>({})
-  // 调用修改Fn
-  const handleRevise = (value: any, index: number) => {
-    console.log(value, '传过来的数据')
+
+  // 提交数据
+  const handleSubmit = async () => {
+    const basicRef = await basic.current.get();
+    if (basicRef.state) {
+      console.log(basicRef.data);
+    }
+  }
+
+  const getBasicInfo = (value: any, index: number) => {
     const data = { ...parmas };
     if (index === 1) {
-      data.invoicesNo = value.orderNo;//对应单据编号
-      data.receiverAddressId = value.deliveryAddresId;//收货方id
-      data.shipmentOrderId = value.id;//发货单id
+      data.companyName = value.children
+    } else if (index === 2) {
       data.shipmentOrderCode = value.invoicesNo;//发货单号
-      data.phone = value.phone;
+      data.receiverPhone = value.phone;
       data.receiverName = value.receiverName;//收货方名称
       data.receiverFullAddress = value.fullAddress;
-      data.memberName = value.memberName;
-      setParmas(data)
-    } else if (index === 2 && !data.invoicesNo) {
-      data.phone = value.phone;
+      data.receiverMemberName = value.memberName;
+      data.invoicesId = value.id
+    } else if (index === 3 && !data.invoicesNo) {
+      data.receiverPhone = value.phone;
       data.receiverName = value.receiverName;//收货方名称
       data.receiverFullAddress = value.fullAddress;
-      data.memberName = value.memberName;
-      setParmas(data)
+      data.receiverMemberName = value.memberName;
+      data.invoicesId = value.id
+    } else {
+      data.shipperFullAddress = value.children
     }
-    
-    
-  }
-  // 提交数据
-  const handleSubmit = () => {
-    console.log('提交数据');
+    setParmas(data)
   }
 
   return (
@@ -70,12 +74,15 @@ const AddEditLogistics: React.FC<{}> = () => {
         <Tabs type="card">
           <TabPane key='tab-1' tab='基本信息'>
             <BasicInfo
-              parmas={parmas}
-              handleRevise={handleRevise}
+              currentRef={basic}
+              set={parmas}
+              onGet={getBasicInfo}
             />
           </TabPane>
           <TabPane key='tab-2' tab='物流单明细'>
-            <Goods />
+            <Goods
+              set={parmas}
+            />
           </TabPane>
           <TabPane key='tab-3' tab='运费'></TabPane>
           <TabPane key='tab-4' tab='流转记录'>

src/pages/transaction/confirmInquiryQuote/components/details.tsx

@@ -394,20 +394,44 @@ const Details: React.FC<parmas> = (props) => {
       }
     >
       <div className={style.item_wrap}>
-        {
         <Tabs>
+          {
+            Object.keys(data).length > 0 &&
+            <>
+              {type === 'quote' ?
                 <TabPane tab="外部流转" key="1">
                   <Steps
                     style={{ padding: '20px 0' }}
                     progressDot
-                current={Number(data.externalState - 1)}
+                    current={data.externalState - 1}
                   >
-                {detailData.externalStateStep.items.map((item, index) => {
+                    {Object.keys(data).length > 0 && data.externalRequisitionFormResponses.map((item, index) => {
                       return (
                         <Step
                           key={index}
-                      title={item.title}
-                      description={item.desc}
+                          title={item.roleName}
+                          description={item.operation}
+                          status={item.isExecute ? 'finish' : 'wait'}
+                        />
+                      );
+                    })}
+                  </Steps>
+                </TabPane>
+                :
+                <>
+                  <TabPane tab="外部流转" key="1">
+                    <Steps
+                      style={{ padding: '20px 0' }}
+                      progressDot
+                      current={data.externalState - 1}
+                    >
+                      {Object.keys(data).length > 0 && data.externalInquiryListStateResponses.map((item, index) => {
+                        return (
+                          <Step
+                            key={index}
+                            title={item.roleName}
+                            description={item.operationalProcess}
+                            status={item.isExecute ? 'finish' : 'wait'}
                           />
                         );
                       })}
@@ -419,20 +443,23 @@ const Details: React.FC<parmas> = (props) => {
                       progressDot
                       current={Number(data.interiorState - 1)}
                     >
-                {detailData.interiorStateStep.items.map((item, index) => {
+                      {Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}
-                      title={item.title}
-                      description={item.desc}
+                            title={item.roleName}
+                            description={item.operationalProcess}
+                            status={item.isExecute ? 'finish' : 'wait'}
                           />
                         );
                       })}
                     </Steps>
                   </TabPane>
-          </Tabs>
+                </>
               }
-
+            </>
+          }
+        </Tabs>
       </div>
       <div className={style.item_wrap}>
         <div className={style.mainCol_title} style={view === 2 ? { paddingBottom: '0px' } : { paddingBottom: '24px' }}>询价商品</div>
@@ -515,12 +542,20 @@ const Details: React.FC<parmas> = (props) => {
       </div>
       <div className={style.item_wrap}>
         <Tabs>
+          {
+            type === 'quote' ?
+              <TabPane tab="外部流转记录" key="1">
+                <Table columns={flowRecord.external} rowKey='id' pagination={false} dataSource={view === 2 ? data.externalRequisitionFormResponses : data.externalInquiryListLogResponses} />
+              </TabPane> :
+              <>
                 <TabPane tab="外部流转记录" key="1">
                   <Table columns={flowRecord.external} rowKey='id' pagination={false} dataSource={view === 2 ? data.externalRequisitionFormResponses : data.externalInquiryListLogResponses} />
                 </TabPane>
                 <TabPane tab="内部流转记录" key="2">
                   <Table columns={flowRecord.interior} rowKey='id' pagination={false} dataSource={view === 2 ? data.interiorQuotationLogResponses : data.interiorInquiryListLogResponses} />
                 </TabPane>
+              </>
+          }
         </Tabs>
       </div>
       <AuditModal

src/pages/transaction/confirmInquiryQuote/pendingSubmit/index.tsx

@@ -38,11 +38,11 @@ const PendingSubmit: React.FC<{}> = () => {
     render: (text: any, record: any) => <EyePreview
       url={`/memberCenter/tranactionAbility/confirmInquiryQuote/pendingSubmit/rfq/preview?id=${record.inquiryListId}`}>{text}</EyePreview>
   }, {
-    title: '询价单摘要',
+    title: '报价单摘要',
     key: 'details',
     dataIndex: 'details',
   }, {
-    title: '询价会员',
+    title: '报价会员',
     key: 'memberName',
     dataIndex: 'memberName',
   }, {
@@ -171,7 +171,7 @@ const PendingSubmit: React.FC<{}> = () => {
               actions={formActions}
               onSubmit={values => handleSumbit(values)}
               effects={($, actions) => {
-                useStateFilterSearchLinkageEffect($, actions, 'inquiryListNo', FORM_FILTER_PATH)
+                useStateFilterSearchLinkageEffect($, actions, 'quotationNo', FORM_FILTER_PATH)
               }}
               expressionScope={{
                 controllerBtns

src/pages/transaction/goodsOffer/addEnquiryOrder/components/flowRecord.tsx

@@ -18,38 +18,10 @@ const FlowRecord: React.FC<parmas> = (props) => {
   const format = (text) => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
   }
-  /**
-   * @description: 外部流转记录
-   * @param {type}
-   * @return {type}
-   */
-  const externalTextState = (text) => {
-    let name = ''
-    editData.externalInquiryListStateResponses.forEach(element => {
-      if (element.state === text) {
-        name = element.operationalProcess
-      }
-    })
-    return <>{name}</>
-  }
 
-  /**
-   * @description: 内部流转记录
-   * @param {type}
-   * @return {type}
-   */
-  const interiorTextState = (text) => {
-    let name = ''
-    editData.interiorInquiryListLogResponses.forEach(element => {
-      if (element.state === text) {
-        name = element.operationalProcess
-      }
-    })
-    return <>{name}</>
-  }
   const outerColumns: EditableColumns[] = [{
     title: '序号',
-    dataIndex: 'inquiryListId',
+    dataIndex: 'id',
   }, {
     title: '操作角色',
     dataIndex: 'roleName',
@@ -70,7 +42,7 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }]
   const insideColumns: EditableColumns[] = [{
     title: '序号',
-    dataIndex: 'inquiryListId',
+    dataIndex: 'id',
   }, {
     title: '操作人',
     dataIndex: 'roleName',

src/pages/transaction/goodsOffer/components/details.tsx

 import React, { useState, useEffect } from 'react';
 import style from './index.less';
 import { history } from 'umi';
-import { Button, Card, Tabs, Steps, Table } from 'antd';
+import { Button, Tabs, Steps, Table } from 'antd';
 import { ColumnType } from 'antd/lib/table/interface';
-import { StopOutlined, CheckSquareOutlined, LinkOutlined } from '@ant-design/icons'
+import { CheckSquareOutlined, LinkOutlined } from '@ant-design/icons'
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { quoteOrderInternalState, inquiryQuoteOuterState } from '../../common/tableStatusList';
 import AuditModal from '../components/auditModel';
 import moment from 'moment';
 import { PublicApi } from '@/services/api';
@@ -41,59 +40,7 @@ const Details: React.FC<parmas> = (props) => {
   const format = (text) => {
     return <>{moment(text).format("YYYY-MM-DD HH:mm:ss")}</>
   }
-  // steps 切换
-  const [detailData, setDetailData] = useState<any>({
-    externalStateStep: {
-      current: 0,
-      title: '外部流转',
-      items: [
-        {
-          title: '采购商',
-          desc: '提交询价单',
-        },
-        {
-          title: '供应商',
-          desc: '提交报价单',
-        },
-        {
-          title: '采购商',
-          desc: '确认报价单',
-        },
-        {
-          title: '完成',
-          desc: ''
-        }
-
-      ]
-    },
-    interiorStateStep: {
-      current: 0,
-      title: '内部流转',
-      items: [
-        {
-          title: '采购员',
-          desc: '新增询价单',
-        },
-        {
-          title: '采购经理',
-          desc: '审核询价单',
-        },
-        {
-          title: '副总经理',
-          desc: '审核询价单',
-        },
-        {
-          title: '采购员',
-          desc: '提交询价单',
-        },
-        {
-          title: '完成',
-          desc: ''
-        }
 
-      ]
-    }
-  })
   // 模拟数据
   const [data, setdata] = useState<any>({});
   // 询价商品
@@ -357,12 +304,13 @@ const Details: React.FC<parmas> = (props) => {
               progressDot
               current={Number(data.externalState - 1)}
             >
-              {detailData.externalStateStep.items.map((item, index) => {
+              {Object.keys(data).length > 0 && data.externalInquiryListStateResponses.map((item, index) => {
                 return (
                   <Step
                     key={index}
-                    title={item.title}
-                    description={item.desc}
+                    title={item.roleName}
+                    description={item.operationalProcess}
+                    status={item.isExecute ? 'finish' : 'wait'}
                   />
                 );
               })}
@@ -374,12 +322,13 @@ const Details: React.FC<parmas> = (props) => {
               progressDot
               current={Number(data.interiorState - 1)}
             >
-              {detailData.interiorStateStep.items.map((item, index) => {
+              {Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses.map((item, index) => {
                 return (
                   <Step
                     key={index}
-                    title={item.title}
-                    description={item.desc}
+                    title={item.roleName}
+                    description={item.operationalProcess}
+                    status={item.isExecute ? 'finish' : 'wait'}
                   />
                 );
               })}

src/pages/transaction/inquiryQuote/addInquiryOrder/components/flowRecord.tsx

@@ -19,7 +19,7 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }
   const outerColumns: EditableColumns[] = [{
     title: '序号',
-    dataIndex: 'inquiryListId',
+    dataIndex: 'id',
   }, {
     title: '操作角色',
     dataIndex: 'roleName',
@@ -40,7 +40,7 @@ const FlowRecord: React.FC<parmas> = (props) => {
   }]
   const insideColumns: EditableColumns[] = [{
     title: '序号',
-    dataIndex: 'inquiryListId',
+    dataIndex: 'id',
   }, {
     title: '操作人',
     dataIndex: 'roleName',

src/pages/transaction/inquiryQuote/components/details.tsx

@@ -434,19 +434,20 @@ const Details: React.FC<parmas> = (props) => {
           {
             Object.keys(data).length > 0 &&
             <>
-              {type === 'rfq' ?
+              {type === 'quote' ?
                 <TabPane tab="外部流转" key="1">
                   <Steps
                     style={{ padding: '20px 0' }}
                     progressDot
                     current={data.externalState - 1}
                   >
-                    {detailData.externalStateStep.items.map((item, index) => {
+                    {Object.keys(data).length > 0 && data.externalRequisitionFormResponses.map((item, index) => {
                       return (
                         <Step
                           key={index}
-                          title={item.title}
-                          description={item.desc}
+                          title={item.roleName}
+                          description={item.operation}
+                          status={item.isExecute ? 'finish' : 'wait'}
                         />
                       );
                     })}
@@ -460,12 +461,13 @@ const Details: React.FC<parmas> = (props) => {
                       progressDot
                       current={data.externalState - 1}
                     >
-                      {detailData.externalStateStep.items.map((item, index) => {
+                      {Object.keys(data).length > 0 && data.externalInquiryListStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}
-                            title={item.title}
-                            description={item.desc}
+                            title={item.roleName}
+                            description={item.operationalProcess}
+                            status={item.isExecute ? 'finish' : 'wait'}
                           />
                         );
                       })}
@@ -477,12 +479,13 @@ const Details: React.FC<parmas> = (props) => {
                       progressDot
                       current={Number(data.interiorState - 1)}
                     >
-                      {detailData.interiorStateStep.items.map((item, index) => {
+                      {Object.keys(data).length > 0 && data.interiorRequisitionFormStateResponses.map((item, index) => {
                         return (
                           <Step
                             key={index}
-                            title={item.title}
-                            description={item.desc}
+                            title={item.roleName}
+                            description={item.operationalProcess}
+                            status={item.isExecute ? 'finish' : 'wait'}
                           />
                         );
                       })}
@@ -575,7 +578,7 @@ const Details: React.FC<parmas> = (props) => {
       </div>
       <div className={style.item_wrap}>
         {
-          type === 'rfq' ?
+          type === 'quote' ?
             <>
               <div className={style.mainCol_title}>外部流转记录</div>
               <Table columns={flowRecord.external} rowKey='id' pagination={false} dataSource={data.externalInquiryListLogResponses} />

src/pages/transaction/inquiryQuote/pendingSubmit/index.tsx

@@ -105,8 +105,8 @@ const PendingSubmit: React.FC<{}> = () => {
   /**搜索 */
   const handleSumbit = (values: any) => {
     if (values.voucherTime) {
-      values.startVoucherTime = timeRange(values.voucherTime).st
-      values.endVoucherTime = timeRange(values.voucherTime).et
+      values.startDocumentsTime = timeRange(values.voucherTime).st
+      values.endDocumentsTime = timeRange(values.voucherTime).et
       delete values.voucherTime
     }
     console.log('values', values)