Commit e9d4cebb authored by FE-安焕焕's avatar FE-安焕焕 👣

修复导出数据问题

parent 65508d62
...@@ -9,7 +9,7 @@ let envAPi = { ...@@ -9,7 +9,7 @@ let envAPi = {
let prodApi = { let prodApi = {
api: '//backstms.q-gp.com', api: '//backstms.q-gp.com',
kdspApi: '//kdsp-operation.q-gp.com', kdspApi: '//kdsp-op.q-gp.com',
}; };
let exportApi; let exportApi;
......
...@@ -2,6 +2,7 @@ import { Button, Upload, notification } from 'antd'; ...@@ -2,6 +2,7 @@ import { Button, Upload, notification } from 'antd';
import React, { useState, useEffect, useRef } from 'react'; import React, { useState, useEffect, useRef } from 'react';
import { PageHeaderWrapper } from '@ant-design/pro-layout'; import { PageHeaderWrapper } from '@ant-design/pro-layout';
import ProTable from '@ant-design/pro-table'; import ProTable from '@ant-design/pro-table';
import { FormInstance } from 'antd/lib/form';
import LogisticsForm from './components/LogisticsForm'; import LogisticsForm from './components/LogisticsForm';
import style from './styles.less'; import style from './styles.less';
import { import {
...@@ -19,10 +20,10 @@ const TableList = props => { ...@@ -19,10 +20,10 @@ const TableList = props => {
const [LogisticsModalVisible, handleModalVisible] = useState(false); const [LogisticsModalVisible, handleModalVisible] = useState(false);
const [skuList, setSkuList] = useState([]); const [skuList, setSkuList] = useState([]);
const [LogisticsData, setLogisticsData] = useState([{}]); const [LogisticsData, setLogisticsData] = useState([{}]);
const [QueryData, setQueryData] = useState({});
const [ShowUpdateBtn] = useState([2, 5]); const [ShowUpdateBtn] = useState([2, 5]);
const actionRef = useRef(); const actionRef = useRef();
const ref = useRef(FormInstance);
const renderContent = (record, key) => const renderContent = (record, key) =>
record.mchOrderSkuVoList.map((item, index) => ( record.mchOrderSkuVoList.map((item, index) => (
<p <p
...@@ -180,7 +181,9 @@ const TableList = props => { ...@@ -180,7 +181,9 @@ const TableList = props => {
const data = await getLogistics(record?.orderId); const data = await getLogistics(record?.orderId);
logisticsData = data.map(item => ({ logisticsData = data.map(item => ({
selectedGoods: item?.skus?.map(sku => sku?.orderSkuId), selectedGoods: item?.skus?.map(sku => sku?.orderSkuId),
selectedCompany: `${item?.expressCompanyCode}-${item?.expressCompanyName}`, selectedCompany: item.expressCompanyCode
? `${item?.expressCompanyCode}-${item?.expressCompanyName}`
: null,
orderNum: item?.deliveryNo, orderNum: item?.deliveryNo,
})); }));
setLogisticsData(logisticsData); setLogisticsData(logisticsData);
...@@ -231,7 +234,6 @@ const TableList = props => { ...@@ -231,7 +234,6 @@ const TableList = props => {
pageNo: params.current, pageNo: params.current,
pageSize: params.pageSize || 20, pageSize: params.pageSize || 20,
}; };
setQueryData(transformedParam);
return queryToSend(transformedParam); return queryToSend(transformedParam);
}; };
const searchRender = ({ searchText, resetText }, { form }) => { const searchRender = ({ searchText, resetText }, { form }) => {
...@@ -268,7 +270,6 @@ const TableList = props => { ...@@ -268,7 +270,6 @@ const TableList = props => {
onClick={() => { onClick={() => {
// eslint-disable-next-line no-unused-expressions // eslint-disable-next-line no-unused-expressions
form?.resetFields(); form?.resetFields();
setQueryData({ logisticsStatus: props.type || 1 });
}} }}
> >
{resetText} {resetText}
...@@ -281,7 +282,10 @@ const TableList = props => { ...@@ -281,7 +282,10 @@ const TableList = props => {
<Button <Button
type="primary" type="primary"
onClick={() => { onClick={() => {
downOrder(QueryData); if (ref.current) {
const obj = { ...ref.current.getFieldsValue(), logisticsStatus: props.type || 1 };
downOrder(obj);
}
}} }}
> >
导出数据 导出数据
...@@ -295,6 +299,7 @@ const TableList = props => { ...@@ -295,6 +299,7 @@ const TableList = props => {
request={params => queryToSendFn({ ...params })} request={params => queryToSendFn({ ...params })}
columns={columns} columns={columns}
rowKey={r => r.orderId} rowKey={r => r.orderId}
formRef={ref}
toolBarRender={toolBarRenderFn} toolBarRender={toolBarRenderFn}
search={{ search={{
collapsed: false, collapsed: false,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment