Browse Source

fix: 热门商圈配置, 所属区域不能设置默认值0, 0是不存在的值, 开发环境有, 测试环境没有

tags/PMS_Frontend_v1.0.6-develop
chenglb 1 year ago
parent
commit
fb97f34357
  1. 12
      src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx
  2. 6
      src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx

12
src/pages/SystemMgm/BusinessConfig/HotCbdConf/loadable.jsx

@ -33,7 +33,7 @@ function HotCbdConf() {
defaultValue:{} defaultValue:{}
}) })
const [formData, setFormData] = useSetState({ const [formData, setFormData] = useSetState({
area: defaultParams.formParams?.area ? defaultParams.formParams.area : '0',
area: defaultParams.formParams?.area ? defaultParams.formParams.area : '',
name: defaultParams.formParams?.name ? defaultParams.formParams.name : '', name: defaultParams.formParams?.name ? defaultParams.formParams.name : '',
}) })
@ -159,7 +159,7 @@ function HotCbdConf() {
setDetailVisible(false) setDetailVisible(false)
setModalFormData({ setModalFormData({
name: '', name: '',
area: '0',
area: '',
center_name: '' center_name: ''
}) })
message.success('编辑商圈成功') message.success('编辑商圈成功')
@ -174,7 +174,7 @@ function HotCbdConf() {
setDetailVisible(false) setDetailVisible(false)
setModalFormData({ setModalFormData({
name: '', name: '',
area: '0',
area: '',
center_name: '' center_name: ''
}) })
search(Object.assign({},formData, pageData)) search(Object.assign({},formData, pageData))
@ -191,7 +191,7 @@ function HotCbdConf() {
setCurrentRecord(record) setCurrentRecord(record)
setModalFormData({ setModalFormData({
name: record.name, name: record.name,
area: parseInt(record.area_id) ? record.area_id : '0' ,
area: parseInt(record.area_id) ? record.area_id : '' ,
center_name: record.center_name center_name: record.center_name
}) })
setDetailVisible(true) setDetailVisible(true)
@ -227,10 +227,10 @@ function HotCbdConf() {
const reset = ()=>{ const reset = ()=>{
setFormData({ setFormData({
name: '', name: '',
area: '0'
area: ''
}) })
setPageData({...pageData, pn: 1}) setPageData({...pageData, pn: 1})
search({name: '', area: '0', pn: 1, size: pageData.size})
search({name: '', area: '', pn: 1, size: pageData.size})
} }
const addConfig = ()=>{ const addConfig = ()=>{

6
src/pages/SystemMgm/BusinessConfig/VacationConf/loadable.jsx

@ -85,6 +85,8 @@ function VacationConf() {
message.success('新增成功') message.success('新增成功')
setModalVisible(false) setModalVisible(false)
getVacationData() getVacationData()
}else{
message.error(res.message)
} }
}).catch(err=>{ }).catch(err=>{
@ -102,6 +104,8 @@ function VacationConf() {
message.success('修改成功') message.success('修改成功')
setModalVisible(false) setModalVisible(false)
getVacationData() getVacationData()
}else{
message.error(res.message)
} }
}).catch(err=>{ }).catch(err=>{
@ -118,7 +122,7 @@ function VacationConf() {
} }
const onChange = (value, mode) => { const onChange = (value, mode) => {
let temp = value.format('MM-DD')
let temp = value.format('YYYY-MM-DD')
if(vacationData.length){ if(vacationData.length){
let one = vacationData.find(item=> item.day == temp) let one = vacationData.find(item=> item.day == temp)
if(one){ if(one){

Loading…
Cancel
Save