diff --git a/jjb.config.js b/jjb.config.js
index 61acb0a..d20c44b 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -10,7 +10,8 @@ module.exports = {
javaGitBranch: "dev",
// 本地联调 safetyEval-service（context-path: /safetyEval，默认端口 8095）
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
- API_HOST: "https://gbs-gateway.qhdsafety.com",
+ //API_HOST: "https://gbs-gateway.qhdsafety.com",
+ API_HOST: "http://192.168.0.150",
},
production: {
// 应用后端分支名称，部署上线需要
diff --git a/src/enumerate/enterpriseOptions.js b/src/enumerate/enterpriseOptions.js
index 075ce15..f47067a 100644
--- a/src/enumerate/enterpriseOptions.js
+++ b/src/enumerate/enterpriseOptions.js
@@ -2,11 +2,43 @@
/** 重庆市辖区（区/县） */
export const CHONGQING_DISTRICTS = [
- "万州区", "涪陵区", "渝中区", "大渡口区", "江北区", "沙坪坝区", "九龙坡区", "南岸区",
- "北碚区", "綦江区", "大足区", "渝北区", "巴南区", "黔江区", "长寿区", "江津区",
- "合川区", "永川区", "南川区", "璧山区", "铜梁区", "潼南区", "荣昌区", "开州区",
- "梁平区", "武隆区", "城口县", "丰都县", "垫江县", "忠县", "云阳县", "奉节县",
- "巫山县", "巫溪县", "石柱土家族自治县", "秀山土家族苗族自治县", "酉阳土家族苗族自治县",
+ "万州区",
+ "涪陵区",
+ "渝中区",
+ "大渡口区",
+ "江北区",
+ "沙坪坝区",
+ "九龙坡区",
+ "南岸区",
+ "北碚区",
+ "綦江区",
+ "大足区",
+ "渝北区",
+ "巴南区",
+ "黔江区",
+ "长寿区",
+ "江津区",
+ "合川区",
+ "永川区",
+ "南川区",
+ "璧山区",
+ "铜梁区",
+ "潼南区",
+ "荣昌区",
+ "开州区",
+ "梁平区",
+ "武隆区",
+ "城口县",
+ "丰都县",
+ "垫江县",
+ "忠县",
+ "云阳县",
+ "奉节县",
+ "巫山县",
+ "巫溪县",
+ "石柱土家族自治县",
+ "秀山土家族苗族自治县",
+ "酉阳土家族苗族自治县",
"彭水苗族土家族自治县",
].map((label) => ({ label, value: label }));
@@ -33,14 +65,12 @@ export const FILING_TYPE_OPTIONS = [
/** 监管端已备案机构 - 备案类型搜索 */
export const REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS = [
-
{ label: "审核备案", value: "1" },
{ label: "确认备案", value: "2" },
];
/** 监管端已备案机构 - 备案状态搜索（1=已备案，2=未备案） */
export const REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS = [
-
{ label: "已备案", value: 1 },
{ label: "未备案", value: 2 },
];
@@ -60,13 +90,46 @@ export const ORG_ACCOUNT_STATE_OPTIONS = [
/** 资质范围 / 证照类型（行业） */
export const QUALIFICATION_INDUSTRY_OPTIONS = [
- { label: "煤炭开采业", value: "煤炭开采业" },
- { label: "金属、非金属矿及其他矿采选业", value: "金属、非金属矿及其他矿采选业" },
- { label: "陆地石油和天然气开采业", value: "陆地石油和天然气开采业" },
- { label: "陆上油气管道运输业", value: "陆上油气管道运输业" },
- { label: "石油加工业，化学原料、化学品及医药制造业", value: "石油加工业，化学原料、化学品及医药制造业" },
- { label: "烟花爆竹制造业", value: "烟花爆竹制造业" },
- { label: "金属冶炼", value: "金属冶炼" },
+ { label: "煤炭开采业", value: "COAL_MINING" },
+ { label: "金属、非金属矿及其他矿采选业", value: "METAL_NONMETAL_MINING" },
+ { label: "陆地石油和天然气开采业", value: "ONSHORE_OIL_GAS" },
+ { label: "陆上油气管道运输业", value: "ONSHORE_OIL_GAS_PIPELINE" },
+ {
+ label: "石油加工业，化学原料、化学品及医药制造业",
+ value: "PETROCHEMICAL_CHEMICAL_PHARMACEUTICAL",
+ },
+ { label: "烟花爆竹制造业", value: "FIREWORKS_FIRECRACKERS" },
+ { label: "金属冶炼", value: "METAL_SMELTING" },
+];
+
+export const QUALIFICATION_INDUSTRY_OPTIONS_MAP =
+ QUALIFICATION_INDUSTRY_OPTIONS.reduce(
+ (acc, cur) => ({ ...acc, [cur.value]: cur.label }),
+ {},
+ );
+
+/** 国民经济行业分类（GB/T 4754-2017 门类） */
+export const ECONOMY_INDUSTRY_OPTIONS = [
+ { label: "农、林、牧、渔业", value: "A" },
+ { label: "采矿业", value: "B" },
+ { label: "制造业", value: "C" },
+ { label: "电力、热力、燃气及水生产和供应业", value: "D" },
+ { label: "建筑业", value: "E" },
+ { label: "批发和零售业", value: "F" },
+ { label: "交通运输、仓储和邮政业", value: "G" },
+ { label: "住宿和餐饮业", value: "H" },
+ { label: "信息传输、软件和信息技术服务业", value: "I" },
+ { label: "金融业", value: "J" },
+ { label: "房地产业", value: "K" },
+ { label: "租赁和商务服务业", value: "L" },
+ { label: "科学研究和技术服务业", value: "M" },
+ { label: "水利、环境和公共设施管理业", value: "N" },
+ { label: "居民服务、修理和其他服务业", value: "O" },
+ { label: "教育", value: "P" },
+ { label: "卫生和社会工作", value: "Q" },
+ { label: "文化、体育和娱乐业", value: "R" },
+ { label: "公共管理、社会保障和社会组织", value: "S" },
+ { label: "国际组织", value: "T" },
];
/** 人员类型 */
diff --git a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js
index a87c268..dde1707 100644
--- a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js
+++ b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js
@@ -10,7 +10,7 @@ import {
Row,
Select,
Space,
- Flex
+ Flex,
} from "antd";
import AttachmentUpload from "~/components/AttachmentUpload";
import BaiduMapPicker from "~/components/BaiduMapPicker";
@@ -24,6 +24,8 @@ import {
ENTERPRISE_STATUS_OPTIONS,
REGISTERED_ORG_FILING_RECORD_STATUS_OPTIONS,
REGISTERED_ORG_FILING_TYPE_SEARCH_OPTIONS,
+ QUALIFICATION_INDUSTRY_OPTIONS,
+ ECONOMY_INDUSTRY_OPTIONS,
} from "~/enumerate/enterpriseOptions";
import { NS_ORG_INFO } from "~/enumerate/namespace";
@@ -188,18 +190,26 @@ function OrgInfoPage(props) {
- {
+ form.setFieldValue(
+ "safetyIndustryCategoryName",
+ option?.map((item) => item.label).join(",") || "",
+ );
+ }}
/>
+
- {
+ form.setFieldValue(
+ "economyIndustryName",
+ option?.label || "",
+ );
+ }}
/>
+
diff --git a/src/pages/Container/QualApplication/FilingListTable.jsx b/src/pages/Container/QualApplication/FilingListTable.jsx
index b741cd0..10a7d93 100644
--- a/src/pages/Container/QualApplication/FilingListTable.jsx
+++ b/src/pages/Container/QualApplication/FilingListTable.jsx
@@ -2,14 +2,17 @@ import { Button, Form, Tag, Table, Typography, Select } from "antd";
import SearchForm from "@cqsjjb/jjb-react-admin-component/SearchForm";
import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
import TableAction from "@cqsjjb/jjb-react-admin-component/TableAction";
-import { CHONGQING_DISTRICTS } from "~/enumerate/enterpriseOptions";
+import {
+ CHONGQING_DISTRICTS,
+ QUALIFICATION_INDUSTRY_OPTIONS_MAP,
+} from "~/enumerate/enterpriseOptions";
import {
FILING_FORM_MODE,
getFilingStatusOptions,
-
isQualFilingEditable,
QUAL_FILING_STATUS_COLOR,
} from "~/enumerate/qualFilingOptions";
+
import { CHANGE_COUNT_STYLE, getChangeCount } from "~/utils/enterpriseForm";
export default function FilingListTable({
@@ -35,19 +38,34 @@ export default function FilingListTable({
const statusOptions = getFilingStatusOptions(mode);
const canEditRow = (record) => {
-
if (mode === FILING_FORM_MODE.CHANGE) {
-
- return [1,3,5].includes(record.filingStatusCode);
+ return [1, 3, 5].includes(record.filingStatusCode);
}
- return [3,5].includes(record.filingStatusCode);
+ return [3, 5].includes(record.filingStatusCode);
};
const columns = [
- { title: "备案属地", dataIndex: "filingTerritoryName", width: 120, ellipsis: true },
+ {
+ title: "备案属地",
+ dataIndex: "filingTerritoryName",
+ width: 120,
+ ellipsis: true,
+ },
{ title: "备案单位", dataIndex: "filingUnitName", ellipsis: true },
- { title: "备案编号", dataIndex: "filingNo", width: 200},
- { title: "安全评价业务范围", dataIndex: "businessScope", ellipsis: true },
+ { title: "备案编号", dataIndex: "filingNo", width: 200 },
+ {
+ title: "安全评价业务范围",
+ dataIndex: "businessScope",
+ ellipsis: true,
+ render: (_, record) => {
+ if (Array.isArray(record.businessScope)) {
+ return record.businessScope
+ .map((item) => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item])
+ .join("、");
+ }
+ return record.businessScope || "-";
+ },
+ },
];
if (showChangeCount) {
@@ -57,7 +75,8 @@ export default function FilingListTable({
width: 90,
render: (_, record) => {
const count = getChangeCount(record);
- const style = count > 0 ? CHANGE_COUNT_STYLE.active : CHANGE_COUNT_STYLE.zero;
+ const style =
+ count > 0 ? CHANGE_COUNT_STYLE.active : CHANGE_COUNT_STYLE.zero;
if (count <= 0) {
return {count};
}
@@ -78,14 +97,10 @@ export default function FilingListTable({
dataIndex: "filingStatusName",
width: 110,
render: (_, record) => {
- const obj= QUAL_FILING_STATUS_COLOR[record.filingStatusCode]
+ const obj = QUAL_FILING_STATUS_COLOR[record.filingStatusCode];
const color = obj?.color || "default";
- const name= obj?.label || "-";
- return (
- obj?
- {name || "-"}
- :"--"
- );
+ const name = obj?.label || "-";
+ return obj ? {name || "-"} : "--";
},
});
@@ -98,23 +113,40 @@ export default function FilingListTable({
{extraActions?.(record)}
- {canEditRow(record) && (
+ {canEditRow(record) && (
)}
- {mode === FILING_FORM_MODE.APPLICATION && isQualFilingEditable(record.filingStatusCode) && onDelete && (
-
- )}
+ {mode === FILING_FORM_MODE.APPLICATION &&
+ isQualFilingEditable(record.filingStatusCode) &&
+ onDelete && (
+
+ )}
),
});
@@ -131,9 +163,13 @@ export default function FilingListTable({
listTitle
)
}
- extra={onCreate && (
-
- )}
+ extra={
+ onCreate && (
+
+ )
+ }
>
-
+
,
{CHONGQING_DISTRICTS.map((d) => (
- {d.label}
+
+ {d.label}
+
))}
,
-
+
,
{statusOptions.map((opt) => (
- {opt.label}
+
+ {opt.label}
+
))}
,
diff --git a/src/pages/Container/QualApplication/filingVerify.js b/src/pages/Container/QualApplication/filingVerify.js
index dbd233e..f6024de 100644
--- a/src/pages/Container/QualApplication/filingVerify.js
+++ b/src/pages/Container/QualApplication/filingVerify.js
@@ -1,7 +1,7 @@
/** 资质申请前置条件核验（提交前展示，对齐原型） */
/** 人员相关三项暂不校验（机构库数据不足），恢复时改为 false */
-const SKIP_PERSONNEL_VERIFY = false;
+const SKIP_PERSONNEL_VERIFY = true;
const KEY_POSITIONS = ["负责人", "技术负责人", "质量负责人"];
diff --git a/src/pages/Container/QualificationReview/ExpertVerification/index.js b/src/pages/Container/QualificationReview/ExpertVerification/index.js
index ae0d40d..504f97f 100644
--- a/src/pages/Container/QualificationReview/ExpertVerification/index.js
+++ b/src/pages/Container/QualificationReview/ExpertVerification/index.js
@@ -9,6 +9,7 @@ import { tools } from "@cqsjjb/jjb-common-lib";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_QUAL_REVIEW } from "~/enumerate/namespace";
import { VERIFY_STATUS_MAP } from "~/enumerate/constant";
+import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions";
import {
FILING_CODE_TO_CONFIRM,
REVIEW_BUSINESS_SCOPE_OPTIONS,
@@ -67,6 +68,12 @@ const ExpertVerification = (props) => {
dataIndex: "businessScope",
width: 180,
ellipsis: true,
+ render: (_, record) => {
+ if(Array.isArray(record.businessScope)){
+ return record.businessScope.map(item => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join("、");
+ }
+ return record.businessScope || "-";
+ },
},
{
title: "确认状态",
diff --git a/src/pages/Container/QualificationReview/FilingTabs/index.js b/src/pages/Container/QualificationReview/FilingTabs/index.js
index 0ebd264..d031ac3 100644
--- a/src/pages/Container/QualificationReview/FilingTabs/index.js
+++ b/src/pages/Container/QualificationReview/FilingTabs/index.js
@@ -4,6 +4,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_QUAL_REVIEW } from "~/enumerate/namespace";
import StaffViewModal from "~/components/StaffViewModal";
import PreviewUrlButton from "~/components/PreviewUrlButton/index";
+import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions";
/**
@@ -81,7 +82,7 @@ const FilingTabs = ({
label: "1.备案基本信息",
children: (
- {detail.businessScope}
+ {Array.isArray(detail.businessScope) ? detail.businessScope.map(item => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join("、") : detail.businessScope || "-"}
{detail.filingTerritoryName}
{detail.filingUnitName}
{detail.filingUnitTypeName}
diff --git a/src/pages/Container/QualificationReview/QualChange/index.js b/src/pages/Container/QualificationReview/QualChange/index.js
index 32284ac..1787c0c 100644
--- a/src/pages/Container/QualificationReview/QualChange/index.js
+++ b/src/pages/Container/QualificationReview/QualChange/index.js
@@ -9,6 +9,7 @@ import { tools } from "@cqsjjb/jjb-common-lib";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_QUAL_REVIEW } from "~/enumerate/namespace";
import { FILING_STATUS_MAP, FILING_STATUS_MAP_CHANGE } from "~/enumerate/constant";
+import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions";
const { router } = tools;
@@ -50,7 +51,14 @@ const QualChange = (props) => {
{ title: "机构名称", dataIndex: "filingUnitName", width: 220, ellipsis: true },
{ title: "机构类型", dataIndex: "filingUnitTypeName", width: 100 },
{ title: "备案编号", dataIndex: "id", width: 140, ellipsis: true },
- { title: "经营范围", dataIndex: "businessScope", width: 180, ellipsis: true },
+ { title: "经营范围", dataIndex: "businessScope", width: 180, ellipsis: true,
+ render: (_, record) => {
+ if(Array.isArray(record.businessScope)){
+ return record.businessScope.map(item => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join("、");
+ }
+ return record.businessScope || "-";
+ }
+ },
{
title: "备案状态",
dataIndex: "filingStatusCode",
diff --git a/src/pages/Container/QualificationReview/QualConfirm/index.js b/src/pages/Container/QualificationReview/QualConfirm/index.js
index d21e5f9..3bf3c33 100644
--- a/src/pages/Container/QualificationReview/QualConfirm/index.js
+++ b/src/pages/Container/QualificationReview/QualConfirm/index.js
@@ -9,6 +9,7 @@ import { tools } from "@cqsjjb/jjb-common-lib";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_QUAL_REVIEW } from "~/enumerate/namespace";
import { FILING_STATUS_MAP } from "~/enumerate/constant";
+import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions";
import {
REVIEW_BUSINESS_SCOPE_OPTIONS,
REVIEW_UNIT_TYPE_OPTIONS,
@@ -55,7 +56,14 @@ const QualConfirm = (props) => {
{ title: "机构名称", dataIndex: "filingUnitName", width: 220, ellipsis: true },
{ title: "机构类型", dataIndex: "filingUnitTypeName", width: 100 },
{ title: "证书编号", dataIndex: "qualCertNo", width: 140, ellipsis: true },
- { title: "安全评价业务范围", dataIndex: "businessScope", width: 180, ellipsis: true },
+ { title: "安全评价业务范围", dataIndex: "businessScope", width: 180, ellipsis: true,
+ render: (_, record) => {
+ if(Array.isArray(record.businessScope)){
+ return record.businessScope.map(item => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join("、");
+ }
+ return record.businessScope || "-";
+ }
+ },
{
title: "确认状态",
dataIndex: "filingStatusCode",
diff --git a/src/pages/Container/QualificationReview/QualPublicity/index.js b/src/pages/Container/QualificationReview/QualPublicity/index.js
index 3a94f9a..1a24c6e 100644
--- a/src/pages/Container/QualificationReview/QualPublicity/index.js
+++ b/src/pages/Container/QualificationReview/QualPublicity/index.js
@@ -16,6 +16,7 @@ import ControlWrapper from "@cqsjjb/jjb-react-admin-component/ControlWrapper";
import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd";
import { tools } from "@cqsjjb/jjb-common-lib";
import { PUBLICITY_STATUS_MAP } from "~/enumerate/constant";
+import { QUALIFICATION_INDUSTRY_OPTIONS_MAP } from "~/enumerate/enterpriseOptions";
const { TextArea } = Input;
@@ -121,6 +122,12 @@ const QualPublicity = (props) => {
dataIndex: "businessScope",
width: 180,
ellipsis: true,
+ render: (_, record) => {
+ if(Array.isArray(record.businessScope)){
+ return record.businessScope.map(item => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join("、");
+ }
+ return record.businessScope || "-";
+ },
},
{ title: "审核部门", dataIndex: "reviewDept", width: 120, ellipsis: true },
{ title: "审核通过时间", dataIndex: "reviewTime", width: 120 },
diff --git a/src/pages/Container/QualificationReview/QualReview/index.js b/src/pages/Container/QualificationReview/QualReview/index.js
index 77c0bc1..e6f4aac 100644
--- a/src/pages/Container/QualificationReview/QualReview/index.js
+++ b/src/pages/Container/QualificationReview/QualReview/index.js
@@ -8,7 +8,9 @@ import { AntdTableFuncControl } from "@cqsjjb/jjb-common-decorator/antd";
import { tools } from "@cqsjjb/jjb-common-lib";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { NS_QUAL_REVIEW } from "~/enumerate/namespace";
-
+import {
+ QUALIFICATION_INDUSTRY_OPTIONS_MAP,
+} from "~/enumerate/enterpriseOptions";
import { REVIEW_STATUS_MAP, EXPERT_STATUS_MAP } from "~/enumerate/constant";
import {
REVIEW_BUSINESS_SCOPE_OPTIONS,
@@ -60,7 +62,14 @@ const QualReview = (props) => {
{ title: "机构名称", dataIndex: "filingUnitName", width: 220, ellipsis: true },
{ title: "机构类型", dataIndex: "filingUnitTypeName", width: 100 },
{ title: "证书编号", dataIndex: "qualCertNo", width: 140, ellipsis: true },
- { title: "安全评价业务范围", dataIndex: "businessScope", width: 180, ellipsis: true },
+ { title: "安全评价业务范围", dataIndex: "businessScope", width: 180, ellipsis: true,
+ render: (_, record) => {
+ if(Array.isArray(record.businessScope)){
+ return record.businessScope.map(item => QUALIFICATION_INDUSTRY_OPTIONS_MAP[item]).join("、");
+ }
+ return record.businessScope || "-";
+ }
+ },
{
title: "专家核验",
dataIndex: "expertStatus",