diff --git a/src/components/QuickMenu/index.jsx b/src/components/QuickMenu/index.jsx index 3fdcae3..bdde0ff 100644 --- a/src/components/QuickMenu/index.jsx +++ b/src/components/QuickMenu/index.jsx @@ -28,7 +28,6 @@ function QuickMenu(props) { // 常用时段设置时间 const setDateTimeByPeriod = (periodId) => { - //开始时间 let beginMoment = moment().subtract(periodId, 'days').startOf('day') //结束时间 diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 3594216..9d77df6 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -145,22 +145,38 @@ const TableModule = forwardRef((props, ref) => { useEffect(() => { if (pageName && sessionTabList && Object.values(sessionTabList).length > 0) { setSessionTabList(sessionTabList) + let temp_obj = {...sessionTabList} if (sessionTabList.start_time) { - let start_time = sessionTabList.start_time - let end_time = sessionTabList.end_time - searchForm.setFieldsValue({ ...sessionTabList, start_time: moment(start_time), end_time: moment(end_time) }) - } else { - if (sessionTabList.in_time) { - searchForm.setFieldsValue({ ...sessionTabList, in_time: moment(sessionTabList.in_time) }) - } else { - searchForm.setFieldsValue({ ...sessionTabList }) - } + temp_obj.start_time = moment(sessionTabList.start_time) + temp_obj.end_time = moment(sessionTabList.end_time) + } + if(sessionTabList.in_time){ + temp_obj.in_time = moment(sessionTabList.in_time) } if (sessionTabList.plateValue) { - //console.log(180,sessionTabList.plateValue.match(/:(\S*)/)[1],sessionTabList.plate2) + temp_obj.carId = sessionTabList.plate2 fetchPlateSearch(sessionTabList.plateValue.match(/:(\S*)/)[1], setPlateData, []); - searchForm.setFieldsValue({ ...sessionTabList, carId: sessionTabList.plate2 }) } + searchForm.setFieldsValue(temp_obj) + // if (sessionTabList.start_time) { + // let temp_obj = { ...sessionTabList, start_time: moment(start_time), end_time: moment(end_time) } + // if (sessionTabList.plateValue){ + // temp_obj.carId = sessionTabList.plate2 + // } + // searchForm.setFieldsValue(temp_obj) + // } else { + // if (sessionTabList.in_time) { + // searchForm.setFieldsValue({ ...sessionTabList, in_time: moment(sessionTabList.in_time) }) + // } else { + // searchForm.setFieldsValue({ ...sessionTabList }) + // } + // } + // if (sessionTabList.plateValue) { + // fetchPlateSearch(sessionTabList.plateValue.match(/:(\S*)/)[1], setPlateData, []); + // searchForm.setFieldsValue({ ...sessionTabList, carId: sessionTabList.plate2 }) + // } // let start_time = sessionTabList.start_time + // let end_time = sessionTabList.end_time + } else { //console.log(2222224333, searchForm.getFieldsValue()) } @@ -308,6 +324,7 @@ const TableModule = forwardRef((props, ref) => { if (timeout) { clearTimeout(timeout); timeout = null; + return // todo } currentValue = value; const fake = () => { @@ -320,7 +337,8 @@ const TableModule = forwardRef((props, ref) => { value: item.value, text: item.label, })); - callback(plateData); + // callback(plateData); + setPlateData(plateData) } }) }; @@ -520,7 +538,7 @@ const TableModule = forwardRef((props, ref) => { onSearch={(newValue) => handlePlateSearch(newValue, item)} onChange={handlePlateChange} notFoundContent={null} - options={(plateData || []).map((d) => ({ + options={(plateData || [{value: '', text: ''}]).map((d) => ({ value: d.value, label: d.text, }))} diff --git a/src/pages/OperationCenter/AppMgm/MobileDeviceMgm/loadable.jsx b/src/pages/OperationCenter/AppMgm/MobileDeviceMgm/loadable.jsx index 7ea402b..b730327 100644 --- a/src/pages/OperationCenter/AppMgm/MobileDeviceMgm/loadable.jsx +++ b/src/pages/OperationCenter/AppMgm/MobileDeviceMgm/loadable.jsx @@ -43,9 +43,9 @@ function WechatMenuMgm() { return
青岛收费管理端APP
-
+
关于我们 - {setResultData({...resultData, description: e.target.value})}} rows={5} showCount={true} maxLength={300} style={{width: "600px"}}> + {setResultData({...resultData, description: e.target.value})}} rows={5} showCount={true} maxLength={300} style={{width: "600px"}}>
客服电话 diff --git a/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx b/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx index 39ef3de..ddf0a1d 100644 --- a/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx +++ b/src/pages/OperationCenter/AppMgm/WechatMenuMgm/loadable.jsx @@ -307,7 +307,9 @@ function WechatMenuMgm() { {onChange('name',e)}}>
- 仅支持中英文和数字, 字数不超过4个汉字或8个字母 + { + activeSubmenuIndex > -1 ? '仅支持中英文, 字数不超过4个汉字或8个字母' : '仅支持中英文, 字数不超过8个汉字或16个字母' + }
{ diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx index 163c69c..38ae2da 100644 --- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponRules/loadable.jsx @@ -156,6 +156,7 @@ function CouponRules() { if (res.status == 20000) { message.success(res.message) setDeleteModalOpen(false) + setCurrentCouponId('') getCouponList(params.current) } else { message.error(res.message) @@ -260,6 +261,7 @@ function CouponRules() { // 添加优惠券规则 const addCoupon = ()=>{ + setCurrentCouponId('') setShowEdit(true) setCurrentCouponInfo({type: 1, mode: 1, partner: '青岛', effective_date: 1}) } @@ -995,7 +997,7 @@ function CouponRules() { {setShowCannotEdit(false)}}>确定}>

优惠券规则状态为有效或者已经关联活动,无法编辑

 - {setDeleteModalOpen(false)}}> + {setDeleteModalOpen(false); setCurrentCouponId('')}}>

确认是否删除该优惠券
diff --git a/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx index b625cf6..6351e4d 100644 --- a/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx +++ b/src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx @@ -125,10 +125,10 @@ function HotCbdConf() { //列表数据 function search(params) { let obj = params; - if(!params.pn){ + if(params.pn === undefined){ obj.pn = pageData.pn obj.size = pageData.size - }else if(!params.area){ + }else if(params.area === undefined){ obj.name = formData.name obj.area = formData.area } @@ -149,6 +149,10 @@ function HotCbdConf() { message.error('商圈名称不能为空') return } + if(!modalFormData.area){ + message.error('所属区域不能为空') + return + } if(!modalFormData.center_name){ message.error('商圈中心点位名称不能为空') return @@ -204,7 +208,7 @@ function HotCbdConf() { icon: , content: '确认删除当前商圈？', onOk() { - confirmDelete() + confirmDelete(record.id) }, onCancel() { console.log('取消'); @@ -212,8 +216,8 @@ function HotCbdConf() { }); } - const confirmDelete = ()=>{ - ajax.deleteHotCbd({id: currentRecord.id}).then((res) => { + const confirmDelete = (id)=>{ + ajax.deleteHotCbd({id: id}).then((res) => { if (res.status == 20000) { search(Object.assign({},formData, pageData)) message.success(res.message) @@ -341,6 +345,7 @@ function HotCbdConf() {
+ 共检索到 {total} 条结果
{ + setModalFormData({ + name: '', + area: '', + center_name: '' + }) setDetailVisible(false); }} onOk={saveModal} diff --git a/src/pages/SystemMgm/BusinessConfig/PageConf/loadable.jsx b/src/pages/SystemMgm/BusinessConfig/PageConf/loadable.jsx index 3870993..a45597e 100644 --- a/src/pages/SystemMgm/BusinessConfig/PageConf/loadable.jsx +++ b/src/pages/SystemMgm/BusinessConfig/PageConf/loadable.jsx @@ -10,6 +10,7 @@ import "./index.scss"; // import { useLocation } from "react-router-dom"; function PageConf() { const [list , setList] = useState([]) + const [total, setTotal] = useState(0) const [type, setType] = useState('-1') const [scrollHeight, setScrollHeight] = useState(0) const rightListRef = useRef(null) @@ -64,6 +65,7 @@ function PageConf() { ajax.getOverviewConfigList({type: value ? value: type, pn: 1, page_size: 20, size: 20}).then((res)=>{ if(res.status == 20000){ setList(res.data) + setTotal(res.total) }else{ message.error(res.message) } @@ -88,7 +90,7 @@ function PageConf() {
{rightListRef.current = e; if(e){setScrollHeight(e.offsetHeight - 100)}}}> + 共检索到 {total} 条结果
{ + } + ajax.editVacationConfig(temp_param).then((res)=>{ if(res.status == 20000){ message.success('修改成功') + setRightDetailData(temp_param) setModalVisible(false) getVacationData() }else{ @@ -156,7 +157,7 @@ function VacationConf() {
{date.format('DD')}
{ - temp_vc_name ?
{temp_vc_name}
: null + temp_vc_name ?
{temp_vc_name}
: null } }