修改bug
parent
3624f41ed8
commit
24a262286e
|
|
@ -14,3 +14,9 @@ export const EMERGENCY_PLAN_FILING_STATUS_ENUM = [
|
|||
{ name: "已备案", bianma: "1" },
|
||||
{ name: "未备案", bianma: "2" },
|
||||
];
|
||||
export const COMMAND_STATUS_ENUM = [
|
||||
{ name: "未反馈", bianma: "1" },
|
||||
{ name: "进行中", bianma: "2" },
|
||||
{ name: "无法执行", bianma: "3" },
|
||||
{ name: "已完成", bianma: "4" },
|
||||
];
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ function Command(props) {
|
|||
<Cesium urlState={urlState} />
|
||||
</div>
|
||||
<div style={{ width: 360 }}>
|
||||
<NonContingencyInstructions id={urlState.id} planId={urlState.planId} getCommandEvent={getCommandEvent} />
|
||||
<NonContingencyInstructions id={urlState.id} planId={urlState.planId} planInfo={urlState} getCommandEvent={getCommandEvent} />
|
||||
<EventHandlingRecords id={urlState.id} planId={urlState.planId} />
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ function BiRescue(props) {
|
|||
<Cesium urlState={urlState} />
|
||||
</div>
|
||||
<div className="bi-rescue-side">
|
||||
<NonContingencyInstructions id={urlState.id} planId={urlState.planId} getCommandEvent={getCommandEvent} />
|
||||
<NonContingencyInstructions id={urlState.id} planId={urlState.planId} planInfo={urlState} getCommandEvent={getCommandEvent} />
|
||||
<EventHandlingRecords id={urlState.id} planId={urlState.planId} />
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./emergencyRescuePersonnel/list?id=${record.id}&corpinfoId=${query.corpinfoId}`);
|
||||
props.history.push(`./emergencyRescuePersonnel/list?id=${record.id}&corpinfoId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
应急救援人列表
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import { message } from "antd";
|
|||
import { useEffect, useState } from "react";
|
||||
import FormBuilder from "zy-react-library/components/FormBuilder";
|
||||
import Page from "zy-react-library/components/Page";
|
||||
import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
|
||||
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
|
||||
import useDictionary from "zy-react-library/hooks/useDictionary";
|
||||
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
|
||||
|
|
@ -43,8 +42,11 @@ function Add(props) {
|
|||
const userInfo = await getUserInfo();
|
||||
if (!query.id) {
|
||||
form.setFieldValue("userId", userInfo.id);
|
||||
form.setFieldValue("userName", userInfo.name);
|
||||
form.setFieldValue("idCardNo", UseDecodeIdCard(userInfo.userIdCard));
|
||||
form.setFieldValue("contactPhone", userInfo.phone);
|
||||
form.setFieldValue("genderName", userInfo?.dictLabel || "未知");
|
||||
form.setFieldValue("gender", userInfo?.dictValue || "UNKNOWN");
|
||||
}
|
||||
setUserInfo(userInfo);
|
||||
const genderDictionary = await getDictionary({ dictValue: "sys_sex_enum" });
|
||||
|
|
@ -53,7 +55,10 @@ function Add(props) {
|
|||
}, []);
|
||||
|
||||
const onSubmit = async (values) => {
|
||||
values.idCardNo = btoa(values.idCardNo);
|
||||
if (values.idCardNo) {
|
||||
values.idCardNo = btoa(values.idCardNo);
|
||||
}
|
||||
|
||||
const { success } = await props[query.id ? "enterpriseEmergencyPersonnelUpdate" : "enterpriseEmergencyPersonnelAdd"]({
|
||||
...values,
|
||||
id: query.id,
|
||||
|
|
@ -89,35 +94,22 @@ function Add(props) {
|
|||
},
|
||||
{ name: "agencyName", label: "所属机构名称", onlyForLabel: true },
|
||||
{
|
||||
name: "userId",
|
||||
name: "userName",
|
||||
label: "用户",
|
||||
render: (
|
||||
<PersonnelSelect
|
||||
isNeedDepartmentId={false}
|
||||
isNeedCorpInfoId={true}
|
||||
params={{ corpinfoId: userInfo.corpinfoId }}
|
||||
onGetOption={(option) => {
|
||||
const genderItem = genderDictionary.find(item => item.dictLabel === option.sex);
|
||||
console.log(option);
|
||||
form.setFieldValue("genderName", genderItem?.dictLabel || "未知");
|
||||
form.setFieldValue("gender", genderItem?.dictValue || "UNKNOWN");
|
||||
form.setFieldValue("idCardNo", UseDecodeIdCard(option?.userIdCard));
|
||||
form.setFieldValue("contactPhone", option?.phone);
|
||||
}}
|
||||
onGetLabel={(label) => {
|
||||
form.setFieldValue("userName", label);
|
||||
}}
|
||||
/>
|
||||
),
|
||||
componentProps: { disabled: true },
|
||||
},
|
||||
{
|
||||
name: "userId",
|
||||
label: "用户Id",
|
||||
onlyForLabel: true,
|
||||
},
|
||||
{ name: "userName", label: "用户名称", onlyForLabel: true },
|
||||
{ name: "sortOrder", label: "排序", render: FORM_ITEM_RENDER_ENUM.INTEGER },
|
||||
{ name: "genderName", label: "性别", componentProps: { disabled: true } },
|
||||
{ name: "gender", label: "性别ID", onlyForLabel: true },
|
||||
{ name: "administrativePosition", label: "行政职务" },
|
||||
{ name: "administrativeLevel", label: "行政级别" },
|
||||
{ name: "idCardNo", label: "身份证号", rules: [{ pattern: ID_NUMBER, message: "请输入正确的身份证号" }] },
|
||||
{ name: "contactPhone", label: "联系电话", rules: [{ pattern: PHONE, message: "请输入正确的联系电话" }] },
|
||||
{ name: "idCardNo", label: "身份证号", rules: [{ pattern: ID_NUMBER, message: "请输入正确的身份证号" }], componentProps: { disabled: true } },
|
||||
{ name: "contactPhone", label: "联系电话", rules: [{ pattern: PHONE, message: "请输入正确的联系电话" }], componentProps: { disabled: true } },
|
||||
]}
|
||||
form={form}
|
||||
onFinish={onSubmit}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ function List(props) {
|
|||
};
|
||||
|
||||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Page isShowAllAction={props.isShowAllAction || false} headerTitle={props.isShowAllAction}>
|
||||
<Search
|
||||
labelCol={{ span: 4 }}
|
||||
options={[
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ function List(props) {
|
|||
};
|
||||
|
||||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Page isShowAllAction={props.isShowAllAction || false} headerTitle={props.isShowAllAction}>
|
||||
<Search
|
||||
labelCol={{ span: 4 }}
|
||||
options={[
|
||||
|
|
|
|||
|
|
@ -69,10 +69,10 @@ function List(props) {
|
|||
};
|
||||
|
||||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Page isShowAllAction={props.isShowAllAction || false} headerTitle={props.isShowAllAction}>
|
||||
<Search
|
||||
options={[
|
||||
{ name: "title", label: "中文名称" },
|
||||
{ name: "likeTitle", label: "中文名称" },
|
||||
]}
|
||||
form={form}
|
||||
onFinish={getData}
|
||||
|
|
|
|||
|
|
@ -69,10 +69,10 @@ function List(props) {
|
|||
};
|
||||
|
||||
return (
|
||||
<Page isShowAllAction={props.headerTitle || false} headerTitle={props.headerTitle}>
|
||||
<Page isShowAllAction={props.isShowAllAction || false} headerTitle={props.isShowAllAction}>
|
||||
<Search
|
||||
options={[
|
||||
{ name: "title", label: "物品名称" },
|
||||
{ name: "likeTitle", label: "物品名称" },
|
||||
]}
|
||||
form={form}
|
||||
onFinish={getData}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ const MarkModal = (props) => {
|
|||
const info = props.info || {};
|
||||
const id = info.id;
|
||||
const type = props.type;
|
||||
console.log(info);
|
||||
console.log(info);
|
||||
return (
|
||||
<Modal
|
||||
title={props.title}
|
||||
|
|
@ -125,6 +125,30 @@ console.log(info);
|
|||
{type === "communicationGuaranteeOrganization" && <CommunicationGuaranteeOrganizationView isShowAllAction={false} id={id} />}
|
||||
{type === "technicalSupportGuaranteeOrganization" && <TechnicalSupportGuaranteeOrganizationView isShowAllAction={false} id={id} />}
|
||||
{type === "enterpriseEmergencyOrganization" && <EnterpriseEmergencyOrganizationView isShowAllAction={false} id={id} />}
|
||||
{type === "firefightingEquipment"
|
||||
&& (
|
||||
<Descriptions
|
||||
bordered
|
||||
column={1}
|
||||
styles={{ label: { width: 200 }, content: { width: 500 } }}
|
||||
items={[
|
||||
{ label: "器材类型", children: info.fireDeviceTypeName },
|
||||
{ label: "器材编号", children: info.fireDeviceCode },
|
||||
{ label: "消防区域名称", children: info.fireRegionName },
|
||||
{ label: "消防点位名称", children: info.firePointName },
|
||||
|
||||
{ label: "消防区域编码", children: info.fireRegionCode },
|
||||
{ label: "消防点位编码", children: info.firePointCode },
|
||||
{ label: "有效期开始时间", children: info.validityStartTime },
|
||||
{ label: "有效期结束时间", children: info.validityEndTime },
|
||||
|
||||
{ label: "存放地点", children: info.storageLocation },
|
||||
{ label: "负责部门", children: info.departmentName },
|
||||
{ label: "负责人", children: info.userName },
|
||||
]}
|
||||
/>
|
||||
)}
|
||||
|
||||
</Modal>
|
||||
);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -55,6 +55,9 @@ export const useCesiumMap = (mackClickEvent) => {
|
|||
if (window.Cesium.defined(pick) && pick.id?.id && pick.id?.monitorItems) {
|
||||
const data = pick.id.monitorItems.data;
|
||||
const mapType = data.mapType.substring(data.mapType.indexOf("_") + 1);
|
||||
if (mapType === "firefightingEquipment") {
|
||||
console.log("firefightingEquipment mark clicked", { data, pick });
|
||||
}
|
||||
mackClickEvent.emit({ mapType, data: pick.id.monitorItems.data });
|
||||
}
|
||||
}, window.Cesium.ScreenSpaceEventType.LEFT_CLICK);
|
||||
|
|
|
|||
|
|
@ -8,6 +8,15 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
|
|||
import useTable from "zy-react-library/hooks/useTable";
|
||||
import { NS_ENTERPRISE_EMERGENCY_PERSONNEL, NS_ENTERPRISE_PLAN, NS_RESUE } from "~/enumerate/namespace";
|
||||
import circle from "~/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/images/circle.png";
|
||||
import { UseDecodeIdCard } from "~/utils";
|
||||
|
||||
const COMMAND_TYPE_NON_CONTINGENCY = "非预案指令";
|
||||
const COMMAND_STATUS_UNFEEDBACK = "1";
|
||||
|
||||
const getExecutingAgencyId = info => info.organizationId || info.agencyId || info.executingAgencyId || "";
|
||||
const getExecutingAgencyName = info => info.organizationName || info.agencyName || info.executingAgencyName || "";
|
||||
const getAdministrativePosition = info => info.administrativePosition || info.position || "";
|
||||
const getAdministrativeLevel = info => info.administrativeLevel || "";
|
||||
|
||||
function NonContingencyInstructions(props) {
|
||||
const [sendCommandModalVisible, setSendCommandModalVisible] = useState(false);
|
||||
|
|
@ -157,6 +166,7 @@ function NonContingencyInstructions(props) {
|
|||
sendCommandModalVisible && (
|
||||
<SendCommandModal
|
||||
info={currentInfo}
|
||||
planInfo={props.planInfo || { planId: props.planId }}
|
||||
subTitle={modalSubTitle}
|
||||
id={props.id}
|
||||
getCommandEvent={props.getCommandEvent}
|
||||
|
|
@ -175,11 +185,34 @@ function NonContingencyInstructions(props) {
|
|||
const SendCommandModalComponent = (props) => {
|
||||
const [form] = FormBuilder.useForm();
|
||||
|
||||
useEffect(() => {
|
||||
console.log(props);
|
||||
}, []);
|
||||
const onSubmit = async (values) => {
|
||||
const planInfo = props.planInfo || {};
|
||||
const administrativePosition = getAdministrativePosition(props.info);
|
||||
const administrativeLevel = getAdministrativeLevel(props.info);
|
||||
|
||||
const { success } = await props["rescueCommandSendCommand"]({
|
||||
...values,
|
||||
rescueId: props.id,
|
||||
planId: planInfo.planId || "",
|
||||
planName: planInfo.planName || "",
|
||||
responseLevel: planInfo.responseLevel || "",
|
||||
responseLevelName: planInfo.responseLevelName || "",
|
||||
executingAgencyId: getExecutingAgencyId(props.info),
|
||||
executingAgencyName: getExecutingAgencyName(props.info),
|
||||
commandType: COMMAND_TYPE_NON_CONTINGENCY,
|
||||
commandStatus: COMMAND_STATUS_UNFEEDBACK,
|
||||
userId: props.info.userId,
|
||||
executor: props.info.userName || "",
|
||||
gender: props.info.gender || "",
|
||||
idCardNo: UseDecodeIdCard(props.info.idCardNo) || "",
|
||||
administrativePosition,
|
||||
administrativePositionName: props.info.administrativePositionName || administrativePosition,
|
||||
administrativeLevel,
|
||||
administrativeLevelName: props.info.administrativeLevelName || administrativeLevel,
|
||||
contactMobilePhone: props.info.contactMobilePhone || props.info.contactPhone || "",
|
||||
});
|
||||
if (success) {
|
||||
message.success("发送成功");
|
||||
|
|
|
|||
|
|
@ -1,11 +1,39 @@
|
|||
import { Connect } from "@cqsjjb/jjb-dva-runtime";
|
||||
import { Button, Space } from "antd";
|
||||
import { Button, Space, Tooltip } from "antd";
|
||||
import { useEffect, useState } from "react";
|
||||
import FormBuilder from "zy-react-library/components/FormBuilder";
|
||||
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
|
||||
import { getLabelName } from "zy-react-library/utils";
|
||||
import { NS_ENTERPRISE_PLAN, NS_RESUE } from "~/enumerate/namespace";
|
||||
|
||||
const twoLineTextStyle = {
|
||||
display: "-webkit-box",
|
||||
flex: 1,
|
||||
minWidth: 0,
|
||||
overflow: "hidden",
|
||||
textOverflow: "ellipsis",
|
||||
wordBreak: "break-all",
|
||||
WebkitBoxOrient: "vertical",
|
||||
WebkitLineClamp: 2,
|
||||
};
|
||||
|
||||
const planInfoRowStyle = {
|
||||
display: "flex",
|
||||
alignItems: "flex-start",
|
||||
};
|
||||
|
||||
const planInfoLabelStyle = {
|
||||
flex: "none",
|
||||
};
|
||||
|
||||
function TwoLineTooltipText({ text }) {
|
||||
return (
|
||||
<Tooltip title={text}>
|
||||
<span style={twoLineTextStyle}>{text}</span>
|
||||
</Tooltip>
|
||||
);
|
||||
}
|
||||
|
||||
function SelectEmergencyPlan(props) {
|
||||
const [form] = FormBuilder.useForm();
|
||||
|
||||
|
|
@ -138,13 +166,13 @@ function SelectEmergencyPlan(props) {
|
|||
: (
|
||||
<div style={{ height: 144 }}>
|
||||
<div>
|
||||
<div>
|
||||
<span>预案名称:</span>
|
||||
<span>{info.planName}</span>
|
||||
<div style={planInfoRowStyle}>
|
||||
<span style={planInfoLabelStyle}>预案名称:</span>
|
||||
<TwoLineTooltipText text={info.planName} />
|
||||
</div>
|
||||
<div>
|
||||
<span>响应级别:</span>
|
||||
<span>{info.responseLevelName}</span>
|
||||
<div style={planInfoRowStyle}>
|
||||
<span style={planInfoLabelStyle}>响应级别:</span>
|
||||
<TwoLineTooltipText text={info.responseLevelName} />
|
||||
</div>
|
||||
</div>
|
||||
<div style={{ textAlign: "center", marginTop: 16 }}>
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ function Command(props) {
|
|||
<Cesium urlState={urlState} />
|
||||
</div>
|
||||
<div style={{ width: 360 }}>
|
||||
<NonContingencyInstructions id={urlState.id} planId={urlState.planId} getCommandEvent={getCommandEvent} />
|
||||
<NonContingencyInstructions id={urlState.id} planId={urlState.planId} planInfo={urlState} getCommandEvent={getCommandEvent} />
|
||||
<EventHandlingRecords id={urlState.id} planId={urlState.planId} />
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import Table from "zy-react-library/components/Table";
|
|||
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
|
||||
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
|
||||
import useTable from "zy-react-library/hooks/useTable";
|
||||
import { getLabelName } from "zy-react-library/utils";
|
||||
import { COMMAND_STATUS_ENUM } from "~/enumerate/constant";
|
||||
import { NS_RESUE } from "~/enumerate/namespace";
|
||||
|
||||
function RescueRecord(props) {
|
||||
|
|
@ -50,7 +52,12 @@ function RescueRecord(props) {
|
|||
dataIndex: "feedbackImageUrl",
|
||||
render: (_, record) => (<TooltipPreviewImg files={record.feedbackImageUrl ? record.feedbackImageUrl.split(",") : []} />),
|
||||
},
|
||||
{ title: "完成状态", dataIndex: "commandStatus" },
|
||||
{ title: "完成状态", dataIndex: "commandStatus", render: (_, record) => (
|
||||
getLabelName({
|
||||
list: COMMAND_STATUS_ENUM,
|
||||
status: record.commandStatus,
|
||||
})
|
||||
) },
|
||||
]}
|
||||
{...executionRecordTableProps}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ function Add(props) {
|
|||
{
|
||||
name: "wellType",
|
||||
label: "类型",
|
||||
required: false,
|
||||
render: (
|
||||
<DictionarySelect
|
||||
dictValue="drainageWellType"
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./facilitiesEquipment/list?id=${record.id}&corpinfoId=${query.corpinfoId}`);
|
||||
props.history.push(`./facilitiesEquipment/list?id=${record.id}&corpinfoId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
查看设施设备
|
||||
|
|
@ -127,7 +127,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./rescueEquipment/list?id=${record.id}&corpinfoId=${query.corpinfoId}`);
|
||||
props.history.push(`./rescueEquipment/list?id=${record.id}&corpinfoId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
查看救援装备
|
||||
|
|
@ -137,7 +137,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./material/list?id=${record.id}&corpinfoId=${query.corpinfoId}`);
|
||||
props.history.push(`./material/list?id=${record.id}&corpinfoId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
查看物资
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ function Institutional(props) {
|
|||
<Divider orientation="left">机构列表</Divider>
|
||||
<Search
|
||||
options={[
|
||||
{ name: "orgName", label: "机构名称" },
|
||||
{ name: "likeOrgName", label: "机构名称" },
|
||||
]}
|
||||
labelCol={{ span: 8 }}
|
||||
form={form}
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ function DrillScene(props) {
|
|||
<Divider orientation="left">演练场景列表</Divider>
|
||||
<Search
|
||||
options={[
|
||||
{ name: "drillScenario", label: "演练场景" },
|
||||
{ name: "likeDrillScenario", label: "演练场景" },
|
||||
]}
|
||||
labelCol={{ span: 8 }}
|
||||
form={form}
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./view?id=${record.id}&corpId=${query.corpinfoId}`);
|
||||
props.history.push(`./view?id=${record.id}&corpId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
查看
|
||||
|
|
@ -129,7 +129,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./add?id=${record.id}`);
|
||||
props.history.push(`./add?id=${record.id}&corpId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
编辑
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ function View(props) {
|
|||
useStorageQueryCriteria: false,
|
||||
});
|
||||
const { tableProps: organizationPersonnelTableProps } = useTable(props["emergencyExerciseOrganizationPersonnelList"], {
|
||||
params: { likeDrillId: query.id },
|
||||
params: { likeDrillId: query.id, corpId: query.corpId },
|
||||
useStorageQueryCriteria: false,
|
||||
});
|
||||
const { tableProps: contentTableProps } = useTable(props["emergencyExerciseContentList"], {
|
||||
|
|
@ -31,7 +31,7 @@ function View(props) {
|
|||
useStorageQueryCriteria: false,
|
||||
});
|
||||
const { tableProps: scenarioTableProps } = useTable(props["emergencyExerciseScenarioList"], {
|
||||
params: { likeDrillId: query.id },
|
||||
params: { likeDrillId: query.id, corpId: query.corpId },
|
||||
useStorageQueryCriteria: false,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ function List(props) {
|
|||
|
||||
const { tableProps, getData } = useTable(props["emergencyPlanList"], {
|
||||
form,
|
||||
params: { corpId: query.corpinfoId },
|
||||
params: { corpId: query.corpinfoId, auditFlag: props.isRecord ? 2 : "" },
|
||||
});
|
||||
|
||||
const onDelete = (record) => {
|
||||
|
|
|
|||
|
|
@ -115,26 +115,26 @@ function Add(props) {
|
|||
{
|
||||
key: "gradeResponse",
|
||||
label: "分级响应",
|
||||
children: (<GradeResponse planId={urlState.planId} />),
|
||||
children: (<GradeResponse planId={urlState.planId} corpId={query.corpId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
},
|
||||
{
|
||||
key: "organizationStructure",
|
||||
label: "组织结构",
|
||||
children: (<OrganizationStructure planId={urlState.planId} />),
|
||||
children: (<OrganizationStructure planId={urlState.planId} corpId={query.corpId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
},
|
||||
{
|
||||
key: "planResources",
|
||||
label: "预案资源",
|
||||
children: (<PlanResources planId={urlState.planId} />),
|
||||
children: (<PlanResources planId={urlState.planId} corpId={query.corpId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
destroyOnHidden: true,
|
||||
},
|
||||
{
|
||||
key: "planInstructions",
|
||||
label: "预案指令",
|
||||
children: (<PlanInstructions planId={urlState.planId} />),
|
||||
children: (<PlanInstructions planId={urlState.planId} corpId={query.corpId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
destroyOnHidden: true,
|
||||
},
|
||||
|
|
@ -144,6 +144,7 @@ function Add(props) {
|
|||
children: (
|
||||
<PlanText
|
||||
planId={urlState.planId}
|
||||
corpId={query.corpId}
|
||||
setUrlState={setUrlState}
|
||||
basicInfo={basicInfo}
|
||||
getBasicInfo={getBasicInfo}
|
||||
|
|
@ -154,7 +155,7 @@ function Add(props) {
|
|||
{
|
||||
key: "planAttachments",
|
||||
label: "预案附件",
|
||||
children: (<PlanAttachments planId={urlState.planId} />),
|
||||
children: (<PlanAttachments planId={urlState.planId}corpId={query.corpId} />),
|
||||
disabled: subordinateTabDisabled,
|
||||
},
|
||||
]}
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`./view?id=${record.id}&corpId=${query.corpinfoId}`);
|
||||
props.history.push(`./view?id=${record.id}&corpId=${query.corpinfoId ? query.corpinfoId : ""}`);
|
||||
}}
|
||||
>
|
||||
查看
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ function List(props) {
|
|||
});
|
||||
|
||||
return (
|
||||
<Page headerTitle="查看">
|
||||
<Page isShowAllAction={false}>
|
||||
<Search
|
||||
options={[
|
||||
{ name: "corpName", label: "公司名称" },
|
||||
|
|
|
|||
|
|
@ -28,12 +28,12 @@ function List(props) {
|
|||
{ title: "公司名称", dataIndex: "corpName" },
|
||||
{
|
||||
title: "救援次数",
|
||||
dataIndex: "eventReportCount",
|
||||
dataIndex: "isRescueExecutedCount",
|
||||
render: (_, record) => (
|
||||
permissionButtonByStatistics({
|
||||
permission: props.permission("jgd-rescue"),
|
||||
url: `./RescueList?corpinfoId=${record.corpinfoId}`,
|
||||
text: record.eventReportCount,
|
||||
text: record.isRescueExecutedCount,
|
||||
history: props.history,
|
||||
})
|
||||
),
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ function List(props) {
|
|||
const { tableProps, getData } = useTable(props["eventReportList"], {
|
||||
form,
|
||||
usePermission: false,
|
||||
params: { isEventOrRescue: 2, corpId: query.corpinfoId },
|
||||
params: { corpId: query.corpinfoId, isEventOrRescue: 2 },
|
||||
});
|
||||
|
||||
return (
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import ListPage from "~/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/List";
|
||||
|
||||
function List(props) {
|
||||
return (<ListPage processStatus={1} isRecord headerTitle="企业预案" {...props} />);
|
||||
return (<ListPage processStatus={4} isRecord headerTitle="企业预案" {...props} />);
|
||||
}
|
||||
|
||||
export default List;
|
||||
|
|
|
|||
Loading…
Reference in New Issue