diff --git a/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx b/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx index 31893bf..9b70707 100644 --- a/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx +++ b/src/pages/OperationCenter/OperationSales/YardDiscount/DebounceSelect.jsx @@ -22,7 +22,12 @@ const DebounceSelect = ({ const fetchId = fetchRef.current; setOptions([]); setFetching(true); - fetchOptions({value, type: ajaxType}).then((newOptions) => { + let _id = props?.value?.length ? props?.value?.join() : ""; + let _data = !value ? + {type: ajaxType, id: _id} + : + {value, type: ajaxType}; + fetchOptions(_data).then((newOptions) => { if (fetchId !== fetchRef.current) { // for fetch callback order return; diff --git a/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx b/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx index ff6b2fa..a45ca4c 100644 --- a/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/YardDiscount/loadable.jsx @@ -12,6 +12,9 @@ import "./index.scss"; import { use } from "echarts"; const { RangePicker } = DatePicker; const YardDiscount = () => { + // message.config({ + // maxCount: 1, + // }); // 默认数据 const defaultData = { activity: [], // 活动名称 @@ -142,6 +145,7 @@ const YardDiscount = () => { className="hover" onClick={() => { setModalData({ + id: record?.id || "", activity: record?.activity_id?.split() || [], road: record?.road_id?.split() || [], discount: record?.discount || "", @@ -252,17 +256,44 @@ const YardDiscount = () => { message.error(error.message); }); }; + + // 时间限制 const $disabledDate = (current) => { // Can not select days before today and today return current && current <= moment().subtract(1, 'day'); }; + // 新增及编辑 + const $addEditSubmit = (data, type) => { + let activity = data?.activity?.length ? data?.activity?.join() : ""; + let road = data?.road?.length ? data?.road?.join() : ""; + if(!activity) return message.error("请选择活动名称!"); + if(!road) return message.error("请选择停车场名称!"); + if(!data?.discount) return message.error("请输入折扣!"); + if(!data?.start_time) return message.error("请选择开始时间!"); + if(!data?.end_time) return message.error("请选择结束时间!"); + let _data = {...data, activity, road}; + ajax.handleYardDiscount(_data, type).then((res) => { + if (res.status === 20000 || res.status == 0) { + message.success(res.message || `${type}成功`); + setModalData(defaultModal); + setModalVisible({open: false, title: ""}); + $getTableList(); + } else { + message.error(res.message); + } + }).catch((error) => { + message.error(error.message); + }); + }; + useEffect(() => { let _data = {}; if (sessionData && Object.values(sessionData).length > 0) { _data = { activity: sessionData?.activity || [], // 活动名称 road: sessionData?.road || [], // 活动名称 + status: sessionData?.status || "0", // 状态 pn: 1, page_size: dictionary?.pageSizeOptions1[0], }; @@ -274,7 +305,6 @@ const YardDiscount = () => { useEffect(() => { // setSessionData(formData); }, [formData]); - return (