diff --git a/config/config.ts b/config/config.ts index 44da989..7579aca 100644 --- a/config/config.ts +++ b/config/config.ts @@ -20,9 +20,9 @@ export default defineConfig({ hash: true, mock: false, antd: {}, - dva: { - hmr: true - }, + // dva: { + // hmr: true + // }, history: { type: REACT_APP_ENV === 'dev' ? "hash" : "memory", // type: "hash" diff --git a/dist.zip b/dist.zip deleted file mode 100644 index 5d67902..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/global.less b/src/global.less index f572cc0..d6430a2 100644 --- a/src/global.less +++ b/src/global.less @@ -1,4 +1,5 @@ -@import '~antd/es/style/themes/default.less'; +// @import '~antd/es/style/themes/default.less'; +@import '~antd/dist/antd.less'; html, body, diff --git a/src/pages/Setting/Users/components/edit.tsx b/src/pages/Setting/Users/components/edit.tsx index 2df9120..0dbcfc0 100644 --- a/src/pages/Setting/Users/components/edit.tsx +++ b/src/pages/Setting/Users/components/edit.tsx @@ -157,7 +157,7 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab, // 根据商家id查询门店列表 const { run: getShopTree, data: shopTree } = useRequest(async (businessManId?: number) => { const data = await getMerchantShopTree({ BusinessManId: businessManId ? `${businessManId}` : detail?.BUSINESSMAN_ID }) - console.log('data', data); + console.log('shopTreeshopTreeshopTreeshopTree', data); return data }, { manual: !detail?.BUSINESSMAN_ID }) @@ -350,6 +350,8 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab, initDetail.USERTYPE_ID = initDetail.USERTYPE_ID || '' setCheckedRole(initDetail.SystemRoleList) setCheckedServerpart(serverpartList) + console.log('serverpartShopListserverpartShopListserverpartShopListserverpartShopList', serverpartShopList); + setCheckedShop(serverpartShopList) if (tableTab === '1000') { getServiceList(initDetail.USER_PROVINCE, initDetail.PushList && initDetail.PushList.length > 0 && initDetail.PushList[0] ? initDetail.PushList[0].type : null) diff --git a/src/pages/merchantManagement/reports/CommitySaleReport/index.tsx b/src/pages/merchantManagement/reports/CommitySaleReport/index.tsx index 1735f6c..96dce59 100644 --- a/src/pages/merchantManagement/reports/CommitySaleReport/index.tsx +++ b/src/pages/merchantManagement/reports/CommitySaleReport/index.tsx @@ -28,6 +28,7 @@ import { getUserShopTree } from '@/services/options'; import { getCommoditySaleSummary } from './service'; import { exportExcel, printOutBody, printOutInternal } from '@/utils/utils'; import '../../style.less'; +import { exportXlsxFromProColumnsExcelJS } from '@/utils/exportExcelFun'; const { Text, Title } = Typography; @@ -40,7 +41,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = ( const { location } = history const [activeKey, setActiveKey] = useState<'1' | '2'>('1'); // 统计类型 1 日报表 2 月报表 - // const [reqDetailList, setReqDetailList] = useState(); + const [reqDetailList, setReqDetailList] = useState(); const [printOut, setPrintOut] = useState(); const [searchParams, setSearchParams] = useState(); @@ -61,8 +62,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = ( } }, [currentUser, location]) - const columns: ProColumns[] = [ - + const columns: any = [ { dataIndex: 'DataType', // title: '统计方式', @@ -287,7 +287,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = ( // 请求完成后 重置默认排序 setCommoditySaleSort('descend') setSearchParams(searchWholeParams) - // setReqDetailList(data.data); + setReqDetailList(data.data); setPrintOut(undefined); return data // { ...data, data: totalData, total: totalData.length }; } @@ -369,18 +369,31 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = ( key="new" type="primary" onClick={async () => { - if (searchParams) { - const data = await getCommoditySaleSummary(searchParams); - - const success = await exportExcel( - columns.filter(n => !n.hideInTable), - data.data || [], - `单品${activeKey === "2" ? '月' : '日'}报表_${moment().format('YYYY/MM/DD')}`, - ); - if (success.message !== 'ok') { - message.info({ content: success.message }); - } + if (reqDetailList && reqDetailList.length > 0) { + // 尝试一下 导出新方法 + exportXlsxFromProColumnsExcelJS(columns, + reqDetailList, + `单品日报表${searchParams?.StartTime}-${searchParams?.EndTime}`, + { + topTitle: `单品日报表`, // 顶部大标题 + } + ) + } else { + message.error('暂无数据可导出！') } + + // if (searchParams) { + // const data = await getCommoditySaleSummary(searchParams); + + // const success = await exportExcel( + // columns.filter(n => !n.hideInTable), + // data.data || [], + // `单品${activeKey === "2" ? '月' : '日'}报表_${moment().format('YYYY/MM/DD')}`, + // ); + // if (success.message !== 'ok') { + // message.info({ content: success.message }); + // } + // } }} > 导出excel diff --git a/src/pages/reports/BusinessAnalysis/saleHisReport/index.tsx b/src/pages/reports/BusinessAnalysis/saleHisReport/index.tsx index 8a63055..e7b10f5 100644 --- a/src/pages/reports/BusinessAnalysis/saleHisReport/index.tsx +++ b/src/pages/reports/BusinessAnalysis/saleHisReport/index.tsx @@ -22,6 +22,7 @@ import { handleGetBusinessTrades } from "../saleReport/service"; import ProDescriptions from "@ant-design/pro-descriptions"; import numeral from "numeral"; import PageTitleBox from "@/components/PageTitleBox"; +import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun"; const saleHisReport: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -380,16 +381,29 @@ const saleHisReport: React.FC<{ currentUser: CurrentUser }> = (props) => { type="primary" onClick={(e) => { if (reqDetailList && reqDetailList.length > 0) { - setShowLoading(true) - setTimeout(() => { - setShowExportTable(true) - setTimeout(() => { - exportTable(e) - }, 100) - }, 100) + // 尝试一下 导出新方法 + exportXlsxFromProColumnsExcelJS(columns, + reqDetailList, + `历史销售单品报表${searchParams?.StartTime}-${searchParams?.EndTime}`, + { + topTitle: `历史销售单品报表`, // 顶部大标题 + } + ) } else { message.error('暂无数据可导出！') } + + // if (reqDetailList && reqDetailList.length > 0) { + // setShowLoading(true) + // setTimeout(() => { + // setShowExportTable(true) + // setTimeout(() => { + // exportTable(e) + // }, 100) + // }, 100) + // } else { + // message.error('暂无数据可导出！') + // } }} > 导出excel diff --git a/src/pages/reports/BusinessAnalysis/saleRankReport/index.tsx b/src/pages/reports/BusinessAnalysis/saleRankReport/index.tsx index bdcf964..9c04d81 100644 --- a/src/pages/reports/BusinessAnalysis/saleRankReport/index.tsx +++ b/src/pages/reports/BusinessAnalysis/saleRankReport/index.tsx @@ -20,6 +20,7 @@ import numeral from "numeral"; import { contractType } from "@/pages/contract/emun"; import { handleGetShopShortNamesGet } from "@/pages/reports/BusinessAnalysis/transactionAnalysis/service"; import PageTitleBox from "@/components/PageTitleBox"; +import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun"; const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -393,16 +394,30 @@ const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => { type="primary" onClick={(e) => { if (reqDetailList && reqDetailList.length > 0) { - setShowLoading(true) - setTimeout(() => { - setShowExportTable(true) - setTimeout(() => { - exportTable(e) - }, 100) - }, 100) + // 尝试一下 导出新方法 + exportXlsxFromProColumnsExcelJS(columns, + reqDetailList, + `单品销售排行统计${searchParams?.startDate}-${searchParams?.endDate}`, + { + topTitle: `单品销售排行统计`, // 顶部大标题 + } + ) } else { message.error('暂无数据可导出！') } + + + // if (reqDetailList && reqDetailList.length > 0) { + // setShowLoading(true) + // setTimeout(() => { + // setShowExportTable(true) + // setTimeout(() => { + // exportTable(e) + // }, 100) + // }, 100) + // } else { + // message.error('暂无数据可导出！') + // } }} > 导出excel diff --git a/src/pages/reports/BusinessAnalysis/saleReport/index.tsx b/src/pages/reports/BusinessAnalysis/saleReport/index.tsx index 7e44f54..d8bd4c8 100644 --- a/src/pages/reports/BusinessAnalysis/saleReport/index.tsx +++ b/src/pages/reports/BusinessAnalysis/saleReport/index.tsx @@ -1,4 +1,4 @@ -// 销售单品报表 区域销售单品报表 +// 销售单品报表 区域销售单品报表 销售单品报表 import { connect } from "umi"; import type { CurrentUser } from "umi"; import type { ConnectState } from "@/models/connect"; @@ -30,6 +30,7 @@ import * as numeral from "numeral"; import { handleGetShopShortNamesGet } from "@/pages/reports/BusinessAnalysis/transactionAnalysis/service"; import PageTitleBox from "@/components/PageTitleBox"; import center from "@/pages/account/center"; +import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun"; const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => { @@ -175,7 +176,7 @@ const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => { render: (text, record, index) => { if (record?.curIndex || record?.curIndex === 0) { const page = actionRef.current?.pageInfo; - return index + (page.current - 1) * page.pageSize + 1; + return index + (page.current - 1) * page.pageSize + 1 } return '' }, @@ -414,16 +415,30 @@ const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => { type="primary" onClick={(e) => { if (reqDetailList && reqDetailList.length > 0) { - setShowLoading(true) - setTimeout(() => { - setShowExportTable(true) - setTimeout(() => { - exportTable(e) - }, 100) - }, 100) + // 尝试一下 导出新方法 + exportXlsxFromProColumnsExcelJS(columns, + reqDetailList, + `单品统计报表${searchParams?.StartTime}-${searchParams?.EndTime}`, + { + topTitle: `单品统计报表`, // 顶部大标题 + } + ) } else { message.error('暂无数据可导出！') } + + + // if (reqDetailList && reqDetailList.length > 0) { + // setShowLoading(true) + // setTimeout(() => { + // setShowExportTable(true) + // setTimeout(() => { + // exportTable(e) + // }, 100) + // }, 100) + // } else { + // message.error('暂无数据可导出！') + // } }} > 导出excel