zcloud_gbs
/
zcloud-gbs-emergencyRescue-react
15
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改BUG

master
853931625@qq.com 2026-06-13 15:21:37 +08:00
parent edb35f65cc
commit 7eff09c05c
57 changed files with 338 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jjb.config.js
View File

@ -20,7 +20,7 @@ module.exports = {
},
},
// 应用唯一标识符
appIdentifier: "emergencyRescue-h5",
appIdentifier: "emergencyRescue",
// 应用上下文注入全局变量
contextInject: {
// 应用Key

2
package.json
View File

@ -33,7 +33,7 @@
"lodash-es": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"zy-react-library": "^1.3.14"
"zy-react-library": "^1.3.17"
},
"devDependencies": {
"@antfu/eslint-config": "^5.4.1",

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyAddressBook/Member/List/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, message, Modal, Space } from "antd";
import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
@ -277,7 +277,7 @@ const ViewModalComponent = (props) => {
<Descriptions
bordered
column={1}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "姓名", children: info.personName },
{ label: "性别", children: info.genderName },

65
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueExpert/Add/index.js
View File

@ -42,9 +42,9 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.expertEmergencyRescueExpert.expertEmergencyRescueExpertLoading}
useAutoGenerateRequired={false}
options={[
{ name: "expertName", label: "专家姓名", rules: [{ required: true, message: "请输入专家姓名" }] },
{ name: "expertName", label: "专家姓名" },
{
name: "gender",
label: "性别",
@ -56,13 +56,15 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "genderName", label: "性别名称", onlyForLabel: true },
{ name: "idCardNo", label: "身份证号", rules: [{ pattern: ID_NUMBER, message: "请输入正确的身份证号" }] },
{ name: "birthDate", label: "出生日期", render: FORM_ITEM_RENDER_ENUM.DATE },
{ name: "genderName", required: false, label: "性别名称", onlyForLabel: true },
{ name: "idCardNo", required: false, label: "身份证号", rules: [{ pattern: ID_NUMBER, message: "请输入正确的身份证号" }] },
{ name: "birthDate", required: false, label: "出生日期", render: FORM_ITEM_RENDER_ENUM.DATE },
{
name: "expertType",
label: "专家类型",
required: false,
render: (
<DictionarySelect
dictValue="emergencyRescueExpertType"
@ -76,6 +78,7 @@ function Add(props) {
{
name: "expertSecurityLevel",
label: "专家密级",
required: false,
render: (
<DictionarySelect
dictValue="emergencyRescueExpertLevel"
@ -86,11 +89,12 @@ function Add(props) {
),
},
{ name: "expertSecurityLevelName", label: "专家密级名称", onlyForLabel: true },
{ name: "professionalTitle", label: "职称" },
{ name: "professionalType", label: "专业类型" },
{ name: "professionalTitle", required: false, label: "职称" },
{ name: "professionalType", required: false, label: "专业类型" },
{
name: "nation",
label: "民族",
required: false,
render: (
<BasicSelect
data={nation}
@ -105,6 +109,7 @@ function Add(props) {
{
name: "politicalStatus",
label: "政治面貌",
required: false,
render: (
<DictionarySelect
dictValue="zhengzhimianmao"
@ -118,6 +123,7 @@ function Add(props) {
{
name: "highestEducation",
label: "最高学历",
required: false,
render: (
<DictionarySelect
dictValue="wenhuachengdu"
@ -128,16 +134,17 @@ function Add(props) {
),
},
{ name: "highestEducationName", label: "最高学历名称", onlyForLabel: true },
{ name: "workStartDate", label: "参加工作时间", render: FORM_ITEM_RENDER_ENUM.DATE },
{ name: "officePhone", label: "办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的办公电话" }] },
{ name: "homePhone", label: "家庭电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的家庭电话" }] },
{ name: "mobilePhone", label: "移动电话", rules: [{ pattern: PHONE, message: "请输入正确的移动电话" }] },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }] },
{ name: "email", label: "电子邮箱", rules: [{ type: "email", message: "请输入正确的电子邮箱" }] },
{ name: "healthStatus", label: "健康状况" },
{ name: "workStartDate", label: "参加工作时间", required: false, render: FORM_ITEM_RENDER_ENUM.DATE },
{ name: "officePhone", label: "办公电话", required: false, rules: [{ pattern: TEL_PHONE, message: "请输入正确的办公电话" }] },
{ name: "homePhone", label: "家庭电话", required: false, rules: [{ pattern: TEL_PHONE, message: "请输入正确的家庭电话" }] },
{ name: "mobilePhone", label: "移动电话", required: false, rules: [{ pattern: PHONE, message: "请输入正确的移动电话" }] },
{ name: "fax", label: "传真", required: false, rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }] },
{ name: "email", label: "电子邮箱", required: false, rules: [{ type: "email", message: "请输入正确的电子邮箱" }] },
{ name: "healthStatus", label: "健康状况", required: false },
{
name: "administrativePosition",
label: "行政职务",
required: false,
render: (
<DictionarySelect
dictValue="administrativePosition"
@ -148,21 +155,21 @@ function Add(props) {
),
},
{ name: "administrativePositionName", label: "行政职务名称", onlyForLabel: true },
{ name: "expertGroupPosition", label: "专家组职务" },
{ name: "homeAddress", label: "家庭住址" },
{ name: "nativePlace", label: "籍贯" },
{ name: "registeredResidence", label: "户口所在地" },
{ name: "mailingAddress", label: "通讯地址" },
{ name: "graduatedSchool", label: "毕业院校" },
{ name: "workUnit", label: "工作单位" },
{ name: "unitSupervisorDepartment", label: "单位主管部门" },
{ name: "unitPostalCode", label: "单位邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的单位邮编" }] },
{ name: "sortOrder", label: "排序号", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "expertise", label: "专家特长" },
{ name: "mainAchievements", label: "主要成果" },
{ name: "emergencyWorkExperience", label: "应急工作经历" },
{ name: "workResume", label: "工作简历概述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "expertGroupPosition", required: false, label: "专家组职务" },
{ name: "homeAddress", required: false, label: "家庭住址" },
{ name: "nativePlace", required: false, label: "籍贯" },
{ name: "registeredResidence", required: false, label: "户口所在地" },
{ name: "mailingAddress", required: false, label: "通讯地址" },
{ name: "graduatedSchool", required: false, label: "毕业院校" },
{ name: "workUnit", required: false, label: "工作单位" },
{ name: "unitSupervisorDepartment", required: false, label: "单位主管部门" },
{ name: "unitPostalCode", required: false, label: "单位邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的单位邮编" }] },
{ name: "sortOrder", required: false, label: "排序号", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "expertise", required: false, label: "专家特长" },
{ name: "mainAchievements", required: false, label: "主要成果" },
{ name: "emergencyWorkExperience", required: false, label: "应急工作经历" },
{ name: "workResume", required: false, label: "工作简历概述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", required: false, label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
]}
form={form}
onFinish={onSubmit}

6
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueExpert/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -12,7 +12,7 @@ function View(props) {
const getData = async () => {
const { data } = await props["expertEmergencyRescueExpertInfo"]({ id: query.id });
setInfo(data);
setInfo(data || {});
};
useEffect(() => {
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "专家姓名", children: info.expertName },
{ label: "性别", children: info.genderName },

44
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueExpertGroup/Add/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { message } from "antd";
import { useEffect } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
@ -40,12 +40,13 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.expertEmergencyRescueExpertGroup.expertEmergencyRescueExpertGroupLoading}
useAutoGenerateRequired={false}
options={[
{ name: "groupName", label: "专家组名称", rules: [{ required: true, message: "请输入专家组名称" }] },
{ name: "groupName", label: "专家组名称" },
{
name: "groupType",
label: "专家组类型",
required: false,
render: (
<DictionarySelect
dictValue="emergencyRescueExpertGroupType"
@ -59,6 +60,7 @@ function Add(props) {
{
name: "groupLevel",
label: "专家组级别",
required: false,
render: (
<DictionarySelect
dictValue="emergencyRescueExpertGroupLevel"
@ -69,24 +71,24 @@ function Add(props) {
),
},
{ name: "groupLevelName", label: "专家组级别名称", onlyForLabel: true },
{ name: "contactPhone", label: "联系电话", rules: [{ pattern: PHONE, message: "请输入正确的联系电话" }] },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }] },
{ name: "memberCount", label: "人数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "establishUnit", label: "组建单位" },
{ name: "establishUnitPostalCode", label: "组件单位邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的组件单位邮编" }] },
{ name: "establishUnitAddress", label: "组建单位地址", span: 24 },
{ name: "leaderName", label: "负责人" },
{ name: "leaderOfficePhone", label: "负责人办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人办公电话" }] },
{ name: "leaderMobilePhone", label: "负责人移动电话", rules: [{ pattern: PHONE, message: "请输入正确的负责人移动电话" }] },
{ name: "leaderHomePhone", label: "负责人住宅电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人住宅电话" }] },
{ name: "contactPerson", label: "联系人" },
{ name: "contactOfficePhone", label: "联系人办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }] },
{ name: "contactMobilePhone", label: "联系人移动电话", rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }] },
{ name: "contactHomePhone", label: "联系人住宅电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }] },
{ name: "contactEmail", label: "联系人电子邮箱", rules: [{ type: "email", message: "请输入正确的联系人电子邮箱" }] },
{ name: "sortOrder", label: "排序号", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "groupIntroduction", label: "专家组介绍", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "contactPhone", label: "联系电话", rules: [{ pattern: PHONE, message: "请输入正确的联系电话" }], required: false },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }], required: false },
{ name: "memberCount", label: "人数", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "establishUnit", label: "组建单位", required: false },
{ name: "establishUnitPostalCode", label: "组件单位邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的组件单位邮编" }], required: false },
{ name: "establishUnitAddress", label: "组建单位地址", span: 24, required: false },
{ name: "leaderName", label: "负责人", required: false },
{ name: "leaderOfficePhone", label: "负责人办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人办公电话" }], required: false },
{ name: "leaderMobilePhone", label: "负责人移动电话", rules: [{ pattern: PHONE, message: "请输入正确的负责人移动电话" }], required: false },
{ name: "leaderHomePhone", label: "负责人住宅电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人住宅电话" }], required: false },
{ name: "contactPerson", label: "联系人", required: false },
{ name: "contactOfficePhone", label: "联系人办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }], required: false },
{ name: "contactMobilePhone", label: "联系人移动电话", rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }], required: false },
{ name: "contactHomePhone", label: "联系人住宅电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }], required: false },
{ name: "contactEmail", label: "联系人电子邮箱", rules: [{ type: "email", message: "请输入正确的联系人电子邮箱" }], required: false },
{ name: "sortOrder", label: "排序号", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "groupIntroduction", label: "专家组介绍", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
]}
form={form}
onFinish={onSubmit}

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueExpertGroup/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "专家组名称", children: info.groupName },
{ label: "专家组类型", children: info.groupTypeName },

59
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/Add/index.js
View File

@ -34,7 +34,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "expertEmergencyRescueTeamUpdate" : "expertEmergencyRescueTeamAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {
@ -47,13 +47,13 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.expertEmergencyRescueTeam.expertEmergencyRescueTeamLoading}
useAutoGenerateRequired={false}
options={[
{ name: "teamName", label: "救援队名称", rules: [{ required: true, message: "请输入救援队名称" }] },
{ name: "address", label: "地址" },
{ name: "teamName", label: "救援队名称" },
{ name: "address", label: "地址", required: false },
{
name: "teamType",
label: "类型",
render: (
<DictionarySelect
dictValue="emergencyRescueTeamType"
@ -62,6 +62,7 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "teamTypeName", label: "类型名称", onlyForLabel: true },
{
@ -75,6 +76,7 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "teamLevelName", label: "级别名称", onlyForLabel: true },
{
@ -88,9 +90,10 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "securityLevelName", label: "密级名称", onlyForLabel: true },
{ name: "officePhone", label: "办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的电话号码" }] },
{ name: "officePhone", label: "办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的电话号码" }], required: false },
{
name: "regionCode",
label: "所属区域",
@ -102,16 +105,17 @@ function Add(props) {
}}
/>
),
required: false,
span: 24,
},
{ name: "regionCodeName", label: "所属区域名称", onlyForLabel: true },
{ key: "map", customizeRender: true, render: (<Map type="cesium" />), span: 24 },
{ name: "leaderName", label: "负责人", rules: [{ required: true, message: "请输入负责人" }] },
{ name: "leaderName", label: "负责人" },
{
name: "leaderOfficePhone",
label: "负责人办公电话",
rules: [
{ required: true, message: "请输入负责人办公电话" },
{ pattern: TEL_PHONE, message: "请输入正确的电话号码" },
],
},
@ -119,36 +123,43 @@ function Add(props) {
name: "leaderMobilePhone",
label: "负责人移动电话",
rules: [{ pattern: PHONE, message: "请输入正确的电话号码" }],
required: false,
},
{
name: "leaderHomePhone",
label: "负责人住宅电话",
rules: [{ pattern: TEL_PHONE, message: "请输入正确的电话号码" }],
required: false,
},
{ name: "contactPerson", label: "联系人" },
{ name: "contactPerson", label: "联系人", required: false },
{
name: "contactOfficePhone",
label: "联系人办公电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的电话号码" }],
},
{
name: "contactMobilePhone",
label: "联系人移动电话",
rules: [{ pattern: PHONE, message: "请输入正确的电话号码" }],
required: false,
},
{
name: "contactHomePhone",
label: "联系人住宅电话",
rules: [{ pattern: TEL_PHONE, message: "请输入正确的电话号码" }],
required: false,
},
{
name: "contactEmail",
label: "联系人邮箱",
rules: [{ type: "email", message: "请输入正确的邮箱地址" }],
required: false,
span: 24,
},
{ name: "postalCode", label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }] },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真号码" }] },
{ name: "postalCode", label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }], required: false },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真号码" }], required: false },
{
name: "supervisorUnit",
label: "主管单位",
@ -158,16 +169,17 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "supervisorUnitName", label: "主管单位名称", onlyForLabel: true },
{ name: "supervisorUnitAddress", label: "主管单位地址" },
{ name: "totalPeople", label: "总人数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "establishDate", label: "成立时间", render: FORM_ITEM_RENDER_ENUM.DATE },
{ name: "emergencyCommunication", label: "应急通讯方式", span: 24 },
{ name: "mainDuty", label: "主要职责", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "mainEquipmentDesc", label: "主要装备描述", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "specialtyDesc", label: "专长描述", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "rescueExperience", label: "应急救援经历", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "supervisorUnitAddress", label: "主管单位地址", required: false },
{ name: "totalPeople", label: "总人数", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "establishDate", label: "成立时间", render: FORM_ITEM_RENDER_ENUM.DATE, required: false },
{ name: "emergencyCommunication", label: "应急通讯方式", span: 24, required: false },
{ name: "mainDuty", label: "主要职责", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, required: false },
{ name: "mainEquipmentDesc", label: "主要装备描述", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, required: false },
{ name: "specialtyDesc", label: "专长描述", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, required: false },
{ name: "rescueExperience", label: "应急救援经历", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, required: false },
{
name: "qualificationLevel",
label: "资质等级",
@ -179,13 +191,14 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "qualificationLevelName", label: "资质等级名称", onlyForLabel: true },
{ name: "estimatedPrepareTime", label: "预计准备时间", render: FORM_ITEM_RENDER_ENUM.DATE },
{ name: "assemblyLocation", label: "集合出发地点" },
{ name: "selfProvidedVehicle", label: "自备交通工具" },
{ name: "needBackupSupport", label: "需要后备支援", span: 24 },
{ name: "remarks", label: "备注", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "estimatedPrepareTime", label: "预计准备时间", render: FORM_ITEM_RENDER_ENUM.DATE, required: false },
{ name: "assemblyLocation", label: "集合出发地点", required: false },
{ name: "selfProvidedVehicle", label: "自备交通工具", required: false },
{ name: "needBackupSupport", label: "需要后备支援", span: 24, required: false },
{ name: "remarks", label: "备注", span: 24, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, required: false },
]}
form={form}
onFinish={onSubmit}

14
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/EmergencyRescuePersonnel/Add/index.js
View File

@ -1,5 +1,5 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { message } from "antd";
import { InputNumber, message } from "antd";
import { useEffect } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
import Page from "zy-react-library/components/Page";
@ -56,7 +56,17 @@ function Add(props) {
),
},
{ name: "genderName", label: "性别名称", onlyForLabel: true },
{ name: "age", label: "年龄", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{
name: "age",
label: "年龄",
render: (
<InputNumber
min={1}
precision={0}
style={{ width: "100%" }}
/>
),
},
{
name: "mobilePhone",
label: "手机号",

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/EmergencyRescuePersonnel/List/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal, Space } from "antd";
import { useState } from "react";
import AddIcon from "zy-react-library/components/Icon/AddIcon";
@ -18,7 +18,7 @@ function List(props) {
const { tableProps, getData } = useTable(props["expertEmergencyRescuePersonnelList"], {
form,
params: { likeTeamId: query.id },
params: { likeTeamId: query.id, corpId: query.corpinfoId },
});
const onDelete = (record) => {

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/EmergencyRescuePersonnel/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "姓名", children: info.personnelName },
{ label: "性别", children: info.genderName },

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/List/index.js
View File

@ -1,4 +1,4 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal, Space } from "antd";
import { useState } from "react";
@ -126,7 +126,7 @@ function List(props) {
<Button
type="link"
onClick={() => {
props.history.push(`./emergencyRescuePersonnel/list?id=${record.id}`);
props.history.push(`./emergencyRescuePersonnel/list?id=${record.id}&corpinfoId=${query.corpinfoId}`);
}}
>
应急救援人列表

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyExpertTeam/ExpertEmergencyRescueTeam/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "救援队名称", children: info.teamName },
{ label: "地址", children: info.address },

15
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/Add/index.js
View File

@ -33,7 +33,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "enterpriseEmergencyOrganizationUpdate" : "enterpriseEmergencyOrganizationAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {
@ -46,12 +46,13 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.enterpriseEmergencyOrganization.enterpriseEmergencyOrganizationLoading}
useAutoGenerateRequired={false}
options={[
{ name: "agencyName", label: "机构名称", rules: [{ required: true, message: "请输入机构名称" }], span: 24 },
{ name: "agencyName", label: "机构名称", span: 24 },
{
name: "agencyType",
label: "机构类型",
required: false,
render: (
<DictionarySelect
dictValue="enterpriseEmergencyOrganizationType"
@ -65,6 +66,7 @@ function Add(props) {
{
name: "agencyLevel",
label: "机构级别",
required: false,
render: (
<DictionarySelect
dictValue="enterpriseEmergencyOrganizationLevel"
@ -75,15 +77,16 @@ function Add(props) {
),
},
{ name: "agencyLevelName", label: "机构级别名称", onlyForLabel: true },
{ name: "agencyDuty", label: "机构职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "agencyDuty", label: "机构职责", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{
name: "dutyPhone",
label: "值班电话",
rules: [{ required: true, message: "请输入值班电话" }, { pattern: TEL_PHONE, message: "请输入正确的值班电话" }],
rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }],
},
{
name: "regionCode",
label: "所属区域",
required: false,
render: (
<AreaCascader
changeOnSelect
@ -94,7 +97,7 @@ function Add(props) {
),
},
{ name: "regionCodeName", label: "所属区域名称", onlyForLabel: true },
{ name: "companyName", label: "所属单位", span: 24 },
{ name: "companyName", label: "所属单位", required: false, span: 24 },
{ key: "map", customizeRender: true, render: (<Map type="cesium" />), span: 24 },
]}
form={form}

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyOrganization/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "机构名称", children: info.agencyName, span: 2 },
{ label: "机构类型", children: info.agencyTypeName },

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyManagementOrganization/EnterpriseEmergencyPersonnel/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "所属机构", children: info.agencyName },
{ label: "用户", children: info.userName },

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyRescueTeam/List/index.js
View File

@ -1,4 +1,4 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal, Space } from "antd";
import { useState } from "react";
@ -111,7 +111,7 @@ function List(props) {
fixed: "right",
render: (_, record) => (
<Space>
{props.permission("qyd-enterprise-emergency-rescue-team-view") && (
{props.permission(props.viewBtn || "qyd-enterprise-emergency-rescue-team-view") && (
<Button
type="link"
onClick={() => {

4
src/pages/Container/Enterprise/EmergencyOrganization/EmergencyRescueTeam/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "队伍名称", children: info.teamName },
{ label: "队伍类别", children: info.teamCategoryName },

49
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/Add/index.js
View File

@ -34,7 +34,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "communicationGuaranteeOrganizationUpdate" : "communicationGuaranteeOrganizationAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {
@ -47,12 +47,13 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.communicationGuaranteeOrganization.communicationGuaranteeOrganizationLoading}
useAutoGenerateRequired={false}
options={[
{ name: "agencyName", label: "通讯机构名称", rules: [{ required: true, message: "请输入通讯机构名称" }] },
{ name: "agencyName", label: "通讯机构名称" },
{
name: "agencyType",
label: "通讯机构类型",
required: false,
render: (
<DictionarySelect
dictValue="communicationGuaranteeOrganizationType"
@ -63,14 +64,15 @@ function Add(props) {
),
},
{ name: "agencyTypeName", label: "通讯机构类型名称", onlyForLabel: true },
{ name: "agencyLevel", label: "通讯机构级别" },
{ name: "address", label: "地址" },
{ name: "postalCode", label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }] },
{ name: "dutyPhone", label: "值班电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }] },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }] },
{ name: "agencyLevel", label: "通讯机构级别", required: false },
{ name: "address", label: "地址", required: false },
{ name: "postalCode", label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }], required: false },
{ name: "dutyPhone", label: "值班电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }], required: false },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }], required: false },
{
name: "regionCode",
label: "所属区域",
required: false,
render: (
<AreaCascader
changeOnSelect
@ -82,17 +84,17 @@ function Add(props) {
},
{ name: "regionCodeName", label: "所属区域名称", onlyForLabel: true },
{ key: "map", customizeRender: true, render: (<Map type="cesium" />), span: 24 },
{ name: "emergencyCommunicationVehicleCount", label: "应急通讯车数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "emergencyGeneratorVehicleCount", label: "应急发电车数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "satellitePhoneCount", label: "卫星电话数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "baseStationTotalCount", label: "基站总数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "emergencyCommunicationMode", label: "应急通讯方式", span: 24 },
{ name: "leaderName", label: "负责人", rules: [{ required: true, message: "请输入负责人" }] },
{ name: "emergencyCommunicationVehicleCount", label: "应急通讯车数", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "emergencyGeneratorVehicleCount", label: "应急发电车数", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "satellitePhoneCount", label: "卫星电话数", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "baseStationTotalCount", label: "基站总数", render: FORM_ITEM_RENDER_ENUM.INTEGER, required: false },
{ name: "emergencyCommunicationMode", label: "应急通讯方式", span: 24, required: false },
{ name: "leaderName", label: "负责人" },
{
name: "leaderOfficePhone",
label: "负责人办公电话",
rules: [
{ required: true, message: "请输入负责人办公电话" },
{ pattern: TEL_PHONE, message: "请输入正确的负责人办公电话" },
],
},
@ -100,32 +102,38 @@ function Add(props) {
name: "leaderMobilePhone",
label: "负责人移动电话",
rules: [{ pattern: PHONE, message: "请输入正确的负责人移动电话" }],
required: false,
},
{
name: "leaderHomePhone",
label: "负责人住宅电话",
rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人住宅电话" }],
required: false,
},
{ name: "contactPerson", label: "联系人" },
{ name: "contactPerson", label: "联系人", required: false },
{
name: "contactOfficePhone",
label: "联系人办公电话",
rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }],
required: false,
},
{
name: "contactMobilePhone",
label: "联系人移动电话",
rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }],
required: false,
},
{
name: "contactHomePhone",
label: "联系人住宅电话",
rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }],
required: false,
},
{
name: "contactEmail",
label: "联系人邮箱",
rules: [{ type: "email", message: "请输入正确的联系人邮箱" }],
required: false,
span: 24,
},
{
@ -137,12 +145,13 @@ function Add(props) {
}}
/>
),
required: false,
},
{ name: "supervisorUnitName", label: "主管单位名称", onlyForLabel: true },
{ name: "supervisorUnitAddress", label: "主管单位地址" },
{ name: "enterpriseBasicInfo", label: "企业基本情况", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "emergencyCapacityDesc", label: "应急能力描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "supervisorUnitAddress", label: "主管单位地址", required: false },
{ name: "enterpriseBasicInfo", label: "企业基本情况", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
{ name: "emergencyCapacityDesc", label: "应急能力描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
]}
form={form}
onFinish={onSubmit}

4
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/CommunicationGuaranteeOrganization/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "通讯机构名称", children: info.agencyName },
{ label: "通讯机构类型", children: info.agencyTypeName },

49
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/Add/index.js
View File

@ -34,7 +34,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "medicalGuaranteeOrganizationUpdate" : "medicalGuaranteeOrganizationAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {
@ -47,12 +47,13 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.medicalGuaranteeOrganization.medicalGuaranteeOrganizationLoading}
useAutoGenerateRequired={false}
options={[
{ name: "agencyName", label: "医疗机构名称", rules: [{ required: true, message: "请输入医疗机构名称" }] },
{ name: "agencyName", label: "医疗机构名称" },
{
name: "agencyType",
label: "医疗机构类型",
required: false,
render: (
<DictionarySelect
dictValue="medicalGuaranteeOrganizationType"
@ -63,14 +64,15 @@ function Add(props) {
),
},
{ name: "agencyTypeName", label: "医疗机构类型名称", onlyForLabel: true },
{ name: "agencyLevel", label: "医疗机构级别" },
{ name: "address", label: "地址" },
{ name: "postalCode", label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }] },
{ name: "fax", label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }] },
{ name: "dutyPhone", label: "值班电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }] },
{ name: "agencyLevel", required: false, label: "医疗机构级别" },
{ name: "address", required: false, label: "地址" },
{ name: "postalCode", required: false, label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }] },
{ name: "fax", required: false, label: "传真", rules: [{ pattern: TEL_PHONE, message: "请输入正确的传真" }] },
{ name: "dutyPhone", required: false, label: "值班电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }] },
{
name: "regionCode",
label: "所属区域",
required: false,
render: (
<AreaCascader
changeOnSelect
@ -82,49 +84,54 @@ function Add(props) {
},
{ name: "regionCodeName", label: "所属区域名称", onlyForLabel: true },
{ key: "map", customizeRender: true, render: (<Map type="cesium" />), span: 24 },
{ name: "bedCount", label: "病床数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "doctorCount", label: "医生数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "nurseCount", label: "护士数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "ambulanceCount", label: "急救车辆数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "emergencyCommunication", label: "应急通讯方式", span: 24 },
{ name: "leaderName", label: "负责人", rules: [{ required: true, message: "请输入负责人" }] },
{ name: "bedCount", required: false, label: "病床数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "doctorCount", required: false, label: "医生数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "nurseCount", required: false, label: "护士数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "ambulanceCount", required: false, label: "急救车辆数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "emergencyCommunication", required: false, label: "应急通讯方式", span: 24 },
{ name: "leaderName", label: "负责人" },
{
name: "leaderOfficePhone",
label: "负责人办公电话",
rules: [
{ required: true, message: "请输入负责人办公电话" },
{ pattern: TEL_PHONE, message: "请输入正确的负责人办公电话" },
],
},
{
name: "leaderMobilePhone",
label: "负责人移动电话",
required: false,
rules: [{ pattern: PHONE, message: "请输入正确的负责人移动电话" }],
},
{
name: "leaderHomePhone",
label: "负责人住宅电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人住宅电话" }],
},
{ name: "contactPerson", label: "联系人" },
{ name: "contactPerson", required: false, label: "联系人" },
{
name: "contactOfficePhone",
label: "联系人办公电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }],
},
{
name: "contactMobilePhone",
label: "联系人移动电话",
required: false,
rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }],
},
{
name: "contactHomePhone",
label: "联系人住宅电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }],
},
{
name: "supervisorUnit",
label: "主管单位",
required: false,
render: (
<DepartmentSelectTree onGetLabel={(label) => {
form.setFieldValue("supervisorUnitName", label);
@ -133,11 +140,11 @@ function Add(props) {
),
},
{ name: "supervisorUnitName", label: "主管单位名称", onlyForLabel: true },
{ name: "supervisorUnitAddress", label: "主管单位地址" },
{ name: "features", label: "特色", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "mainMedicalEquipment", label: "主要医疗设备" },
{ name: "anticoagulationTreatmentCount", label: "抗震设防列数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "supervisorUnitAddress", required: false, label: "主管单位地址" },
{ name: "features", label: "特色", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "mainMedicalEquipment", required: false, label: "主要医疗设备" },
{ name: "anticoagulationTreatmentCount", required: false, label: "抗震设防列数", render: FORM_ITEM_RENDER_ENUM.INTEGER },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
]}
form={form}
onFinish={onSubmit}

4
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/MedicalGuaranteeOrganization/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "医疗机构名称", children: info.agencyName },
{ label: "医疗机构类型", children: info.agencyTypeName },

25
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/Add/index.js
View File

@ -32,7 +32,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "technicalSupportGuaranteeOrganizationUpdate" : "technicalSupportGuaranteeOrganizationAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {
@ -45,13 +45,14 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.technicalSupportGuaranteeOrganization.technicalSupportGuaranteeOrganizationLoading}
useAutoGenerateRequired={false}
options={[
{ name: "agencyName", label: "机构名称", rules: [{ required: true, message: "请输入机构名称" }], span: 24 },
{ name: "address", label: "地址" },
{ name: "agencyName", label: "机构名称", span: 24 },
{ name: "address", label: "地址", required: false },
{
name: "regionCode",
label: "所属区域",
required: false,
render: (
<AreaCascader
changeOnSelect
@ -63,14 +64,14 @@ function Add(props) {
},
{ name: "regionCodeName", label: "所属区域名称", onlyForLabel: true },
{ key: "map", customizeRender: true, render: (<Map type="cesium" />), span: 24 },
{ name: "contactPerson", label: "联系人" },
{ name: "contactOfficePhone", label: "联系人办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }] },
{ name: "contactMobilePhone", label: "联系人移动电话", rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }] },
{ name: "contactHomePhone", label: "联系人住宅电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }] },
{ name: "transportMode", label: "运输方式", span: 24 },
{ name: "loadCapacity", label: "载重", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "fuelType", label: "所用燃料", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "contactPerson", label: "联系人", required: false },
{ name: "contactOfficePhone", label: "联系人办公电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }], required: false },
{ name: "contactMobilePhone", label: "联系人移动电话", rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }], required: false },
{ name: "contactHomePhone", label: "联系人住宅电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }], required: false },
{ name: "transportMode", label: "运输方式", span: 24, required: false },
{ name: "loadCapacity", label: "载重", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
{ name: "fuelType", label: "所用燃料", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24, required: false },
]}
form={form}
onFinish={onSubmit}

4
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TechnicalSupportGuaranteeOrganization/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "机构名称", children: info.agencyName, span: 2 },
{ label: "地址", children: info.address },

42
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/Add/index.js
View File

@ -34,7 +34,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "transportGuaranteeOrganizationUpdate" : "transportGuaranteeOrganizationAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {
@ -47,12 +47,13 @@ function Add(props) {
<Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
<FormBuilder
loading={props.transportGuaranteeOrganization.transportGuaranteeOrganizationLoading}
useAutoGenerateRequired={false}
options={[
{ name: "agencyName", label: "运输机构名称", rules: [{ required: true, message: "请输入运输机构名称" }] },
{ name: "agencyName", label: "运输机构名称" },
{
name: "agencyType",
label: "运输机构类型",
required: false,
render: (
<DictionarySelect
dictValue="transportGuaranteeOrganizationType"
@ -63,14 +64,15 @@ function Add(props) {
),
},
{ name: "agencyTypeName", label: "运输机构类型名称", onlyForLabel: true },
{ name: "agencyLevel", label: "运输机构级别" },
{ name: "address", label: "地址" },
{ name: "postalCode", label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }] },
{ name: "dutyPhone", label: "值班电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }] },
{ name: "emergencyTransportMode", label: "应急运输方式" },
{ name: "agencyLevel", required: false, label: "运输机构级别" },
{ name: "address", required: false, label: "地址" },
{ name: "postalCode", required: false, label: "邮编", rules: [{ pattern: POSTAL_CODE, message: "请输入正确的邮编" }] },
{ name: "dutyPhone", required: false, label: "值班电话", rules: [{ pattern: TEL_PHONE, message: "请输入正确的值班电话" }] },
{ name: "emergencyTransportMode", required: false, label: "应急运输方式" },
{
name: "regionCode",
label: "所属区域",
required: false,
render: (
<AreaCascader
changeOnSelect
@ -82,50 +84,56 @@ function Add(props) {
},
{ name: "regionCodeName", label: "所属区域名称", onlyForLabel: true },
{ key: "map", customizeRender: true, render: (<Map type="cesium" />), span: 24 },
{ name: "leaderName", label: "负责人", rules: [{ required: true, message: "请输入负责人" }] },
{ name: "leaderName", label: "负责人" },
{
name: "leaderOfficePhone",
label: "负责人办公电话",
rules: [
{ required: true, message: "请输入负责人办公电话" },
{ pattern: TEL_PHONE, message: "请输入正确的负责人办公电话" },
],
},
{
name: "leaderMobilePhone",
label: "负责人移动电话",
required: false,
rules: [{ pattern: PHONE, message: "请输入正确的负责人移动电话" }],
},
{
name: "leaderHomePhone",
label: "负责人住宅电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的负责人住宅电话" }],
},
{ name: "contactPerson", label: "联系人" },
{ name: "contactPerson", required: false, label: "联系人" },
{
name: "contactOfficePhone",
label: "联系人办公电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人办公电话" }],
},
{
name: "contactMobilePhone",
label: "联系人移动电话",
required: false,
rules: [{ pattern: PHONE, message: "请输入正确的联系人移动电话" }],
},
{
name: "contactHomePhone",
label: "联系人住宅电话",
required: false,
rules: [{ pattern: TEL_PHONE, message: "请输入正确的联系人住宅电话" }],
},
{
name: "contactEmail",
label: "联系人邮箱",
required: false,
rules: [{ type: "email", message: "请输入正确的联系人邮箱" }],
span: 24,
},
{
name: "supervisorUnit",
label: "主管单位",
required: false,
render: (
<DepartmentSelectTree onGetLabel={(label) => {
form.setFieldValue("supervisorUnitName", label);
@ -134,12 +142,12 @@ function Add(props) {
),
},
{ name: "supervisorUnitName", label: "主管单位名称", onlyForLabel: true },
{ name: "supervisorUnitAddress", label: "主管单位地址" },
{ name: "enterpriseBasicInfo", label: "企业基本情况", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "passengerCapacity", label: "客运能力" },
{ name: "freightCapacity", label: "货运能力" },
{ name: "emergencyCapacityDesc", label: "应急能力描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", label: "备注", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "supervisorUnitAddress", required: false, label: "主管单位地址" },
{ name: "enterpriseBasicInfo", required: false, label: "企业基本情况", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "passengerCapacity", required: false, label: "客运能力" },
{ name: "freightCapacity", required: false, label: "货运能力" },
{ name: "emergencyCapacityDesc", required: false, label: "应急能力描述", render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA, span: 24 },
]}
form={form}
onFinish={onSubmit}

4
src/pages/Container/Enterprise/EmergencyOrganization/ProfessionalGuaranteeOrganization/TransportGuaranteeOrganization/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "运输机构名称", children: info.agencyName },
{ label: "运输机构类型", children: info.agencyTypeName },

4
src/pages/Container/Enterprise/EmergencyRescue/Duty/DutyLog/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -24,7 +24,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "单位名称", children: info.unitName },
{ label: "值班时间", children: `${info.startTime} ~ ${info.endTime}` },

11
src/pages/Container/Enterprise/EmergencyRescue/EmergencyKnowledgeLibrary/Case/List/index.js
View File

@ -1,4 +1,4 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal, Space } from "antd";
import { useEffect, useRef, useState } from "react";
@ -74,7 +74,7 @@ function List(props) {
<Search
labelCol={{ span: 4 }}
options={[
{ name: "title", label: "标题" },
{ name: "likeTitle", label: "标题" },
]}
form={form}
onFinish={getData}
@ -126,6 +126,7 @@ function List(props) {
{(props.isRecord || props.permission("qyd-case-library-download")) && (
<Button
type="link"
disabled={!record.fileId}
onClick={async () => {
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[706], eqForeignKey: record.fileId });
downloadFile({ url: files[0].url, name: files[0].name });
@ -203,7 +204,11 @@ const AddModalComponent = (props) => {
const { data } = await props["emergencyKnowledgeLibraryInfo"]({ id: props.id });
fileIdRef.current = data.fileId;
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[706], eqForeignKey: data.fileId });
let files = [];
if (data.fileId) {
files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[706], eqForeignKey: data.fileId });
}
form.setFieldsValue({
...data,
files,

8
src/pages/Container/Enterprise/EmergencyRescue/EmergencyKnowledgeLibrary/GenerationProcess/List/index.js
View File

@ -73,7 +73,7 @@ function List(props) {
<Search
labelCol={{ span: 4 }}
options={[
{ name: "title", label: "名称" },
{ name: "likeTitle", label: "名称" },
]}
form={form}
onFinish={getData}
@ -125,6 +125,7 @@ function List(props) {
{(props.isRecord || props.permission("qyd-generation-process-download")) && (
<Button
type="link"
disabled={!record.fileId}
onClick={async () => {
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[709], eqForeignKey: record.fileId });
downloadFile({ url: files[0].url, name: files[0].name });
@ -202,7 +203,10 @@ const AddModalComponent = (props) => {
const { data } = await props["emergencyKnowledgeLibraryInfo"]({ id: props.id });
fileIdRef.current = data.fileId;
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[709], eqForeignKey: data.fileId });
let files = [];
if (data.fileId) {
files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[709], eqForeignKey: data.fileId });
}
form.setFieldsValue({
...data,
files,

8
src/pages/Container/Enterprise/EmergencyRescue/EmergencyKnowledgeLibrary/HazardousChemicals/List/index.js
View File

@ -1,4 +1,4 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal, Space } from "antd";
import { useEffect, useRef, useState } from "react";
@ -124,6 +124,7 @@ function List(props) {
{(props.isRecord || props.permission("qyd-hazardous-chemicals-download")) && (
<Button
type="link"
disabled={!record.fileId}
onClick={async () => {
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[708], eqForeignKey: record.fileId });
downloadFile({ url: files[0].url, name: files[0].name });
@ -201,7 +202,10 @@ const AddModalComponent = (props) => {
const { data } = await props["emergencyKnowledgeLibraryInfo"]({ id: props.id });
fileIdRef.current = data.fileId;
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[708], eqForeignKey: data.fileId });
let files = [];
if (data.fileId) {
files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[708], eqForeignKey: data.fileId });
}
form.setFieldsValue({
...data,
files,

7
src/pages/Container/Enterprise/EmergencyRescue/EmergencyKnowledgeLibrary/HazardousGoods/List/index.js
View File

@ -123,6 +123,7 @@ function List(props) {
{(props.isRecord || props.permission("qyd-hazardous-goods-download")) && (
<Button
type="link"
disabled={!record.fileId}
onClick={async () => {
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[707], eqForeignKey: record.fileId });
downloadFile({ url: files[0].url, name: files[0].name });
@ -200,7 +201,11 @@ const AddModalComponent = (props) => {
const { data } = await props["emergencyKnowledgeLibraryInfo"]({ id: props.id });
fileIdRef.current = data.fileId;
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[707], eqForeignKey: data.fileId });
let files = [];
if (data.fileId) {
files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[707], eqForeignKey: data.fileId });
}
form.setFieldsValue({
...data,
files,

4
src/pages/Container/Enterprise/EmergencyRescue/EmergencyReporting/EventReport/List/index.js
View File

@ -19,8 +19,8 @@ function List(props) {
const { tableProps, getData } = useTable(props["eventReportList"], {
form,
transform: formData => ({
occurrenceStartTime: formData.occurrenceTime?.[0],
occurrenceEndTime: formData.occurrenceTime?.[1],
occurrenceStartTime: formData.occurrenceTime?.[0] ? `${formData.occurrenceTime?.[0]} 00:00:00` : "",
occurrenceEndTime: formData.occurrenceTime?.[1] ? `${formData.occurrenceTime?.[1]} 23:59:59` : "",
}),
params: { corpId: query.corpinfoId, isEventOrRescue: 1 },
});

4
src/pages/Container/Enterprise/EmergencyRescue/EmergencyReporting/EventReport/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "接入方式", children: info.accessModeName },
{ label: "机主姓名", children: info.ownerName },

4
src/pages/Container/Enterprise/EmergencyRescue/Rescue/Command/components/Cesium/index.js
View File

@ -1,4 +1,4 @@
import { useEventEmitter, useMount } from "ahooks";
import { useEventEmitter, useMount } from "ahooks";
import { Button, Descriptions, Modal } from "antd";
import { useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
@ -105,7 +105,7 @@ const MarkModal = (props) => {
<Descriptions
bordered
column={1}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "事件标题", children: info.eventTitle },
{ label: "事件类型", children: info.eventType },

4
src/pages/Container/Enterprise/EmergencyRescue/Rescue/RescueRecord/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Divider } from "antd";
import Page from "zy-react-library/components/Page";
import Table from "zy-react-library/components/Table";
@ -25,7 +25,7 @@ function RescueRecord(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "事件标题", children: query.eventTitle, span: 2 },
{ label: "救援开始时间", children: query.executionTime },

3
src/pages/Container/Enterprise/EmergencyRescue/Rescue/SpecialReport/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { message } from "antd";
import { useEffect } from "react";
import AreaCascader from "zy-react-library/components/Cascader/Area";
@ -35,7 +35,6 @@ function Add(props) {
<Page headerTitle="生成专报" isShowFooter={false}>
<FormBuilder
loading={props.rescue.rescueLoading}
useAutoGenerateRequired={false}
options={[
{ name: "eventTitle", label: "事件标题", span: 24, componentProps: { disabled: true } },
{ name: "ownerName", label: "机主姓名", componentProps: { disabled: true } },

6
src/pages/Container/Enterprise/EmergencyRescue/Rescue/View/index.js
View File

@ -12,7 +12,9 @@ function View(props) {
const getData = async () => {
const { data } = await props["eventReportSpecialReportInfo"]({ id: query.id });
setInfo(data);
if (data) {
setInfo(data);
}
};
useEffect(() => {
@ -25,7 +27,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "事件标题", children: info.eventTitle, span: 2 },
{ label: "机主姓名", children: info.ownerName },

4
src/pages/Container/Enterprise/EmergencyResource/ClosedCardPort/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "卡口名称", children: info.checkpointName },
{ label: "详情地址", children: info.address },

4
src/pages/Container/Enterprise/EmergencyResource/DrainageWell/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "排水井名称", children: info.wellName },
{ label: "类型", children: info.wellTypeName },

2
src/pages/Container/Enterprise/EmergencyResource/EmergencyEquipment/View/index.js
View File

@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "装备名称", children: info.equipmentName },
{ label: "装备类别", children: info.equipmentCategoryName },

4
src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/Add/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { message } from "antd";
import { useEffect, useState } from "react";
import AreaCascader from "zy-react-library/components/Cascader/Area";
@ -42,7 +42,7 @@ function Add(props) {
const onSubmit = async (values) => {
const { success } = await props[query.id ? "emergencyShelterUpdate" : "emergencyShelterAdd"]({
...values,
regionCode: values.regionCode.join(","),
regionCode: values.regionCode && values.regionCode.join(","),
id: query.id,
});
if (success) {

4
src/pages/Container/Enterprise/EmergencyResource/EmergencyShelter/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "避难所名称", children: info.placeName },
{ label: "场所类型", children: info.placeTypeName },

4
src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/FacilitiesEquipment/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -57,7 +57,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "设备名称", children: info.equipmentName },
{ label: "设备类型", children: info.equipmentTypeName },

4
src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/Material/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "物资名称", children: info.materialName },
{ label: "物资类别", children: info.materialCategoryName },

4
src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/RescueEquipment/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -25,7 +25,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "装备名称", children: info.equipmentName },
{ label: "装备类别", children: info.equipmentCategoryName },

4
src/pages/Container/Enterprise/EmergencyResource/MaterialEquipment/View/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Descriptions, Spin } from "antd";
import { useEffect, useState } from "react";
import Page from "zy-react-library/components/Page";
@ -28,7 +28,7 @@ function View(props) {
<Descriptions
bordered
column={props.isShowAllAction === false ? 1 : 2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "资源库名称", children: info.warehouseName },
{ label: "所在地点", children: info.address },

6
src/pages/Container/Enterprise/PlanAndDrill/EmergencyExercise/View/index.js
View File

@ -83,7 +83,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "应急演练方案名称", children: basicInfo.drillName, span: 2 },
{ label: "演练单位", children: basicInfo.drillUnit },
@ -145,7 +145,7 @@ function View(props) {
<Descriptions
bordered
column={1}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "演练目的", children: basicInfo.drillPurpose },
{ label: "附件", children: previewFile(basicInfo.summaryEvaluationFiles) },
@ -157,7 +157,7 @@ function View(props) {
<Descriptions
bordered
column={1}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "附件", children: previewFile(basicInfo.emergencyDrillFiles) },
]}

2
src/pages/Container/Enterprise/PlanAndDrill/EmergencyPlan/View/index.js
View File

@ -57,7 +57,7 @@ function View(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "应急预案名称", children: info.planName },
{ label: "预案编码", children: info.planCode },

13
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/Add/components/OrganizationStructure/index.js
View File

@ -21,7 +21,6 @@ const addModalTypeNames = {
update: "编辑",
addChild: "添加下级",
};
function OrganizationStructure(props) {
const [treeList, setTreeList] = useState([]);
const [parentId, setParentId] = useState(defaultParentId);
@ -295,7 +294,11 @@ const AddOrganizationModalComponent = (props) => {
{
key: "parentName",
label: "上级菜单",
render: (<Tag color="#4096ff">{props.addModalType === "add" ? defaultParentName : props.parentName}</Tag>),
render: (
<Tag color="#4096ff" style={{ whiteSpace: "normal", wordBreak: "break-all" }}>
{props.addModalType === "add" ? defaultParentName : props.parentName}
</Tag>
),
},
{ name: "orgName", label: "名称" },
{ name: "orgNameEn", label: "英文名称" },
@ -362,7 +365,11 @@ const AddOrganizationPersonnelModalComponent = (props) => {
{
key: "organizationName",
label: "所属机构",
render: (<Tag color="#4096ff">{props.organizationName}</Tag>),
render: (
<Tag color="#4096ff" style={{ whiteSpace: "normal", wordBreak: "break-all" }}>
{props.organizationName}
</Tag>
),
},
{ name: "userId", label: "姓名", render: (
<PersonnelSelect

10
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/Add/components/PlanAttachments/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal, Space } from "antd";
import dayjs from "dayjs";
import { useEffect, useRef, useState } from "react";
@ -77,6 +77,7 @@ function PlanAttachments(props) {
<Space>
<Button
type="link"
disabled={!record.fileId}
onClick={async () => {
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[702], eqForeignKey: record.fileId });
downloadFile({ url: files[0].url, name: files[0].name });
@ -144,7 +145,11 @@ const AddModalComponent = (props) => {
const { data } = await props["enterprisePlanAttachmentInfo"]({ id: props.id });
fileIdRef.current = data.fileId;
const files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[702], eqForeignKey: data.fileId });
let files = [];
if (data.fileId) {
files = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM[702], eqForeignKey: data.fileId });
}
form.setFieldsValue({
...data,
files,
@ -157,6 +162,7 @@ const AddModalComponent = (props) => {
const onSubmit = async (values) => {
await deleteFile({ single: false, files: values.deleteFiles });
const { id: fileId } = await uploadFile({
single: false,
files: values.files,

4
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/Add/components/PlanResources/index.js
View File

@ -1,4 +1,4 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, Descriptions, message, Modal, Space } from "antd";
import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
@ -220,7 +220,7 @@ const ViewModalComponent = (props) => {
<Descriptions
column={1}
bordered
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "资源类型", children: info.resourceType },
{ label: "资源名称", children: info.resourceName },

4
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/Add/index.js
View File

@ -216,7 +216,9 @@ const ReviewPersonModalComponent = (props) => {
options={[
{ name: "auditUserId", label: "审核人员", render: (
<PersonnelSelect
params={{ departmentId: userInfo.departmentId }}
isNeedDepartmentId={false}
isNeedCorpInfoId={true}
params={{ corpinfoId: userInfo.corpinfoId }}
onGetOption={(option) => {
form.setFieldValue("auditUserName", option.name);
form.setFieldValue("auditCorpId", option.corpinfoId);

2
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/List/index.js
View File

@ -168,7 +168,7 @@ const ReasonsRefusalModal = (props) => {
<Descriptions
bordered
column={1}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "驳回原因", value: props.reasonsRefusal },
]}

4
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/View/components/BasicInfo/index.js
View File

@ -1,4 +1,4 @@
import { Descriptions } from "antd";
import { Descriptions } from "antd";
function BasicInfo(props) {
const info = props.info;
@ -8,7 +8,7 @@ function BasicInfo(props) {
<Descriptions
bordered
column={2}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "预案名称", children: info.planName },
{ label: "预案类型", children: info.planTypeName },

4
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlan/View/components/PlanText/index.js
View File

@ -1,4 +1,4 @@
import { Descriptions } from "antd";
import { Descriptions } from "antd";
function PlanText(props) {
const info = props.info;
@ -8,7 +8,7 @@ function PlanText(props) {
<Descriptions
bordered
column={1}
styles={{ label: { width: 200 } }}
styles={{ label: { width: 200 }, content: { width: 500 } }}
items={[
{ label: "预案名称", children: info.planName },
{ label: "预案文本", children: info.planText },

4
src/pages/Container/Enterprise/PlanAndDrill/EnterprisePlanAudit/Audit/index.js
View File

@ -1,4 +1,4 @@
import useUrlState from "@ahooksjs/use-url-state";
import useUrlState from "@ahooksjs/use-url-state";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Button, message, Modal } from "antd";
import { Fragment, useState } from "react";
@ -46,7 +46,7 @@ function Audit(props) {
const AuditModalComponent = (props) => {
const [form] = FormBuilder.useForm();
FormBuilder.useWatch("auditFlag", form);
const onSubmit = async (values) => {
const { success } = await props["enterprisePlanBasicInfoAudit"]({
...values,

4
src/pages/Container/Supervision/EmergencyOrganization/EmergencyRescueTeam/EmergencyRescueTeam/List/index.js
View File

@ -1,7 +1,7 @@
import ListPage from "~/pages/Container/Enterprise/EmergencyOrganization/EmergencyRescueTeam/List";
import ListPage from "~/pages/Container/Enterprise/EmergencyOrganization/EmergencyRescueTeam/List";
function List(props) {
return (<ListPage isRecord headerTitle="救援队伍" {...props} />);
return (<ListPage isRecord headerTitle="救援队伍" viewBtn="gfd-enterprise-emergency-rescue-team-view" {...props} />);
}
export default List;