diff --git a/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx b/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx index c0510ea..1e664b9 100644 --- a/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx +++ b/src/pages/OffPeak/OffPeakTimeMgm/ManagementTime/loadable.jsx @@ -70,7 +70,7 @@ function ManagementTime(props) { title: `提示`, content: `是否确认删除选中的数据项?`, onOk: () => { - ajax.getDelRuleLink({ids:[record.id]}).then((res) => { + ajax.getDelRuleLink({ids:[record.id],rule_id:id}).then((res) => { if (res.status === 20000) { message.success('删除成功') tableRef.current.fetch(1,{}) @@ -167,7 +167,7 @@ function ManagementTime(props) { title: `提示`, content: `是否确认删除选中的数据项?`, onOk: () => { - ajax.getDelRuleLink({ids:tableSelectCheck}).then((res) => { + ajax.getDelRuleLink({ids:tableSelectCheck,rule_id:id}).then((res) => { if (res.status === 20000) { message.success('删除成功') tableRef.current.fetch(1,{}) @@ -191,7 +191,9 @@ function ManagementTime(props) { message.warning(`时间规则不可为空`); return } - ajax.getRuleLinkAdd(rowData).then((res) => { + let data = rowData + data.rule_id=id + ajax.getRuleLinkAdd(data).then((res) => { if (res.status === 20000) { setVisible(false); message.success("新增成功") diff --git a/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx b/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx index 860785b..6eea5e8 100644 --- a/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx +++ b/src/pages/OffPeak/OffPeakTimeMgm/RuleDetail/loadable.jsx @@ -118,10 +118,11 @@ function RuleDetail() { setActionState("edit"); setVisible(true); setEditId(record.id) + let dataType=selectData.filter(item => { return item.label==record.date_type}) setRowData({ ...rowData, name: record.name, - date_type:record.date_type, + date_type:dataType[0].value||"", start_time: record.start_time, end_time: record.end_time, is_in: record.is_in, @@ -365,7 +366,8 @@ function RuleDetail() { <FormSelect yisaLabel="是否可以进入" yisaData={modalSelectData} - defaultValue={rowData.is_in || null} + defaultValue={rowData.is_in===""?null:rowData.is_in} + // defaultValue={rowData.is_in} placeholder="请选择是否可以进入" hasUnlimited={false} required={true} @@ -375,7 +377,7 @@ function RuleDetail() { <FormSelect yisaLabel="是否可以出场" yisaData={modalSelectData} - defaultValue={rowData.is_out || null} + defaultValue={rowData.is_out===""? null:rowData.is_out} placeholder="请选择是否可以出场" hasUnlimited={false} required={true}