fix

src/pages/cms/emergencyPlan/detail/index.jsx

@@ -1,15 +1,9 @@
-import { savePosts, getPostsDetail, updatePosts } from "@/services/posts";
-import { getStoreList } from "@/services/stock";
-import {
-  PageContainer,
-  ProForm,
-  ProFormSelect,
-  ProFormText,
-} from "@ant-design/pro-components";
+import { getPostsDetail } from "@/services/posts";
+
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { Card, Typography, message, Row, Button, Space } from "antd";
-import { useEffect, useRef, useState } from "react";
-import Wangeditor from "@/components/Wangeditor";
+import { Card, Typography, Button } from "antd";
+import { useEffect, useState } from "react";
+
 const { Title } = Typography;
 export default (props) => {
   const [searchParams] = useSearchParams();
@@ -18,8 +12,6 @@ export default (props) => {
   const [url, setUrl] = useState("");
   const navigate = useNavigate();
 
-  const formRef = useRef();
-
   useEffect(() => {
     if (id) {
       getPostsDetail(id).then((res) => {
@@ -36,7 +28,7 @@ export default (props) => {
       </Title>
       <div dangerouslySetInnerHTML={{ __html: data?.detail }}></div>
       {url && (
-        <div style={{marginTop:"2em"}}>
+        <div style={{ marginTop: "2em" }}>
           <a
             href={`${url}`}
             download

src/pages/cms/emergencyPlan/list/index.jsx

@@ -33,6 +33,15 @@ const EmergencyPlanList = (props) => {
     {
       title: "内容名称",
       dataIndex: "title",
+      render: (text, record) => (
+        <a
+          onClick={() => {
+            navigate(`/cms/emergency-plan/detail?id=${record.id}`);
+          }}
+        >
+          {text}
+        </a>
+      ),
     },
 
     {
@@ -41,7 +50,7 @@ const EmergencyPlanList = (props) => {
       search: false,
       ellipsis: true,
       width: "50%",
-      renderText: (text) => text.replace(regex, ""),
+      renderText: (text) => text?.replace(regex, ""),
     },
     {
       title: "状态",

src/pages/purchase/bill/edit/index.jsx

@@ -99,6 +99,9 @@ export default (props) => {
             searchConfig: {
               resetText: "返回",
             },
+            submitButtonProps: {
+              disabled: isCompleted,
+            },
             onReset: () => navigate(-1),
             render: (props, doms) => {
               console.log(props, doms, "renderprops");
@@ -106,15 +109,11 @@ export default (props) => {
                 <Row>
                   <Col span={8} offset={2}>
                     <Space>
-                      {doms?.map((x, index) => {
-                        if (index === 1 && isCompleted) {
-                          return null;
-                        }
-                        return x;
-                      })}
-                      {id&&!isCompleted && (
+                      {doms}
+                      {id&& (
                         <Button
                           type="primary"
+                          disabled={isCompleted}
                           onClick={() => onBillFinish(props)}
                         >
                           采购完成

src/pages/purchase/plan/edit/index.jsx

@@ -85,6 +85,10 @@ export default (props) => {
           submitter={{
             searchConfig: {
               resetText: "返回",
+              
+            },
+            submitButtonProps: {
+              disabled: isCompleted,
             },
             onReset: () => navigate(-1),
             render: (props, doms) => {
@@ -93,14 +97,7 @@ export default (props) => {
               return (
                 <Row>
                   <Col span={8} offset={2}>
-                    <Space>
-                      {doms?.map((x, index) => {
-                        if (index === 1 && isCompleted) {
-                          return null;
-                        }
-                        return x;
-                      })}
-                    </Space>
+                    <Space>{doms}</Space>
                   </Col>
                 </Row>
               );
@@ -110,12 +107,14 @@ export default (props) => {
           <ProFormText
             name="title"
             label="采购计划"
+            allowClear={false}
             placeholder="请输入采购计划"
             rules={[{ required: true, message: "请输入采购计划" }]}
             width={480}
           />
           <ProFormText
             name="planDate"
+            allowClear={false}
             label="计划时间"
             placeholder="请输入计划时间"
             rules={[{ required: true, message: "请输入计划时间" }]}
@@ -138,6 +137,7 @@ export default (props) => {
                       <ProFormSelect
                         {...restField}
                         name={[name, "storeId"]}
+                        allowClear={false}
                         label="库存名称"
                         placeholder="请选择库存名称"
                         rules={[{ required: true, message: "请输入选择名称" }]}
@@ -146,6 +146,7 @@ export default (props) => {
 
                       <ProFormDigit
                         {...restField}
+                        allowClear={false}
                         name={[name, "planAmount"]}
                         label="计划数量"
                         placeholder="请输入计划数量"
@@ -165,20 +166,18 @@ export default (props) => {
                         fieldProps={{ precision: 2, prefix: "￥" }}
                         // width={150}
                       />
-                      <MinusCircleOutlined onClick={() => remove(name)} />
+                    {  !isCompleted&&<MinusCircleOutlined onClick={() => remove(name)} />}
                     </Space>
                   ))}
-                  <Form.Item>
+                  {!isCompleted&&<Form.Item>
                     <Button
                       type="dashed"
                       onClick={() => add()}
-                      // block
-                      // style={{width:100}}
                       icon={<PlusOutlined />}
                     >
                       添加
                     </Button>
-                  </Form.Item>
+                  </Form.Item>}
                 </>
               )}
             </Form.List>

src/regulation/detail/index.jsx

@@ -0,0 +1,44 @@
+import { getPostsDetail } from "@/services/posts";
+
+import { useNavigate, useSearchParams } from "react-router-dom";
+import { Card, Typography, Button } from "antd";
+import { useEffect, useState } from "react";
+
+const { Title } = Typography;
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  const [data, setData] = useState({});
+  const [url, setUrl] = useState("");
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    if (id) {
+      getPostsDetail(id).then((res) => {
+        setData(res);
+        setUrl(res.filesList[0]?.fileAddr);
+      });
+    }
+  }, [id]);
+
+  return (
+    <Card title={<Button onClick={() => navigate(-1)}> 返回</Button>}>
+      <Title level={2} style={{ marginBottom: "2em" }}>
+        {data.title}
+      </Title>
+      <div dangerouslySetInnerHTML={{ __html: data?.detail }}></div>
+      {url && (
+        <div style={{ marginTop: "2em" }}>
+          <a
+            href={`${url}`}
+            download
+            // rel="noopener noreferrer"
+            // key="link"
+          >
+            {url?.substring(url?.lastIndexOf("/") + 1)}
+          </a>
+        </div>
+      )}
+    </Card>
+  );
+};

src/regulation/edit/index.jsx

@@ -1,32 +1,55 @@
-import { addRegulation, getRegulationById } from '@/services/regulation';
-import { queryDict } from '@/utils/request';
-import { PageContainer, ProForm, ProFormSelect, ProFormText } from '@ant-design/pro-components';
-import { Card, Col, message, Row, Space } from 'antd';
-import { useNavigate, useSearchParams } from 'react-router-dom';
-import { useEffect, useRef, useState } from 'react';
+import { savePosts, getPostsDetail } from "@/services/posts";
+import {
+  PageContainer,
+  ProForm,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import { Card, Col, Row, Space } from "antd";
+import { useEffect, useRef } from "react";
+import UploadFile from "@/components/UploadFile";
+import Wangeditor from "@/components/Wangeditor";
 
 export default (props) => {
-  const [searchParams, setSearchParams] = useSearchParams();
-  const id = searchParams.get('id');
-  const formRef = useRef();
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
   const navigate = useNavigate();
 
+  const formRef = useRef();
+
   useEffect(() => {
     if (id) {
-      getRegulationById(id).then((res) => {
-        formRef.current.setFieldsValue(res);
+      getPostsDetail(id).then((res) => {
+        formRef.current.setFieldsValue({
+          ...res,
+          filesList: res.filesList?.map((x) => x.fileAddr)[0]||null,
+        });
       });
     }
   }, [id]);
 
   const onFinish = async (values) => {
-    console.log(values);
-
-    //添加,修改
-    addRegulation({ ...values, id }).then((res) => {
-      // message.success('成功');
+    savePosts({
+      ...values,
+      type: 'regulation',
+      filesList: values.filesList
+        ? [
+            {
+              fileAddr: values.filesList,
+              fileName: values.filesList?.substring(
+                values.filesList?.lastIndexOf("/") + 1
+              ),
+            },
+          ]
+        : null,
+      status: Number(values.status),
+      ...(id?{id}:{}),
+    }).then((res) => {
       navigate(-1);
     });
+    // }
+
     return false;
   };
 
@@ -35,13 +58,14 @@ export default (props) => {
       <Card>
         <ProForm
           formRef={formRef}
-          layout={'horizontal'}
+          layout={"horizontal"}
           labelCol={{ span: 8 }}
-          wrapperCol={{ span: 16 }}
+          wrapperCol={{ span: 12 }}
           onFinish={onFinish}
+          initialValues={{ status: 0 }}
           submitter={{
             searchConfig: {
-              resetText: '返回',
+              resetText: "返回",
             },
             onReset: () => navigate(-1),
             render: (props, doms) => {
@@ -56,23 +80,50 @@ export default (props) => {
           }}
         >
           <ProFormText
+            name="title"
+            label="内容名称"
+            placeholder="请输入内容名称"
+            rules={[{ required: true, message: "请输入内容名称" }]}
+            width={460}
+          />
+
+          <ProForm.Item
             name="detail"
-            label="发布内容"
-            placeholder="请输入发布内容"
-            rules={[{ required: true, message: '请输入发布内容' }]}
-            allowClear={false}
+            label="发布详情"
+            placeholder="请输入发布详情"
+            rules={[{ required: true, message: "请输入发布详情" }]}
+          >
+            <Wangeditor></Wangeditor>
+          </ProForm.Item>
+          <ProForm.Item name="filesList" label="文件">
+            <UploadFile preview={true}></UploadFile>
+          </ProForm.Item>
+
+          <ProFormSelect
+            name="status"
+            label="状态"
+            placeholder="请选择"
+            rules={[{ required: true, message: "请选择状态" }]}
             width={460}
+            options={[
+              {
+                value: 0,
+                label: "未发布",
+              },
+              {
+                value: 1,
+                label: "已发布",
+              },
+            ]}
           />
           <ProFormText
-            name="title"
-            label="内容名称"
-            placeholder="请输入内容名称"
-            rules={[{ required: true, message: '请输入内容名称' }]}
-            allowClear={false}
+            name="createPerson"
+            label="发布人"
+            placeholder="请输入发布人"
             width={460}
           />
         </ProForm>
       </Card>
     </PageContainer>
   );
-}
+};

src/regulation/index.jsx

@@ -1,22 +1,28 @@
-import { getRegulationList, deleteRegulation } from '@/services/regulation';
-import { PageContainer, ProTable } from '@ant-design/pro-components';
-import { useRef, useState, useEffect } from 'react';
-import { useNavigate } from 'react-router-dom';
-import { queryTable } from '@/utils/request';
-import { Button, message, Popconfirm } from 'antd';
+import { getPostsList, deletePosts, updatePosts } from "@/services/posts";
+import { queryTable } from "@/utils/request";
+import { PageContainer, ProTable } from "@ant-design/pro-components";
+import { useNavigate } from "react-router-dom";
+import { Button, Popconfirm } from "antd";
+import { useRef } from "react";
+
+const regex = /(<([^>]+)>)/gi;
 
 const RegulationList = (props) => {
+
   const actionRef = useRef();
   const navigate = useNavigate();
 
-  useEffect(() => {
-    actionRef.current.reload();
-  });
+  const updata = (row) => {
+    if (row.id) {
+      updatePosts(row.id, { status: row.status === 1 ? 0 : 1 }).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
 
   const handleDelete = (id) => {
     if (id) {
-      deleteRegulation(id).then((res) => {
-        // message.success('删除成功');
+      deletePosts(id).then((res) => {
         actionRef.current.reload();
       });
     }
@@ -24,54 +30,76 @@ const RegulationList = (props) => {
 
   const columns = [
     {
-      title: 'id',
-      dataIndex: 'id',
-      width: 200,
-      search: false,
-    },
-    {
-      title: '标题',
-      dataIndex: 'title',
-      width: 200,
-      search: true,
+      title: "内容名称",
+      dataIndex: "title",
+      render: (text, record) => (
+        <a
+          onClick={() => {
+            navigate(`/cms/regulation/detail?id=${record.id}`);
+          }}
+        >
+          {text}
+        </a>
+      ),
     },
 
     {
-      title: '内容',
-      dataIndex: 'detail',
-      width: 200,
+      title: "发布内容",
+      dataIndex: "detail",
       search: false,
+      ellipsis: true,
+      width: "50%",
+      renderText: (text) => text?.replace(regex, ""),
     },
-
     {
-      title: '发布人',
-      dataIndex: 'create_person',
-      width: 200,
-      search: false,
+      title: "状态",
+      dataIndex: "status",
+      valueType: "select",
+      valueEnum: {
+        0: { text: "未发布", status: "Error" },
+        1: { text: "已发布", status: "Processing" },
+      },
     },
     {
-      title: '发布时间',
-      dataIndex: 'create_date',
-      width: 200,
+      title: "发布人",
+      dataIndex: "createPerson",
       search: false,
     },
     {
-      title: '操作',
-      valueType: 'option',
+      title: "操作",
+      valueType: "option",
       width: 200,
       render: (_, record) => [
+        <Button
+          key={4}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            updata(record);
+          }}
+        >
+          {record.status === 1 ? "下架" : "发布"}
+        </Button>,
+        <Button
+          key={1}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            navigate(`/cms/regulation/detail?id=${record.id}`);
+          }}
+        >
+          详情
+        </Button>,
         <Button
           key={2}
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            console.log(record, ']]');
-            navigate(`/cms/regulation/add?id=${record.id}`);
+            navigate(`/cms/regulation/edit?id=${record.id}`);
           }}
         >
-          编辑
+          修改
         </Button>,
-
         <Popconfirm
           key={3}
           title="您是否确认删除 ?"
@@ -91,7 +119,6 @@ const RegulationList = (props) => {
   return (
     <PageContainer>
       <ProTable
-        search={true}
         actionRef={actionRef}
         rowKey="id"
         toolBarRender={() => [
@@ -99,17 +126,19 @@ const RegulationList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              navigate('/cms/regulation/add');
+              navigate("/cms/regulation/edit");
             }}
           >
             新增
           </Button>,
         ]}
-        request={queryTable(getRegulationList)}
+        // search={false}
+        params={{ type: 'regulation' }}
+        request={queryTable(getPostsList)}
         columns={columns}
       />
     </PageContainer>
   );
-}
+};
 
-export default RegulationList;
+export default RegulationList;

src/routes/routes.jsx

@@ -35,6 +35,7 @@ import RotationChartDetail from "@/pages/rotationChart/detail";
 import Roles from "@/pages/roles/index";
 import RegulationList from "@/regulation";
 import RegulationEdit from "@/regulation/edit";
+import RegulationDetail from "@/regulation/detail";
 import UserList from "@/pages/user";
 import UserEdit from "@/pages/user/Edit";
 import PurchasePlanList from "@/pages/purchase/plan/list";
@@ -306,7 +307,7 @@ export const authRoutes = [
         },
       },
       {
-        path: "regulation/add",
+        path: "regulation/edit",
         element: <RegulationEdit />,
         meta: {
           hideInMenu: true,
@@ -314,6 +315,15 @@ export const authRoutes = [
           permission: 'regulation.edit',
         },
       },
+      {
+        path: "regulation/detail",
+        element: <RegulationDetail />,
+        meta: {
+          hideInMenu: true,
+          title: "规章制度详情",
+          permission: 'regulation.detail',
+        },
+      },
       {
         path: "emergency-plan",
         element: <EmergencyPlanList />,

src/services/regulation.js

@@ -5,7 +5,7 @@ import request from '@/utils/request';
  * @param {*} params
  * @returns
  */
-export const getRegulationList = (params) => request('/posts', { params });
+export const getRegulationList = (params) => request('/posts', { params,successTip:false });
 
 /**
 * 新增,更新
@@ -20,7 +20,7 @@ export const addRegulation = (data) => request(`/posts`, { method: 'post', data
 * @param {*} id
 * @returns
 */
-export const getRegulationById = (id) => request(`/posts/${id}`);
+export const getRegulationById = (id) => request(`/posts/${id}` ,{successTip:false});
 
 /**
  * 删除