+
+ 
{
+ setShowServiceSearchBox(true)
+ }} />
+ {
+ setCollapsible(!collapsible);
+ }} />
+
}
+ colSpan={!collapsible ? "300px" : "60px"}
+ title={!collapsible ? "请选择服务区" : ""}
+ headerBordered
+ collapsed={collapsible}
+ >
+ {treeView && treeView.length > 0 ?
+ {
+ return []
+ }
+ }}
+ isKeyPressSubmit
+ onFinish={(values: any) => {
+ return handleFilterServiceTree(values?.searchValue || '')
+ }}
+ >
+
+
+
+
+ 
{
+ setShowServiceSearchBox(false)
+ }} />
+
+
+ ();
const formRef = useRef();
const modelFormRef = useRef();
@@ -316,7 +319,13 @@ const DataDictionary: React.FC = () => {
actionRef={actionRef}
pagination={{ defaultPageSize: 20 }}
request={async (params) => {
- const data: any = await getSystemMenu({ ...params, ShowModule: true })
+ console.log('currentUsercurrentUsercurrentUser', currentUser);
+
+ const data: any = await getSystemMenu({
+ ...params,
+ ShowModule: true,
+ SystemMenuPID: currentUser?.ID === 4653 ? '95' : '-1'
+ })
setMenuTree(data)
return { data, success: true }
@@ -353,8 +362,6 @@ const DataDictionary: React.FC = () => {
formRef.current?.resetFields();
setCurrentRow(undefined);
}
-
-
}}
onFinish={async (value) => {
@@ -626,4 +633,8 @@ const DataDictionary: React.FC = () => {
)
}
-export default DataDictionary;
+export default connect(({ user }: ConnectState) => ({
+ currentUser: user.currentUser
+}))(DataDictionary);
+
+// export default DataDictionary;
diff --git a/src/pages/Setting/OperationLog/index.tsx b/src/pages/Setting/OperationLog/index.tsx
index 8be7d87..955b818 100644
--- a/src/pages/Setting/OperationLog/index.tsx
+++ b/src/pages/Setting/OperationLog/index.tsx
@@ -275,7 +275,9 @@ const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
}
setSearchParams(params)
const data = await handleGetBEHAVIORRECORDList(req)
- setTableData(data)
+ console.log('djakjkasdjas', data);
+
+ setTableData(data.List)
setTableLoading(false)
@@ -296,7 +298,7 @@ const saleRankReport: React.FC<{ currentUser: CurrentUser }> = (props) => {
PageSize: 999999
}
const allData = await handleGetBEHAVIORRECORDList(allReq)
- setTableData(allData)
+ setTableData(allData.List)
setIsFirst(false)
}
diff --git a/src/pages/operatingMerchants/MerchantInformation/index.tsx b/src/pages/operatingMerchants/MerchantInformation/index.tsx
index 8cfdb1b..b3423d2 100644
--- a/src/pages/operatingMerchants/MerchantInformation/index.tsx
+++ b/src/pages/operatingMerchants/MerchantInformation/index.tsx
@@ -343,6 +343,14 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
// 关联商家的表格
const merchantColumns: any = [
+ {
+ dataIndex: 'searchText',
+ title: '查询内容',
+ hideInTable: true,
+ fieldProps: {
+ placeholder: "请输入服务区名称/门店名称"
+ }
+ },
{
dataIndex: 'SERVERPART_NAME',
title: '服务区名称',
@@ -364,7 +372,6 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
title: '所属方位',
align: 'center',
width: 120,
- hideInSearch: true,
valueType: "select",
valueEnum: shopregionObj
},
@@ -386,8 +393,8 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
align: 'center',
width: 120,
valueType: "select",
- hideInSearch: true,
- valueEnum: businessStateObj
+ valueEnum: businessStateObj,
+ initialValue: '1000'
},
// {
// dataIndex: 'SHOPDIRECTION',
@@ -907,14 +914,15 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
{
return `${record?.SERVERPARTSELLER_ID}`
}}
@@ -970,7 +978,7 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
,
],
}}
- pagination={{ defaultPageSize: 20 }}
+ // pagination={{ defaultPageSize: 20 }}
/>
@@ -1043,14 +1051,15 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
// handleModalOk()
// }} />}
>
- {
+ setCurrentRow(undefined)
+ setShowDetailDrawer(false)
+ }}
+ closable={false}
+ destroyOnClose
+ >
+
)
}
diff --git a/src/pages/travelMember/OperationTypeConfig/index.tsx b/src/pages/travelMember/OperationTypeConfig/index.tsx
new file mode 100644
index 0000000..b036fba
--- /dev/null
+++ b/src/pages/travelMember/OperationTypeConfig/index.tsx
@@ -0,0 +1,554 @@
+// 操作类型配置
+import React, { useRef, useState, Suspense } from 'react';
+import moment from 'moment'; // 时间相关引用，没有使用可以删除
+import numeral from "numeral"; // 数字相关引用，没有使用可以删除
+import { connect } from 'umi';
+
+import useRequest from '@ahooksjs/use-request'; // 请求数据的引用
+import Draggable from 'react-draggable';
+import SubMenu from "antd/lib/menu/SubMenu";
+import ProTable from '@ant-design/pro-table';
+import ProDescriptions from '@ant-design/pro-descriptions';
+import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormDateTimeRangePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from '@ant-design/pro-form';
+import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { PageContainer } from '@ant-design/pro-layout';
+import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect } from 'antd';
+
+import type { CurrentUser } from "umi";
+import type { ConnectState } from '@/models/connect';
+import type { ActionType, ProColumns } from '@ant-design/pro-table';
+import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
+import type { FormInstance } from 'antd';
+
+import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
+import { handeDeleteFIELDENUMNoEncryption, handeGetFIELDEXPLAINListNoEncryption, handeGetNestingFIELDENUMListNoEncryption, handeSynchroFIELDENUMNoEncryption, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
+import PageTitleBox from '@/components/PageTitleBox';
+import { uploadPicture } from '@/services/picture';
+import defaultIcon from '../../../assets/brand/defaultIcon.png'
+import classNames from 'classnames';
+import session from '@/utils/session';
+import ModalFooter from '../scenicSpotConfig/component/modalFooter';
+import { handleSetlogSave } from '@/utils/format';
+
+
+const beforeUpload = (file: any) => {
+ const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+ if (!isJpgOrPng) {
+ message.error('请上传JPEG、jpg、png格式的图片文件!');
+ }
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isLt2M) {
+ message.error('图片大小不超过 2MB!');
+ }
+ return isJpgOrPng && isLt2M;
+}
+
+
+const OperationTypeConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
+ const { currentUser } = props
+ const { confirm } = Modal;
+ const actionRef = useRef {
+ // 打印报表
+ if (!reqDetailList || reqDetailList.length === 0) return;
+ setPrintOut(el);
+ }} >
+
+
)
}
export default connect(({ user }: ConnectState) => ({
currentUser: user.currentUser
-}))(CardVoucherSearch);
\ No newline at end of file
+}))(CardVoucherSearch);
diff --git a/src/pages/Setting/Module/index.tsx b/src/pages/Setting/Module/index.tsx
index 11cf220..718ddfe 100644
--- a/src/pages/Setting/Module/index.tsx
+++ b/src/pages/Setting/Module/index.tsx
@@ -9,6 +9,8 @@
// 菜单管理列表
import ProTable from '@ant-design/pro-table';
import React, { useState, useRef } from 'react';
+import type { ConnectState } from "@/models/connect";
+import { connect } from "umi";
import { PageContainer } from '@ant-design/pro-layout';
import { PlusOutlined } from '@ant-design/icons';
import { Button, message, TreeSelect, Form, Space } from 'antd';
@@ -21,6 +23,7 @@ import type { ProColumns, ActionType } from '@ant-design/pro-table';
import { getSystemMenu, deleteSystemMenu, updataSystemMenu, updataModule } from './service'
import './modelStyle.less'
+import { CurrentUser } from 'umi';
/**
* @en-US Add node
@@ -74,8 +77,8 @@ const handleDelete = async (nodeId: number) => {
* @param {*}
* @return {*}
*/
-const DataDictionary: React.FC = () => {
-
+const DataDictionary: React.FC<{ currentUser: CurrentUser }> = (props) => {
+ const { currentUser } = props
const actionRef = useRef
+ {/*
+
+
+
();
+ const formRef = useRef();
+ const [currentRow, setCurrentRow] = useState();
+ const [showDetail, setShowDetail] = useState();
+ const [modalVisible, handleModalVisible] = useState();
+ const [confirmLoading, handleConfirmLoading] = useState(false) // 弹出框的内容表单是否在提交
+ const [searchParams, setSearchParams] = useState();
+ // 分类的树形结构数据
+ const [typeTreeData, setTypeTreeData] = useState()
+ // 表单里面的是否预售
+ const [formPRESALE_TYPE, setFormPRESALE_TYPE] = useState(false)
+
+ // 弹出框拖动效果
+ const [bounds, setBounds] = useState<{ left: number, right: number, top: number, bottom: number }>() // 移动的位置
+ const [disabled, setDraggleDisabled] = useState() // 是否拖动
+ const draggleRef = React.createRef()
+
+ let AFTERSALETYPEObj = session.get('AFTERSALETYPEObj')
+ const { data: FIELDEXPLAIN_ID } = useRequest(async () => {
+ const req: any = {
+ SearchParameter: {
+ FIELDEXPLAIN_FIELD: "CONSUMPTIONRECORD_TYPE"
+ }
+ }
+ const data = await handeGetFIELDEXPLAINList(req)
+ if (data && data.length > 0) {
+ let obj: any = data[0]
+ return obj.FIELDEXPLAIN_ID
+ }
+ })
+ // 文件列表
+ const [fileList, setFileList] = useState([])
+ const [imagePreviewVisible, setImagePreviewVisible] = useState(false) // 预览图片
+
+ const onDraggaleStart = (event, uiData) => {
+ const { clientWidth, clientHeight } = window.document.documentElement;
+ const targetRect = draggleRef.current?.getBoundingClientRect();
+ if (!targetRect) {
+ return;
+ }
+ setBounds({
+ left: -targetRect.left + uiData.x,
+ right: clientWidth - (targetRect.right - uiData.x),
+ top: -targetRect.top + uiData.y,
+ bottom: clientHeight - (targetRect.bottom - uiData.y),
+ });
+ };
+ // 定义列表字段内容
+ const columns: any = [
+ {
+ dataIndex: 'FIELDENUM_NAME',
+ title: '类别名称',
+ align: 'center',
+ width: 300,
+ ellipsis: true,
+ hideInSearch: true,
+ hideInDescriptions: true,
+ render: (_, record) => {
+ return {
+ setCurrentRow({ ...record });
+ handleModalVisible(true);
+ }}
+ >{record?.FIELDENUM_NAME || ""}
+ }
+ },
+ {
+ dataIndex: 'FIELDENUM_VALUE',
+ title: '类型枚举',
+ align: 'center',
+ width: 120,
+ ellipsis: true,
+ // valueType: 'treeSelect',
+ // valueEnum: typeTreeData,
+ hideInSearch: true,
+ },
+ {
+ dataIndex: 'FIELDENUM_INDEX',
+ title: '类别索引',
+ align: 'center',
+ width: 120,
+ ellipsis: true,
+ hideInSearch: true,
+ },
+ {
+ dataIndex: 'FIELDENUM_STATUS',
+ title: '有效状态',
+ align: 'center',
+ width: 120,
+ ellipsis: true,
+ valueType: "select",
+ valueEnum: {
+ "1": "有效",
+ "0": "无效"
+ },
+ initialValue: "1"
+ },
+ {
+ dataIndex: 'FIELDENUM_DESC',
+ title: '备注说明',
+ align: 'center',
+ ellipsis: true,
+ hideInSearch: true,
+ },
+ // {
+ // dataIndex: 'option',
+ // title: '操作',
+ // width: 100,
+ // ellipsis: true,
+ // valueType: 'option',
+ // align: 'center',
+ // hideInSearch: true,
+ // render: (_, record) => {
+ // return (
+ //
+ // {
+ // setCurrentRow({ ...record });
+ // handleModalVisible(true);
+ // }}
+ // >
+ // 编辑
+ //
+ // {
+ // handelDelete(record.FIELDENUM_ID);
+ // }}
+ // >
+ // 删除
+ //
+ //
+ // );
+ // },
+ // },
+ ];
+
+ // 预览上传后的图片
+ const handlePreview = async () => {
+ setFileList(fileList)
+ setImagePreviewVisible(true)
+ };
+ const handleChangePreview = (val: any) => {
+ setImagePreviewVisible(val)
+ }
+
+ // 删除点餐类别
+ const handelDelete = async (id: any) => {
+ const req: any = {
+ FIELDENUMId: id
+ }
+ const result = await handeDeleteFIELDENUM(req)
+ if (result.Result_Code !== 100) {
+ message.error(`${result.Result_Desc}` || `${result.Result_Code}:删除失败`);
+ } else {
+ message.success('删除成功！');
+ handleSetlogSave(`删除【${currentRow?.FIELDENUM_NAME}】`)
+ actionRef.current?.reload()
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setFormPRESALE_TYPE(false)
+ setFileList([])
+ }
+ }
+
+ // 同步点餐列表
+ const handleAddUpdate = async (res: any) => {
+ let req: any = {}
+ if (currentRow?.FIELDENUM_ID) {
+ req = {
+ ...currentRow,
+ ...res,
+ }
+ } else {
+ req = {
+ ...res,
+ FIELDEXPLAIN_ID: FIELDEXPLAIN_ID,
+ FIELDENUM_PID: -1,
+ }
+ }
+ const data = await handeSynchroFIELDENUM(req)
+ handleConfirmLoading(false)
+ if (data.Result_Code === 100) {
+ handleSetlogSave(`${currentRow?.FIELDENUM_ID ? '更新' : '新增'}【${data.Result_Data.FIELDENUM_NAME}】`)
+ message.success("新增成功！")
+ setCurrentRow(undefined)
+ formRef?.current?.resetFields()
+ handleModalVisible(false)
+ setFormPRESALE_TYPE(false)
+ setFileList([])
+ actionRef.current?.reload()
+ } else {
+ message.error(data.Result_Desc)
+ }
+ }
+
+ return (
+
+ {
+ return `${record?.FIELDENUM_PID}-${record?.FIELDENUM_ID}`
+ }}
+ formRef={formRef}
+ headerTitle={ {
+ if (disabled) {
+ setDraggleDisabled(false)
+ }
+ }}
+ onMouseOut={() => {
+ setDraggleDisabled(true)
+ }}
+
+ onFocus={() => { }}
+ onBlur={() => { }}
+ >
+ {currentRow ? '更新会员等级类别' : '新建会员等级类别'}
+
+ }
+ destroyOnClose={true}
+ width={900}
+ bodyStyle={{
+ height: '700px', // 你可以根据需要调整高度
+ overflowY: 'auto',
+ }}
+ visible={modalVisible}
+ confirmLoading={confirmLoading}
+ afterClose={() => {
+ formRef.current?.resetFields();
+ setCurrentRow(undefined);
+ }}
+ footer={ {
+ await handelDelete(currentRow?.FIELDENUM_ID)
+ }}
+ handleCancel={() => {
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setFormPRESALE_TYPE(false)
+ setFileList([])
+ }}
+ handleOK={() => {
+ formRef?.current?.validateFields().then(() => {
+ handleConfirmLoading(true)
+ formRef?.current?.submit()
+ })
+ }}
+
+ />}
+ onCancel={() => {
+ handleConfirmLoading(false)
+ handleModalVisible(false)
+ setFormPRESALE_TYPE(false)
+ setFileList([])
+ }}
+
+ onOk={async () => { // 提交框内的数据
+ formRef?.current?.validateFields().then(() => {
+ handleConfirmLoading(true)
+ formRef?.current?.submit()
+ })
+ }}
+ modalRender={(modal) => {
+ return onDraggaleStart(event, uiData)}
+ handle='.membershipLevel'
+ >
+
+ }}
+ >
+ {
+ let newValue = { ...values };
+ if (currentRow) {
+ // 编辑数据
+ newValue = { ...values, FIELDENUM_ID: currentRow.FIELDENUM_ID };
+ }
+
+ // 如果有开关，要把开关的代码写进去
+ await handleAddUpdate(newValue);
+
+ handleConfirmLoading(false)
+ setFormPRESALE_TYPE(false)
+ }}
+ >
+
+ {/* {
+ if (typeTreeData && typeTreeData.length > 0) {
+ let list: any = [{ FIELDENUM_NAME: "默认类别", FIELDENUM_ID: -1 }, ...typeTreeData]
+ return list
+ } else {
+ const req = {
+ FIELDEXPLAIN_FIELD: 'CONSUMPTIONRECORD_TYPE',
+ FIELDEXPLAIN_ID: "",
+ FIELDENUM_PID: "",
+ FIELDENUM_STATUS: 1,
+ SearchKey: ""
+ }
+ const data = await handeGetNestingFIELDENUMList(req);
+ if (data && data.length > 0) {
+ data.unshirft({ FIELDENUM_NAME: "默认类别", FIELDENUM_ID: -1 })
+ setTypeTreeData(data)
+ return data
+ } else {
+ return [{ FIELDENUM_NAME: "默认类别", FIELDENUM_ID: -1 }]
+ }
+ }
+ }}
+ fieldProps={{
+ fieldNames: {
+ label: 'FIELDENUM_NAME',
+ value: 'FIELDENUM_ID',
+ children: 'children'
+ },
+ showSearch: true,
+ filterTreeNode: (input, node) =>
+ (node.FIELDENUM_NAME || '').toLowerCase().includes(input.toLowerCase())
+ }}
+ rules={[
+ {
+ required: true,
+ message: "请选择上级类别"
+ }
+ ]}
+ />
+ */}
+
+
+
+
+ );
+};
+export default connect(({ user }: ConnectState) => ({
+ currentUser: user.currentUser
+}))(ConsumptionTypeConfig);
\ No newline at end of file
diff --git a/src/pages/travelMember/GrowthValueRecordSearch/index.tsx b/src/pages/travelMember/GrowthValueRecordSearch/index.tsx
index b7b4f3f..3b62d71 100644
--- a/src/pages/travelMember/GrowthValueRecordSearch/index.tsx
+++ b/src/pages/travelMember/GrowthValueRecordSearch/index.tsx
@@ -114,7 +114,8 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
ellipsis: true,
valueType: 'select',
- valueEnum: MEMBERSHIPLEVELYNObj
+ valueEnum: MEMBERSHIPLEVELYNObj,
+ sorter: true
},
{
title: "会员类型",
@@ -127,6 +128,7 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
valueEnum: {
...MEMBERSHIPTYPEYNObj,
},
+ sorter: true
},
{
title: "成长来源",
@@ -143,7 +145,8 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
treeDefaultExpandAll: true, // 默认展开所有节点（可选）
showSearch: true, // 允许搜索（可选）
treeNodeFilterProp: 'title', // 按 title 搜索（可选）
- }
+ },
+ sorter: true
// valueEnum: {
// "0": "全部",
// "1000": "消费赠送",
@@ -159,11 +162,12 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
valueType: 'select',
valueEnum: {
- "-2": "全部",
+ // "-2": "全部",
"1": "积累",
"-1": "消耗",
},
- initialValue: "-2"
+ // initialValue: "-2",
+ sorter: true
},
{
title: "订单编号",
@@ -180,6 +184,18 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
}}>{record?.TICKET_CODE} : "-"
}
},
+ {
+ title: "下单时间",
+ width: 180,
+ dataIndex: "OPERATE_DATE",
+ align: 'center',
+ hideInSearch: true,
+ render: (_, record) => {
+ return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
+ },
+ sorter: true,
+ defaultSortOrder: 'descend',
+ },
{
title: "累计成长值",
width: 120,
@@ -187,7 +203,8 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
hideInSearch: true,
align: 'center',
ellipsis: true,
- valueType: 'digit'
+ valueType: 'digit',
+ sorter: true
},
{
title: "本次成长值",
@@ -196,7 +213,8 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
hideInSearch: true,
align: 'center',
ellipsis: true,
- valueType: 'digit'
+ valueType: 'digit',
+ sorter: true
},
{
title: "实付金额",
@@ -205,7 +223,8 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
hideInSearch: true,
align: 'center',
ellipsis: true,
- valueType: 'digit'
+ valueType: 'digit',
+ sorter: true
},
{
title: "服务区名称",
@@ -223,16 +242,6 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
ellipsis: true,
},
- {
- title: "操作时间",
- width: 180,
- dataIndex: "OPERATE_DATE",
- align: 'center',
- hideInSearch: true,
- render: (_, record) => {
- return record?.OPERATE_DATE ? moment(record?.OPERATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
- }
- },
]
const handleCloseModal = () => {
@@ -269,14 +278,21 @@ const GrowthValueRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
expandRowByClick: true
}}
headerTitle={isComponent ? '' : {
return `${record?.FIELDENUM_PID}-${record?.FIELDENUM_ID}`
diff --git a/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx b/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx
index 0123687..a55ae7f 100644
--- a/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx
+++ b/src/pages/travelMember/GrowthValueRuleConfig/components/growthConfig.tsx
@@ -250,7 +250,8 @@ const GrowthConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (props)
breadcrumb: {}
}}>
{
return `${record?.FIELDENUM_PID}-${record?.FIELDENUM_ID}`
diff --git a/src/pages/travelMember/GrowthValueRuleConfig/index.tsx b/src/pages/travelMember/GrowthValueRuleConfig/index.tsx
index cf9e7ea..6e8277c 100644
--- a/src/pages/travelMember/GrowthValueRuleConfig/index.tsx
+++ b/src/pages/travelMember/GrowthValueRuleConfig/index.tsx
@@ -402,6 +402,22 @@ const GrowthValueRuleConfig: React.FC<{ currentUser: CurrentUser | undefined }>
return true
}
+ // 拿到最全的规则的数据
+ const handleGetAllRuleData = async () => {
+ const req: any = {
+ searchParameter: {
+ PROVINCE_CODE: currentUser?.ProvinceCode || "",
+ OWNERUNIT_ID: 911,
+ GROWTHSETTING_STATE: "",
+ MEMBERSHIP_TYPES: ""
+ },
+ SortStr: "MEMBERSHIP_TYPE,MEMBERSHIP_LEVEL,PROMOTION_LEVEL desc",
+ PageIndex: 1,
+ PageSize: 999999
+ }
+ const data = await handleGetGROWTHSETTINGList(req);
+ setTableData(data.List)
+ }
return (
GROWTHSETTING_STATE: params?.GROWTHSETTING_STATE,
MEMBERSHIP_TYPES: params?.MEMBERSHIP_TYPE
},
- SortStr: "PROMOTION_LEVEL desc",
+ SortStr: "MEMBERSHIP_TYPE,MEMBERSHIP_LEVEL,PROMOTION_LEVEL desc",
PageIndex: 1,
PageSize: 20
}
const data = await handleGetGROWTHSETTINGList(req);
if (data.List && data.List.length > 0) {
handleSetlogSave(`查看了成长规则配置列表`)
- if (isFirst) {
- setTableData(data.List);
- setIsFirst(false)
- }
+ // if (isFirst) {
+ // setTableData(data.List);
+ // setIsFirst(false)
+ // }
+ handleGetAllRuleData()
return { data: data.List, success: true, total: data.TotalCount }
}
return { data: [], success: true }
diff --git a/src/pages/travelMember/MallBrandManage/index.tsx b/src/pages/travelMember/MallBrandManage/index.tsx
index ff6ae62..f5f967b 100644
--- a/src/pages/travelMember/MallBrandManage/index.tsx
+++ b/src/pages/travelMember/MallBrandManage/index.tsx
@@ -308,7 +308,7 @@ const MallBrandManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
rowKey={(record: any) => {
return `${record.BRAND_PID}-${record.BRAND_ID}`
}}
- scroll={{ x: "100%", y: "calc(100vh - 410px)" }}
+ scroll={{ x: "100%", y: "calc(100vh - 430px)" }}
headerTitle={
- scroll={{ x: "100%", y: isComponent ? '300px' : 'calc(100vh - 370px)' }}
+ scroll={{ x: "100%", y: isComponent ? '300px' : 'calc(100vh - 390px)' }}
rowKey={(record) => {
return `${record?.COMMODITY_ID}`
}}
diff --git a/src/pages/travelMember/MallOrderManage/index.tsx b/src/pages/travelMember/MallOrderManage/index.tsx
index b161573..b6f2d11 100644
--- a/src/pages/travelMember/MallOrderManage/index.tsx
+++ b/src/pages/travelMember/MallOrderManage/index.tsx
@@ -186,7 +186,9 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
align: "center",
render: (_, record) => {
return record?.ORDER_DATE ? moment(record?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
- }
+ },
+ sorter: (a, b) => new Date(a.ORDER_DATE).getTime() - new Date(b.ORDER_DATE).getTime(),
+ defaultSortOrder: 'descend',
},
{
title: "订单状态",
@@ -207,6 +209,7 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
"9999": "订单已撤销"
},
align: "center",
+ sorter: (a, b) => a.SALEBILL_STATE - b.SALEBILL_STATE
},
{
title: "获得积分",
@@ -215,6 +218,7 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => a.MEMBERSHIP_POINT - b.MEMBERSHIP_POINT
},
{
title: "获得成长值",
@@ -223,6 +227,7 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => a.MEMBERGROWTH_VALUE - b.MEMBERGROWTH_VALUE
},
{
title: "购买的商品",
@@ -239,6 +244,7 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => a.ORDER_AMOUNT - b.ORDER_AMOUNT
},
{
title: "实付金额",
@@ -247,6 +253,7 @@ const MallOrderManage: React.FC<{ currentUser: CurrentUser }> = (props) => {
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => a.PAY_AMOUNT - b.PAY_AMOUNT
},
{
title: "订单类型",
diff --git a/src/pages/travelMember/MemberAddress/index.tsx b/src/pages/travelMember/MemberAddress/index.tsx
index 210a5a3..94d5143 100644
--- a/src/pages/travelMember/MemberAddress/index.tsx
+++ b/src/pages/travelMember/MemberAddress/index.tsx
@@ -90,7 +90,7 @@ const MemberAddress: React.FC<{ currentUser: CurrentUser | undefined }> = (props
},
{
dataIndex: 'USER_NAME',
- title: '收货人名称',
+ title: '用户昵称',
width: 150,
align: 'center',
hideInSearch: true,
@@ -103,7 +103,7 @@ const MemberAddress: React.FC<{ currentUser: CurrentUser | undefined }> = (props
},
{
dataIndex: 'USER_SEX',
- title: '收货人性别',
+ title: '用户性别',
width: 120,
align: 'center',
hideInSearch: true,
diff --git a/src/pages/travelMember/MerchantEvaluationManage/index.tsx b/src/pages/travelMember/MerchantEvaluationManage/index.tsx
index 7d2c1e8..123bc28 100644
--- a/src/pages/travelMember/MerchantEvaluationManage/index.tsx
+++ b/src/pages/travelMember/MerchantEvaluationManage/index.tsx
@@ -21,9 +21,10 @@ import './MerchantEvaluationManage.less'
-const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolean, parentDetail?: any }> = (props) => {
+const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent?: boolean, parentDetail?: any, come?: string }> = (props) => {
const draggleRef = React.createRef()
- const { currentUser, isComponent, parentDetail } = props
+ // come 来自哪里
+ const { currentUser, isComponent, parentDetail, come } = props
const actionRef = useRef();
const formRef = useRef();
const modalFormRef = useRef();
@@ -119,6 +120,8 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => new Date(a.CREATE_DATE).getTime() - new Date(b.CREATE_DATE).getTime(),
+ defaultSortOrder: 'descend',
render: (_, record) => {
return record?.CREATE_DATE ? moment(record?.CREATE_DATE).format('YYYY-MM-DD HH:mm:ss') : "-"
}
@@ -277,7 +280,24 @@ const MerchantEvaluationManage: React.FC<{ currentUser: CurrentUser, isComponent
if (!selectedId && !isComponent) {
return
}
- const req: any = isComponent ? {
+ console.log('parentDetailparentDetailparentDetail', parentDetail);
+
+ const req: any = isComponent ? come === 'MerchantSalesRanking' ? {
+ SearchParameter: {
+ OWNERUNIT_ID: currentUser?.OwnerUnitId,
+ SERVERPART_IDS: parentDetail?.SERVERPART_ID || "",
+ COMMENT_ISVALID: 1,
+ // MEMBERSHIP_IDS: parentDetail?.MEMBERSHIP_ID,
+ MERCHANTS_ID: parentDetail?.SELLER_ID
+ },
+ PageIndex: 1,
+ PageSize: 999999,
+ keyWord: {
+ Key: "SELLER_NAME,MEMBERSHIP_NAME",
+ Value: params?.searchText || ""
+ },
+ SortStr: "CREATE_DATE desc"
+ } : {
SearchParameter: {
OWNERUNIT_ID: currentUser?.OwnerUnitId,
// PROVINCE_CODE: currentUser?.ProvinceCode,
diff --git a/src/pages/travelMember/MerchantSalesRanking/index.tsx b/src/pages/travelMember/MerchantSalesRanking/index.tsx
index befe837..cb1229e 100644
--- a/src/pages/travelMember/MerchantSalesRanking/index.tsx
+++ b/src/pages/travelMember/MerchantSalesRanking/index.tsx
@@ -1,14 +1,16 @@
// 商户销售排行
import { ConnectState } from "@/models/connect";
-import { Button, FormInstance } from "antd";
+import { Button, Drawer, FormInstance } from "antd";
import { connect, CurrentUser } from "umi";
import { handeGetSERVERPARTSELLERList } from "../service";
import { useRef, useState } from "react";
import ProTable, { ActionType } from "@ant-design/pro-table";
import PageTitleBox from "@/components/PageTitleBox";
import LeftSelectTree from "@/pages/reports/settlementAccount/component/leftSelectTree";
+import MerchantEvaluationManage from "../MerchantEvaluationManage";
const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
+ const { currentUser } = props
const actionRef = useRef();
const formRef = useRef();
const [collapsible, setCollapsible] = useState(false)
@@ -20,6 +22,11 @@ const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> =
// 当前查询的文字
const [currentSearchText, setCurrentSearchText] = useState('')
+ // 行数据
+ const [currentRow, setCurrentRow] = useState()
+ // 显示详情抽屉
+ const [showDetailDrawer, setShowDetailDrawer] = useState(false)
+
const columns: any = [
{
dataIndex: 'searchText',
@@ -85,7 +92,18 @@ const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> =
align: 'right',
width: 120,
hideInSearch: true,
- sorter: true
+ sorter: true,
+ render: (_, record) => {
+ return record?.COMMENT_COUNT ? {
+ setCurrentRow({
+ ...record,
+ MEMBERSHIP_ID: currentUser?.ID
+ })
+ setShowDetailDrawer(true)
+ }}>
+ {record?.COMMENT_COUNT}
+ : "-"
+ }
},
{
dataIndex: 'MONTHLYSALES',
@@ -193,6 +211,20 @@ const MerchantSalesRanking: React.FC<{ currentUser: CurrentUser | undefined }> =
/>
+
+
+
+
{
if (!selectAssociationServerpart) {
@@ -1059,7 +1068,13 @@ const MerchantInformation: React.FC<{ currentUser: CurrentUser | undefined }> =
const req: any = {
SearchParameter: {
SERVERPART_IDS: selectAssociationServerpart,
- ISVALID: 1
+ ISVALID: 1,
+ SHOPREGION: params?.SHOPREGION || "",
+ BUSINESS_STATE: params?.BUSINESS_STATE || ""
+ },
+ keyWord: {
+ Key: "SERVERPART_NAME,SHOPNAME",
+ Value: params?.searchText || ""
},
PageIndex: 1,
PageSize: 999999,
diff --git a/src/pages/travelMember/ActiveMemberStatistics/index.tsx b/src/pages/travelMember/ActiveMemberStatistics/index.tsx
index e762374..6bc2836 100644
--- a/src/pages/travelMember/ActiveMemberStatistics/index.tsx
+++ b/src/pages/travelMember/ActiveMemberStatistics/index.tsx
@@ -55,7 +55,7 @@ const ActiveMemberStatistics: React.FC<{ currentUser: CurrentUser | undefined }>
ExcludeTest: formData ? formData?.ExcludeTest === 1 ? true : false : true,
StartDate: start ? start : "",
EndDate: end ? end : "",
- MembershipType: formData?.MembershipType || "",
+ MembershipType: formData?.MembershipType === 1 ? "" : formData?.MembershipType || "",
// MembershipLevel: formData?.MembershipLevel || "",
MembershipLevel: "",
}
diff --git a/src/pages/travelMember/BookingMealOrder/index.tsx b/src/pages/travelMember/BookingMealOrder/index.tsx
index 74ac253..a920526 100644
--- a/src/pages/travelMember/BookingMealOrder/index.tsx
+++ b/src/pages/travelMember/BookingMealOrder/index.tsx
@@ -128,6 +128,8 @@ const BookingMealOrder: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
hideInSearch: true,
width: 170,
ellipsis: true,
+ sorter: (a, b) => new Date(a.ORDER_DATE).getTime() - new Date(b.ORDER_DATE).getTime(),
+ defaultSortOrder: 'descend',
render: (_, record) => {
return record?.ORDER_DATE ? moment(record?.ORDER_DATE).format('YYYY-MM-DD HH:mm:ss') : ''
}
@@ -159,6 +161,7 @@ const BookingMealOrder: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
hideInSearch: true,
width: 120,
ellipsis: true,
+ sorter: (a, b) => a.ORDER_AMOUNT - b.ORDER_AMOUNT,
},
{
dataIndex: 'COUPON_AMOUNT',
@@ -167,6 +170,7 @@ const BookingMealOrder: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
hideInSearch: true,
width: 120,
ellipsis: true,
+ sorter: (a, b) => a.COUPON_AMOUNT - b.COUPON_AMOUNT,
},
{
dataIndex: 'PAY_AMOUNT',
@@ -175,6 +179,7 @@ const BookingMealOrder: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
hideInSearch: true,
width: 120,
ellipsis: true,
+ sorter: (a, b) => a.PAY_AMOUNT - b.PAY_AMOUNT,
},
{
title: "获得积分",
@@ -183,6 +188,7 @@ const BookingMealOrder: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => a.MEMBERSHIP_POINT - b.MEMBERSHIP_POINT,
},
{
title: "获得成长值",
@@ -191,6 +197,7 @@ const BookingMealOrder: React.FC<{ currentUser: CurrentUser | undefined }> = (pr
hideInSearch: true,
ellipsis: true,
align: "center",
+ sorter: (a, b) => a.MEMBERGROWTH_VALUE - b.MEMBERGROWTH_VALUE,
},
{
dataIndex: 'SERVERPART_NAME',
diff --git a/src/pages/travelMember/BusinessActivityStatistics/index.tsx b/src/pages/travelMember/BusinessActivityStatistics/index.tsx
index cb2e359..bcccbd2 100644
--- a/src/pages/travelMember/BusinessActivityStatistics/index.tsx
+++ b/src/pages/travelMember/BusinessActivityStatistics/index.tsx
@@ -59,8 +59,8 @@ const BusinessActivityStatistics: React.FC<{ currentUser: CurrentUser | undefine
ExcludeTest: formData ? formData?.ExcludeTest === 1 ? true : false : true,
StartDate: start ? start : "",
EndDate: end ? end : "",
- MembershipType: formData?.MembershipType || "",
- MembershipLevel: formData?.MembershipLevel || "",
+ MembershipType: formData?.MembershipType === 1 ? '' : formData?.MembershipType || "",
+ MembershipLevel: formData?.MembershipLevel === '1' ? '' : formData?.MembershipLevel || "",
}
const req2: any = {
@@ -68,8 +68,8 @@ const BusinessActivityStatistics: React.FC<{ currentUser: CurrentUser | undefine
StartDate: start ? start : "",
EndDate: end ? end : "",
SalebillType: "",
- MembershipType: formData?.MembershipType || "",
- MembershipLevel: formData?.MembershipLevel || "",
+ MembershipType: formData?.MembershipType === 1 ? '' : formData?.MembershipType || "",
+ MembershipLevel: formData?.MembershipLevel === '1' ? '' : formData?.MembershipLevel || "",
}
diff --git a/src/pages/travelMember/ConsumptionRecordSearch/index.tsx b/src/pages/travelMember/ConsumptionRecordSearch/index.tsx
index cfddedb..c08b091 100644
--- a/src/pages/travelMember/ConsumptionRecordSearch/index.tsx
+++ b/src/pages/travelMember/ConsumptionRecordSearch/index.tsx
@@ -147,7 +147,8 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
ellipsis: true,
valueType: 'select',
- valueEnum: MEMBERSHIPLEVELYNObj
+ valueEnum: MEMBERSHIPLEVELYNObj,
+ sorter: true,
},
{
title: "会员类型",
@@ -160,6 +161,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
valueEnum: {
...MEMBERSHIPTYPEYNObj,
},
+ sorter: true,
},
{
title: "订单编号",
@@ -184,9 +186,11 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
dataIndex: "CONSUMPTIONRECORD_DATE",
hideInSearch: true,
+ sorter: true,
render: (_, record) => {
return record?.CONSUMPTIONRECORD_DATE ? moment(record?.CONSUMPTIONRECORD_DATE).format('YYYY-MM-DD HH:mm:ss') : '-'
- }
+ },
+ defaultSortOrder: 'descend',
},
{
title: "消费类型",
@@ -199,7 +203,8 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
"0": "全部",
...CONSUMPTIONRECORDTYPEObj
},
- initialValue: "0"
+ initialValue: "0",
+ sorter: true,
},
{
title: "订单状态",
@@ -218,6 +223,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
"9000": "订单已关闭",
"9999": "订单已撤销",
},
+ sorter: true
},
{
title: "获得积分",
@@ -226,6 +232,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
hideInSearch: true,
align: 'center',
ellipsis: true,
+ sorter: true
},
{
title: "获得成长值",
@@ -234,6 +241,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
hideInSearch: true,
align: 'center',
ellipsis: true,
+ sorter: true
},
{
title: "订单金额",
@@ -243,6 +251,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
valueType: 'digit',
ellipsis: true,
+ sorter: true
},
{
title: "消费金额",
@@ -252,6 +261,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
valueType: 'digit',
align: 'center',
ellipsis: true,
+ sorter: true
},
{
title: "消费积分",
@@ -261,6 +271,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
align: 'center',
valueType: 'digit',
ellipsis: true,
+ sorter: true
},
{
title: "实付金额",
@@ -270,6 +281,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
valueType: 'digit',
align: 'center',
ellipsis: true,
+ sorter: true
},
{
title: "优惠金额",
@@ -278,6 +290,7 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
hideInSearch: true,
align: 'center',
ellipsis: true,
+ sorter: true
},
{
@@ -331,16 +344,23 @@ const ConsumptionRecordSearch: React.FC<{ currentUser: CurrentUser, isComponent?
expandRowByClick: true
}}
headerTitle={isComponent ? '' :
diff --git a/src/pages/travelMember/ConsumptionTypeConfig/index.tsx b/src/pages/travelMember/ConsumptionTypeConfig/index.tsx
new file mode 100644
index 0000000..09f2148
--- /dev/null
+++ b/src/pages/travelMember/ConsumptionTypeConfig/index.tsx
@@ -0,0 +1,527 @@
+// 消费类型配置
+import React, { useRef, useState, Suspense } from 'react';
+import moment from 'moment'; // 时间相关引用，没有使用可以删除
+import numeral from "numeral"; // 数字相关引用，没有使用可以删除
+import { connect } from 'umi';
+
+import useRequest from '@ahooksjs/use-request'; // 请求数据的引用
+import Draggable from 'react-draggable';
+import SubMenu from "antd/lib/menu/SubMenu";
+import ProTable from '@ant-design/pro-table';
+import ProDescriptions from '@ant-design/pro-descriptions';
+import ProForm, { ProFormDatePicker, ProFormDateTimePicker, ProFormDateTimeRangePicker, ProFormDigit, ProFormMoney, ProFormSelect, ProFormText, ProFormTextArea, ProFormTreeSelect, ProFormUploadButton } from '@ant-design/pro-form';
+import { MenuFoldOutlined, PlusOutlined, ExclamationCircleOutlined } from '@ant-design/icons';
+import { PageContainer } from '@ant-design/pro-layout';
+import { Button, Col, Drawer, message, Row, Popconfirm, Space, Image, Modal, Form, Switch, Upload, Tooltip, Descriptions, TreeSelect } from 'antd';
+
+import type { CurrentUser } from "umi";
+import type { ConnectState } from '@/models/connect';
+import type { ActionType, ProColumns } from '@ant-design/pro-table';
+import type { ProDescriptionsItemProps } from '@ant-design/pro-descriptions';
+import type { FormInstance } from 'antd';
+
+import { getFieldEnumTree, getFieldEnumName } from "@/services/options"; // 枚举的引用，没有使用可以删除
+import { handeDeleteFIELDENUM, handeGetFIELDENUMList, handeGetFIELDEXPLAINList, handeGetNestingFIELDENUMList, handeSynchroFIELDENUM, handlDeleteUSERDEFINEDTYPE, handlGetUSERDEFINEDTYPEList, handlSynchroUSERDEFINEDTYPE } from '../service';
+import PageTitleBox from '@/components/PageTitleBox';
+import { uploadPicture } from '@/services/picture';
+import defaultIcon from '../../../assets/brand/defaultIcon.png'
+import classNames from 'classnames';
+import session from '@/utils/session';
+import ModalFooter from '../scenicSpotConfig/component/modalFooter';
+import { handleSetlogSave } from '@/utils/format';
+
+
+const beforeUpload = (file: any) => {
+ const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+ if (!isJpgOrPng) {
+ message.error('请上传JPEG、jpg、png格式的图片文件!');
+ }
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isLt2M) {
+ message.error('图片大小不超过 2MB!');
+ }
+ return isJpgOrPng && isLt2M;
+}
+
+
+const ConsumptionTypeConfig: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
+ const { currentUser } = props
+ const { confirm } = Modal;
+ const actionRef = useRef
+ {
+ handleChangePreview(vis)
+ }
+ }}>
+ {
+ fileList.map((n) =>
+
}
+
+
+ {modal}
+
+ {
+ handleChangePreview(vis)
+ }
+ }}>
+ {
+ fileList.map((n) =>
+
}
+
+
+ {modal}
+ {
+ // 打印报表
+ if (!reqDetailList || reqDetailList.length === 0) return;
+ setPrintOut(el);
+ }} >
+
+ {
+ if (disabled) {
+ setDraggleDisabled(false)
+ }
+ }}
+ onMouseOut={() => {
+ setDraggleDisabled(true)
+ }}
+
+ onFocus={() => { }}
+ onBlur={() => { }}
+ >
+ {currentRow ? '更新商品预警类型' : '新建商品预警类型'}
+
+ }
+ destroyOnClose={true}
+ width={900}
+ bodyStyle={{
+ height: '700px', // 你可以根据需要调整高度
+ overflowY: 'auto',
+ }}
+ visible={modalVisible}
+ confirmLoading={confirmLoading}
+ afterClose={() => {
+ formRef.current?.resetFields();
+ setCurrentRow(undefined);
+ }}
+ footer={
+
+
+
+
+
+ {modal}
+
-
`${record?.SALEBILL_CODE}-${record?.ORDER_DATE}`}
formRef={formRef}
bordered
@@ -533,6 +543,14 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> =
search={false}
options={false}
request={async (params, sorter) => {
+
+ const sortstr = Object.keys(sorter).map(n => {
+ const value = sorter[n]
+ return value ? `${n} ${value.replace('end', '')}` : ''
+ })
+ console.log('sortstrsortstrsortstr', sortstr);
+
+
const req = {
searchParameter: {
SALEBILL_TYPES: selectPageTab === 1 ? 6000 : "3000,3001,3002",
@@ -553,7 +571,7 @@ const SummaryOfReservation: React.FC<{ currentUser: CurrentUser | undefined }> =
},
PageIndex: 1,
PageSize: 999999,
- SortStr: "ORDER_DATE desc",
+ // sortStr: sortstr.toString()
}
const data = await handeGetSaleBillWholeList(req)
diff --git a/src/pages/travelMember/SummaryofMerchantReviews/index.tsx b/src/pages/travelMember/SummaryofMerchantReviews/index.tsx
index 0801840..da5503e 100644
--- a/src/pages/travelMember/SummaryofMerchantReviews/index.tsx
+++ b/src/pages/travelMember/SummaryofMerchantReviews/index.tsx
@@ -1,11 +1,16 @@
// 商户评价汇总
-import { ConnectState } from "@/models/connect";
+import { ConnectState } from "@/models/connect";
import { connect, CurrentUser } from "umi";
const SummaryofMerchantReviews: React.FC<{ currentUser: CurrentUser | undefined }> = (props) => {
+ const { currentUser } = props
+
return (
}
colSpan={!collapsible ? "300px" : "60px"}
- title={!collapsible ? "请选择服务区" : ""}
+ title={!collapsible ? "请选择供应商" : ""}
headerBordered
collapsed={collapsible}
>
diff --git a/src/pages/travelMember/SupplierOrderStatistics/index.tsx b/src/pages/travelMember/SupplierOrderStatistics/index.tsx
index 3f35040..7a5a5f3 100644
--- a/src/pages/travelMember/SupplierOrderStatistics/index.tsx
+++ b/src/pages/travelMember/SupplierOrderStatistics/index.tsx
@@ -1,3 +1,4 @@
+// 供应商订单汇总
import { connect } from "umi";
import type { CurrentUser } from "umi";
import type { ConnectState } from "@/models/connect";
@@ -122,6 +123,8 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.summaryData - b.TotalActualAmount.summaryData,
+ defaultSortOrder: 'descend',
},
{
dataIndex: ['TotalActualAmount', 'maxData'],
@@ -131,6 +134,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.maxData - b.TotalActualAmount.maxData
},
{
dataIndex: ['TotalActualAmount', 'minData'],
@@ -140,6 +144,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.maxData - b.TotalActualAmount.maxData
},
{
dataIndex: ['TotalActualAmount', 'avgData'],
@@ -149,6 +154,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.avgData - b.TotalActualAmount.avgData
},
{
dataIndex: ['TotalActualAmount', 'YOYData'],
@@ -158,6 +164,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.YOYData - b.TotalActualAmount.YOYData
},
{
dataIndex: ['TotalActualAmount', 'YOYDataAdd'],
@@ -167,6 +174,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.YOYDataAdd - b.TotalActualAmount.YOYDataAdd,
render: (_, record) => {
return record?.TotalActualAmount?.YOYData && record?.TotalActualAmount?.summaryData ? (((record?.TotalActualAmount?.summaryData - record?.TotalActualAmount?.YOYData) / record?.TotalActualAmount?.YOYData) * 100).toFixed(2) + '%' : "-"
}
@@ -179,6 +187,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalActualAmount.QOQData - b.TotalActualAmount.QOQData,
},
]
},
@@ -195,6 +204,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.summaryData - b.TotalSuccAmount.summaryData,
},
{
dataIndex: ['TotalSuccAmount', 'maxData'],
@@ -204,6 +214,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.maxData - b.TotalSuccAmount.maxData,
},
{
dataIndex: ['TotalSuccAmount', 'minData'],
@@ -213,6 +224,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.minData - b.TotalSuccAmount.minData,
},
{
dataIndex: ['TotalSuccAmount', 'avgData'],
@@ -222,6 +234,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.avgData - b.TotalSuccAmount.avgData,
},
{
dataIndex: ['TotalSuccAmount', 'YOYData'],
@@ -231,6 +244,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.YOYData - b.TotalSuccAmount.YOYData,
},
{
dataIndex: ['TotalSuccAmount', 'YOYDataAdd'],
@@ -240,6 +254,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.YOYDataAdd - b.TotalSuccAmount.YOYDataAdd,
render: (_, record) => {
return record?.TotalSuccAmount?.YOYData && record?.TotalSuccAmount?.summaryData ? (((record?.TotalSuccAmount?.summaryData - record?.TotalSuccAmount?.YOYData) / record?.TotalSuccAmount?.YOYData) * 100).toFixed(2) + '%' : "-"
}
@@ -252,6 +267,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccAmount.QOQData - b.TotalSuccAmount.QOQData,
},
]
},
@@ -268,6 +284,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccTicket.summaryData - b.TotalSuccTicket.summaryData,
},
{
dataIndex: ['TotalSuccTicket', 'maxData'],
@@ -277,6 +294,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccTicket.maxData - b.TotalSuccTicket.maxData,
},
{
dataIndex: ['TotalSuccTicket', 'minData'],
@@ -286,6 +304,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccTicket.minData - b.TotalSuccTicket.minData,
},
{
dataIndex: ['TotalSuccTicket', 'avgData'],
@@ -295,6 +314,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccTicket.avgData - b.TotalSuccTicket.avgData,
},
{
dataIndex: ['TotalSuccTicket', 'YOYData'],
@@ -304,6 +324,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccTicket.YOYData - b.TotalSuccTicket.YOYData,
},
{
dataIndex: ['TotalSuccTicket', 'YOYDataAdd'],
@@ -313,6 +334,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
align: 'center',
hideInSearch: true,
ellipsis: true,
+ sorter: (a, b) => a.TotalSuccTicket.YOYDataAdd - b.TotalSuccTicket.YOYDataAdd,
render: (_, record) => {
return record?.TotalSuccTicket?.YOYData && record?.TotalSuccTicket?.summaryData ? (((record?.TotalSuccTicket?.summaryData - record?.TotalSuccTicket?.YOYData) / record?.TotalSuccTicket?.YOYData) * 100).toFixed(2) + '%' : "-"
}
@@ -324,6 +346,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalSuccTicket.QOQData - b.TotalSuccTicket.QOQData,
ellipsis: true,
},
]
@@ -340,6 +363,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.summaryData - b.TotalCount.summaryData,
ellipsis: true,
},
{
@@ -349,6 +373,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.maxData - b.TotalCount.maxData,
ellipsis: true,
},
{
@@ -358,6 +383,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.minData - b.TotalCount.minData,
ellipsis: true,
},
{
@@ -367,6 +393,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.avgData - b.TotalCount.avgData,
ellipsis: true,
},
{
@@ -376,6 +403,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.YOYData - b.TotalCount.YOYData,
ellipsis: true,
},
{
@@ -385,6 +413,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.YOYDataAdd - b.TotalCount.YOYDataAdd,
ellipsis: true,
render: (_, record) => {
return record?.TotalCount?.YOYData && record?.TotalCount?.summaryData ? (((record?.TotalCount?.summaryData - record?.TotalCount?.YOYData) / record?.TotalCount?.YOYData) * 100).toFixed(2) + '%' : "-"
@@ -397,6 +426,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalCount.QOQData - b.TotalCount.QOQData,
ellipsis: true,
},
]
@@ -412,6 +442,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
title: '合计值',
width: 120,
align: 'center',
+ sorter: (a, b) => a.TotalFailureTicket.summaryData - b.TotalFailureTicket.summaryData,
hideInSearch: true,
ellipsis: true,
},
@@ -422,6 +453,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalFailureTicket.maxData - b.TotalFailureTicket.maxData,
ellipsis: true,
},
{
@@ -431,6 +463,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalFailureTicket.minData - b.TotalFailureTicket.minData,
ellipsis: true,
},
{
@@ -440,6 +473,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalFailureTicket.avgData - b.TotalFailureTicket.avgData,
ellipsis: true,
},
{
@@ -447,6 +481,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
key: "TotalFailureTicket.YOYData",
title: '同比数值',
width: 120,
+ sorter: (a, b) => a.TotalFailureTicket.YOYData - b.TotalFailureTicket.YOYData,
align: 'center',
hideInSearch: true,
ellipsis: true,
@@ -458,6 +493,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalFailureTicket.YOYDataAdd - b.TotalFailureTicket.YOYDataAdd,
ellipsis: true,
render: (_, record) => {
return record?.TotalFailureTicket?.YOYData && record?.TotalFailureTicket?.summaryData ? (((record?.TotalFailureTicket?.summaryData - record?.TotalFailureTicket?.YOYData) / record?.TotalFailureTicket?.YOYData) * 100).toFixed(2) + '%' : "-"
@@ -468,6 +504,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
key: "TotalFailureTicket.QOQData",
title: '环比数值',
width: 120,
+ sorter: (a, b) => a.TotalFailureTicket.QOQData - b.TotalFailureTicket.QOQData,
align: 'center',
hideInSearch: true,
ellipsis: true,
@@ -486,11 +523,13 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
width: 120,
align: 'center',
hideInSearch: true,
+ sorter: (a, b) => a.TotalRefundTicket.summaryData - b.TotalRefundTicket.summaryData,
ellipsis: true,
},
{
dataIndex: ['TotalRefundTicket', 'maxData'],
key: "TotalRefundTicket.maxData",
+ sorter: (a, b) => a.TotalRefundTicket.maxData - b.TotalRefundTicket.maxData,
title: '最大值',
width: 120,
align: 'center',
@@ -500,6 +539,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundTicket', 'minData'],
key: "TotalRefundTicket.minData",
+ sorter: (a, b) => a.TotalRefundTicket.minData - b.TotalRefundTicket.minData,
title: '最小值',
width: 120,
align: 'center',
@@ -509,6 +549,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundTicket', 'avgData'],
key: "TotalRefundTicket.avgData",
+ sorter: (a, b) => a.TotalRefundTicket.avgData - b.TotalRefundTicket.avgData,
title: '平均值',
width: 120,
align: 'center',
@@ -518,6 +559,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundTicket', 'YOYData'],
key: "TotalRefundTicket.YOYData",
+ sorter: (a, b) => a.TotalRefundTicket.YOYData - b.TotalRefundTicket.YOYData,
title: '同比数值',
width: 120,
align: 'center',
@@ -527,6 +569,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundTicket', 'YOYDataAdd'],
key: "TotalRefundTicket.YOYDataAdd",
+ sorter: (a, b) => a.TotalRefundTicket.YOYDataAdd - b.TotalRefundTicket.YOYDataAdd,
title: '同比增长',
width: 120,
align: 'center',
@@ -539,6 +582,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundTicket', 'QOQData'],
key: "TotalRefundTicket.QOQData",
+ sorter: (a, b) => a.TotalRefundTicket.QOQData - b.TotalRefundTicket.QOQData,
title: '环比数值',
width: 120,
align: 'center',
@@ -555,6 +599,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'summaryData'],
key: "TotalRefundAmount.summaryData",
+ sorter: (a, b) => a.TotalRefundAmount.summaryData - b.TotalRefundAmount.summaryData,
title: '合计值',
width: 120,
align: 'center',
@@ -564,6 +609,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'maxData'],
key: "TotalRefundAmount.maxData",
+ sorter: (a, b) => a.TotalRefundAmount.maxData - b.TotalRefundAmount.maxData,
title: '最大值',
width: 120,
align: 'center',
@@ -573,6 +619,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'minData'],
key: "TotalRefundAmount.minData",
+ sorter: (a, b) => a.TotalRefundAmount.minData - b.TotalRefundAmount.minData,
title: '最小值',
width: 120,
align: 'center',
@@ -582,6 +629,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'avgData'],
key: "TotalRefundAmount.avgData",
+ sorter: (a, b) => a.TotalRefundAmount.avgData - b.TotalRefundAmount.avgData,
title: '平均值',
width: 120,
align: 'center',
@@ -591,6 +639,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'YOYData'],
key: "TotalRefundAmount.YOYData",
+ sorter: (a, b) => a.TotalRefundAmount.YOYData - b.TotalRefundAmount.YOYData,
title: '同比数值',
width: 120,
align: 'center',
@@ -600,6 +649,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'YOYDataAdd'],
key: "TotalRefundAmount.YOYDataAdd",
+ sorter: (a, b) => a.TotalRefundAmount.YOYDataAdd - b.TotalRefundAmount.YOYDataAdd,
title: '同比增长',
width: 120,
align: 'center',
@@ -612,6 +662,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
{
dataIndex: ['TotalRefundAmount', 'QOQData'],
key: "TotalRefundAmount.QOQData",
+ sorter: (a, b) => a.TotalRefundAmount.QOQData - b.TotalRefundAmount.QOQData,
title: '环比数值',
width: 120,
align: 'center',
@@ -712,7 +763,7 @@ const SupplierOrderStatistics: React.FC<{ currentUser: CurrentUser }> = (props)
expandable={{
expandRowByClick: true
}}
- scroll={{ x: "100%", y: "calc(100vh - 410px)" }}
+ scroll={{ x: "100%", y: "calc(100vh - 470px)" }}
headerTitle={
+
+
+
)
}
diff --git a/src/pages/travelMember/SupplierOrderStatistics/components/SupplierLeftSelectTree.tsx b/src/pages/travelMember/SupplierOrderStatistics/components/SupplierLeftSelectTree.tsx
index 1e6fd36..25ad18f 100644
--- a/src/pages/travelMember/SupplierOrderStatistics/components/SupplierLeftSelectTree.tsx
+++ b/src/pages/travelMember/SupplierOrderStatistics/components/SupplierLeftSelectTree.tsx
@@ -182,7 +182,7 @@ const SupplierLeftSelectTree = ({ setSelectedId, reload, actionRef, currentUser,