feats

.env.production

@@ -1 +1 @@
-VITE_SERVER_BASE=/api
+VITE_SERVER_BASE=http://jgz.njyunzhi.com/api

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

@@ -12,11 +12,13 @@ import {
   ProFormDigit,
 } from "@ant-design/pro-components";
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { Card, Col, message, Row, Space, Form, Button } from "antd";
+import { Card, Col, Modal, Row, Space, Form, Button } from "antd";
 import { useEffect, useRef, useState } from "react";
-import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { ExclamationCircleOutlined } from '@ant-design/icons';
 import { floatMultiply, floatDivide } from "@/utils/float";
 
+const { confirm } = Modal;
+
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get("id");
@@ -53,8 +55,6 @@ export default (props) => {
   }, [id]);
 
   const onFinish = async (values) => {
-    console.log(values, "===");
-
     let data = {
       id: id ? Number(id) : null,
       ...values,
@@ -74,9 +74,15 @@ export default (props) => {
   };
 
   const onBillFinish = ({ form }) => {
-    form.validateFields().then((res) => {
-      console.log(res, "===--");
-      onFinish({ ...res, isCompleted: true });
+    confirm({
+      title: '确认采购完成?',
+      icon: <ExclamationCircleOutlined />,
+      content: '确定之后, 将不能再做修改!',
+      onOk: () => {
+        form.validateFields().then((res) => {
+          onFinish({ ...res, isCompleted: true });
+        });
+      }
     });
   };
 
@@ -93,6 +99,9 @@ export default (props) => {
             searchConfig: {
               resetText: "返回",
             },
+            submitButtonProps: {
+              disabled: isCompleted,
+            },
             onReset: () => navigate(-1),
             render: (props, doms) => {
               console.log(props, doms, "renderprops");
@@ -100,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)}
                         >
                           采购完成
@@ -184,7 +189,10 @@ export default (props) => {
                         name={[name, "actAmount"]}
                         label="采购数量"
                         placeholder="请输入采购数量"
-                        rules={[{ required: true, message: "请输入采购数量" }]}
+                        rules={[
+                          { required: true, message: "请输入采购数量" },
+                          { validator: (_, val) => val > 0 ? Promise.resolve() : Promise.reject(), message: "采购数量必须大于0" },
+                        ]}
                         width={100}
                         fieldProps={{
                           precision: 10,
@@ -196,7 +204,10 @@ export default (props) => {
                         name={[name, "actUnitPrice"]}
                         label="采购单价"
                         placeholder="请输入采购单价"
-                        rules={[{ required: true, message: "请输入采购单价" }]}
+                        rules={[
+                          { required: true, message: "请输入采购单价" },
+                          { validator: (_, val) => val > 0 ? Promise.resolve() : Promise.reject(), message: "采购单价必须大于0" },
+                        ]}
                         fieldProps={{ precision: 2, prefix: "￥" }}
                         width={100}
                       />

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

@@ -1,45 +1,45 @@
 import {
-  savePurchaseInStore,
   getPurchaseDetail,
+  savePurchaseInStore,
 } from "@/services/purchase";
 import { getStoreList } from "@/services/stock";
-import {
-  PageContainer,
-  ProForm,
-  ProFormSelect,
-  ProFormText,
-  ProFormDigit,
-} from "@ant-design/pro-components";
 import { useNavigate, useSearchParams } from "react-router-dom";
-import { Card, Col, message, Row, Space, Form, Button } from "antd";
-import { useEffect, useRef, useState } from "react";
-import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Card, Descriptions, Button } from "antd";
+import { useEffect, useMemo, useState } from "react";
+import moment from "moment";
 import { floatMultiply, floatDivide } from "@/utils/float";
+import useBool from "@/utils/hooks/useBool";
+
+const Item = Descriptions;
 
 export default (props) => {
   const [searchParams] = useSearchParams();
   const id = searchParams.get("id");
   const [storeList, setStoreList] = useState([]);
-  const [isInStore, setIsInStore] = useState(false);
+  const [detail, setDetail] = useState({});
   const navigate = useNavigate();
+  const [loading, startLoading, cancelLoading] = useBool();
+
+  const dtStr = useMemo(() => detail.completedDate ? moment(detail.completedDate).format('YYYY-MM-DD'): '', [detail.completedDate]);
+
+  const onSumbit = () => {
+    startLoading()
+    savePurchaseInStore(id).then(() => {
+      cancelLoading()
+      setDetail({ ...detail, isInStore: true })
+    }).catch(cancelLoading)
+  }
   
-  const formRef = useRef();
   useEffect(() => {
     getStoreList({ pageSize: 9999 }).then((res) => {
-      setStoreList(
-        res?.records?.map((x) => ({
-          label: x.name,
-          value: x.id,
-        }))
-      );
+      setStoreList(res.records || []);
     });
   }, []);
 
   useEffect(() => {
     if (id) {
       getPurchaseDetail(id).then((res) => {
-        setIsInStore(res.isInStore)
-        formRef.current.setFieldsValue({
+        setDetail({
           ...res,
           itemsList: res.itemsList?.map((x) => ({
             ...x,
@@ -55,143 +55,48 @@ export default (props) => {
     }
   }, [id]);
 
-  const onFinish = async (values) => {
-    console.log(values, "===");
-
-
-
-    savePurchaseInStore(Number(id)).then((res) => {
-      // message.success("添加成功");
-      navigate(-1);
-    });
-
-    return false;
-  };
-
-
-
   return (
-    <PageContainer>
-      <Card>
-        <ProForm
-        
-          formRef={formRef}
-          layout={"horizontal"}
-          labelCol={{ span: 2 }}
-          wrapperCol={{ span: 8 }}
-          onFinish={onFinish}
-          submitter={{
-            searchConfig: {
-              resetText: "返回",
-              submitText:'入库'
-            },
-            onReset: () => navigate(-1),
-            render: (props, doms) => {
-              console.log(props, doms, "renderprops");
-              return (
-                <Row>
-                  <Col span={8} offset={2}>
-                    <Space>
-                      {doms?.map((x, index) => {
-                        if (index === 1 && isInStore) {
-                          return null;
-                        }
-                        return x;
-                      })}
-                    </Space>
-                  </Col>
-                </Row>
-              );
-            },
-          }}
-        >
-          <ProFormText
-            name="title"
-            label="采购计划"
-            placeholder="请输入采购计划"
-            disabled
-            width={480}
-          />
-          <ProFormText
-            name="planDate"
-            label="计划时间"
-            placeholder="请输入计划时间"
-            disabled
-            width={480}
-          />
-          <Form.Item
-            label="采购清单"
-            labelCol={{ span: 2 }}
-            wrapperCol={{ span: 22 }}
+    <Card
+      title={<div>采购单</div>}
+      extra={(
+        <>
+          <Button
+            type="primary"            
+            disabled={detail.isInStore || !detail.isCompleted}
+            loading={loading}
+            onClick={onSumbit}
           >
-            <Form.List name="itemsList">
-              {(fields, { add, remove }) => (
-                <>
-                  {fields.map(({ key, name, ...restField }) => (
-                    <Space
-                      key={key}
-                      style={{ display: "flex" }}
-                      align="baseline"
-                    >
-                      <ProFormSelect
-                        {...restField}
-                        name={[name, "storeId"]}
-                        label="库存名称"
-                        placeholder="请选择库存名称"
-                        disabled
-                        options={storeList}
-                      />
+            入库
+          </Button>
+          <Button style={{ marginLeft: '2em' }} onClick={() => navigate(-1)}>返回</Button> 
+        </>
+      )}
+    >
+      <Descriptions title="基本信息" bordered>
+        <Item label="采购时间">{dtStr}</Item>
+        <Item label="计划时间">{detail.planDate}</Item>
+      </Descriptions>
+      <Descriptions title="明细信息" bordered style={{ marginTop: '24px' }} column={5}>
+        {
+          (detail.itemsList || []).reduce((acc, it, inx) => {
+
+            const store = storeList.filter(x => x.id === it.storeId)[0] || {};
+            const planUnitPrice = it.planUnitPrice ? `${it.planUnitPrice} 元` : '-';
+            const planAmount = it.planAmount ? `${it.planAmount} ${store.unit}` : '-';
+            const actUnitPrice = it.actUnitPrice ? `${it.actUnitPrice} 元` : '-';
+            const actAmount = it.actAmount ? `${it.actAmount} ${store.unit}` : '-';
 
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "planAmount"]}
-                        label="计划数量"
-                        placeholder="请输入计划数量"
-                        disabled
-                        width={100}
-                        fieldProps={{
-                          precision: 10,
-                          formatter: (value) => value,
-                        }}
-                      />
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "planUnitPrice"]}
-                        label="预估单价"
-                        placeholder="请输入预估单价"
-                        disabled
-                        fieldProps={{ precision: 2, prefix: "￥" }}
-                        width={100}
-                      />
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "actAmount"]}
-                        label="采购数量"
-                        placeholder="请输入采购数量"
-                        disabled
-                        width={100}
-                        fieldProps={{
-                          precision: 10,
-                          formatter: (value) => value,
-                        }}
-                      />
-                      <ProFormDigit
-                        {...restField}
-                        name={[name, "actUnitPrice"]}
-                        label="采购单价"
-                        placeholder="请输入采购单价"
-                        disabled
-                        fieldProps={{ precision: 2, prefix: "￥" }}
-                        width={100}
-                      />
-                    </Space>
-                  ))}
-                </>
-              )}
-            </Form.List>
-          </Form.Item>
-        </ProForm>
-      </Card>
-    </PageContainer>
+            return acc.concat([
+                <Item key={`t-${inx}-1`} label="采购物品名称">{store.name}</Item>,
+                <Item key={`t-${inx}-2`} label="计划采购单价">{planUnitPrice}</Item>,
+                <Item key={`t-${inx}-3`} label="计划采购数量">{planAmount}</Item>,
+                <Item key={`t-${inx}-4`} label="实际采购单价">{actUnitPrice}</Item>,
+                <Item key={`t-${inx}-5`} label="实际采购数量">{actAmount}</Item>,
+              ]
+            )
+          }, [])
+        }
+      </Descriptions>
+    </Card>
   );
 };

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/pages/purchase/plan/list/index.jsx

@@ -91,7 +91,7 @@ const StockList = (props) => {
             key={4}
             style={{ padding: 0 }}
             type="link"
-            disabled={record?.isCompleted}
+            // disabled={record?.isCompleted}
             onClick={() => {
               navigate(`/purchase/bill/edit?id=${record.id}`);
             }}
@@ -105,7 +105,7 @@ const StockList = (props) => {
             key={5}
             style={{ padding: 0 }}
             type="link"
-            disabled={record?.isInStore}
+            // disabled={record?.isInStore}
             onClick={() => {
               navigate(`/purchase/inStore/edit?id=${record.id}`);
             }}

src/pages/rotationChart/list/index.jsx

@@ -143,7 +143,7 @@ const RotationChartList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              navigate('/cms/rotationChart/edit');
+              navigate('/cms/rotationChart/add');
             }}
           >
             新增

src/pages/user/index.jsx

@@ -1,9 +1,9 @@
-import React from 'react';
-import { useNavigate } from 'react-router-dom';
-import { queryTable } from '@/utils/request';
-import { ProTable } from '@ant-design/pro-components';
-import { Button, message, Popconfirm } from 'antd';
-import { getUserList, updateUserStatus } from '@/services/user';
+import React from "react";
+import { useNavigate } from "react-router-dom";
+import { queryTable } from "@/utils/request";
+import { ProTable } from "@ant-design/pro-components";
+import { Button, message, Popconfirm } from "antd";
+import { getUserList, updateUserStatus,deleteUser } from "@/services/user";
 
 const queryUserList = queryTable(getUserList);
 
@@ -13,56 +13,65 @@ export default (props) => {
 
   const updateStatus = (user) => {
     const status = user.status === 1 ? 0 : 1;
-    const hide = message.loading('请稍候...', 0);
-    updateUserStatus(user.id, status).then(res => {
-      hide();
-      actionRef.current.reload();
-    }).catch(() => {
-      hide();
-    })
-  }
+    const hide = message.loading("请稍候...", 0);
+    updateUserStatus(user.id, status)
+      .then((res) => {
+        hide();
+        actionRef.current.reload();
+      })
+      .catch(() => {
+        hide();
+      });
+  };
+  const handleDelete = (id) => {
+    if (id) {
+      deleteUser(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
 
   const columns = [
     {
-      title: 'id',
-      dataIndex: 'id',
+      title: "id",
+      dataIndex: "id",
       search: false,
     },
     {
-      title: '姓名',
-      dataIndex: 'name',
+      title: "姓名",
+      dataIndex: "name",
     },
     {
-      title: '部门',
-      dataIndex: 'dept',
+      title: "部门",
+      dataIndex: "dept",
     },
     {
-      title: '手机号',
-      dataIndex: 'phone',
+      title: "手机号",
+      dataIndex: "phone",
     },
     {
-      title: '账号',
-      dataIndex: 'loginName',
+      title: "账号",
+      dataIndex: "loginName",
       search: false,
     },
     {
-      title: '状态',
-      dataIndex: 'status',
+      title: "状态",
+      dataIndex: "status",
       search: false,
       valueEnum: {
         1: {
-          text: '正常',
-          status: 'Processing',
+          text: "正常",
+          status: "Processing",
         },
         0: {
-          text: '禁用',
-          status: 'Error',
+          text: "禁用",
+          status: "Error",
         },
       },
     },
     {
-      title: '操作',
-      valueType: 'option',
+      title: "操作",
+      valueType: "option",
       width: 200,
       render: (_, record) => [
         <Button
@@ -73,22 +82,34 @@ export default (props) => {
             updateStatus(record);
           }}
         >
-          {record.status === 1 ? '禁用' : '启用'}
+          {record.status === 1 ? "禁用" : "启用"}
         </Button>,
         <Button
           key={2}
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            console.log(record, ']]');
+            console.log(record, "]]");
             navigate(`/system/user/edit?id=${record.id}`);
           }}
         >
           编辑
         </Button>,
+        <Popconfirm
+          key={3}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.id)}
+          okText="确定"
+          cancelText="取消"
+        >
+          {/* manualPush */}
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
       ],
     },
-  ]
+  ];
 
   return (
     <ProTable
@@ -99,7 +120,7 @@ export default (props) => {
           key="1"
           type="primary"
           onClick={() => {
-            navigate('/system/user/edit');
+            navigate("/system/user/edit");
           }}
         >
           新增
@@ -108,5 +129,5 @@ export default (props) => {
       request={queryUserList}
       columns={columns}
     />
-  )
-}
+  );
+};

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,19 +1,29 @@
-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]);
@@ -22,9 +32,27 @@ export default (props) => {
     console.log(values);
 
     //添加,修改
-    addRegulation({ ...values, id }).then((res) => {
+    // addRegulation({ ...values, id }).then((res) => {
+    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;
   };
 
@@ -33,13 +61,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) => {
@@ -54,23 +83,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,19 +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();
-  // const turn = replace(/<[^]+>/g, '');
+
+  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();
       });
     }
@@ -21,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="您是否确认删除 ?"
@@ -88,7 +119,6 @@ const RegulationList = (props) => {
   return (
     <PageContainer>
       <ProTable
-        search={true}
         actionRef={actionRef}
         rowKey="id"
         toolBarRender={() => [
@@ -96,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});
 
 /**
  * 删除

src/services/stock.js

@@ -89,7 +89,7 @@ export const deleteStoreType = (id) => request(`/storeType/${id}`, { method: 'de
  * @param {*} params
  * @returns
  */
-export const getStoreLogList = (params) => request('/storeLog', { params });
+export const getStoreLogList = (params) => request('/storeLog', { params, successTip: false });
 
 /**
  * 新增

src/utils/request.js

@@ -18,9 +18,9 @@ instance.interceptors.request.use(function (config) {
     successTip,
     headers: {
       ...headers,
-      responseType: download ? 'blob' : responseType,
       Authorization: token,
-    }
+    },    
+    responseType: download ? 'blob' : responseType,
   };
 }, function (error) {
   // 对请求错误做些什么
@@ -33,8 +33,8 @@ instance.interceptors.response.use(function (response) {
   // 对响应数据做点什么
 
   const { data, config } = response;
-  if (config.download) {
-    return downloadBlob(response.data, '下载文件');
+  if (config.download && !data.code) {
+    return downloadBlob(response, '下载文件');
   }
   
   if (data.code === 1000) {
@@ -128,15 +128,16 @@ export function restful(url) {
 
 function downloadBlob(response) {
   let fileName = '未知文件';
+  const contentType = response.headers['content-type'];
   const contentDisposition = response.headers['content-disposition'];
   if (contentDisposition) {
     const parts = contentDisposition.split(';filename=');
     if (parts[1]) {
-      fileName = parts[1];
+      fileName = decodeURIComponent(parts[1]);
     }
   }
-
-  const url = window.URL.createObjectURL(response.data);
+console.log(response);
+  const url = window.URL.createObjectURL(new Blob([response.data], { type: contentType }));
   const link = document.createElement('a');
   link.href = url;
   link.setAttribute('download', fileName);

vite.config.js

@@ -5,6 +5,7 @@ import vitePluginImp from 'vite-plugin-imp'
 
 // https://vitejs.dev/config/
 export default defineConfig({
+  base: '/jgz/',
   server: {
     host: '0.0.0.0',
     proxy: {