{modal}
}}
+ footer={
+
+ )
+}
+
+export default connect(({ user }: ConnectState) => ({
+ currentUser: user.currentUser
+}))(MallSummaryStatistics);
\ No newline at end of file
diff --git a/src/pages/travelMember/MemberAddress/components/addressDetail.tsx b/src/pages/travelMember/MemberAddress/components/addressDetail.tsx
index acde389..a6d58df 100644
--- a/src/pages/travelMember/MemberAddress/components/addressDetail.tsx
+++ b/src/pages/travelMember/MemberAddress/components/addressDetail.tsx
@@ -228,7 +228,6 @@ const AddressDetail = ({ currentBigRow, currentUser }: DetailProps) => {
console.log('resultresultresult', result);
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
- handleSetlogSave(`删除【${currentRow?.ADDRESS || ""}】失败`)
} else {
message.success('删除成功！');
modalActionRef.current?.reload()
@@ -278,14 +277,13 @@ const AddressDetail = ({ currentBigRow, currentUser }: DetailProps) => {
}
const data = await handleSynchroMEMBERADDRESS(req);
if (data.Result_Code === 100) {
- handleSetlogSave(`更新【${currentRow?.ADDRESS || ""}】成功`)
+ handleSetlogSave(`${currentRow?.MEMBERADDRESS_ID ? '更新' : '新增'}【${data.Result_Data?.ADDRESS || ""}】成功`)
message.success(data.Result_Desc)
formRef?.current?.resetFields()
setCurrentRow(undefined)
handleModalVisible(false)
modalActionRef.current?.reload()
} else {
- handleSetlogSave(`更新【${currentRow?.ADDRESS || ""}】失败`)
message.error(data.Result_Desc)
}
};
diff --git a/src/pages/travelMember/MemberSummaryStatistics/index.tsx b/src/pages/travelMember/MemberSummaryStatistics/index.tsx
index c62c0ae..0c716b6 100644
--- a/src/pages/travelMember/MemberSummaryStatistics/index.tsx
+++ b/src/pages/travelMember/MemberSummaryStatistics/index.tsx
@@ -12,6 +12,7 @@ import reduceIcon from '@/assets/detail/reduceIcon.png'
import staticSumTotalBg from '@/assets/detail/staticSumTotalBg.png'
import session from "@/utils/session";
import ProForm, { ProFormDateRangePicker } from "@ant-design/pro-form";
+import { handleSetlogSave } from "@/utils/format";
@@ -85,26 +86,32 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
width: 120,
dataIndex: "POINT_TYPE",
ellipsis: true,
- hideInSearch: true,
valueType: 'select',
align: 'center',
valueEnum: {
"-2": "全部",
"1": "累计",
"-1": "消耗"
- }
+ },
+ initialValue: "-2"
},
{
title: "积分来源",
width: 120,
dataIndex: "POINT_SOURCE",
ellipsis: true,
- hideInSearch: true,
valueType: 'treeSelect',
align: 'center',
request: () => {
return SCORETYPETree
}
+ // valueEnum: {
+ // "0": "全部",
+ // "1000": "消费赠送",
+ // "2000": "消费抵扣",
+ // "3000": "注册赠送"
+ // },
+ // initialValue: "0"
},
{
title: "本次积分",
@@ -125,12 +132,13 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
valueType: "digit"
},
{
- title: "会员名称",
- width: 150,
- dataIndex: "MEMBERSHIP_NAME",
+ title: "实付金额",
+ width: 120,
+ dataIndex: "PAY_AMOUNT",
hideInSearch: true,
ellipsis: true,
align: 'center',
+ valueType: "digit"
},
{
title: "获取时间",
@@ -140,7 +148,7 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
align: 'center',
ellipsis: true,
render: (_, record) => {
- return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD') : "-"
+ return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
]
@@ -184,6 +192,14 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
align: 'center',
ellipsis: true,
},
+ {
+ title: "会员昵称",
+ width: 150,
+ dataIndex: "MEMBERSHIP_NAME",
+ hideInSearch: true,
+ align: 'center',
+ ellipsis: true,
+ },
{
title: "累计成长值",
width: 120,
@@ -208,11 +224,22 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
dataIndex: "GROWTH_SOURCE",
align: 'center',
ellipsis: true,
- hideInSearch: true,
valueType: 'treeSelect',
request: () => {
return SCORETYPETree
+ },
+ fieldProps: {
+ allowClear: true, // 允许清除已选中的值
+ treeDefaultExpandAll: true, // 默认展开所有节点（可选）
+ showSearch: true, // 允许搜索（可选）
+ treeNodeFilterProp: 'title', // 按 title 搜索（可选）
}
+ // valueEnum: {
+ // "0": "全部",
+ // "1000": "消费赠送",
+ // "2000": "消费抵扣",
+ // "3000": "注册赠送",
+ // },
},
{
title: "成长方式",
@@ -221,29 +248,21 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
ellipsis: true,
align: 'center',
valueType: 'select',
- hideInSearch: true,
valueEnum: {
"-2": "全部",
"1": "积累",
"-1": "消耗",
},
- },
- {
- title: "会员名称",
- width: 150,
- dataIndex: "MEMBERSHIP_NAME",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
+ initialValue: "-2"
},
{
title: "操作时间",
- width: 120,
+ width: 180,
dataIndex: "OPERATE_DATE",
align: 'center',
hideInSearch: true,
render: (_, record) => {
- return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD') : "-"
+ return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
]
@@ -483,10 +502,8 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
// 判断当前选择的 1、2、3为积分的 4、5、6 为成长值的
let req: any = {}
let data: any = {}
-
const params = searchParams;
-
if (selectTab <= 3) {
req = {
SearchParameter: {
@@ -532,6 +549,8 @@ const MemberSummaryStatistics: React.FC<{ currentUser: CurrentUser | undefined }
// }
setSearchParams(params)
+ handleSetlogSave(`查询${selectTab === 1 ? '总积分' : selectTab === 2 ? '赚取积分' : selectTab === 3 ? '消耗积分' : selectTab === 4 ? '总成长值' : selectTab === 5 ? '赚取成长值' : selectTab === 6 ? '消耗成长值' : ''}数据汇总`)
+
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
}
diff --git a/src/pages/travelMember/MemberTagManage/index.tsx b/src/pages/travelMember/MemberTagManage/index.tsx
index 05051fb..ea457fb 100644
--- a/src/pages/travelMember/MemberTagManage/index.tsx
+++ b/src/pages/travelMember/MemberTagManage/index.tsx
@@ -165,10 +165,9 @@ const MemberTagManage: React.FC<{ currentUser: CurrentUser | undefined }> = (pro
const result = await handeDeleteAUTOTYPE(req)
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
- handleSetlogSave(`删除【${currentRow?.AUTOTYPE_NAME}】失败`)
} else {
message.success('删除成功！');
- handleSetlogSave(`删除【${currentRow?.AUTOTYPE_NAME}】成功`)
+ handleSetlogSave(`删除【${currentRow?.AUTOTYPE_NAME}】`)
actionRef.current?.reload()
handleConfirmLoading(false)
handleModalVisible(false)
@@ -204,7 +203,7 @@ const MemberTagManage: React.FC<{ currentUser: CurrentUser | undefined }> = (pro
const data = await handeSynchroAUTOTYPE(req)
handleConfirmLoading(false)
if (data.Result_Code === 100) {
- handleSetlogSave(`更新【${currentRow?.AUTOTYPE_NAME}】成功`)
+ handleSetlogSave(`${currentRow?.FIELDENUM_ID ? '更新' : '新增'}【${currentRow?.AUTOTYPE_NAME}】`)
message.success("新增成功！")
setCurrentRow(undefined)
formRef?.current?.resetFields()
@@ -214,7 +213,6 @@ const MemberTagManage: React.FC<{ currentUser: CurrentUser | undefined }> = (pro
actionRef.current?.reload()
} else {
message.error(data.Result_Desc)
- handleSetlogSave(`更新【${currentRow?.AUTOTYPE_NAME}】失败`)
}
}
diff --git a/src/pages/travelMember/MembershipLevelManage/index.tsx b/src/pages/travelMember/MembershipLevelManage/index.tsx
index cc124f0..454ddc1 100644
--- a/src/pages/travelMember/MembershipLevelManage/index.tsx
+++ b/src/pages/travelMember/MembershipLevelManage/index.tsx
@@ -201,10 +201,9 @@ const MembershipLevelManage: React.FC<{ currentUser: CurrentUser | undefined }>
const result = await handeDeleteFIELDENUM(req)
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
- handleSetlogSave(`删除【${currentRow?.FIELDENUM_NAME}】失败`)
} else {
message.success('删除成功！');
- handleSetlogSave(`删除【${currentRow?.FIELDENUM_NAME}】成功`)
+ handleSetlogSave(`删除【${currentRow?.FIELDENUM_NAME}】`)
actionRef.current?.reload()
handleConfirmLoading(false)
handleModalVisible(false)
@@ -231,7 +230,7 @@ const MembershipLevelManage: React.FC<{ currentUser: CurrentUser | undefined }>
const data = await handeSynchroFIELDENUM(req)
handleConfirmLoading(false)
if (data.Result_Code === 100) {
- handleSetlogSave(`更新【${currentRow?.FIELDENUM_NAME}】成功`)
+ handleSetlogSave(`${currentRow?.FIELDENUM_ID ? '更新' : '新增'}【${data.Result_Data.FIELDENUM_NAME}】`)
message.success("新增成功！")
setCurrentRow(undefined)
formRef?.current?.resetFields()
@@ -241,7 +240,6 @@ const MembershipLevelManage: React.FC<{ currentUser: CurrentUser | undefined }>
actionRef.current?.reload()
} else {
message.error(data.Result_Desc)
- handleSetlogSave(`更新【${currentRow?.FIELDENUM_NAME}】失败`)
}
}
diff --git a/src/pages/travelMember/MembershipLevelStatistics/index.tsx b/src/pages/travelMember/MembershipLevelStatistics/index.tsx
index d47d04a..fe2953e 100644
--- a/src/pages/travelMember/MembershipLevelStatistics/index.tsx
+++ b/src/pages/travelMember/MembershipLevelStatistics/index.tsx
@@ -11,6 +11,7 @@ import addIcon from '@/assets/detail/addIcon.png'
import reduceIcon from '@/assets/detail/reduceIcon.png'
import session from "@/utils/session";
import ProForm, { ProFormDateRangePicker } from "@ant-design/pro-form";
+import { handleSetlogSave } from "@/utils/format";
@@ -102,26 +103,32 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
width: 120,
dataIndex: "POINT_TYPE",
ellipsis: true,
- hideInSearch: true,
valueType: 'select',
align: 'center',
valueEnum: {
"-2": "全部",
"1": "累计",
"-1": "消耗"
- }
+ },
+ initialValue: "-2"
},
{
title: "积分来源",
width: 120,
dataIndex: "POINT_SOURCE",
ellipsis: true,
- hideInSearch: true,
valueType: 'treeSelect',
align: 'center',
request: () => {
return SCORETYPETree
}
+ // valueEnum: {
+ // "0": "全部",
+ // "1000": "消费赠送",
+ // "2000": "消费抵扣",
+ // "3000": "注册赠送"
+ // },
+ // initialValue: "0"
},
{
title: "本次积分",
@@ -141,24 +148,6 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
align: 'center',
valueType: "digit"
},
- {
- title: "会员类型",
- width: 120,
- dataIndex: "MEMBERSHIP_TYPE",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
- valueType: 'select',
- valueEnum: MEMBERSHIPTYPEYNObj
- },
- {
- title: "会员名称",
- width: 150,
- dataIndex: "MEMBERSHIP_NAME",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
- },
{
title: "获取时间",
width: 150,
@@ -167,7 +156,7 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
align: 'center',
ellipsis: true,
render: (_, record) => {
- return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD') : "-"
+ return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
]
@@ -210,6 +199,14 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
align: 'center',
ellipsis: true,
},
+ {
+ title: "会员昵称",
+ width: 150,
+ dataIndex: "MEMBERSHIP_NAME",
+ hideInSearch: true,
+ align: 'center',
+ ellipsis: true,
+ },
{
title: "累计成长值",
width: 120,
@@ -234,11 +231,22 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
dataIndex: "GROWTH_SOURCE",
align: 'center',
ellipsis: true,
- hideInSearch: true,
valueType: 'treeSelect',
request: () => {
return SCORETYPETree
+ },
+ fieldProps: {
+ allowClear: true, // 允许清除已选中的值
+ treeDefaultExpandAll: true, // 默认展开所有节点（可选）
+ showSearch: true, // 允许搜索（可选）
+ treeNodeFilterProp: 'title', // 按 title 搜索（可选）
}
+ // valueEnum: {
+ // "0": "全部",
+ // "1000": "消费赠送",
+ // "2000": "消费抵扣",
+ // "3000": "注册赠送",
+ // },
},
{
title: "成长方式",
@@ -247,39 +255,21 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
ellipsis: true,
align: 'center',
valueType: 'select',
- hideInSearch: true,
valueEnum: {
"-2": "全部",
"1": "积累",
"-1": "消耗",
},
- },
- {
- title: "会员等级",
- width: 120,
- dataIndex: "MEMBERSHIP_LEVEL",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
- valueType: 'select',
- valueEnum: MEMBERSHIPLEVELYNObj
- },
- {
- title: "会员名称",
- width: 150,
- dataIndex: "MEMBERSHIP_NAME",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
+ initialValue: "-2"
},
{
title: "操作时间",
- width: 120,
+ width: 180,
dataIndex: "OPERATE_DATE",
align: 'center',
hideInSearch: true,
render: (_, record) => {
- return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD') : "-"
+ return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
]
@@ -680,6 +670,7 @@ const MembershipLevelStatistics: React.FC<{ currentUser: CurrentUser | undefined
}
data = await handleGetMEMBERGROWTHList(req);
}
+ handleSetlogSave(`查询${selectTab === 1 ? '总积分' : selectTab === 2 ? '赚取积分' : selectTab === 3 ? '消耗积分' : selectTab === 4 ? '总成长值' : selectTab === 5 ? '赚取成长值' : selectTab === 6 ? '消耗成长值' : ''}会员等级汇总`)
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
diff --git a/src/pages/travelMember/MembershipTypeStatistics/index.tsx b/src/pages/travelMember/MembershipTypeStatistics/index.tsx
index b390204..94f609b 100644
--- a/src/pages/travelMember/MembershipTypeStatistics/index.tsx
+++ b/src/pages/travelMember/MembershipTypeStatistics/index.tsx
@@ -11,6 +11,7 @@ import addIcon from '@/assets/detail/addIcon.png'
import reduceIcon from '@/assets/detail/reduceIcon.png'
import session from "@/utils/session";
import ProForm, { ProFormDateRangePicker } from "@ant-design/pro-form";
+import { handleSetlogSave } from "@/utils/format";
@@ -103,26 +104,32 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
width: 120,
dataIndex: "POINT_TYPE",
ellipsis: true,
- hideInSearch: true,
valueType: 'select',
align: 'center',
valueEnum: {
"-2": "全部",
"1": "累计",
"-1": "消耗"
- }
+ },
+ initialValue: "-2"
},
{
title: "积分来源",
width: 120,
dataIndex: "POINT_SOURCE",
ellipsis: true,
- hideInSearch: true,
valueType: 'treeSelect',
align: 'center',
request: () => {
return SCORETYPETree
}
+ // valueEnum: {
+ // "0": "全部",
+ // "1000": "消费赠送",
+ // "2000": "消费抵扣",
+ // "3000": "注册赠送"
+ // },
+ // initialValue: "0"
},
{
title: "本次积分",
@@ -142,24 +149,6 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
align: 'center',
valueType: "digit"
},
- {
- title: "会员类型",
- width: 120,
- dataIndex: "MEMBERSHIP_TYPE",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
- valueType: 'select',
- valueEnum: MEMBERSHIPTYPEYNObj
- },
- {
- title: "会员名称",
- width: 150,
- dataIndex: "MEMBERSHIP_NAME",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
- },
{
title: "获取时间",
width: 150,
@@ -168,7 +157,7 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
align: 'center',
ellipsis: true,
render: (_, record) => {
- return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD') : "-"
+ return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
]
@@ -212,6 +201,14 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
align: 'center',
ellipsis: true,
},
+ {
+ title: "会员昵称",
+ width: 150,
+ dataIndex: "MEMBERSHIP_NAME",
+ hideInSearch: true,
+ align: 'center',
+ ellipsis: true,
+ },
{
title: "累计成长值",
width: 120,
@@ -236,11 +233,22 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
dataIndex: "GROWTH_SOURCE",
align: 'center',
ellipsis: true,
- hideInSearch: true,
valueType: 'treeSelect',
request: () => {
return SCORETYPETree
+ },
+ fieldProps: {
+ allowClear: true, // 允许清除已选中的值
+ treeDefaultExpandAll: true, // 默认展开所有节点（可选）
+ showSearch: true, // 允许搜索（可选）
+ treeNodeFilterProp: 'title', // 按 title 搜索（可选）
}
+ // valueEnum: {
+ // "0": "全部",
+ // "1000": "消费赠送",
+ // "2000": "消费抵扣",
+ // "3000": "注册赠送",
+ // },
},
{
title: "成长方式",
@@ -249,39 +257,21 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
ellipsis: true,
align: 'center',
valueType: 'select',
- hideInSearch: true,
valueEnum: {
"-2": "全部",
"1": "积累",
"-1": "消耗",
},
- },
- {
- title: "会员等级",
- width: 120,
- dataIndex: "MEMBERSHIP_LEVEL",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
- valueType: 'select',
- valueEnum: MEMBERSHIPLEVELYNObj
- },
- {
- title: "会员名称",
- width: 150,
- dataIndex: "MEMBERSHIP_NAME",
- hideInSearch: true,
- ellipsis: true,
- align: 'center',
+ initialValue: "-2"
},
{
title: "操作时间",
- width: 120,
+ width: 180,
dataIndex: "OPERATE_DATE",
align: 'center',
hideInSearch: true,
render: (_, record) => {
- return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD') : "-"
+ return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
]
@@ -684,6 +674,7 @@ const MembershipTypeStatistics: React.FC<{ currentUser: CurrentUser | undefined
}
data = await handleGetMEMBERGROWTHList(req);
}
+ handleSetlogSave(`查询${selectTab === 1 ? '总积分' : selectTab === 2 ? '赚取积分' : selectTab === 3 ? '消耗积分' : selectTab === 4 ? '总成长值' : selectTab === 5 ? '赚取成长值' : selectTab === 6 ? '消耗成长值' : ''}会员类型汇总`)
// req = {
// SearchParameter: {
diff --git a/src/pages/travelMember/MerchantEvaluationManage/index.tsx b/src/pages/travelMember/MerchantEvaluationManage/index.tsx
index 67eab57..cd392c3 100644
--- a/src/pages/travelMember/MerchantEvaluationManage/index.tsx
+++ b/src/pages/travelMember/MerchantEvaluationManage/index.tsx
@@ -4,31 +4,54 @@ import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";
import React, { useRef, useState } from "react";
import type { FormInstance } from "antd";
-import { Button, message, Space, Spin, Tree } from "antd";
+import { Button, Col, message, Modal, Row, Space, Spin, Tree } from "antd";
import useRequest from "@ahooksjs/use-request";
import type { ActionType } from "@ant-design/pro-table";
import ProTable from "@ant-design/pro-table";
import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSelectTree";
import PageTitleBox from "@/components/PageTitleBox";
-import { handeGetCOMMENTList } from "../service";
+import { handeGetCOMMENTList, handeSynchroCOMMENT } from "../service";
import moment from 'moment'
import session from "@/utils/session";
+import { handleSetlogSave } from "@/utils/format";
+import Draggable from "react-draggable";
+import ProForm, { ProFormText, ProFormTextArea } from "@ant-design/pro-form";
const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolean, parentDetail?: any }> = (props) => {
+ const draggleRef = React.createRef
+
+ {
+ console.log('values', values);
+ let [StartDate, EndDate] = ['', '']
+ if (values.searchTime && values.searchTime.length > 0) {
+ [StartDate, EndDate] = values.searchTime
+ }
+ handleGetTopData(StartDate, EndDate)
+ setSearchParams({
+ StartDate: StartDate,
+ EndDate: EndDate
+ })
+ actionRef.current?.reload()
+ }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+ 商城订单汇总
+
+
+
+
+
+
+
+
+
+
+
+ {
+ handleChangeTab(1)
+ }}>
+
+
+ 实际销售金额（扣除退款）
+ {topData && topData?.TotalActualAmount ? topData?.TotalActualAmount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalActualAmount && topData?.TotalActualAmount.QOQData && topData?.TotalActualAmount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalActualAmount && topData?.TotalActualAmount.QOQData && topData?.TotalActualAmount.summaryData ?
+
+ {(((topData?.TotalActualAmount.summaryData - topData?.TotalActualAmount.QOQData) / topData?.TotalActualAmount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(2)
+ }}>
+
+
+ 成交销售金额
+ {topData && topData?.TotalSuccAmount ? topData?.TotalSuccAmount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalSuccAmount && topData?.TotalSuccAmount.QOQData && topData?.TotalSuccAmount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalSuccAmount && topData?.TotalSuccAmount.QOQData && topData?.TotalSuccAmount.summaryData ?
+ // {topData && topData?.TotalSuccAmount ? topData?.TotalSuccAmount.QOQData : "-"}
+
+ {(((topData?.TotalSuccAmount.summaryData - topData?.TotalSuccAmount.QOQData) / topData?.TotalSuccAmount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(3)
+ }}>
+
+
+ 成交订单笔数
+ {topData && topData?.TotalSuccTicket ? topData?.TotalSuccTicket.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalSuccTicket && topData?.TotalSuccTicket.QOQData && topData?.TotalSuccTicket.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalSuccTicket && topData?.TotalSuccTicket.QOQData && topData?.TotalSuccTicket.summaryData ?
+ // {topData && topData?.TotalSuccTicket ? topData?.TotalSuccTicket.QOQData : "-"}
+
+ {(((topData?.TotalSuccTicket.summaryData - topData?.TotalSuccTicket.QOQData) / topData?.TotalSuccTicket.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(4)
+ }}>
+
+
+ 成交销售数量
+ {topData && topData?.TotalCount ? topData?.TotalCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalCount && topData?.TotalCount.QOQData && topData?.TotalCount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalCount && topData?.TotalCount.QOQData && topData?.TotalCount.summaryData ?
+ // {topData && topData?.TotalCount ? topData?.TotalCount.QOQData : "-"}
+
+ {(((topData?.TotalCount.summaryData - topData?.TotalCount.QOQData) / topData?.TotalCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(5)
+ }}>
+
+
+ 交易失败笔数
+ {topData && topData?.TotalFailureTicket ? topData?.TotalFailureTicket.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalFailureTicket && topData?.TotalFailureTicket.QOQData && topData?.TotalFailureTicket.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalFailureTicket && topData?.TotalFailureTicket.QOQData && topData?.TotalFailureTicket.summaryData ?
+ // {topData && topData?.TotalFailureTicket ? topData?.TotalFailureTicket.QOQData : "-"}
+
+ {(((topData?.TotalFailureTicket.summaryData - topData?.TotalFailureTicket.QOQData) / topData?.TotalFailureTicket.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(6)
+ }}>
+
+
+ 退款订单笔数
+ {topData && topData?.TotalRefundTicket ? topData?.TotalRefundTicket.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalRefundTicket && topData?.TotalRefundTicket.QOQData && topData?.TotalRefundTicket.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalRefundTicket && topData?.TotalRefundTicket.QOQData && topData?.TotalRefundTicket.summaryData ?
+ // {topData && topData?.TotalRefundTicket ? topData?.TotalRefundTicket.QOQData : "-"}
+
+ {(((topData?.TotalRefundTicket.summaryData - topData?.TotalRefundTicket.QOQData) / topData?.TotalRefundTicket.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(7)
+ }}>
+
+ {/*
+ 退款订单金额
+ {topData && topData?.TotalRefundAmount ? topData?.TotalRefundAmount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalRefundAmount && topData?.TotalRefundAmount.QOQData && topData?.TotalRefundAmount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalRefundAmount && topData?.TotalRefundAmount.QOQData && topData?.TotalRefundAmount.summaryData ?
+ // {topData && topData?.TotalRefundAmount ? topData?.TotalRefundAmount.QOQData : "-"}
+
+ {(((topData?.TotalRefundAmount.summaryData - topData?.TotalRefundAmount.QOQData) / topData?.TotalRefundAmount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(8)
+ }}>
+
+
+ 用户访问量
+ {topData && topData?.VisitCount ? topData?.VisitCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.VisitCount && topData?.VisitCount.QOQData && topData?.VisitCount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.VisitCount && topData?.VisitCount.QOQData && topData?.VisitCount.summaryData ?
+ // {topData && topData?.VisitCount ? topData?.VisitCount.QOQData : "-"}
+
+ {(((topData?.VisitCount.summaryData - topData?.VisitCount.QOQData) / topData?.VisitCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(9)
+ }}>
+
+
+ 用户收藏量
+ {topData && topData?.CollectionCount ? topData?.CollectionCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.CollectionCount && topData?.CollectionCount.QOQData && topData?.CollectionCount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.CollectionCount && topData?.CollectionCount.QOQData && topData?.CollectionCount.summaryData ?
+ // {topData && topData?.CollectionCount ? topData?.CollectionCount.QOQData : "-"}
+
+ {(((topData?.CollectionCount.summaryData - topData?.CollectionCount.QOQData) / topData?.CollectionCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(10)
+ }}>
+
*/}
+
+ 商品数量
+ {topData && topData?.CommodityCount ? topData?.CommodityCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.CommodityCount && topData?.CommodityCount.QOQData && topData?.CommodityCount.summaryData ?
+ 
0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.CommodityCount && topData?.CommodityCount.QOQData && topData?.CommodityCount.summaryData ?
+ // {topData && topData?.CommodityCount ? topData?.CommodityCount.QOQData : "-"}
+
+ {(((topData?.CommodityCount.summaryData - topData?.CommodityCount.QOQData) / topData?.CommodityCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+
+
+ `${record?.SALEBILL_CODE}-${record?.ORDER_DATE}`}
+ formRef={formRef}
+ bordered
+ actionRef={actionRef}
+ search={false}
+ options={false}
+ request={async (params, sorter) => {
+ const req = {
+ searchParameter: {
+ OWNERUNIT_ID: currentUser?.OwnerUnitId,
+ SALEBILL_TYPES: "3000,3001,3002",
+ ORDER_DATE_Start: searchParams?.StartDate || "",
+ ORDER_DATE_End: searchParams?.EndDate || "",
+ SALEBILL_STATES: selectTab == 1 ? '1010,2000,3000,8000' :
+ selectTab == 2 ? '1010,2000,3000,8000,8900' :
+ selectTab == 3 ? '1010,2000,3000,8000,8900' :
+ selectTab == 4 ? '1010,2000,3000,8000,8900' :
+ selectTab == 5 ? '9000,9999' :
+ selectTab == 6 ? '8900' :
+ selectTab == 7 ? '8900' :
+ selectTab == 8 ? '' :
+ selectTab == 9 ? '' :
+ selectTab == 10 ? '' : '',
+ SearchKeyValue: params?.searchText || ""
+ },
+ PageIndex: 1,
+ PageSize: 999999,
+ SortStr: "ORDER_DATE desc",
+ }
+ const data = await handeGetSaleBillWholeList(req)
+
+ handleSetlogSave(`点击查询按钮`)
+ console.log('datadatadatadatadata', data);
+ if (data.List && data.List.length > 0) {
+ let PAY_AMOUNTSUM: number = 0
+ let ORDER_AMOUNTSUM: number = 0
+ let COUPON_AMOUNTSUM: number = 0
+ let TOTAL_COUNTSUM: number = 0
+ data.List.forEach((item: any) => {
+ PAY_AMOUNTSUM += item.PAY_AMOUNT
+ ORDER_AMOUNTSUM += item.ORDER_AMOUNT
+ COUPON_AMOUNTSUM += item.COUPON_AMOUNT
+ TOTAL_COUNTSUM += item.TOTAL_COUNT
+ })
+
+ let sumTotal: any = {
+ PAY_AMOUNT: PAY_AMOUNTSUM.toFixed(2),
+ ORDER_AMOUNT: ORDER_AMOUNTSUM.toFixed(2),
+ COUPON_AMOUNT: COUPON_AMOUNTSUM.toFixed(2),
+ TOTAL_COUNT: TOTAL_COUNTSUM.toFixed(0),
+ SALEBILL_CODE: "合计",
+ ORDER_DATE: 1
+ }
+
+ let res: any = [{
+ ...sumTotal,
+ children: data.List
+ }]
+
+ return { data: res, success: true }
+ // , total: data.TotalCount
+ }
+ return { data: [], success: true }
+ }}
+ pagination={false}
+ columns={columns}
+ expandable={{
+ defaultExpandedRowKeys: ["合计-1"],
+ // defaultExpandAllRows: true, // 默认展开所有行（包括合计行）
+ // indentSize: 0, // 可选：调整缩进大小
+ }}
+ />
+
+
+
+
@@ -169,7 +204,7 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
const req: any = isComponent ? {
SearchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
- PROVINCE_CODE: currentUser?.ProvinceCode,
+ // PROVINCE_CODE: currentUser?.ProvinceCode,
COMMENT_ISVALID: 1,
CREATE_DATE_Start: params?.CREATE_DATE_Start || "",
CREATE_DATE_End: params?.CREATE_DATE_End || "",
@@ -181,10 +216,11 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
Key: "SELLER_NAME,MEMBERSHIP_NAME",
Value: params?.searchText || ""
},
+ SortStr: "CREATE_DATE desc"
} : {
SearchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
- PROVINCE_CODE: currentUser?.ProvinceCode,
+ // PROVINCE_CODE: currentUser?.ProvinceCode,
COMMENT_ISVALID: 1,
CREATE_DATE_Start: params?.CREATE_DATE_Start || "",
CREATE_DATE_End: params?.CREATE_DATE_End || "",
@@ -195,9 +231,13 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
Key: "SELLER_NAME,MEMBERSHIP_NAME",
Value: params?.searchText || ""
},
+ SortStr: "CREATE_DATE desc"
}
const data = await handeGetCOMMENTList(req)
console.log('datadatadatadatadata222', data);
+
+ handleSetlogSave(`点击查询按钮`)
+
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
}
@@ -210,6 +250,99 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
/>
+
}
+ modalRender={(modal) => {
+ return
+
+
+
+
+
+
+
+ {modal}
+
{
currentRow ?
- : ""
+
+
+
+
+
+ : ""
}
@@ -777,6 +806,7 @@ const COMMODITYTable: React.FC<{ currentUser: CurrentUser | undefined }> = (prop
formRef={formRef}
autoFocusFirstInput
submitter={false}
+ labelCol={{ style: { width: 80 } }}
preserve={false}
request={async () => {
if (currentRow?.COMMODITY_ID) {
diff --git a/src/pages/travelMember/ProductSpecificationManage/index.tsx b/src/pages/travelMember/ProductSpecificationManage/index.tsx
index 7e33a46..1e0eae0 100644
--- a/src/pages/travelMember/ProductSpecificationManage/index.tsx
+++ b/src/pages/travelMember/ProductSpecificationManage/index.tsx
@@ -24,6 +24,8 @@ import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚
import PageTitleBox from "@/components/PageTitleBox";
import { handeDeleteCOMMODITY_MULTI, handeSynchroCOMMODITY_MULTI, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
import { render } from 'react-dom';
+import ModalFooter from '../scenicSpotConfig/component/modalFooter';
+import { handleSetlogSave } from '@/utils/format';
const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
@@ -69,7 +71,19 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
width: 200,
ellipsis: true,
render: (_, record) => {
- return record?.COMMODITY_NAME || record?.USERDEFINEDTYPE_NAME || "-"
+ return record?.COMMODITY_NAME || record?.USERDEFINEDTYPE_NAME ?
+ {
+ if (record?.COMMODITY_MULTI_ID) {
+ setDataType(2)
+ } else {
+ setDataType(1)
+ }
+
+ setCurrentRow({ ...record });
+ handleModalVisible(true);
+ }}>
+ {record?.COMMODITY_NAME || record?.USERDEFINEDTYPE_NAME}
+ : "-"
}
},
{
@@ -137,47 +151,47 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
return record?.USERDEFINEDTYPE_DATE ? moment(record?.USERDEFINEDTYPE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
},
- {
- dataIndex: 'option',
- title: '操作',
- width: 150,
- valueType: 'option',
- align: 'center',
- hideInSearch: true,
- render: (_, record) => {
- return (
-
- {
- if (record?.COMMODITY_MULTI_ID) {
- setDataType(2)
- } else {
- setDataType(1)
- }
- console.log('recordrecord', record);
+ // {
+ // dataIndex: 'option',
+ // title: '操作',
+ // width: 150,
+ // valueType: 'option',
+ // align: 'center',
+ // hideInSearch: true,
+ // render: (_, record) => {
+ // return (
+ //
+ // {
+ // if (record?.COMMODITY_MULTI_ID) {
+ // setDataType(2)
+ // } else {
+ // setDataType(1)
+ // }
+ // console.log('recordrecord', record);
- setCurrentRow({ ...record });
- handleModalVisible(true);
- }}
- >
- 编辑
-
- {
- if (record?.COMMODITY_MULTI_ID) {
- await handelDeleteSpecifications(record.COMMODITY_MULTI_ID);
- } else {
- await handelDelete(record.USERDEFINEDTYPE_ID);
- }
- }}
- >
- 删除
-
-
- );
- },
- },
+ // setCurrentRow({ ...record });
+ // handleModalVisible(true);
+ // }}
+ // >
+ // 编辑
+ //
+ // {
+ // if (record?.COMMODITY_MULTI_ID) {
+ // await handelDeleteSpecifications(record.COMMODITY_MULTI_ID);
+ // } else {
+ // await handelDelete(record.USERDEFINEDTYPE_ID);
+ // }
+ // }}
+ // >
+ // 删除
+ //
+ //
+ // );
+ // },
+ // },
];
@@ -189,6 +203,12 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
} else {
message.success('删除成功！');
+ handleSetlogSave(`删除类别【${currentRow.USERDEFINEDTYPE_NAME}】`)
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setDataType(0)
+ formRef.current?.resetFields();
+ setCurrentRow(undefined);
actionRef.current?.reload()
}
};
@@ -200,6 +220,12 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
} else {
message.success('删除成功！');
+ handleSetlogSave(`删除规格【${currentRow.COMMODITY_NAME}】`)
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setDataType(0)
+ formRef.current?.resetFields();
+ setCurrentRow(undefined);
actionRef.current?.reload()
}
}
@@ -234,6 +260,7 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
handleConfirmLoading(false)
if (data.Result_Code === 100) {
message.success("新增成功！")
+ handleSetlogSave(`${currentRow?.USERDEFINEDTYPE_ID ? '更新' : '新增'}类别【${data.Result_Data.USERDEFINEDTYPE_NAME}】`)
setCurrentRow(undefined)
formRef?.current?.resetFields()
handleModalVisible(false)
@@ -270,6 +297,7 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
handleConfirmLoading(false)
if (data.Result_Code === 100) {
message.success("新增成功！")
+ handleSetlogSave(`${currentRow?.COMMODITY_MULTI_ID ? '更新' : '新增'}规格【${data.Result_Data.COMMODITY_NAME}】`)
setCurrentRow(undefined)
formRef?.current?.resetFields()
handleModalVisible(false)
@@ -329,6 +357,7 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
const data = await handlGetUSERDEFINEDTYPEList(req);
setTableData(data)
+ handleSetlogSave(`点击查询按钮`)
if (data && data.length > 0) {
let list: any = transformMultiRuleToChildren(data)
console.log('listlistlistlist', list);
@@ -421,6 +450,32 @@ const ProductSpecificationManage: React.FC<{ currentUser: CurrentUser | undefine
{
+ if (currentRow?.COMMODITY_MULTI_ID) {
+ await handelDeleteSpecifications(currentRow.COMMODITY_MULTI_ID);
+ } else {
+ await handelDelete(currentRow.USERDEFINEDTYPE_ID);
+ }
+ }}
+ handleCancel={() => {
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setDataType(0)
+ formRef.current?.resetFields();
+ setCurrentRow(undefined);
+ }}
+ handleOK={() => {
+ formRef?.current?.validateFields().then(() => {
+ handleConfirmLoading(true)
+ formRef?.current?.submit()
+ })
+ }}
+
+ />
+ }
>
{
@@ -175,6 +176,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
return {
setCurrentRow({ ...record });
handleModalVisible(true);
+ handleSetlogSave(`查询商品【${record?.COMMODITY_NAME}】`)
}}>{record?.COMMODITY_NAME || ""}
}
},
@@ -660,6 +662,7 @@ const ShoppingMallProductSearch: React.FC<{ currentUser: CurrentUser | undefined
PageSize: 999999,
}
const data = await handeGetCOMMODITYList(req);
+ handleSetlogSave(`点击查询按钮`)
console.log('datadatadatadatadata', data);
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
diff --git a/src/pages/travelMember/SummaryOfReservation/SummaryOfReservation.less b/src/pages/travelMember/SummaryOfReservation/SummaryOfReservation.less
new file mode 100644
index 0000000..b109b19
--- /dev/null
+++ b/src/pages/travelMember/SummaryOfReservation/SummaryOfReservation.less
@@ -0,0 +1,258 @@
+.SummaryOfReservationMain {
+ width: 100%;
+
+ .SummaryOfReservationTop {
+ width: 100%;
+ background: #FFFFFF;
+ box-shadow: 0px 0px 6px 0px rgba(31, 48, 95, 0.2);
+ border-radius: 4px;
+ box-sizing: border-box;
+ padding: 16px;
+
+ .SummaryOfReservationTitleBox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .SummaryOfReservationTitle {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 600;
+ font-size: 18px;
+ color: #333333;
+ line-height: 18px;
+ text-align: left;
+ font-style: normal;
+ margin-left: 12px;
+ position: relative;
+ }
+
+ .SummaryOfReservationTitle::after {
+ content: "";
+ width: 4px;
+ height: 18px;
+ background: #1492FF;
+ border-radius: 2px;
+ position: absolute;
+ left: -12px;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ }
+
+ .SummaryOfReservationContentBox {
+ width: 100%;
+ margin-top: 16px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ // .SummaryOfReservationItemFirst {
+ // width: 280px;
+ // height: 180px;
+ // background-image: url('../../../assets/detail/staticSumTotalBg.png');
+ // background-size: 100% 100%;
+ // background-repeat: no-repeat;
+ // box-sizing: border-box;
+ // padding: 26px 39px;
+ // margin-right: 16px;
+
+ // .firstItemTitle {
+ // font-family: PingFangSC, PingFang SC;
+ // font-weight: 500;
+ // font-size: 18px;
+ // color: #FFFFFF;
+ // line-height: 13px;
+ // text-align: left;
+ // font-style: normal;
+ // }
+
+ // .firstItemValue {
+ // font-family: DINAlternate, DINAlternate;
+ // font-weight: bold;
+ // font-size: 28px;
+ // color: #FFFFFF;
+ // line-height: 32px;
+ // text-align: left;
+ // font-style: normal;
+ // margin-top: 12px;
+ // }
+ // }
+
+ .SummaryOfReservationItemOther {
+ width: 100%;
+ height: 180px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .SummaryOfReservationOtherItem {
+ width: calc((100% - 112px) / 7);
+ height: 100%;
+ background: #F6F9FF;
+ border-radius: 8px;
+ box-sizing: border-box;
+ padding: 29px 24px;
+ position: relative;
+ cursor: pointer;
+
+ .otherItemTitle {
+ height: 36px;
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 600;
+ font-size: 16px;
+ color: #333333;
+ line-height: 18px;
+ text-align: left;
+ font-style: normal;
+ }
+
+ .otherItemValue {
+ font-family: DINAlternate, DINAlternate;
+ font-weight: bold;
+ font-size: 32px;
+ color: #1492FF;
+ line-height: 38px;
+ text-align: left;
+ margin-top: 17px;
+ font-style: normal;
+ }
+
+ .addLabel {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 12px;
+ color: rgba(0, 0, 0, 0.65);
+ line-height: 12px;
+ text-align: left;
+ font-style: normal;
+ margin-right: 5px;
+ margin-top: 10px;
+ }
+
+
+ .otherItemAddBox {
+ display: flex;
+ align-items: center;
+ margin-top: 10px;
+
+
+ .addIcon {
+ width: 7px;
+ height: 10px;
+ margin-right: 6px;
+ }
+
+ .addValue {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 16px;
+ color: rgba(0, 0, 0, 0.65);
+ line-height: 16px;
+ text-align: center;
+ font-style: normal;
+ }
+ }
+
+ // .otherBgIcon {
+ // width: 76px;
+ // height: 51px;
+ // position: absolute;
+ // top: 29px;
+ // right: 4px;
+ // background-image: url(../../../assets/detail/otherBgIcon.png);
+ // background-repeat: no-repeat;
+ // background-size: 100% 100%;
+ // }
+ }
+
+ .SummaryOfReservationOtherItemSelect {
+ background-image: url('../../../assets/detail/staticSumTotalBg.png');
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+
+ .otherItemTitle {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 600;
+ font-size: 16px;
+ color: #fff;
+ line-height: 18px;
+ text-align: left;
+ font-style: normal;
+ }
+
+ .otherItemValue {
+ font-family: DINAlternate, DINAlternate;
+ font-weight: bold;
+ font-size: 32px;
+ color: #fff;
+ line-height: 38px;
+ text-align: left;
+ margin-top: 17px;
+ font-style: normal;
+ }
+
+ .addLabel {
+ color: #fff;
+ }
+
+ .otherItemAddBox {
+
+ .addValue {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 400;
+ font-size: 14px;
+ color: #fff;
+ line-height: 16px;
+ text-align: center;
+ font-style: normal;
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ .SummaryOfReservationBottom {
+ width: 100%;
+ margin-top: 16px;
+ box-sizing: border-box;
+ background: #FFFFFF;
+ box-shadow: 0px 0px 6px 0px rgba(31, 48, 95, 0.2);
+ border-radius: 4px;
+ padding: 16px;
+
+ .SummaryOfReservationTitleBox {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+
+ .SummaryOfReservationTitle {
+ font-family: PingFangSC, PingFang SC;
+ font-weight: 600;
+ font-size: 18px;
+ color: #333333;
+ line-height: 18px;
+ text-align: left;
+ font-style: normal;
+ margin-left: 12px;
+ position: relative;
+ }
+
+ .SummaryOfReservationTitle::after {
+ content: "";
+ width: 4px;
+ height: 18px;
+ background: #1492FF;
+ border-radius: 2px;
+ position: absolute;
+ left: -12px;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/src/pages/travelMember/SummaryOfReservation/index.tsx b/src/pages/travelMember/SummaryOfReservation/index.tsx
index b84dc29..6861d44 100644
--- a/src/pages/travelMember/SummaryOfReservation/index.tsx
+++ b/src/pages/travelMember/SummaryOfReservation/index.tsx
@@ -1,11 +1,567 @@
-// 预约订单汇总
+// 订单汇总统计
import { ConnectState } from "@/models/connect";
+import { useEffect, useRef, useState } from "react";
import { connect, CurrentUser } from "umi";
+import { handeGetGetOnlineOrderSummary, handeGetSaleBillWholeList } from "../service";
+import { Button, Col, FormInstance, Row, Tooltip } from "antd";
+import ProForm, { ProFormDateRangePicker } from "@ant-design/pro-form";
+import ProTable, { ActionType } from "@ant-design/pro-table";
+import moment from 'moment'
+import './SummaryOfReservation.less'
+import addIcon from '@/assets/detail/addIcon.png'
+import reduceIcon from '@/assets/detail/reduceIcon.png'
+import { handleSetlogSave } from "@/utils/format";
+import OrderDetailModal from "../BookingMealOrder/components/orderDetailModal";
+import PageTitleBox from "@/components/PageTitleBox";
const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
- return (
-
diff --git a/src/pages/travelMember/memberInfor/component/style.less b/src/pages/travelMember/memberInfor/component/style.less
index 702c1fb..50bdc7f 100644
--- a/src/pages/travelMember/memberInfor/component/style.less
+++ b/src/pages/travelMember/memberInfor/component/style.less
@@ -1,4 +1,7 @@
.memberInfoDetailModal {
+ width: 100%;
+ height: 100%;
+
.react-draggable {
.ant-modal-content {
border-radius: 16px;
diff --git a/src/pages/travelMember/memberInfor/index.tsx b/src/pages/travelMember/memberInfor/index.tsx
index 1a38e75..4ce686e 100644
--- a/src/pages/travelMember/memberInfor/index.tsx
+++ b/src/pages/travelMember/memberInfor/index.tsx
@@ -14,7 +14,7 @@ import ProTable from "@ant-design/pro-table";
import ReactHTMLTableToExcel from "react-html-table-to-excel";
import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSelectTree";
import PageTitleBox from "@/components/PageTitleBox";
-import { handleGetCONSUMPTIONRECORDList, handleGetMEMBERGROWTHList, handleGetMEMBERSHIPList, handleGetPOINTRECORDList } from "../service";
+import { handeGetMemberShipLicenseList, handleGetCONSUMPTIONRECORDList, handleGetMEMBERGROWTHList, handleGetMEMBERSHIPList, handleGetPOINTRECORDList } from "../service";
import session from "@/utils/session";
import moment from 'moment'
import Draggable from "react-draggable";
@@ -107,7 +107,7 @@ const memberInfor: React.FC<{ currentUser: CurrentUser }> = (props) => {
return {
setCurrentRow(record)
setShowDetailDrawer(true)
- handleSetlogSave(`查看了${record?.MEMBERSHIP_NAME}【${record?.MEMBERSHIP_ID}】的会员信息`)
+ handleSetlogSave(`查看${record?.MEMBERSHIP_NAME}【${record?.MEMBERSHIP_ID}】会员信息`)
}}>
{record?.MEMBERSHIP_NAME || ""}
@@ -158,9 +158,8 @@ const memberInfor: React.FC<{ currentUser: CurrentUser }> = (props) => {
align: 'center',
valueType: 'select',
valueEnum: {
- 1: '男',
- 2: '女',
- 0: '-'
+ 0: '男',
+ 1: '女',
}
},
{
@@ -222,7 +221,7 @@ const memberInfor: React.FC<{ currentUser: CurrentUser }> = (props) => {
{
title: "车牌号",
width: 150,
- dataIndex: "LICENSEPLATE_NUMBER",
+ dataIndex: "PLATE_NUMBER",
hideInSearch: true,
ellipsis: true,
align: 'center',
@@ -677,7 +676,8 @@ const memberInfor: React.FC<{ currentUser: CurrentUser }> = (props) => {
MEMBERSHIP_STATE: params?.MEMBERSHIP_STATE
},
keyWord: {
- Key: "MEMBERSHIP_NAME,MEMBERSHIP_MOBILEPHONE,CERTIFICATE_NUMBER,MEMBERSHIP_CARD,MEMBERSHIP_ADDRESS,LICENSEPLATE_NUMBER",
+ // PLATE_NUMBER
+ Key: "MEMBERSHIP_NAME,MEMBERSHIP_MOBILEPHONE,CERTIFICATE_NUMBER,MEMBERSHIP_CARD,MEMBERSHIP_ADDRESS",
value: params?.MEMBERSHIP_NAME || ""
},
PageIndex: params.current || 1,
@@ -689,6 +689,8 @@ const memberInfor: React.FC<{ currentUser: CurrentUser }> = (props) => {
handleSetlogSave(`查看了会员账户管理列表`)
const data = await handleGetMEMBERSHIPList(req)
+ // 可以拿到车牌号的用户信息列表
+ // const data = await handeGetMemberShipLicenseList(req)
console.log('datadatadatadatadata', data);
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
diff --git a/src/pages/travelMember/scenicSpotConfig/index.tsx b/src/pages/travelMember/scenicSpotConfig/index.tsx
index 4d03368..e042086 100644
--- a/src/pages/travelMember/scenicSpotConfig/index.tsx
+++ b/src/pages/travelMember/scenicSpotConfig/index.tsx
@@ -292,10 +292,9 @@ const scenicSpotConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
if (result.Result_Code !== 100) {
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
- handleSetlogSave(`删除【${currentRow?.SCENICAREA_NAME}】信息失败`)
} else {
message.success('删除成功！');
- handleSetlogSave(`删除【${currentRow?.SCENICAREA_NAME}】信息成功`)
+ handleSetlogSave(`删除【${currentRow?.SCENICAREA_NAME}】`)
handleConfirmLoading(false)
handleModalVisible(false)
setFileList([])
diff --git a/src/pages/travelMember/serverpartInfo/index.tsx b/src/pages/travelMember/serverpartInfo/index.tsx
index 3067e0d..4d8e1f1 100644
--- a/src/pages/travelMember/serverpartInfo/index.tsx
+++ b/src/pages/travelMember/serverpartInfo/index.tsx
@@ -141,7 +141,7 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
console.log('value', value);
let serverpartObj = session.get('serverpartObj')
- handleSetlogSave(`${serverpartObj && value && serverpartObj[value] ? `查看了${serverpartObj[value]}基础信息` : ""}`)
+ handleSetlogSave(`${serverpartObj && value && serverpartObj[value] ? `查看${serverpartObj[value]}基础信息` : ""}`)
// 只有修改服务区的时候 触发刷新
setShowRightForm(false)
@@ -309,7 +309,7 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
const data = await handleSynchroSERVERPART(req)
let serverpartObj = session.get('serverpartObj')
- handleSetlogSave(`${serverpartObj && currenMenu && serverpartObj[currenMenu] ? `保存${serverpartObj[currenMenu]}的基础信息` : ""}`)
+ handleSetlogSave(`${serverpartObj && currenMenu && serverpartObj[currenMenu] ? `更新${serverpartObj[currenMenu]}的基础信息` : ""}`)
if (res.carryingCapacity) {
let carryReq: any = {}
@@ -782,7 +782,7 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
let serverpartObj = session.get('serverpartObj')
if (res.Result_Code === 100) {
message.success("上传成功！")
- handleSetlogSave(`更新【${serverpartObj && currenMenu && serverpartObj[currenMenu] ? `保存${serverpartObj[currenMenu]}的基础信息` : ""}${selectActiveKey === '1' ? '服务区图片' : selectActiveKey === '2' ? '母婴室图片' : selectActiveKey === '3' ? '司机之家图片' : selectActiveKey === '4' ? '住宿客房图片' : selectActiveKey === '5' ? '便利店图片' : ''}】成功`)
+ handleSetlogSave(`更新【${serverpartObj && currenMenu && serverpartObj[currenMenu] ? `${serverpartObj[currenMenu]}基础信息` : ""}${selectActiveKey === '1' ? '服务区图片' : selectActiveKey === '2' ? '母婴室图片' : selectActiveKey === '3' ? '司机之家图片' : selectActiveKey === '4' ? '住宿客房图片' : selectActiveKey === '5' ? '便利店图片' : ''}】`)
setConfirmLoading(false)
setShowType(0)
setShowUploadImgModal(false);
@@ -794,7 +794,6 @@ const serverpartInfo: React.FC<{ currentUser: CurrentUser }> = (props) => {
}, 1000)
} else {
message.error(res.Result_Desc)
- handleSetlogSave(`更新【${serverpartObj && currenMenu && serverpartObj[currenMenu] ? `保存${serverpartObj[currenMenu]}的基础信息` : ""}${selectActiveKey === '1' ? '服务区图片' : selectActiveKey === '2' ? '母婴室图片' : selectActiveKey === '3' ? '司机之家图片' : selectActiveKey === '4' ? '住宿客房图片' : selectActiveKey === '5' ? '便利店图片' : ''}】失败`)
}
} else {
setConfirmLoading(false)
diff --git a/src/pages/travelMember/service.ts b/src/pages/travelMember/service.ts
index 112a780..494c9c9 100644
--- a/src/pages/travelMember/service.ts
+++ b/src/pages/travelMember/service.ts
@@ -536,6 +536,17 @@ export async function handeGetCOMMENTList(params: any) {
return data.Result_Data
}
+// 回复评论表
+export async function handeSynchroCOMMENT(params: any) {
+ const data = await requestEncryption(`/Comment/SynchroCOMMENT`, {
+ method: 'POST',
+ data: { ...params, requestEncryption: true }
+ })
+ if (data.Result_Code !== 100) {
+ return []
+ }
+ return data.Result_Data
+}
// 服务区的图片
export async function handeGetPictureList(params: any) {
@@ -834,7 +845,7 @@ export async function handeGetMemberShipLicenseList(params: any) {
if (data.Result_Code !== 100) {
return data
}
- return data.Result_Data.List
+ return data.Result_Data
}
// 获取会员优惠券表列表
@@ -861,3 +872,15 @@ export async function handeGetCommodityCollectionList(params: any) {
return data.Result_Data.List
}
+
+// 获取交易订单汇总报表
+export async function handeGetGetOnlineOrderSummary(params: any) {
+ const data = await requestEncryption(`/OnlineOrder/GetOnlineOrderSummary`, {
+ method: 'POST',
+ data: { ...params, requestEncryption: true }
+ })
+ if (data.Result_Code !== 100) {
+ return data
+ }
+ return data.Result_Data.List
+}
{modal}
}}
+ footer={
+
+ const { currentUser } = props
+ const actionRef = useRef();
+ const formRef = useRef();
+ // 搜索参数
+ const [searchParams, setSearchParams] = useState({
+ StartDate: moment().startOf('M').format('YYYY-MM-DD'),
+ EndDate: moment().format('YYYY-MM-DD')
+ })
+ // 当前顶部的选择到了第几个
+ const [selectTab, setSelectTab] = useState(1)
+ // 顶部内容的对象值
+ const [topData, setTopData] = useState()
+ const [modalVisible, handleModalVisible] = useState();
+ const [currentRow, setCurrentRow] = useState();
+ // 算的列表合计
+ const [tableSumDetail, setTableSumDetail] = useState()
+
+
+
+ const columns: any = [
+ {
+ dataIndex: 'searchText',
+ title: '查询内容',
+ hideInTable: true,
+ },
+ {
+ title: '查询时间',
+ dataIndex: 'search_date',
+ valueType: 'dateRange',
+ hideInTable: true,
+ hideInDescriptions: true,
+ search: {
+ transform: (value) => {
+ return {
+ ORDER_DATE_Start: value[0],
+ ORDER_DATE_End: value[1],
+ };
+ },
+ },
+ initialValue: [moment().add(-1, 'M').format('YYYY-MM-DD'), moment().format('YYYY-MM-DD')],
+ },
+ {
+ dataIndex: "index",
+ title: "序号",
+ align: 'center',
+ hideInSearch: true,
+ valueType: "index",
+ width: 120,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'SALEBILL_CODE',
+ title: '订单编号',
+ align: 'center',
+ hideInSearch: true,
+ width: 250,
+ ellipsis: true,
+ render: (_, record) => {
+ return record?.SALEBILL_CODE ? record?.SALEBILL_CODE === '合计' ? '合计' : {
+ setCurrentRow(record);
+ handleModalVisible(true)
+ handleSetlogSave(`查看编号为【${record?.SALEBILL_CODE}】的订单`)
+ }}>{record?.SALEBILL_CODE} : "-"
+ }
+ },
+ {
+ dataIndex: 'SHOPNAME',
+ title: '门店名称',
+ align: 'center',
+ hideInSearch: true,
+ width: 150,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'ORDER_PERSON',
+ title: '下单人员',
+ align: 'center',
+ hideInSearch: true,
+ width: 250,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'TOTAL_COUNT',
+ title: '销售数量',
+ align: 'center',
+ hideInSearch: true,
+ width: 250,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'ORDER_AMOUNT',
+ title: '订单金额',
+ align: 'center',
+ hideInSearch: true,
+ width: 120,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'COUPON_AMOUNT',
+ title: '优惠金额',
+ align: 'center',
+ hideInSearch: true,
+ width: 120,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'PAY_AMOUNT',
+ title: '实付金额',
+ align: 'center',
+ hideInSearch: true,
+ width: 120,
+ ellipsis: true,
+ },
+ {
+ dataIndex: 'ORDER_DATE',
+ title: '订单时间',
+ align: 'center',
+ hideInSearch: true,
+ width: 170,
+ ellipsis: true,
+ render: (_, record) => {
+ return record?.SALEBILL_CODE === '合计' ? '' : record?.ORDER_DATE ? moment(record?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : ''
+ }
+ },
+ {
+ dataIndex: 'SALEBILL_STATE',
+ title: '订单状态',
+ align: 'center',
+ width: 120,
+ ellipsis: true,
+ valueType: 'select',
+ valueEnum: {
+ "0": "全部",
+ "1005": "订单待支付",
+ "1010": "订单待制作",
+ "2000": "订单待取餐",
+ "3000": "订单已完成",
+ "8000": "退款申请中",
+ "8900": "订单已退款",
+ "9000": "订单已关闭",
+ "9999": "订单已撤销",
+ },
+ initialValue: "0"
+ }
+ ]
+
+ // 获取顶部的数据
+ const handleGetTopData = async (StartDate?: string, EndDate?: string) => {
+
+ const req: any = {
+ CalcType: 1,
+ OwnerUnitId: currentUser?.OwnerUnitId,
+ StartDate: StartDate || searchParams?.StartDate || "",
+ EndDate: EndDate || searchParams?.EndDate || "",
+ SalebillType: "6000",
+ MerchantId: ""
+ }
+ const data = await handeGetGetOnlineOrderSummary(req)
+ console.log('datadatadatadata', data);
+ if (data && data.length > 0) {
+ let obj: any = data[0]
+ setTopData(obj)
+ } else {
+ setTopData(null)
+ }
+ }
+ // 改变顶部的选择
+ const handleChangeTab = (value: number) => {
+ setSelectTab(value)
+ actionRef.current?.reload()
+ }
+ // 关闭悬浮框
+ const handleCloseModal = () => {
+ handleModalVisible(false)
+ setCurrentRow(undefined);
+ }
+
+ useEffect(() => {
+ handleGetTopData()
+ }, [])
+ return (
+
- {
- setCurrentRow({ ...record });
- handleModalVisible(true);
- }}
- >
- 编辑
-
- {
- handelDelete(record.AUTOTYPE_ID);
- }}
- >
- 删除
-
-
- );
- },
- },
+ // {
+ // dataIndex: 'option',
+ // title: '操作',
+ // width: 100,
+ // ellipsis: true,
+ // valueType: 'option',
+ // align: 'center',
+ // hideInSearch: true,
+ // render: (_, record) => {
+ // return (
+ //
+ // {
+ // setCurrentRow({ ...record });
+ // handleModalVisible(true);
+ // }}
+ // >
+ // 编辑
+ //
+ // {
+ // handelDelete(record.AUTOTYPE_ID);
+ // }}
+ // >
+ // 删除
+ //
+ //
+ // );
+ // },
+ // },
];
// 预览上传后的图片
@@ -199,6 +209,12 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
} else {
message.success('删除成功！');
actionRef.current?.reload()
+ handleSetlogSave(`删除【${currentRow?.AUTOTYPE_NAME}】`)
+
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setFormPRESALE_TYPE(false)
+ setFileList([])
}
}
@@ -234,6 +250,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
handleConfirmLoading(false)
if (data.Result_Code === 100) {
message.success("新增成功！")
+ handleSetlogSave(`${currentRow?.AUTOTYPE_ID ? '同步' : '新增'}【${data.Result_Data?.AUTOTYPE_NAME}】`)
setCurrentRow(undefined)
formRef?.current?.resetFields()
handleModalVisible(false)
@@ -275,6 +292,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
const data = await handlGetNestingAUTOTYPEList(req);
console.log('datadatadatadatadata', data);
if (data && data.length > 0) {
+ handleSetlogSave(`点击查询按钮`)
setTypeTreeData(data)
return { data: data, success: true, total: data.length }
}
@@ -317,6 +335,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
}
destroyOnClose={true}
width={900}
+ bodyStyle={{
+ height: '700px', // 你可以根据需要调整高度
+ overflowY: 'auto',
+ }}
visible={modalVisible}
confirmLoading={confirmLoading}
afterClose={() => {
@@ -357,11 +380,30 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
formRef?.current?.submit()
})
}}
+ footer={ {
+ await handelDelete(currentRow?.AUTOTYPE_ID)
+ }}
+ handleCancel={() => {
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setFormPRESALE_TYPE(false)
+ setFileList([])
+ }}
+ handleOK={() => {
+ formRef?.current?.validateFields().then(() => {
+ handleConfirmLoading(true)
+ formRef?.current?.submit()
+ })
+ }}
+ />}
modalRender={(modal) => {
return onDraggaleStart(event, uiData)}
+ handle={'.supplierClassBox'}
>
@@ -372,6 +414,7 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
formRef={formRef}
autoFocusFirstInput
submitter={false}
+ labelCol={{ style: { width: 80 } }}
preserve={false}
initialValues={currentRow ? currentRow : {
OPERATE_DATE: moment().format('YYYY-MM-DD HH:mm:ss'),
diff --git a/src/pages/travelMember/SupplierMerchantManage/index.tsx b/src/pages/travelMember/SupplierMerchantManage/index.tsx
index fcca2ab..6143b14 100644
--- a/src/pages/travelMember/SupplierMerchantManage/index.tsx
+++ b/src/pages/travelMember/SupplierMerchantManage/index.tsx
@@ -13,6 +13,7 @@ import React from "react";
import ProForm, { ProFormSelect, ProFormText, ProFormTextArea } from "@ant-design/pro-form";
import moment from 'moment'
import ModalFooter from "../scenicSpotConfig/component/modalFooter";
+import { handleSetlogSave } from "@/utils/format";
const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
const { currentUser } = props
@@ -208,6 +209,7 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }>
message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
} else {
message.success('删除成功！');
+ handleSetlogSave(`删除【${currentRow?.MERCHANTS_NAME}】`)
handleConfirmLoading(false)
handleModalVisible(false)
actionRef.current?.reload()
@@ -241,6 +243,7 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }>
const data = await handeSynchroMERCHANTS(req)
handleConfirmLoading(false)
if (data.Result_Code === 100) {
+ handleSetlogSave(`${currentRow?.USERDEFINEDTYPE_ID ? '编辑' : '新增'}【${data.Result_Data?.MERCHANTS_NAME}】`)
message.success("新增成功！")
setCurrentRow(undefined)
formRef?.current?.resetFields()
@@ -295,6 +298,7 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }>
setCurrentSearchText(params?.searchText || "")
const data = await handeGetMERCHANTSList(req);
console.log('datadatadatadatadata', data);
+ handleSetlogSave(`点击查询按钮`)
if (data.List && data.List.length > 0) {
return { data: data.List, success: true, total: data.TotalCount }
}
@@ -342,7 +346,7 @@ const SupplierMerchantManage: React.FC<{ currentUser: CurrentUser | undefined }>
onFocus={() => { }}
onBlur={() => { }}
>
- {currentRow ? '更新商品管理' : '新建商品管理'}
+ {currentRow ? '更新商户信息' : '新建商户信息'}
}
destroyOnClose={true}
diff --git a/src/pages/travelMember/TradingLedger/index.tsx b/src/pages/travelMember/TradingLedger/index.tsx
index aff15a5..b28c00f 100644
--- a/src/pages/travelMember/TradingLedger/index.tsx
+++ b/src/pages/travelMember/TradingLedger/index.tsx
@@ -17,6 +17,7 @@ import PageTitleBox from "@/components/PageTitleBox";
import { handeGetSupplierSaleBillList } from "../service";
import moment from 'moment'
import OrderDetailModal from "../BookingMealOrder/components/orderDetailModal";
+import { handleSetlogSave } from "@/utils/format";
const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
const { currentUser } = props
@@ -87,6 +88,8 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
{
setCurrentRow(record);
handleModalVisible(true)
+ handleSetlogSave(`查询收货人【${record?.ORDER_PERSON}】编码【${record.SALEBILL_CODE}】订单`)
+
}}>{record?.SALEBILL_CODE} : "-"
}
},
@@ -319,6 +322,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
console.log('reqreqreqreq', req);
const data = await handeGetSupplierSaleBillList(req)
+ handleSetlogSave(`点击查询按钮`)
console.log('datadatadatadatadata', data);
setReqDetailList(data)
@@ -347,6 +351,7 @@ const TradingLedger: React.FC<{ currentUser: CurrentUser }> = (props) => {
setTimeout(() => {
setShowExportTable(true)
setTimeout(() => {
+ handleSetlogSave('导出Excel')
exportTable(e)
}, 100)
}, 100)
diff --git a/src/pages/travelMember/memberInfor/component/LicensePlateManage.tsx b/src/pages/travelMember/memberInfor/component/LicensePlateManage.tsx
index a5b107f..3d663be 100644
--- a/src/pages/travelMember/memberInfor/component/LicensePlateManage.tsx
+++ b/src/pages/travelMember/memberInfor/component/LicensePlateManage.tsx
@@ -46,6 +46,14 @@ const LicensePlateManage = ({ parentDetail }: DetailProps) => {
hideInSearch: true,
align: 'center',
ellipsis: true,
+ },
+ {
+ title: "会员证件号",
+ width: 150,
+ dataIndex: "CERTIFICATE_NUMBER",
+ hideInSearch: true,
+ align: 'center',
+ ellipsis: true,
}
]
@@ -73,8 +81,8 @@ const LicensePlateManage = ({ parentDetail }: DetailProps) => {
}
const data = await handeGetMemberShipLicenseList(req)
console.log('datadatadata', data);
- if (data && data.length > 0) {
- return { data, success: true }
+ if (data.List && data.List.length > 0) {
+ return { data: data.List, success: true, total: data.TotalCount }
}
return { data: [], success: true }
}}
diff --git a/src/pages/travelMember/memberInfor/component/memberDetail.tsx b/src/pages/travelMember/memberInfor/component/memberDetail.tsx
index 91c3ae7..8948f52 100644
--- a/src/pages/travelMember/memberInfor/component/memberDetail.tsx
+++ b/src/pages/travelMember/memberInfor/component/memberDetail.tsx
@@ -309,6 +309,7 @@ const MemberDetail = ({ showDetailDrawer, currentRow, handleCloseModal, currentU
modalRef.current?.resetFields();
// setCurrentRow(undefined);
}}
+ maskClosable={true}
bodyStyle={{
maxHeight: '850px', // 你可以根据需要调整高度
overflowY: 'auto',
@@ -396,7 +397,7 @@ const MemberDetail = ({ showDetailDrawer, currentRow, handleCloseModal, currentU
+
)
}
diff --git a/src/pages/travelMember/SupplierClassification/index.tsx b/src/pages/travelMember/SupplierClassification/index.tsx
index d5d4e5e..f1a7213 100644
--- a/src/pages/travelMember/SupplierClassification/index.tsx
+++ b/src/pages/travelMember/SupplierClassification/index.tsx
@@ -25,6 +25,8 @@ import { handlDeleteAUTOTYPE, handlDeleteUSERDEFINEDTYPE, handlGetNestingAUTOTYP
import PageTitleBox from '@/components/PageTitleBox';
import { uploadPicture } from '@/services/picture';
import defaultIcon from '../../../assets/brand/defaultIcon.png'
+import ModalFooter from '../scenicSpotConfig/component/modalFooter';
+import { handleSetlogSave } from '@/utils/format';
const beforeUpload = (file: any) => {
@@ -97,6 +99,14 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
ellipsis: true,
hideInSearch: true,
hideInDescriptions: true,
+ render: (_, record) => {
+ return record?.AUTOTYPE_NAME ? {
+ setCurrentRow({ ...record });
+ handleModalVisible(true);
+ }}>
+ {record?.AUTOTYPE_NAME}
+ : "-"
+ }
},
{
dataIndex: 'AUTOTYPE_CODE',
@@ -146,37 +156,37 @@ const SupplierClassification: React.FC<{ currentUser: CurrentUser | undefined }>
return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD HH:mm:ss') : ""
}
},
- {
- dataIndex: 'option',
- title: '操作',
- width: 100,
- ellipsis: true,
- valueType: 'option',
- align: 'center',
- hideInSearch: true,
- render: (_, record) => {
- return (
-
+
+ {
+ console.log('values', values);
+ let [StartDate, EndDate] = ['', '']
+ if (values.searchTime && values.searchTime.length > 0) {
+ [StartDate, EndDate] = values.searchTime
+ }
+ handleGetTopData(StartDate, EndDate)
+ setSearchParams({
+ StartDate: StartDate,
+ EndDate: EndDate
+ })
+ actionRef.current?.reload()
+ }}
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+ 预约点餐订单汇总
+
+
+
+
+
+
+
+
+
+
+
+ {
+ handleChangeTab(1)
+ }}>
+
+
+ 实际销售金额（扣除退款）
+ {topData && topData?.TotalActualAmount ? topData?.TotalActualAmount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalActualAmount && topData?.TotalActualAmount.QOQData && topData?.TotalActualAmount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalActualAmount && topData?.TotalActualAmount.QOQData && topData?.TotalActualAmount.summaryData ?
+
+ {(((topData?.TotalActualAmount.summaryData - topData?.TotalActualAmount.QOQData) / topData?.TotalActualAmount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(2)
+ }}>
+
+
+ 成交销售金额
+ {topData && topData?.TotalSuccAmount ? topData?.TotalSuccAmount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalSuccAmount && topData?.TotalSuccAmount.QOQData && topData?.TotalSuccAmount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalSuccAmount && topData?.TotalSuccAmount.QOQData && topData?.TotalSuccAmount.summaryData ?
+ // {topData && topData?.TotalSuccAmount ? topData?.TotalSuccAmount.QOQData : "-"}
+
+ {(((topData?.TotalSuccAmount.summaryData - topData?.TotalSuccAmount.QOQData) / topData?.TotalSuccAmount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(3)
+ }}>
+
+
+ 成交订单笔数
+ {topData && topData?.TotalSuccTicket ? topData?.TotalSuccTicket.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalSuccTicket && topData?.TotalSuccTicket.QOQData && topData?.TotalSuccTicket.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalSuccTicket && topData?.TotalSuccTicket.QOQData && topData?.TotalSuccTicket.summaryData ?
+ // {topData && topData?.TotalSuccTicket ? topData?.TotalSuccTicket.QOQData : "-"}
+
+ {(((topData?.TotalSuccTicket.summaryData - topData?.TotalSuccTicket.QOQData) / topData?.TotalSuccTicket.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(4)
+ }}>
+
+
+ 成交销售数量
+ {topData && topData?.TotalCount ? topData?.TotalCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalCount && topData?.TotalCount.QOQData && topData?.TotalCount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalCount && topData?.TotalCount.QOQData && topData?.TotalCount.summaryData ?
+ // {topData && topData?.TotalCount ? topData?.TotalCount.QOQData : "-"}
+
+ {(((topData?.TotalCount.summaryData - topData?.TotalCount.QOQData) / topData?.TotalCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(5)
+ }}>
+
+
+ 交易失败笔数
+ {topData && topData?.TotalFailureTicket ? topData?.TotalFailureTicket.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalFailureTicket && topData?.TotalFailureTicket.QOQData && topData?.TotalFailureTicket.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalFailureTicket && topData?.TotalFailureTicket.QOQData && topData?.TotalFailureTicket.summaryData ?
+ // {topData && topData?.TotalFailureTicket ? topData?.TotalFailureTicket.QOQData : "-"}
+
+ {(((topData?.TotalFailureTicket.summaryData - topData?.TotalFailureTicket.QOQData) / topData?.TotalFailureTicket.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(6)
+ }}>
+
+
+ 退款订单笔数
+ {topData && topData?.TotalRefundTicket ? topData?.TotalRefundTicket.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalRefundTicket && topData?.TotalRefundTicket.QOQData && topData?.TotalRefundTicket.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalRefundTicket && topData?.TotalRefundTicket.QOQData && topData?.TotalRefundTicket.summaryData ?
+ // {topData && topData?.TotalRefundTicket ? topData?.TotalRefundTicket.QOQData : "-"}
+
+ {(((topData?.TotalRefundTicket.summaryData - topData?.TotalRefundTicket.QOQData) / topData?.TotalRefundTicket.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(7)
+ }}>
+
+ {/*
+ 退款订单金额
+ {topData && topData?.TotalRefundAmount ? topData?.TotalRefundAmount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.TotalRefundAmount && topData?.TotalRefundAmount.QOQData && topData?.TotalRefundAmount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.TotalRefundAmount && topData?.TotalRefundAmount.QOQData && topData?.TotalRefundAmount.summaryData ?
+ // {topData && topData?.TotalRefundAmount ? topData?.TotalRefundAmount.QOQData : "-"}
+
+ {(((topData?.TotalRefundAmount.summaryData - topData?.TotalRefundAmount.QOQData) / topData?.TotalRefundAmount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(8)
+ }}>
+
+
+ 用户访问量
+ {topData && topData?.VisitCount ? topData?.VisitCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.VisitCount && topData?.VisitCount.QOQData && topData?.VisitCount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.VisitCount && topData?.VisitCount.QOQData && topData?.VisitCount.summaryData ?
+ // {topData && topData?.VisitCount ? topData?.VisitCount.QOQData : "-"}
+
+ {(((topData?.VisitCount.summaryData - topData?.VisitCount.QOQData) / topData?.VisitCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(9)
+ }}>
+
+
+ 用户收藏量
+ {topData && topData?.CollectionCount ? topData?.CollectionCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.CollectionCount && topData?.CollectionCount.QOQData && topData?.CollectionCount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.CollectionCount && topData?.CollectionCount.QOQData && topData?.CollectionCount.summaryData ?
+ // {topData && topData?.CollectionCount ? topData?.CollectionCount.QOQData : "-"}
+
+ {(((topData?.CollectionCount.summaryData - topData?.CollectionCount.QOQData) / topData?.CollectionCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+ {
+ handleChangeTab(10)
+ }}>
+
*/}
+
+ 商品数量
+ {topData && topData?.CommodityCount ? topData?.CommodityCount.summaryData : "-"}
+ 环比增长
+
+ {
+ topData && topData?.CommodityCount && topData?.CommodityCount.QOQData && topData?.CommodityCount.summaryData ?
+ 0 ? addIcon : reduceIcon} /> : ""
+ }
+ {
+ topData && topData?.CommodityCount && topData?.CommodityCount.QOQData && topData?.CommodityCount.summaryData ?
+ // {topData && topData?.CommodityCount ? topData?.CommodityCount.QOQData : "-"}
+
+ {(((topData?.CommodityCount.summaryData - topData?.CommodityCount.QOQData) / topData?.CommodityCount.QOQData) * 100).toFixed(2) + '%'}
+
+ : "-"
+ }
+
+
+
+ `${record?.SALEBILL_CODE}-${record?.ORDER_DATE}`}
+ formRef={formRef}
+ bordered
+ actionRef={actionRef}
+ search={false}
+ options={false}
+ request={async (params, sorter) => {
+ const req = {
+ searchParameter: {
+ SALEBILL_TYPES: 6000,
+ OWNERUNIT_ID: currentUser?.OwnerUnitId,
+ ORDER_DATE_Start: searchParams?.StartDate || "",
+ ORDER_DATE_End: searchParams?.EndDate || "",
+ SALEBILL_STATES: selectTab == 1 ? '1010,2000,3000,8000' :
+ selectTab == 2 ? '1010,2000,3000,8000,8900' :
+ selectTab == 3 ? '1010,2000,3000,8000,8900' :
+ selectTab == 4 ? '1010,2000,3000,8000,8900' :
+ selectTab == 5 ? '9000,9999' :
+ selectTab == 6 ? '8900' :
+ selectTab == 7 ? '8900' :
+ selectTab == 8 ? '' :
+ selectTab == 9 ? '' :
+ selectTab == 10 ? '' : '',
+ SearchKeyValue: params?.searchText || ""
+ },
+ PageIndex: 1,
+ PageSize: 999999,
+ SortStr: "ORDER_DATE desc",
+ }
+ const data = await handeGetSaleBillWholeList(req)
+
+ handleSetlogSave(`点击查询按钮`)
+ console.log('datadatadatadatadata', data);
+ if (data.List && data.List.length > 0) {
+ let PAY_AMOUNTSUM: number = 0
+ let ORDER_AMOUNTSUM: number = 0
+ let COUPON_AMOUNTSUM: number = 0
+ let TOTAL_COUNTSUM: number = 0
+ data.List.forEach((item: any) => {
+ PAY_AMOUNTSUM += item.PAY_AMOUNT
+ ORDER_AMOUNTSUM += item.ORDER_AMOUNT
+ COUPON_AMOUNTSUM += item.COUPON_AMOUNT
+ TOTAL_COUNTSUM += item.TOTAL_COUNT
+ })
+
+ let sumTotal: any = {
+ PAY_AMOUNT: PAY_AMOUNTSUM.toFixed(2),
+ ORDER_AMOUNT: ORDER_AMOUNTSUM.toFixed(2),
+ COUPON_AMOUNT: COUPON_AMOUNTSUM.toFixed(2),
+ TOTAL_COUNT: TOTAL_COUNTSUM.toFixed(0),
+ SALEBILL_CODE: "合计",
+ ORDER_DATE: 1
+ }
+
+ let res: any = [{
+ ...sumTotal,
+ children: data.List
+ }]
+
+ return { data: res, success: true }
+ // , total: data.TotalCount
+ }
+ return { data: [], success: true }
+ }}
+ pagination={false}
+ columns={columns}
+ expandable={{
+ defaultExpandedRowKeys: ["合计-1"],
+ // defaultExpandAllRows: true, // 默认展开所有行（包括合计行）
+ // indentSize: 0, // 可选：调整缩进大小
+ }}
+ />
+
+
+
+ {modal}