zcloud_gbs
/
zcloud_gbs_qualifications-react
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed:部分bug修复

master
dearLin 2026-01-09 18:06:22 +08:00
parent 2d671111e7
commit 7fc5b1d238
17 changed files with 96 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jjb.config.js
View File

@ -9,14 +9,13 @@ module.exports = {
// 应用后端分支名称，部署上线需要
javaGitBranch: "<branch-name>",
// 接口服务地址
API_HOST: "http://192.168.20.100:30140",
// API_HOST: "http://192.168.10.41:81",
API_HOST: "https://gbs-gateway.qhdsafety.com",
},
production: {
// 应用后端分支名称，部署上线需要
javaGitBranch: "<branch-name>",
// 接口服务地址
API_HOST: "",
API_HOST: "https://gbs-gateway.qhdsafety.com",
},
},
// 应用唯一标识符
@ -25,8 +24,8 @@ module.exports = {
contextInject: {
// 应用Key
appKey: "",
// fileUrl: "https://jpfz.qhdscom/gbsFileTest/",
fileUrl: "http://192.168.20.240:9787/mnt/",
fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/",
// fileUrl: "http://192.168.20.240:9787/mnt/",
},
// public/index.html注入全局变量
windowInject: {

2
package.json
View File

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

43
src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
View File

@ -65,17 +65,18 @@ const StepOneComponent = (props) => {
const stakeholderLevel = Form.useWatch("stakeholderLevel", form);
const groupUnitId = Form.useWatch("groupUnitId", form);
const groupUnitDept = Form.useWatch("groupUnitDept", form);
// const [corpTypeList, setCorpTypeList] = useState([2]);
const [corpInfoList, setCorpInfoList] = useState([]);
const [qualificationsListAll, setQualificationsListAll] = useState([]);
const getQualificationsListAll = async () => {
const { data } = await props["qualificationsListAll"]({ qualificationsTypeId, stakeholderLevel });
const { data } = await props["qualificationsListAll"]({ qualificationsTypeId, stakeholderLevel, status: 0 });
setQualificationsListAll(data);
};
const getCorpInfoList = async () => {
const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000 });
const getCorpInfoList = async (type) => {
const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, eqType: type || 1 });
setCorpInfoList(data);
};
@ -107,8 +108,15 @@ const StepOneComponent = (props) => {
render: (
<DictionarySelect
dictValue="qualificationsType"
onGetLabel={label => form.setFieldValue("qualificationsTypeName", label)}
onChange={() => {
onGetLabel={(label) => {
form.setFieldValue("qualificationsTypeName", label);
}}
onChange={async (value) => {
console.log(value);
if (value === "wzgll") {
await getCorpInfoList(6);
}
form.setFieldValue("groupUnitName", "");
form.setFieldValue("groupUnitName", "");
form.setFieldValue("groupUnitDeptName", "");
form.setFieldValue("groupUnitUserName", "");
@ -120,7 +128,7 @@ const StepOneComponent = (props) => {
{ name: "qualificationsTypeName", label: "资质类别", onlyForLabel: true },
{
name: "stakeholderLevel",
label: "资质级别",
label: "资质等级",
render: (
<DictionarySelect
dictValue="stakeholderLevel"
@ -134,12 +142,13 @@ const StepOneComponent = (props) => {
/>
),
},
{ name: "stakeholderLevelName", label: "资质级别", onlyForLabel: true },
{ name: "stakeholderLevelName", label: "资质等级", onlyForLabel: true },
{
name: "groupUnitId",
label: "集团单位",
label: "集团单位主管公司",
dependencies: ["stakeholderLevel", "qualificationsTypeId"],
hidden: formValues => !(formValues.stakeholderLevel === "two-level" || formValues.qualificationsTypeId === "wzgll"),
hidden: formValues => !(formValues.stakeholderLevel === "two-level"
|| formValues.stakeholderLevel === "other-level"),
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: corpInfoList,
itemsField: { valueKey: "id", labelKey: "corpName" },
@ -153,25 +162,25 @@ const StepOneComponent = (props) => {
}));
form.setFieldValue("groupUnitDept", "");
form.setFieldValue("groupUnitDeptName", "");
form.setFieldValue("groupUnitUser", "");
form.setFieldValue("groupUnitUserName", "");
form.setFieldValue("groupUnitUser", []);
form.setFieldValue("groupUnitUserName", []);
},
},
},
{ name: "groupUnitName", label: "集团单位名称", onlyForLabel: true },
{ name: "groupUnitName", label: "集团单位主管公司名称", onlyForLabel: true },
{
name: "groupUnitDept",
label: "部门",
dependencies: ["stakeholderLevel", "qualificationsTypeId"],
hidden: formValues => !(formValues.stakeholderLevel === "two-level" || formValues.qualificationsTypeId === "wzgll"),
hidden: formValues => !(formValues.stakeholderLevel === "two-level" || formValues.stakeholderLevel === "other-level"),
render: (
<DepartmentSelectTree
params={{ eqCorpinfoId: groupUnitId }}
isNeedCorpInfoId
onGetLabel={label => form.setFieldValue("groupUnitDeptName", label)}
onChange={() => {
form.setFieldValue("groupUnitUser", "");
form.setFieldValue("groupUnitUserName", "");
form.setFieldValue("groupUnitUser", []);
form.setFieldValue("groupUnitUserName", []);
}}
/>
),
@ -181,10 +190,12 @@ const StepOneComponent = (props) => {
name: "groupUnitUser",
label: "负责人",
dependencies: ["stakeholderLevel", "qualificationsTypeId"],
hidden: formValues => !(formValues.stakeholderLevel === "two-level" || formValues.qualificationsTypeId === "wzgll"),
hidden: formValues => !(formValues.stakeholderLevel === "two-level" || formValues.stakeholderLevel === "other-level"),
render: (
<PersonnelSelect
params={{ departmentId: groupUnitDept }}
extraParams={{ noMain: 1 }}
mode="multiple"
onGetLabel={label => form.setFieldValue("groupUnitUserName", label)}
/>
),

4
src/pages/Container/BranchCompany/Qualification/Apply/List/index.js
View File

@ -33,7 +33,7 @@ function List(props) {
options={[
{ name: "qualificationsName", label: "资质名称" },
{ name: "qualificationsTypeId", label: "资质类别", render: (<DictionarySelect dictValue="qualificationsType" />) },
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
]}
form={form}
onFinish={getData}
@ -57,7 +57,7 @@ function List(props) {
columns={[
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数量", dataIndex: "materialNum" },
{ title: "审核公司", dataIndex: "groupUnitName" },
{ title: "审核状态", dataIndex: "status", render: (_, record) => (

2
src/pages/Container/BranchCompany/Qualification/Apply/View/index.js
View File

@ -61,7 +61,7 @@ function View(props) {
styles={{ label: { width: 200 } }}
items={[
{ label: "资质类别", children: info.qualificationsTypeName },
{ label: "资质级别", children: info.stakeholderLevelName },
{ label: "资质等级", children: info.stakeholderLevelName },
...(info.stakeholderLevel === "two-level"
? [
{ label: "集团单位", children: info.groupUnitName },

4
src/pages/Container/BranchCompany/Qualification/Records/List/index.js
View File

@ -39,7 +39,7 @@ function List(props) {
label: "资质类别",
render: (<DictionarySelect dictValue="qualificationsType" />),
},
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{
name: "auditStatus",
label: "审核状态",
@ -59,7 +59,7 @@ function List(props) {
{ title: "相关方名称", dataIndex: "corpName" },
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "时效属性", dataIndex: "isLongTerm", render: (_, record) => record.isLongTerm ? "长期" : "短期" },
{ title: "材料数", dataIndex: "materialNum" },
{

4
src/pages/Container/BranchCompany/Qualification/Review/List/index.js
View File

@ -25,7 +25,7 @@ function List(props) {
label: "资质类别",
render: (<DictionarySelect dictValue="qualificationsType" />),
},
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
]}
form={form}
onFinish={getData}
@ -35,7 +35,7 @@ function List(props) {
{ title: "相关方名称", dataIndex: "corpName" },
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" },
{
title: "资质状态",

4
src/pages/Container/Local/Qualification/Review/List/index.js
View File

@ -25,7 +25,7 @@ function List(props) {
label: "资质类别",
render: (<DictionarySelect dictValue="qualificationsType" />),
},
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
]}
form={form}
onFinish={getData}
@ -35,7 +35,7 @@ function List(props) {
{ title: "相关方名称", dataIndex: "corpName" },
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" },
{
title: "资质状态",

2
src/pages/Container/Local/Qualification/Review/Review/index.js
View File

@ -11,10 +11,8 @@ import ViewInfo from "../../ViewInfo";
function Review() {
const query = useGetUrlQuery();
const [rejectModalOpen, setRejectModalOpen] = useState(false);
const [passModalOpen, setPassModalOpen] = useState(false);
return (
<div>
<ViewInfo

4
src/pages/Container/Local/Qualification/ViewInfo/index.js
View File

@ -1,8 +1,8 @@
import InfoPage from "../../../Supervision/Qualification/ViewInfo";
function ViewInfo() {
function ViewInfo(props) {
return (
<InfoPage />
<InfoPage {...props} />
);
}

6
src/pages/Container/Stakeholder/Qualification/Apply/List/index.js
View File

@ -33,7 +33,7 @@ function List(props) {
options={[
{ name: "qualificationsName", label: "资质名称" },
{ name: "qualificationsTypeId", label: "资质类别", render: (<DictionarySelect dictValue="qualificationsType" />) },
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
]}
form={form}
onFinish={getData}
@ -57,10 +57,10 @@ function List(props) {
columns={[
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数量", dataIndex: "materialNum" },
{ title: "直属审核公司", dataIndex: "groupUnitName" },
{ title: "备注", dataIndex: "remarks" },
// { title: "备注", dataIndex: "remarks" },
{ title: "审核状态", dataIndex: "status", render: (_, record) => (
<>
{record.status === 200 && "审核中"}

43
src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js
View File

@ -1,6 +1,6 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd";
import { useEffect } from "react";
import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
import Page from "zy-react-library/components/Page";
import DictionarySelect from "zy-react-library/components/Select/Dictionary";
@ -13,10 +13,14 @@ import { NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace";
function Add(props) {
const query = useGetUrlQuery();
const [form] = Form.useForm();
const [corpTypeList, setCorpTypeList] = useState([2]);
const managerDept = Form.useWatch("managerDept", form);
const getData = async () => {
const { data } = await props["qualificationMaintenanceInfo"]({ id: query.id });
if (data.qualificationsTypeId === "wzgll") {
setCorpTypeList([6]);
}
form.setFieldsValue({
...data,
managerUser: data.managerUser.split(","),
@ -27,7 +31,6 @@ function Add(props) {
useEffect(() => {
query.id && getData();
}, []);
const onSubmit = async (values) => {
const { success } = await props[!query.id ? "qualificationMaintenanceAdd" : "qualificationMaintenanceUpdate"]({
...values,
@ -37,7 +40,7 @@ function Add(props) {
});
if (success) {
message.success("操作成功");
props.history.goBack();
// props.history.goBack();
}
};
@ -58,13 +61,26 @@ function Add(props) {
onFinish={onSubmit}
options={[
{ key: "divider-basic", label: "基础信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
{ name: "qualificationsName", label: "资质名称", span: 24 },
{ name: "qualificationsName", label: "资质名称", span: 24, componentProps: { disabled: query.id } },
{
name: "qualificationsTypeId",
label: "资质类别",
render: (
<DictionarySelect
disabled={query.id}
dictValue="qualificationsType"
onGetOption={(v) => {
if (v.dictValue === "wzgll") {
setCorpTypeList([6]);
}
else {
setCorpTypeList([2]);
}
form.setFieldValue("managerDept", []);
form.setFieldValue("managerDeptName", []);
form.setFieldValue("managerUser", []);
form.setFieldValue("managerUserName", []);
}}
onGetLabel={(label) => {
form.setFieldValue("qualificationsTypeName", label);
}}
@ -74,41 +90,52 @@ function Add(props) {
{ name: "qualificationsTypeName", label: "资质类别", onlyForLabel: true },
{
name: "stakeholderLevel",
label: "资质级别",
label: "资质等级",
render: (
<DictionarySelect
disabled={query.id}
dictValue="stakeholderLevel"
onGetLabel={(label) => {
form.setFieldValue("stakeholderLevelName", label);
}}
/>
),
componentProps: { disabled: query.id },
},
{ name: "stakeholderLevelName", label: "资质级别", onlyForLabel: true },
{ name: "stakeholderLevelName", label: "资质等级", onlyForLabel: true, componentProps: { disabled: query.id } },
{
name: "managerDept",
label: "主管部门",
render: (
<DepartmentSelectTree
disabled={query.id}
searchType="company"
params={{ corpinfoTypeList: corpTypeList }}
onGetLabel={(label) => {
form.setFieldValue("managerDeptName", label);
}}
onChange={(_, __, extra) => {
console.log(extra);
form.setFieldValue("managerUser", []);
form.setFieldValue("managerUserName", []);
form.setFieldValue("corpId", extra.triggerNode.props.corpinfoId);
form.setFieldValue("managerCorpId", extra.triggerNode.props.corpinfoId);
form.setFieldValue("managerCorpName", extra.triggerNode.props.corpinfoName);
}}
/>
),
},
{ name: "managerDeptName", label: "主管部门名称", onlyForLabel: true },
{ name: "corpId", label: "主管部门所属公司", onlyForLabel: true },
{ name: "managerCorpId", label: "主管部门所属公司", onlyForLabel: true },
{ name: "managerCorpName", label: "主管部门所属公司名称", onlyForLabel: true },
{
name: "managerUser",
label: "主管人员",
label: "选择审核人",
render: (
<PersonnelSelect
params={{ departmentId: managerDept }}
extraParams={{ noMain: 1 }}
mode="multiple"
onGetLabel={(label) => {
form.setFieldValue("managerUserName", label);
@ -116,7 +143,7 @@ function Add(props) {
/>
),
},
{ name: "managerUserName", label: "主管人员名称", onlyForLabel: true },
{ name: "managerUserName", label: "审核人名称", onlyForLabel: true },
{
name: "status",
label: "是否启用",

7
src/pages/Container/Supervision/Qualification/Maintenance/List/index.js
View File

@ -37,7 +37,7 @@ function List(props) {
options={[
{ name: "qualificationsName", label: "资质名称" },
{ name: "qualificationsTypeId", label: "资质类别", render: (<DictionarySelect dictValue="qualificationsType" />) },
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
]}
form={form}
onFinish={getData}
@ -61,10 +61,11 @@ function List(props) {
columns={[
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "审核单位", dataIndex: "managerCorpName" },
{ title: "主管部门", dataIndex: "managerDeptName" },
{ title: "材料数量", dataIndex: "materialNum", render: (_, record) => record.details?.length || 0 },
{ title: "状态", dataIndex: "status", render: (_, record) => record.status === 0 ? "启用" : "禁用" },
{ title: "资质状态", dataIndex: "status", render: (_, record) => record.status === 0 ? "启用" : "禁用" },
{
title: "操作",
fixed: "right",

2
src/pages/Container/Supervision/Qualification/Records/History/index.js
View File

@ -17,7 +17,7 @@ function History(props) {
{ title: "相关方名称", dataIndex: "corpName" },
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" },
{
title: "资质状态",

10
src/pages/Container/Supervision/Qualification/Records/List/index.js
View File

@ -34,7 +34,7 @@ function List(props) {
label: "资质类别",
render: (<DictionarySelect dictValue="qualificationsType" />),
},
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{
name: "auditStatus",
label: "审核状态",
@ -54,16 +54,16 @@ function List(props) {
{ title: "相关方名称", dataIndex: "corpName" },
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "时效属性", dataIndex: "isLongTerm", render: (_, record) => record.isLongTerm ? "长期" : "短期" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" },
{
title: "资质状态",
title: "资质资料状态",
dataIndex: "qualificationsStatus",
render: (_, record) => (
<div>
{record.qualificationsStatus === 0 && "正常"}
{record.qualificationsStatus === 1 && "待完善"}
{record.qualificationsStatus === 1 && "资质待完善"}
{record.qualificationsStatus === 2 && (
<Tooltip
overlayStyle={{ width: "auto", maxWidth: "700px", whiteSpace: "normal", wordBreak: "break-word" }}
@ -110,7 +110,7 @@ function List(props) {
</div>
),
},
{ title: "时效性", dataIndex: "qualificationsTermStart", render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-" },
// { title: "时效性", dataIndex: "qualificationsTermStart", render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-" },
{
title: "操作",
fixed: "right",

4
src/pages/Container/Supervision/Qualification/Review/List/index.js
View File

@ -25,7 +25,7 @@ function List(props) {
label: "资质类别",
render: (<DictionarySelect dictValue="qualificationsType" />),
},
{ name: "stakeholderLevel", label: "资质级别", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
{ name: "stakeholderLevel", label: "资质等级", render: (<DictionarySelect dictValue="stakeholderLevel" />) },
]}
form={form}
onFinish={getData}
@ -40,7 +40,7 @@ function List(props) {
},
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质级别", dataIndex: "stakeholderLevelName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
{ title: "材料数", dataIndex: "materialNum" },
{
title: "资质状态",

6
src/pages/Container/Supervision/Qualification/ViewInfo/index.js
View File

@ -65,7 +65,7 @@ function ViewInfo(props) {
const { data: corpInfoData } = await props["corpInfoDetails"]({ id: data.corpId });
const licenseFile = await getFile({
eqType: UPLOAD_FILE_TYPE_ENUM["6"],
eqForeignKey: data.corpId,
eqForeignKey: corpInfoData.corpinfoId,
});
corpInfoData.licenseFile = licenseFile;
setCorpInfoData(corpInfoData);
@ -125,7 +125,7 @@ function ViewInfo(props) {
{ label: "所属集团单位", children: info.groupUnitName },
{ label: "资质名称", children: info.qualificationsName },
{ label: "资质类别", children: info.qualificationsTypeName },
{ label: "资质级别", children: info.stakeholderLevelName },
{ label: "资质等级", children: info.stakeholderLevelName },
{ label: "材料数", children: info.materialNum },
{ label: "备注", children: info.remarks },
]}
@ -165,7 +165,7 @@ function ViewInfo(props) {
children: getLabelName({ status: corpInfoData.type, list: ENTERPRISE_TYPE }),
},
{ label: "营业执照", children: <TooltipPreviewImg files={corpInfoData.licenseFile} /> },
{ label: "营业执照有效期", children: `${corpInfoData.licenseStart} 至 ${corpInfoData.licenseEnd}` },
{ label: "营业执照有效期", children: corpInfoData.licenseStart ? `${corpInfoData.licenseStart} 至 ${corpInfoData.licenseEnd}` : "" },
]}
/>
</Spin>