diff --git a/package.json b/package.json
index 741d645..8cbc4b9 100644
--- a/package.json
+++ b/package.json
@@ -6,8 +6,8 @@
"license": "MIT",
"main": "index.js",
"scripts": {
- "serve": "node node_modules/@cqsjjb/scripts/webpack.dev.server.js",
- "build": "node node_modules/@cqsjjb/scripts/webpack.build.js",
+ "serve": "node node_modules/@cqsjjb/scripts/rspack.dev.server.js",
+ "build": "node node_modules/@cqsjjb/scripts/rspack.build.js",
"push": "jjb-cmd push java production",
"clean-cache": "rimraf node_modules/.cache/webpack",
"serve:development": "cross-env NODE_ENV=development npm run serve",
@@ -30,6 +30,7 @@
"lodash-es": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
+ "react-pdf": "^10.4.1",
"zy-react-library": "^1.2.35"
},
"devDependencies": {
diff --git a/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/Review/index.js b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/Review/index.js
new file mode 100644
index 0000000..921197b
--- /dev/null
+++ b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/Review/index.js
@@ -0,0 +1,7 @@
+import Review from "~/pages/Container/Supervision/Qualification/Review/Review";
+
+function EntrustedQualificationReview(props) {
+ return ;
+}
+
+export default EntrustedQualificationReview;
diff --git a/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/index.js b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/index.js
new file mode 100644
index 0000000..b19b7b1
--- /dev/null
+++ b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/index.js
@@ -0,0 +1,5 @@
+function EntrustedQualification(props) {
+ return (
{props.children}
);
+}
+
+export default EntrustedQualification;
diff --git a/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js
new file mode 100644
index 0000000..d3d523f
--- /dev/null
+++ b/src/pages/Container/BranchCompany/Qualification/EntrustedQualification/list/index.js
@@ -0,0 +1,80 @@
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
+import { Connect } from "@cqsjjb/jjb-dva-runtime";
+import { Button, Form, message, Modal, Space } from "antd";
+import { useState } from "react";
+import FormBuilder from "zy-react-library/components/FormBuilder";
+import Page from "zy-react-library/components/Page";
+import Search from "zy-react-library/components/Search";
+import DictionarySelect from "zy-react-library/components/Select/Dictionary";
+import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj";
+import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
+import Table from "zy-react-library/components/Table";
+import useTable from "zy-react-library/hooks/useTable";
+import { NS_QUALIFICATION_REVIEW } from "~/enumerate/namespace";
+
+function List(props) {
+ const [form] = Form.useForm();
+
+ const { tableProps, getData } = useTable(props["qualificationReviewList"], {
+ form,
+ });
+
+ return (
+
+
+ ),
+ },
+ { name: "stakeholderLevel", label: "资质等级", render: () },
+ ]}
+ form={form}
+ onFinish={getData}
+ />
+ record.stakeholderLevel === "one-level" ? "-" : record.groupUnitName,
+ },
+ { title: "资质名称", dataIndex: "qualificationsName" },
+ { title: "资质类别", dataIndex: "qualificationsTypeName" },
+ { title: "资质等级", dataIndex: "stakeholderLevelName" },
+ { title: "材料数", dataIndex: "materialNum" },
+ {
+ title: "操作",
+ fixed: "right",
+ width: 180,
+ hidden: !props.permission("fgs-bwtzz-sh"),
+ render: (_, record) => (
+
+
+
+ ),
+ },
+ ]}
+ {...tableProps}
+ />
+
+
+
+
+ );
+}
+
+
+export default Connect([NS_QUALIFICATION_REVIEW], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/List/index.js b/src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/List/index.js
new file mode 100644
index 0000000..8f5d6d1
--- /dev/null
+++ b/src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/List/index.js
@@ -0,0 +1,138 @@
+import { WarningOutlined } from "@ant-design/icons";
+import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
+import { Connect } from "@cqsjjb/jjb-dva-runtime";
+import { Button, Form, Space, Tooltip } from "antd";
+import Page from "zy-react-library/components/Page";
+import Search from "zy-react-library/components/Search";
+import DictionarySelect from "zy-react-library/components/Select/Dictionary";
+import Table from "zy-react-library/components/Table";
+import useTable from "zy-react-library/hooks/useTable";
+import { NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace";
+
+function List(props) {
+ const [form] = Form.useForm();
+ const { tableProps, getData } = useTable(props["qualificationRecordsList"], {
+ form,
+ transform: (formData) => {
+ const auditStatus = formData.auditStatus?.split("-") || [];
+ return {
+ auditProcess: auditStatus[0],
+ auditStatus: auditStatus[1],
+ };
+ },
+ });
+
+ return (
+
+ ),
+ },
+ { name: "stakeholderLevel", label: "资质等级", render: () },
+ // {
+ // name: "auditStatus",
+ // label: "审核状态",
+ // render: FORM_ITEM_RENDER_ENUM.SELECT,
+ // items: [
+ // { bianma: "200-200", name: "主管部门审核中" },
+ // { bianma: "200-300", name: "主管部门已驳回" },
+ // { bianma: "400", name: "已完成" },
+ // ],
+ // },
+ ]}
+ form={form}
+ onFinish={getData}
+ />
+ record.isLongTerm ? "长期" : "短期" },
+ { title: "资质等级", dataIndex: "stakeholderLevelName" },
+ { title: "材料数", dataIndex: "materialNum" },
+ {
+ title: "资质资料状态",
+ dataIndex: "qualificationsStatus",
+ render: (_, record) => (
+
+ {record.qualificationsStatus === 0 && "正常"}
+ {record.qualificationsStatus === 1 && "资质待完善"}
+ {record.qualificationsStatus === 2 && (
+
+ {record.expireList.map((item, index) => (
+
+ {item.dataName}
+ {" "}
+ 已于
+ {item.qualificationsTermEnd}
+ {" "}
+ 过期
+
+ ))}
+
+ )
+ : "部分资料已过期"
+ }
+ >
+
+ 存在异常
+ {" "}
+
+
+
+ )}
+ {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"}
+
+ ),
+ },
+ {
+ title: "审核状态",
+ dataIndex: "auditProcess",
+ render: (_, record) => (
+
+ {record.auditProcess === "100" && "集团单位"}
+ {record.status === 100 && "待审核"}
+ {record.status === 200 && "审核中"}
+ {record.status === 300 && "已驳回"}
+ {record.status === 400 && "已完成"}
+
+ ),
+ },
+ // { title: "时效性", dataIndex: "qualificationsTermStart", render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-" },
+ {
+ title: "操作",
+ fixed: "right",
+ width: 130,
+ hidden: !props.permission("fgs-bwtshjl-ck"),
+ render: (_, record) => (
+
+
+
+ ),
+ },
+ ]}
+ {...tableProps}
+ />
+
+ );
+}
+
+export default Connect([NS_QUALIFICATION_RECORDS], true)(Permission(List));
diff --git a/src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/index.js b/src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/index.js
new file mode 100644
index 0000000..988c9b6
--- /dev/null
+++ b/src/pages/Container/BranchCompany/Qualification/ExpertProjectReviewRecord/index.js
@@ -0,0 +1,5 @@
+function ExpertProjectReviewRecord(props) {
+ return ({props.children}
);
+}
+
+export default ExpertProjectReviewRecord;
diff --git a/src/pages/Container/Supervision/Qualification/Review/List/index.js b/src/pages/Container/Supervision/Qualification/Review/List/index.js
index 159a7bc..e35d51d 100644
--- a/src/pages/Container/Supervision/Qualification/Review/List/index.js
+++ b/src/pages/Container/Supervision/Qualification/Review/List/index.js
@@ -54,11 +54,11 @@ function List(props) {
{
title: "操作",
fixed: "right",
- width: 100,
+ width: 150,
render: (_, record) => (
- {/* todo recor里entrustAudit 是200 才能委托,
- */}
+ {
+ (record.entrustAudit === 200 && props.permission("gfd-zrzzsh-wt")) &&
-
+ }
{props.permission("zrzz-jgd-xgfzrzzsh-btn-sh") && (
{rejectModalOpen && setRejectModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
- {passModalOpen && setPassModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} />}
+ {passModalOpen && setPassModalOpen(false)} id={query.id} qualificationsAuditId={query.qualificationsAuditId} isLongTerm={info.isLongTerm} periodTermStart={info.periodTermStart} periodTermEnd={info.periodTermEnd} />}
);
}
@@ -99,6 +99,7 @@ const RejectModalComponent = (props) => {
};
const PassModalComponent = (props) => {
+ console.log(props)
const [form] = Form.useForm();
const periodTermStart = Form.useWatch("periodTermStart", form);
const onSubmit = async (values) => {
@@ -109,6 +110,12 @@ const PassModalComponent = (props) => {
window.history.back();
}
};
+ useEffect(() => {
+ if(props.isLongTerm !== null){
+ form.setFieldsValue({isLongTerm:props.isLongTerm, periodTermStart:props.periodTermStart, periodTermEnd:props.periodTermEnd});
+ }
+
+ }, []);
return (