diff --git a/package.json b/package.json
index 4e31aa1..45a9538 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"lodash-es": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
- "zy-react-library": "^1.1.26"
+ "zy-react-library": "^1.1.28"
},
"devDependencies": {
"@antfu/eslint-config": "^5.4.1",
diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
index 2350431..76d30b1 100644
--- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js
@@ -30,6 +30,7 @@ function Add(props) {
const { data } = await props["qualificationApplyInfo"]({ id: query.id });
// 重新提交时,删除id
if (query.resubmit) {
+ data.resubmitId = query.id;
delete data.id;
}
if (data.groupUnitUser) {
@@ -330,9 +331,11 @@ const StepTwoComponent = (props) => {
delete query.id;
}
const data = { ...props.formValues, qualificationsApplyDetailList: [...specialList] };
- if (data.groupUnitUser && data.groupUnitUser.length !== 0) {
+ if (data.groupUnitUser && Array.isArray(data.groupUnitUser)) {
data.groupUnitUser = data.groupUnitUser.join(",");
- data.groupUnitUserName = data.groupUnitUserName?.join(",");
+ }
+ if (data.groupUnitUserName && Array.isArray(data.groupUnitUserName)) {
+ data.groupUnitUserName = data.groupUnitUserName.join(",");
}
const { success } = await props[!query.id ? "qualificationApplyAdd" : "qualificationApplyUpdate"]({
...data,
@@ -351,7 +354,7 @@ const StepTwoComponent = (props) => {
>
{typeGroup.map(item => (
-
{item.dataTypeName}
+
{`${item.dataTypeName}信息`}
record.dataType === item.dataType)}
pagination={false}
diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js
index 8f07fea..44ad004 100644
--- a/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Apply/View/index.js
@@ -76,7 +76,7 @@ function View(props) {
{typeGroup.map(item => (
-
{item.dataTypeName}
+
{`${item.dataTypeName}信息`}
detail.dataType === item.dataType)}
pagination={false}
diff --git a/src/pages/Container/BranchCompany/Qualification/Records/List/index.js b/src/pages/Container/BranchCompany/Qualification/Records/List/index.js
index b3ed0c2..f47f0fa 100644
--- a/src/pages/Container/BranchCompany/Qualification/Records/List/index.js
+++ b/src/pages/Container/BranchCompany/Qualification/Records/List/index.js
@@ -12,7 +12,7 @@ import useTable from "zy-react-library/hooks/useTable";
import { NS_QUALIFICATION_RECORDS } from "~/enumerate/namespace";
function List(props) {
- const [currentTenantId, setCurrentTenantId] = useState("");
+ const [currentUserId, setCurrentUserId] = useState("");
const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["qualificationRecordsList"], {
form,
@@ -24,7 +24,7 @@ function List(props) {
};
},
onSuccess: (data) => {
- setCurrentTenantId(data.extValues.currentTenantId);
+ setCurrentUserId(data.extValues.currentUserId);
},
});
@@ -60,7 +60,7 @@ function List(props) {
{ title: "资质名称", dataIndex: "qualificationsName" },
{ title: "资质类别", dataIndex: "qualificationsTypeName" },
{ title: "资质等级", dataIndex: "stakeholderLevelName" },
- { title: "时效属性", dataIndex: "isLongTerm", render: (_, record) => record.isLongTerm ? "长期" : "短期" },
+ { title: "时效属性", dataIndex: "isLongTerm", render: (_, record) => record.isLongTerm === 1 ? "长期" : "短期" },
{ title: "材料数", dataIndex: "materialNum" },
{
title: "资质状态",
@@ -98,19 +98,15 @@ function List(props) {
)}
- {record.qualificationsStatus === 3 && "资质过期"}
+ {(record.qualificationsStatus === 3 || record.qualificationsStatus === 4) && "资质过期"}
),
},
{
title: "当前状态",
- dataIndex: "auditProcess",
+ dataIndex: "status",
render: (_, record) => (
- {record.auditProcess === "100" && "集团单位"}
- {record.status === 100 && "待审核"}
- {record.status === 200 && "审核中"}
- {record.status === 300 && "已驳回"}
{record.status === 400 && "已通过"}
),
@@ -121,7 +117,9 @@ function List(props) {
width: 200,
render: (_, record) => (
- {(props.permission(props.cxtjbtn || "zrzz-jtgs-zrzzjl-btn-cxtj") && record.status === 400 && record.corpId === currentTenantId && (record.qualificationsStatus === 1 || record.qualificationsStatus === 2)) && (
+ {(props.permission(props.cxtjbtn || "zrzz-jtgs-zrzzjl-btn-cxtj")
+ && record.status === 400 && record.createId === currentUserId
+ && (record.isAnnualInspection === 1)) && (