From 3d3ef70f8f0568cf82ec657159e6c1c24920fece Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Thu, 20 Aug 2026 16:38:00 +0800 Subject: [PATCH] =?UTF-8?q?0814=20=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/api/rectification/index.js | 4 ++++ .../Average/Ledger/List/index.js | 6 +++--- .../Average/Rectification/List/index.js | 19 ++++++++++++------- .../Average/Rectification/Review/index.js | 5 ++++- 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 7afaea0..d81d08d 100644 --- a/package.json +++ b/package.json @@ -32,12 +32,12 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.3.17" + "zy-react-library": "^1.3.29" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", "@babel/plugin-proposal-decorators": "^7.19.3", - "@cqsjjb/scripts": "latest", + "@cqsjjb/scripts": "2.0.0", "@eslint-react/eslint-plugin": "^2.2.2", "cross-env": "^7.0.3", "eslint": "^9.37.0", diff --git a/src/api/rectification/index.js b/src/api/rectification/index.js index 9907f19..3e7a3e3 100644 --- a/src/api/rectification/index.js +++ b/src/api/rectification/index.js @@ -16,3 +16,7 @@ export const rectificationSave = declareRequest( "rectificationLoading", "Put > @/hidden/hidden/rectify", ); +export const rectificationCanRequestAnExtension = declareRequest( + "rectificationLoading", + "Get > /hidden/hiddenExamine/canRequestAnExtension/{id}", +); diff --git a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js index 786b3a8..68f478f 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js @@ -35,7 +35,7 @@ function List(props) { hiddenFindTime: formData.hiddenFindTime?.[0], hiddenFindTimeLe: formData.hiddenFindTime?.[1], state: formData.state ? [formData.state] : undefined, - hiddenLevels: ["hiddenLevel1001", "hiddenLevel1004", "hiddenLevel1002"], + hiddenLevels: ["hiddenLevel1004", "hiddenLevel1002"], }), }); @@ -70,7 +70,7 @@ function List(props) { name: "hiddenLevel", label: "隐患级别", render: ( - + ), }, { name: "creatorName", label: "隐患发现人" }, @@ -78,7 +78,7 @@ function List(props) { name: "state", label: "隐患状态", render: FORM_ITEM_RENDER_ENUM.SELECT, - items: getUnmatchedItems({ list: HIDDEN_STATE_ENUM, value: ["98", "102"] }), + items: getUnmatchedItems({ list: HIDDEN_STATE_ENUM, value: ["98", "102", "101", "202", "400"] }), }, { name: "confirmUserName", label: "确认人" }, { name: "rectificationUserName", label: "整改人" }, diff --git a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js index 1b4065a..f4e885b 100644 --- a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js @@ -39,7 +39,6 @@ function List(props) { }); const getInfoData = async () => { const data = await getUserInfo(); - console.log(data.id); setUserId(data.id); }; @@ -150,10 +149,13 @@ function List(props) { {props.permission(props.sqyqButton || "fgs-yqzg-sqyq") && !record.noReviewExtensionNum && userId === record.rectifyUserId && (