ylj/newCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ylj20011123 2025-09-15 11:29:35 +08:00
parent c5500f6170
commit 02b1425689
8 changed files with 103 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/config.ts
View File

@ -20,9 +20,9 @@ export default defineConfig({
hash: true, hash: true,
mock: false, mock: false,
antd: {}, antd: {},
dva: { // dva: {
hmr: true // hmr: true
}, // },
history: { history: {
type: REACT_APP_ENV === 'dev' ? "hash" : "memory", type: REACT_APP_ENV === 'dev' ? "hash" : "memory",
// type: "hash" // type: "hash"

BIN
dist.zip
View File

Binary file not shown.

3
src/global.less
View File

@ -1,4 +1,5 @@
@import '~antd/es/style/themes/default.less'; // @import '~antd/es/style/themes/default.less';
@import '~antd/dist/antd.less';
html, html,
body, body,

4
src/pages/Setting/Users/components/edit.tsx
View File

@ -157,7 +157,7 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
// 根据商家id查询门店列表 // 根据商家id查询门店列表
const { run: getShopTree, data: shopTree } = useRequest(async (businessManId?: number) => { const { run: getShopTree, data: shopTree } = useRequest(async (businessManId?: number) => {
const data = await getMerchantShopTree({ BusinessManId: businessManId ? `${businessManId}` : detail?.BUSINESSMAN_ID }) const data = await getMerchantShopTree({ BusinessManId: businessManId ? `${businessManId}` : detail?.BUSINESSMAN_ID })
console.log('data', data); console.log('shopTreeshopTreeshopTreeshopTree', data);
return data return data
}, { manual: !detail?.BUSINESSMAN_ID }) }, { manual: !detail?.BUSINESSMAN_ID })
@ -350,6 +350,8 @@ const Edit = ({ tableTab, openType, detail, reloadTable, currentUser, selectTab,
initDetail.USERTYPE_ID = initDetail.USERTYPE_ID || '' initDetail.USERTYPE_ID = initDetail.USERTYPE_ID || ''
setCheckedRole(initDetail.SystemRoleList) setCheckedRole(initDetail.SystemRoleList)
setCheckedServerpart(serverpartList) setCheckedServerpart(serverpartList)
console.log('serverpartShopListserverpartShopListserverpartShopListserverpartShopList', serverpartShopList);
setCheckedShop(serverpartShopList) setCheckedShop(serverpartShopList)
if (tableTab === '1000') { if (tableTab === '1000') {
getServiceList(initDetail.USER_PROVINCE, initDetail.PushList && initDetail.PushList.length > 0 && initDetail.PushList[0] ? initDetail.PushList[0].type : null) getServiceList(initDetail.USER_PROVINCE, initDetail.PushList && initDetail.PushList.length > 0 && initDetail.PushList[0] ? initDetail.PushList[0].type : null)

43
src/pages/merchantManagement/reports/CommitySaleReport/index.tsx
View File

@ -28,6 +28,7 @@ import { getUserShopTree } from '@/services/options';
import { getCommoditySaleSummary } from './service'; import { getCommoditySaleSummary } from './service';
import { exportExcel, printOutBody, printOutInternal } from '@/utils/utils'; import { exportExcel, printOutBody, printOutInternal } from '@/utils/utils';
import '../../style.less'; import '../../style.less';
import { exportXlsxFromProColumnsExcelJS } from '@/utils/exportExcelFun';
const { Text, Title } = Typography; const { Text, Title } = Typography;
@ -40,7 +41,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = (
const { location } = history const { location } = history
const [activeKey, setActiveKey] = useState<'1' | '2'>('1'); // 统计类型 1 日报表 2 月报表 const [activeKey, setActiveKey] = useState<'1' | '2'>('1'); // 统计类型 1 日报表 2 月报表
// const [reqDetailList, setReqDetailList] = useState<CommoditySaleSummaryModel[]>(); const [reqDetailList, setReqDetailList] = useState<any>();
const [printOut, setPrintOut] = useState<any>(); const [printOut, setPrintOut] = useState<any>();
const [searchParams, setSearchParams] = useState<any>(); const [searchParams, setSearchParams] = useState<any>();
@ -61,8 +62,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = (
} }
}, [currentUser, location]) }, [currentUser, location])
const columns: ProColumns<CommoditySaleSummaryModel>[] = [ const columns: any = [
{ {
dataIndex: 'DataType', dataIndex: 'DataType',
// title: '统计方式', // title: '统计方式',
@ -287,7 +287,7 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = (
// 请求完成后 重置默认排序 // 请求完成后 重置默认排序
setCommoditySaleSort('descend') setCommoditySaleSort('descend')
setSearchParams(searchWholeParams) setSearchParams(searchWholeParams)
// setReqDetailList(data.data); setReqDetailList(data.data);
setPrintOut(undefined); setPrintOut(undefined);
return data // { ...data, data: totalData, total: totalData.length }; return data // { ...data, data: totalData, total: totalData.length };
} }
@ -369,18 +369,31 @@ const CommoditysaleTable: React.FC<{ currentUser: CurrentUser | undefined }> = (
key="new" key="new"
type="primary" type="primary"
onClick={async () => { onClick={async () => {
if (searchParams) { if (reqDetailList && reqDetailList.length > 0) {
const data = await getCommoditySaleSummary(searchParams); // 尝试一下 导出新方法
exportXlsxFromProColumnsExcelJS(columns,
const success = await exportExcel( reqDetailList,
columns.filter(n => !n.hideInTable), `单品日报表${searchParams?.StartTime}-${searchParams?.EndTime}`,
data.data || [], {
`单品${activeKey === "2" ? '月' : '日'}报表_${moment().format('YYYY/MM/DD')}`, topTitle: `单品日报表`, // 顶部大标题
); }
if (success.message !== 'ok') { )
message.info({ content: success.message }); } 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 导出excel

28
src/pages/reports/BusinessAnalysis/saleHisReport/index.tsx
View File

@ -22,6 +22,7 @@ import { handleGetBusinessTrades } from "../saleReport/service";
import ProDescriptions from "@ant-design/pro-descriptions"; import ProDescriptions from "@ant-design/pro-descriptions";
import numeral from "numeral"; import numeral from "numeral";
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun";
const saleHisReport: React.FC<{ currentUser: CurrentUser }> = (props) => { const saleHisReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
@ -380,16 +381,29 @@ const saleHisReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
type="primary" type="primary"
onClick={(e) => { onClick={(e) => {
if (reqDetailList && reqDetailList.length > 0) { if (reqDetailList && reqDetailList.length > 0) {
setShowLoading(true) // 尝试一下 导出新方法
setTimeout(() => { exportXlsxFromProColumnsExcelJS(columns,
setShowExportTable(true) reqDetailList,
setTimeout(() => { `历史销售单品报表${searchParams?.StartTime}-${searchParams?.EndTime}`,
exportTable(e) {
}, 100) topTitle: `历史销售单品报表`, // 顶部大标题
}, 100) }
)
} else { } else {
message.error('暂无数据可导出！') message.error('暂无数据可导出！')
} }
// if (reqDetailList && reqDetailList.length > 0) {
// setShowLoading(true)
// setTimeout(() => {
// setShowExportTable(true)
// setTimeout(() => {
// exportTable(e)
// }, 100)
// }, 100)
// } else {
// message.error('暂无数据可导出！')
// }
}} }}
> >
导出excel 导出excel

29
src/pages/reports/BusinessAnalysis/saleRankReport/index.tsx
View File

@ -20,6 +20,7 @@ import numeral from "numeral";
import { contractType } from "@/pages/contract/emun"; import { contractType } from "@/pages/contract/emun";
import { handleGetShopShortNamesGet } from "@/pages/reports/BusinessAnalysis/transactionAnalysis/service"; import { handleGetShopShortNamesGet } from "@/pages/reports/BusinessAnalysis/transactionAnalysis/service";
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun";
const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => { const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
@ -393,16 +394,30 @@ const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
type="primary" type="primary"
onClick={(e) => { onClick={(e) => {
if (reqDetailList && reqDetailList.length > 0) { if (reqDetailList && reqDetailList.length > 0) {
setShowLoading(true) // 尝试一下 导出新方法
setTimeout(() => { exportXlsxFromProColumnsExcelJS(columns,
setShowExportTable(true) reqDetailList,
setTimeout(() => { `单品销售排行统计${searchParams?.startDate}-${searchParams?.endDate}`,
exportTable(e) {
}, 100) topTitle: `单品销售排行统计`, // 顶部大标题
}, 100) }
)
} else { } else {
message.error('暂无数据可导出！') message.error('暂无数据可导出！')
} }
// if (reqDetailList && reqDetailList.length > 0) {
// setShowLoading(true)
// setTimeout(() => {
// setShowExportTable(true)
// setTimeout(() => {
// exportTable(e)
// }, 100)
// }, 100)
// } else {
// message.error('暂无数据可导出！')
// }
}} }}
> >
导出excel 导出excel

33
src/pages/reports/BusinessAnalysis/saleReport/index.tsx
View File

@ -1,4 +1,4 @@
// 销售单品报表 区域销售单品报表 // 销售单品报表 区域销售单品报表 销售单品报表
import { connect } from "umi"; import { connect } from "umi";
import type { CurrentUser } from "umi"; import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect"; import type { ConnectState } from "@/models/connect";
@ -30,6 +30,7 @@ import * as numeral from "numeral";
import { handleGetShopShortNamesGet } from "@/pages/reports/BusinessAnalysis/transactionAnalysis/service"; import { handleGetShopShortNamesGet } from "@/pages/reports/BusinessAnalysis/transactionAnalysis/service";
import PageTitleBox from "@/components/PageTitleBox"; import PageTitleBox from "@/components/PageTitleBox";
import center from "@/pages/account/center"; import center from "@/pages/account/center";
import { exportXlsxFromProColumnsExcelJS } from "@/utils/exportExcelFun";
const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => { const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
@ -175,7 +176,7 @@ const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
render: (text, record, index) => { render: (text, record, index) => {
if (record?.curIndex || record?.curIndex === 0) { if (record?.curIndex || record?.curIndex === 0) {
const page = actionRef.current?.pageInfo; const page = actionRef.current?.pageInfo;
return index + (page.current - 1) * page.pageSize + 1; return index + (page.current - 1) * page.pageSize + 1
} }
return '' return ''
}, },
@ -414,16 +415,30 @@ const saleReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
type="primary" type="primary"
onClick={(e) => { onClick={(e) => {
if (reqDetailList && reqDetailList.length > 0) { if (reqDetailList && reqDetailList.length > 0) {
setShowLoading(true) // 尝试一下 导出新方法
setTimeout(() => { exportXlsxFromProColumnsExcelJS(columns,
setShowExportTable(true) reqDetailList,
setTimeout(() => { `单品统计报表${searchParams?.StartTime}-${searchParams?.EndTime}`,
exportTable(e) {
}, 100) topTitle: `单品统计报表`, // 顶部大标题
}, 100) }
)
} else { } else {
message.error('暂无数据可导出！') message.error('暂无数据可导出！')
} }
// if (reqDetailList && reqDetailList.length > 0) {
// setShowLoading(true)
// setTimeout(() => {
// setShowExportTable(true)
// setTimeout(() => {
// exportTable(e)
// }, 100)
// }, 100)
// } else {
// message.error('暂无数据可导出！')
// }
}} }}
> >
导出excel 导出excel