From 0f03bc49d24e1c845b33e53b6657c5a0dc59fc91 Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Fri, 10 Jul 2026 09:26:24 +0800
Subject: [PATCH 1/4] bug fix
---
.../Supervision/ExperManage/index.js | 22 ++++++++++++++-----
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/pages/Container/Supervision/ExperManage/index.js b/src/pages/Container/Supervision/ExperManage/index.js
index b83ae85..091503d 100644
--- a/src/pages/Container/Supervision/ExperManage/index.js
+++ b/src/pages/Container/Supervision/ExperManage/index.js
@@ -316,16 +316,22 @@ const ExperManage = (props) => {
-
+
-
+
-
-
+
+
From 7b697b099ba017b4ad5a8b80aa3a1dab3338afd3 Mon Sep 17 00:00:00 2001
From: tangjie <122778500@qq.com>
Date: Fri, 10 Jul 2026 09:28:43 +0800
Subject: [PATCH 2/4] fix
---
src/components/AttachmentUpload/index.js | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/components/AttachmentUpload/index.js b/src/components/AttachmentUpload/index.js
index a3da783..16f6684 100644
--- a/src/components/AttachmentUpload/index.js
+++ b/src/components/AttachmentUpload/index.js
@@ -59,9 +59,17 @@ export default function AttachmentUpload({ name, label, disabled = false, maxCou
action={`${window.process.env.app.API_HOST}/safetyEval/file/upload`}
beforeUpload={(file) => {
if (!accept) return true;
- const exts = accept.split(",").map((e) => e.trim().toLowerCase());
+ const rules = accept.split(",").map((e) => e.trim().toLowerCase());
const ext = "." + file.name.split(".").pop().toLowerCase();
- if (!exts.includes(ext)) {
+ const matchExt = rules.includes(ext);
+ const matchMime = rules.some((r) => {
+ if (r.endsWith("/*")) {
+ const prefix = r.slice(0, -1);
+ return file.type && file.type.toLowerCase().startsWith(prefix);
+ }
+ return false;
+ });
+ if (!matchExt && !matchMime) {
message.error(`仅支持 ${accept} 格式文件`);
return Upload.LIST_IGNORE;
}
From ffd0d68cce7fd82e758fb28540fb4a2f09f57689 Mon Sep 17 00:00:00 2001
From: tangjie <122778500@qq.com>
Date: Fri, 10 Jul 2026 09:46:46 +0800
Subject: [PATCH 3/4] fix
---
jjb.config.js | 2 +-
.../Container/EnterpriseInfo/EquipInfo/index.js | 13 +++++++------
.../Container/Supervision/ExperManage/index.js | 8 +++++++-
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/jjb.config.js b/jjb.config.js
index 8c58ad4..a384d58 100644
--- a/jjb.config.js
+++ b/jjb.config.js
@@ -10,7 +10,7 @@ module.exports = {
javaGitBranch: "dev",
// 本地联调 safetyEval-service(context-path: /safetyEval,默认端口 8095)
// 可通过环境变量覆盖: SAFETY_EVAL_API_HOST=http://192.168.x.x:8095
- API_HOST: "http://192.168.0.152",
+ API_HOST: "http://192.168.0.103",
},
production: {
// 应用后端分支名称,部署上线需要
diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js
index 3f210e8..6c9833b 100644
--- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js
+++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js
@@ -116,6 +116,7 @@ function EquipInfoPage(props) {
label="设备名称"
placeholder="请输入"
allowClear
+ maxLength={30}
/>
,
@@ -161,7 +162,7 @@ function EquipInfoPage(props) {
width: 200,
ellipsis: true,
},
- { title: "设备型号", dataIndex: "deviceModel" },
+ { title: "设备型号", dataIndex: "deviceModel", ellipsis: true, },
{ title: "仪器类型", dataIndex: "instrumentTypeName" },
{ title: "设备类型", dataIndex: "deviceTypeName" },
{
@@ -353,7 +354,7 @@ function EquipFormModal({
label="设备名称"
rules={[{ required: true, message: "请输入设备名称" }]}
>
-
+
@@ -362,7 +363,7 @@ function EquipFormModal({
label="型号"
rules={[{ required: true, message: "请输入型号" }]}
>
-
+
@@ -397,12 +398,12 @@ function EquipFormModal({
label="厂家"
rules={[{ required: true, message: "请输入厂家" }]}
>
-
+
-
+
@@ -431,7 +432,7 @@ function EquipFormModal({
-
+
diff --git a/src/pages/Container/Supervision/ExperManage/index.js b/src/pages/Container/Supervision/ExperManage/index.js
index b83ae85..d6f53b2 100644
--- a/src/pages/Container/Supervision/ExperManage/index.js
+++ b/src/pages/Container/Supervision/ExperManage/index.js
@@ -339,7 +339,13 @@ const ExperManage = (props) => {
-
+
From a3a84e7d2433b6b98f5e913f828a8b3705d5261f Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Fri, 10 Jul 2026 09:52:23 +0800
Subject: [PATCH 4/4] bug fix
---
.../FilingForm/components/BasicInfoStep.jsx | 101 ++++++++++++++----
1 file changed, 83 insertions(+), 18 deletions(-)
diff --git a/src/pages/Container/QualApplication/FilingForm/components/BasicInfoStep.jsx b/src/pages/Container/QualApplication/FilingForm/components/BasicInfoStep.jsx
index e6be10a..157c3ff 100644
--- a/src/pages/Container/QualApplication/FilingForm/components/BasicInfoStep.jsx
+++ b/src/pages/Container/QualApplication/FilingForm/components/BasicInfoStep.jsx
@@ -38,7 +38,7 @@ export default function BasicInfoStep({ form, disabled }) {
-
+
@@ -48,81 +48,146 @@ export default function BasicInfoStep({ form, disabled }) {
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
+ value === undefined || value === null || value === ""
+ ? Promise.resolve()
+ : /^\d{1,9}(\.\d{1,2})?$/.test(String(value))
+ ? Promise.resolve()
+ : Promise.reject(new Error("整数最多9位,小数最多2位")),
+ },
+ ]}
>
-
+
+ value === undefined || value === null || value === ""
+ ? Promise.resolve()
+ : /^\d{1,9}(\.\d{1,2})?$/.test(String(value))
+ ? Promise.resolve()
+ : Promise.reject(new Error("整数最多9位,小数最多2位")),
+ },
+ ]}
>
-
+
-
-
+
+ value === undefined || value === null || value === ""
+ ? Promise.resolve()
+ : /^\d{1,9}(\.\d{1,2})?$/.test(String(value))
+ ? Promise.resolve()
+ : Promise.reject(new Error("整数最多9位,小数最多2位")),
+ },
+ ]}
+ >
+
-
+
-
+
-
+