diff --git a/jjb.config.js b/jjb.config.js index 61acb0a..be646be 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: "https://gbs-gateway.qhdsafety.com", + API_HOST: "http://127.0.0.1", }, production: { // 应用后端分支名称,部署上线需要 diff --git a/src/components/AttachmentUpload/index.js b/src/components/AttachmentUpload/index.js index f6b638a..ba0c2dc 100644 --- a/src/components/AttachmentUpload/index.js +++ b/src/components/AttachmentUpload/index.js @@ -17,16 +17,23 @@ export default function AttachmentUpload({ name, label, disabled = false, maxCou if (Array.isArray(value)) { return { fileList: value }; } - return { - fileList: value - ? value.split(",").map((item) => ({ - url: item, - uid: item, - status: "done", - name: "附件", - })) - : [], - }; + if (typeof value === "string" && value) { + try { + const parsed = JSON.parse(value); + if (Array.isArray(parsed)) { + return { fileList: parsed }; + } + } catch {} + return { + fileList: value.split(",").map((item) => ({ + url: item, + uid: item, + status: "done", + name: "附件", + })), + }; + } + return { fileList: [] }; }} getValueFromEvent={({ fileList }) => { return ( diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index ededf07..3f210e8 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -24,6 +24,7 @@ import { tools } from "@cqsjjb/jjb-common-lib"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { NS_EQUIP_INFO } from "~/enumerate/namespace"; import { positiveNumberRule } from "~/utils/validators"; +import { toEquipPageQuery } from "../equipPageQuery"; const { router } = tools; const DUAL_CHANNEL_MAP = { 1: "是", 2: "否" }; @@ -41,9 +42,7 @@ function EquipInfoPage(props) { } = equipInfo || {}; const handleSearch = () => { - props.equipInfoList({ - ...router.query, - }); + props.equipInfoList(toEquipPageQuery(router.query)); }; useEffect(() => { @@ -143,17 +142,6 @@ function EquipInfoPage(props) { 便携式 , - - - 启用 - 禁用 - - , ]} onReset={(value) => { router.query = { ...value, current: 1, size: 10 }; diff --git a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js index f169011..cf6f6ce 100644 --- a/src/pages/Container/EnterpriseInfo/OrgInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/OrgInfo/index.js @@ -341,11 +341,7 @@ function OrgInfoPage(props) { /> - - - - - + setHistoryRecord(record)} - extraActions={(record) => - [ 1,3].includes(record.filingStatusCode) ? ( - - ) : null - } + /> ({ ...prev, current: page, pageSize, total: res?.total || 0 })); diff --git a/src/pages/Container/QualApplication/FilingListTable.jsx b/src/pages/Container/QualApplication/FilingListTable.jsx index b28ba71..b741cd0 100644 --- a/src/pages/Container/QualApplication/FilingListTable.jsx +++ b/src/pages/Container/QualApplication/FilingListTable.jsx @@ -35,10 +35,12 @@ export default function FilingListTable({ const statusOptions = getFilingStatusOptions(mode); const canEditRow = (record) => { - if (mode === FILING_FORM_MODE.FILED) { - return Number(record.filingStatusCode) === 3; + + if (mode === FILING_FORM_MODE.CHANGE) { + + return [1,3,5].includes(record.filingStatusCode); } - return isQualFilingEditable(record.filingStatusCode); + return [3,5].includes(record.filingStatusCode); }; const columns = [ @@ -101,7 +103,7 @@ export default function FilingListTable({ 查看 {extraActions?.(record)} - {canEditRow(record) && mode !== FILING_FORM_MODE.CHANGE && ( + {canEditRow(record) && (