diff --git a/src/api/Notice/index.js b/src/api/Notice/index.js index e3c201b..81a8626 100644 --- a/src/api/Notice/index.js +++ b/src/api/Notice/index.js @@ -20,5 +20,11 @@ export const noticeBatchDelete = declareRequest( "noticeLoading", "Delete > @/appmenu/notice/ids/{ids}", ); -export const noticeInfo = declareRequest("noticeLoading", "Get > /appmenu/notice/{id}"); -export const noticeReadStatus = declareRequest("noticeLoading", "Get > /appmenu/notice/readStatus/{noticeId}"); +export const noticeInfo = declareRequest( + "noticeLoading", + "Get > /appmenu/notice/{id}", +); +export const noticeReadStatus = declareRequest( + "noticeLoading", + "Post > @/appmenu/notice/noticeReadStatus", +); diff --git a/src/pages/Container/Notice/Add/index.js b/src/pages/Container/Notice/Add/index.js index 4a42ec5..092507a 100644 --- a/src/pages/Container/Notice/Add/index.js +++ b/src/pages/Container/Notice/Add/index.js @@ -15,6 +15,9 @@ function Add(props) { const contentValue = Form.useWatch("content", form); const publishScope = Form.useWatch("publishScope", form); + // 判断是否为只读模式 + const isReadOnly = queryParams["readonly"] === "true"; + // 当取消勾选分子公司时,清空发布部门ID useEffect(() => { if (publishScope && !publishScope.includes("2")) { @@ -26,15 +29,26 @@ function Add(props) { if (queryParams["id"]) { props["noticeInfo"]({ id: queryParams["id"] }).then((res) => { if (res.data) { - form.setFieldsValue(res.data); + // 处理编辑时的数据格式 + const formData = { ...res.data }; + // 将逗号分隔的字符串转换为数组 + if (formData.publishScope && typeof formData.publishScope === "string") { + formData.publishScope = formData.publishScope.split(","); + } + if (formData.publishCorpinfoIds && typeof formData.publishCorpinfoIds === "string") { + formData.publishCorpinfoIds = formData.publishCorpinfoIds.split(","); + } + form.setFieldsValue(formData); } }); } }, []); useEffect(() => { - props["corpInfoListAll"]({ inType: "0,1,2,6", eqUseFlag: 1 }).then((res) => { + console.log(props); + props["corpInfoListAll"]({ inType: "0,1,6", eqUseFlag: 1 }).then((res) => { if (res.data) { + console.log(res.data); res.data.forEach((item) => { item.bianma = item.id; item.name = item.corpName; @@ -52,6 +66,15 @@ function Add(props) { return; // 阻止后续逻辑 } const values = await form.validateFields(); + + // 将通知范围数组转换为字符串 + if (values.publishScope && Array.isArray(values.publishScope)) { + values.publishScope = values.publishScope.join(","); + } + // 将分子公司数组转换为字符串 + if (values.publishCorpinfoIds && Array.isArray(values.publishCorpinfoIds)) { + values.publishCorpinfoIds = values.publishCorpinfoIds.join(","); + } if (queryParams["id"]) { values.id = queryParams["id"]; props["noticeEdit"](values).then((res) => { @@ -73,8 +96,8 @@ function Add(props) { return ( {_hasPermission("notice-edit") && (