部分问题修复
parent
ba7801a494
commit
e0c85d9be4
|
|
@ -71,6 +71,7 @@ function List(props) {
|
|||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Search
|
||||
labelCol={{ span: 4 }}
|
||||
options={[
|
||||
{ name: "title", label: "标题" },
|
||||
]}
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ function List(props) {
|
|||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Search
|
||||
labelCol={{ span: 4 }}
|
||||
options={[
|
||||
{ name: "title", label: "名称" },
|
||||
]}
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@ function List(props) {
|
|||
|
||||
const { tableProps, getData } = useTable(props["eventReportList"], {
|
||||
form,
|
||||
transform: formData => ({
|
||||
occurrenceStartTime: formData.occurrenceTime?.[0],
|
||||
occurrenceEndTime: formData.occurrenceTime?.[1],
|
||||
}),
|
||||
params: { corpinfoId: query.corpinfoId },
|
||||
});
|
||||
|
||||
|
|
@ -40,7 +44,7 @@ function List(props) {
|
|||
options={[
|
||||
{ name: "likeAccessMode", label: "接入方式", render: (<DictionarySelect dictValue="eventReportMethod" />) },
|
||||
{ name: "eventType", label: "事件类型" },
|
||||
{ name: "times", label: "发生时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
||||
{ name: "occurrenceTime", label: "发生时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
||||
]}
|
||||
form={form}
|
||||
onFinish={getData}
|
||||
|
|
|
|||
|
|
@ -62,6 +62,7 @@ function List(props) {
|
|||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Search
|
||||
labelCol={{ span: 8 }}
|
||||
options={[
|
||||
{ name: "likeDrillName", label: "应急演练方案名称" },
|
||||
{ name: "drillTime", label: "演练时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
|
||||
|
|
|
|||
|
|
@ -15,9 +15,6 @@ function GradeResponse(props) {
|
|||
const { tableProps, getData } = useTable(props["enterprisePlanLevelResponseList"], {
|
||||
params: { likePlanId: props.planId },
|
||||
useStorageQueryCriteria: false,
|
||||
onSuccess: () => {
|
||||
props.mode !== "view" && props.setResponseLevelRefresh(true);
|
||||
},
|
||||
});
|
||||
|
||||
const onDelete = (id) => {
|
||||
|
|
|
|||
|
|
@ -42,7 +42,6 @@ function OrganizationStructure(props) {
|
|||
const getTreeList = async () => {
|
||||
const { data } = await props["enterprisePlanLevelOrganizationListTree"]({ planId: props.planId });
|
||||
setTreeList(data);
|
||||
props.mode !== "view" && props.setExecutingAgencyRefresh(true);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
|
|
|
|||
|
|
@ -22,30 +22,25 @@ function PlanInstructions(props) {
|
|||
});
|
||||
|
||||
const getResponseLevelList = async () => {
|
||||
if (!props.responseLevelRefresh)
|
||||
if (props.mode === "view")
|
||||
return;
|
||||
|
||||
const { data } = await props["enterprisePlanLevelResponseListAll"]({ planId: props.planId });
|
||||
setResponseLevelList(data);
|
||||
props.setResponseLevelRefresh(false);
|
||||
};
|
||||
|
||||
const getTreeList = async () => {
|
||||
if (!props.executingAgencyRefresh)
|
||||
if (props.mode === "view")
|
||||
return;
|
||||
|
||||
const { data } = await props["enterprisePlanLevelOrganizationListTree"]({ planId: props.planId });
|
||||
setExecutingAgencyListTree(data);
|
||||
props.setExecutingAgencyRefresh(false);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getTreeList();
|
||||
}, [props.executingAgencyRefresh]);
|
||||
|
||||
useEffect(() => {
|
||||
getResponseLevelList();
|
||||
}, [props.responseLevelRefresh]);
|
||||
}, []);
|
||||
|
||||
const onSubmit = async (values) => {
|
||||
const { success } = await props[!isEditCommandIdRef.current ? "enterprisePlanCommandSettingAdd" : "enterprisePlanCommandSettingUpdate"]({
|
||||
|
|
|
|||
|
|
@ -26,8 +26,6 @@ function Add(props) {
|
|||
{ navigateMode: "replace" },
|
||||
);
|
||||
|
||||
const [responseLevelRefresh, setResponseLevelRefresh] = useState(true);
|
||||
const [executingAgencyRefresh, setExecutingAgencyRefresh] = useState(true);
|
||||
const [reviewPersonModalVisible, setReviewPersonModalVisible] = useState(false);
|
||||
const [basicInfo, setBasicInfo] = useState({});
|
||||
|
||||
|
|
@ -100,6 +98,7 @@ function Add(props) {
|
|||
<Tabs
|
||||
activeKey={urlState.currentStep}
|
||||
onChange={key => setUrlState({ currentStep: key })}
|
||||
destroyOnHidden
|
||||
items={[
|
||||
{
|
||||
key: "basicInfo",
|
||||
|
|
@ -116,23 +115,13 @@ function Add(props) {
|
|||
{
|
||||
key: "gradeResponse",
|
||||
label: "分级响应",
|
||||
children: (
|
||||
<GradeResponse
|
||||
planId={urlState.planId}
|
||||
setResponseLevelRefresh={setResponseLevelRefresh}
|
||||
/>
|
||||
),
|
||||
children: (<GradeResponse planId={urlState.planId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
},
|
||||
{
|
||||
key: "organizationStructure",
|
||||
label: "组织结构",
|
||||
children: (
|
||||
<OrganizationStructure
|
||||
planId={urlState.planId}
|
||||
setExecutingAgencyRefresh={setExecutingAgencyRefresh}
|
||||
/>
|
||||
),
|
||||
children: (<OrganizationStructure planId={urlState.planId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
},
|
||||
{
|
||||
|
|
@ -140,20 +129,14 @@ function Add(props) {
|
|||
label: "预案资源",
|
||||
children: (<PlanResources planId={urlState.planId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
destroyOnHidden: true,
|
||||
},
|
||||
{
|
||||
key: "planInstructions",
|
||||
label: "预案指令",
|
||||
children: (
|
||||
<PlanInstructions
|
||||
planId={urlState.planId}
|
||||
setResponseLevelRefresh={setResponseLevelRefresh}
|
||||
setExecutingAgencyRefresh={setExecutingAgencyRefresh}
|
||||
responseLevelRefresh={responseLevelRefresh}
|
||||
executingAgencyRefresh={executingAgencyRefresh}
|
||||
/>
|
||||
),
|
||||
children: (<PlanInstructions planId={urlState.planId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
destroyOnHidden: true,
|
||||
},
|
||||
{
|
||||
key: "planText",
|
||||
|
|
|
|||
Loading…
Reference in New Issue