fix

package.json

@@ -11,6 +11,7 @@
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-components": "^2.3.13",
+    "@wangeditor/editor-for-react": "^1.0.5",
     "@zjxpcyc/react-tiny-store": "^2.0.1",
     "antd": "^4.23.4",
     "axios": "^1.1.2",

src/components/Wangeditor/index.jsx

@@ -0,0 +1,78 @@
+import React, { useState, useEffect } from "react";
+import "@wangeditor/editor/dist/css/style.css";
+import { Editor, Toolbar } from "@wangeditor/editor-for-react";
+
+function MyEditor(props) {
+  const {
+    value,
+    onChange = (e) => {
+      setHtml(e);
+    },
+    toolbarConfig = {
+      excludeKeys: [
+        "insertImage",
+        "viewImageLink",
+        "editImage",
+        "uploadImage",
+        "uploadVideo",
+      ],
+    },
+    editorConfig = {
+      placeholder: "请输入内容...",
+    },
+    readonly = false,
+  } = props;
+  const [editor, setEditor] = useState(null); // 存储 editor 实例
+  const [html, setHtml] = useState("");
+  console.log(props, "MyEditor");
+  // 模拟 ajax 请求，异步设置 html
+  useEffect(() => {
+    console.log(editor     );
+
+    setHtml(value);
+  }, [value]);
+
+  // 及时销毁 editor
+  useEffect(() => {
+    return () => {
+      if (editor == null) return;
+      editor.destroy();
+      setEditor(null);
+    };
+  }, [editor]);
+
+  function insertText() {
+    if (editor == null) return;
+    editor.insertText(" hello ");
+  }
+
+  function printHtml() {
+    if (editor == null) return;
+    console.log(editor.getHtml());
+  }
+
+  return !readonly ? (
+    <>
+      <div style={{ border: "1px solid #ccc", zIndex: 100, marginTop: "15px" }}>
+        <Toolbar
+          editor={editor}
+          defaultConfig={toolbarConfig}
+          mode="default"
+          style={{ borderBottom: "1px solid #ccc" }}
+        />
+        <Editor
+          defaultConfig={editorConfig}
+          value={html}
+          onCreated={setEditor}
+          onChange={(editor) => onChange(editor.getHtml())}
+          mode="default"
+          style={{ height: "500px" }}
+        />
+      </div>
+    </>
+  ) : (
+    <div dangerouslySetInnerHTML={{ __html: value }}></div>
+  );
+}
+
+export default MyEditor;

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

@@ -0,0 +1,123 @@
+import { savePosts, getPostsDetail, updatePosts } from "@/services/posts";
+import { getStoreList } from "@/services/stock";
+import {
+  PageContainer,
+  ProForm,
+  ProFormSelect,
+  ProFormText,
+} from "@ant-design/pro-components";
+import { useNavigate, useSearchParams } from "react-router-dom";
+import { Card, Col, message, Row, Space } from "antd";
+import { useEffect, useRef, useState } from "react";
+import Wangeditor from "@/components/Wangeditor";
+
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  // const [foodDict, setFoodDict] = useState([]);
+  const navigate = useNavigate();
+
+  const formRef = useRef();
+  // useEffect(() => {
+  //   getStoreList({ isDish: 1, pageSize: 9999 }).then((res) => {
+  //     setFoodDict(
+  //       res?.records?.map((x) => ({
+  //         label: x.name,
+  //         value: x.id,
+  //       }))
+  //     );
+  //   });
+  // }, [id]);
+
+  useEffect(() => {
+    if (id) {
+      getPostsDetail(id).then((res) => {
+        formRef.current.setFieldsValue(res);
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    console.log(values, "===");
+
+    if (id) {
+      updatePosts(id, { ...values, status: Number(values.status) }).then(
+        (res) => {
+          navigate(-1);
+        }
+      );
+    } else {
+      savePosts({ ...values, status: Number(values.status) }).then((res) => {
+        navigate(-1);
+      });
+    }
+
+    return false;
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <ProForm
+          //  readonly
+          formRef={formRef}
+          layout={"horizontal"}
+          labelCol={{ span: 8 }}
+          wrapperCol={{ span: 12 }}
+          onFinish={onFinish}
+          initialValues={{ status: 0 }}
+          submitter={{
+            searchConfig: {
+              resetText: "返回",
+            },
+            onReset: () => navigate(-1),
+            render: (props, doms) => {
+              return (
+                <Row>
+                  <Col span={8} offset={8}>
+                    <Space>{doms}</Space>
+                  </Col>
+                </Row>
+              );
+            },
+          }}
+        >
+          <ProFormText
+            name="title"
+            label="内容名称"
+            placeholder="请输入内容名称"
+            rules={[{ required: true, message: "请输入内容名称" }]}
+            width={460}
+          />
+
+          <ProForm.Item
+            name="detail"
+            label="发布详情"
+            placeholder="请输入发布详情"
+            rules={[{ required: true, message: "请输入发布详情" }]}
+          >
+            <Wangeditor></Wangeditor>
+          </ProForm.Item>
+
+          <ProFormSelect
+            name="status"
+            label="状态"
+            placeholder="请选择"
+            rules={[{ required: true, message: "请选择状态" }]}
+            width={460}
+            options={[
+              {
+                value: 0,
+                label: "未发布",
+              },
+              {
+                value: 1,
+                label: "已发布",
+              },
+            ]}
+          />
+        </ProForm>
+      </Card>
+    </PageContainer>
+  );
+};

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

@@ -0,0 +1,113 @@
+import { getPostsList } from "@/services/posts";
+import { queryTable } from "@/utils/request";
+import { PageContainer, ProTable } from "@ant-design/pro-components";
+import { useNavigate } from "react-router-dom";
+import { Button, message, Popconfirm } from "antd";
+import { useRef, useState, useEffect } from "react";
+import { floatMultiply, floatDivide } from "@/utils";
+
+// type plan 采购计划  bill 采购账单  inStore  采购入库
+const StockList = (props) => {
+  const { type } = props;
+  const [showDetail, setShowDetail] = useState(false);
+  const [activeKey, setActiveKey] = useState("");
+  const actionRef = useRef();
+  const navigate = useNavigate();
+  // console.log(props, "props");
+
+  useEffect(() => {
+    actionRef.current.reload();
+  }, [type]);
+  const handleDelete = (id) => {
+    if (id) {
+      deletePurchase(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: "内容名称",
+      dataIndex: "title",
+    },
+
+    {
+      title: "发布内容",
+      dataIndex: "detail",
+      search: false,
+      width:'50%'
+    },
+    {
+      title: "状态",
+      dataIndex: "status",
+      valueType: 'select',
+      valueEnum:{
+        0: { text: '未发布', status: 'Error' },
+        1: { text: '已发布', status: 'Processing' }, 
+      },
+    
+    //   const valueEnum = {
+    //     all: { text: '全部', status: 'Default' },
+    //     running: { text: '运行中', status: 'Processing' },
+    //     online: { text: '已上线', status: 'Success' },
+    //     error: { text: '异常', status: 'Error' },
+    //   };
+    },
+
+    {
+      title: "操作",
+      valueType: "option",
+      width: 200,
+      render: (_, record) => [
+        <Button
+          key={2}
+          style={{ padding: 0 }}
+          type="link"
+          onClick={() => {
+            navigate(`/cms/emergency-plan/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 (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        rowKey="id"
+        toolBarRender={() => [
+          <Button
+            key="2"
+            type="primary"
+            onClick={() => {
+              navigate("/cms/emergency-plan/edit");
+            }}
+          >
+            新增
+          </Button>,
+        ]}
+        // search={false}
+        request={queryTable(getPostsList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default StockList;

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

@@ -0,0 +1,213 @@
+import {
+  savePurchase,
+  updatePurchase,
+  getPurchaseDetail,
+} 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 { floatMultiply, floatDivide } from "@/utils";
+
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  const [storeList, setStoreList] = useState([]);
+  const [isCompleted, setIsCompleted] = useState(false);
+  const navigate = useNavigate();
+  
+  const formRef = useRef();
+  useEffect(() => {
+    getStoreList({ pageSize: 9999 }).then((res) => {
+      setStoreList(
+        res?.records?.map((x) => ({
+          label: x.name,
+          value: x.id,
+        }))
+      );
+    });
+  }, []);
+
+  useEffect(() => {
+    if (id) {
+      getPurchaseDetail(id).then((res) => {
+        setIsCompleted(res.isCompleted)
+        formRef.current.setFieldsValue({
+          ...res,
+          itemsList: res.itemsList?.map((x) => ({
+            ...x,
+            planUnitPrice: floatDivide(x.planUnitPrice, 100),
+            actUnitPrice: floatDivide(x.actUnitPrice, 100),
+          })),
+        });
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    console.log(values, "===");
+
+    let data = {
+      id: id ? Number(id) : null,
+      ...values,
+      itemsList: values.itemsList?.map((x) => ({
+        ...x,
+        planUnitPrice: floatMultiply(x.planUnitPrice, 100),
+        actUnitPrice: floatMultiply(x.actUnitPrice, 100),
+      })),
+    };
+
+    savePurchase(data).then((res) => {
+      // message.success("添加成功");
+      navigate(-1);
+    });
+
+    return false;
+  };
+
+  const onBillFinish = ({ form }) => {
+    form.validateFields().then((res) => {
+      console.log(res, "===--");
+      onFinish({ ...res, isCompleted: true });
+    });
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          layout={"horizontal"}
+          labelCol={{ span: 2 }}
+          wrapperCol={{ span: 8 }}
+          onFinish={onFinish}
+          submitter={{
+            searchConfig: {
+              resetText: "返回",
+            },
+            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 && isCompleted) {
+                          return null;
+                        }
+                        return x;
+                      })}
+                      {id&&!isCompleted && (
+                        <Button
+                          type="primary"
+                          onClick={() => onBillFinish(props)}
+                        >
+                          采购完成
+                        </Button>
+                      )}
+                    </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 }}
+          >
+            <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}
+                      />
+
+                      <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="请输入采购数量"
+                        rules={[{ required: true, message: "请输入采购数量" }]}
+                        width={100}
+                        fieldProps={{
+                          precision: 10,
+                          formatter: (value) => value,
+                        }}
+                      />
+                      <ProFormDigit
+                        {...restField}
+                        name={[name, "actUnitPrice"]}
+                        label="采购单价"
+                        placeholder="请输入采购单价"
+                        rules={[{ required: true, message: "请输入采购单价" }]}
+                        fieldProps={{ precision: 2, prefix: "￥" }}
+                        width={100}
+                      />
+                    </Space>
+                  ))}
+                </>
+              )}
+            </Form.List>
+          </Form.Item>
+        </ProForm>
+      </Card>
+    </PageContainer>
+  );
+};

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

@@ -0,0 +1,197 @@
+import {
+  savePurchaseInStore,
+  getPurchaseDetail,
+} 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 { floatMultiply, floatDivide } from "@/utils";
+
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  const [storeList, setStoreList] = useState([]);
+  const [isInStore, setIsInStore] = useState(false);
+  const navigate = useNavigate();
+  
+  const formRef = useRef();
+  useEffect(() => {
+    getStoreList({ pageSize: 9999 }).then((res) => {
+      setStoreList(
+        res?.records?.map((x) => ({
+          label: x.name,
+          value: x.id,
+        }))
+      );
+    });
+  }, []);
+
+  useEffect(() => {
+    if (id) {
+      getPurchaseDetail(id).then((res) => {
+        setIsInStore(res.isInStore)
+        formRef.current.setFieldsValue({
+          ...res,
+          itemsList: res.itemsList?.map((x) => ({
+            ...x,
+            planUnitPrice: x.planUnitPrice
+              ? floatDivide(x.planUnitPrice, 100)
+              : null,
+            actUnitPrice: x.actUnitPrice
+              ? floatDivide(x.actUnitPrice, 100)
+              : null,
+          })),
+        });
+      });
+    }
+  }, [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 }}
+          >
+            <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}
+                      />
+
+                      <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>
+  );
+};

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

@@ -0,0 +1,190 @@
+import {
+  savePurchase,
+  updatePurchase,
+  getPurchaseDetail,
+} 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 { floatMultiply, floatDivide } from "@/utils";
+
+export default (props) => {
+  const [searchParams] = useSearchParams();
+  const id = searchParams.get("id");
+  const [storeList, setStoreList] = useState([]);
+  const [isCompleted, setIsCompleted] = useState(false);
+
+  const navigate = useNavigate();
+
+  const formRef = useRef();
+  useEffect(() => {
+    getStoreList({ pageSize: 9999 }).then((res) => {
+      setStoreList(
+        res?.records?.map((x) => ({
+          label: x.name,
+          value: x.id,
+        }))
+      );
+    });
+  }, []);
+
+  useEffect(() => {
+    if (id) {
+      getPurchaseDetail(id).then((res) => {
+        setIsCompleted(res.isCompleted);
+        formRef.current.setFieldsValue({
+          ...res,
+          itemsList: res.itemsList?.map((x) => ({
+            ...x,
+            planUnitPrice: x.planUnitPrice
+              ? floatDivide(x.planUnitPrice, 100)
+              : null,
+          })),
+        });
+      });
+    }
+  }, [id]);
+
+  const onFinish = async (values) => {
+    let data = {
+      id: id ? Number(id) : null,
+      ...values,
+      itemsList: values.itemsList?.map((x) => ({
+        ...x,
+        planUnitPrice: floatMultiply(x.planUnitPrice, 100),
+      })),
+    };
+
+    savePurchase(data).then((res) => {
+      // message.success("添加成功");
+      navigate(-1);
+    });
+
+    return false;
+  };
+
+  return (
+    <PageContainer>
+      <Card>
+        <ProForm
+          formRef={formRef}
+          layout={"horizontal"}
+          labelCol={{ span: 2 }}
+          wrapperCol={{ span: 8 }}
+          onFinish={onFinish}
+          initialValues={{ type: "1", state: "1" }}
+          submitter={{
+            searchConfig: {
+              resetText: "返回",
+            },
+            onReset: () => navigate(-1),
+            render: (props, doms) => {
+              console.log(props, doms, "propsprops");
+              console.log(props?.form?.getFieldsValue(), "propsprops");
+              return (
+                <Row>
+                  <Col span={8} offset={2}>
+                    <Space>
+                      {doms?.map((x, index) => {
+                        if (index === 1 && isCompleted) {
+                          return null;
+                        }
+                        return x;
+                      })}
+                    </Space>
+                  </Col>
+                </Row>
+              );
+            },
+          }}
+        >
+          <ProFormText
+            name="title"
+            label="采购计划"
+            placeholder="请输入采购计划"
+            rules={[{ required: true, message: "请输入采购计划" }]}
+            width={480}
+          />
+          <ProFormText
+            name="planDate"
+            label="计划时间"
+            placeholder="请输入计划时间"
+            rules={[{ required: true, message: "请输入计划时间" }]}
+            width={480}
+          />
+          <Form.Item
+            label="采购清单"
+            labelCol={{ span: 2 }}
+            wrapperCol={{ span: 22 }}
+          >
+            <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="请选择库存名称"
+                        rules={[{ required: true, message: "请输入选择名称" }]}
+                        options={storeList}
+                      />
+
+                      <ProFormDigit
+                        {...restField}
+                        name={[name, "planAmount"]}
+                        label="计划数量"
+                        placeholder="请输入计划数量"
+                        rules={[{ required: true, message: "请输入计划数量" }]}
+                        // width={150}
+                        fieldProps={{
+                          precision: 10,
+                          formatter: (value) => value,
+                        }}
+                      />
+                      <ProFormDigit
+                        {...restField}
+                        name={[name, "planUnitPrice"]}
+                        label="预估单价"
+                        placeholder="请输入预估单价"
+                        rules={[{ required: true, message: "请输入预估单价" }]}
+                        fieldProps={{ precision: 2, prefix: "￥" }}
+                        // width={150}
+                      />
+                      <MinusCircleOutlined onClick={() => remove(name)} />
+                    </Space>
+                  ))}
+                  <Form.Item>
+                    <Button
+                      type="dashed"
+                      onClick={() => add()}
+                      // block
+                      // style={{width:100}}
+                      icon={<PlusOutlined />}
+                    >
+                      添加
+                    </Button>
+                  </Form.Item>
+                </>
+              )}
+            </Form.List>
+          </Form.Item>
+        </ProForm>
+      </Card>
+    </PageContainer>
+  );
+};

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

@@ -0,0 +1,160 @@
+import {
+  getPurchaseList,
+  getPurchaseDetail,
+  savePurchase,
+  updatePurchase,
+  deletePurchase,
+} from "@/services/purchase";
+import { queryTable } from "@/utils/request";
+import { PageContainer, ProTable } from "@ant-design/pro-components";
+import { useNavigate } from "react-router-dom";
+import { Button, message, Popconfirm } from "antd";
+import { useRef, useState, useEffect } from "react";
+import { floatMultiply, floatDivide } from "@/utils";
+
+// type plan 采购计划  bill 采购账单  inStore  采购入库
+const StockList = (props) => {
+  const { type } = props;
+  const [showDetail, setShowDetail] = useState(false);
+  const [activeKey, setActiveKey] = useState("");
+  const actionRef = useRef();
+  const navigate = useNavigate();
+  // console.log(props, "props");
+
+  useEffect(() => {
+    actionRef.current.reload();
+  }, [type]);
+  const handleDelete = (id) => {
+    if (id) {
+      deletePurchase(id).then((res) => {
+        actionRef.current.reload();
+      });
+    }
+  };
+
+  const columns = [
+    {
+      title: "采购计划",
+      dataIndex: "title",
+    },
+
+    {
+      title: "计划时间",
+      dataIndex: "planDate",
+    },
+    {
+      title: "采购项目",
+      dataIndex: "items",
+      search: false,
+    },
+
+    {
+      title: "是否入库",
+      dataIndex: "isInStore",
+      valueEnum: {
+        false: { text: "否", status: "Error" },
+        true: { text: "是", status: "Success" },
+      },
+      search: false,
+    },
+
+    {
+      title: "是否采购完成",
+      dataIndex: "isCompleted",
+      valueEnum: {
+        false: { text: "否", status: "Error" },
+        true: { text: "是", status: "Success" },
+      },
+      search: false,
+    },
+
+    {
+      title: "操作",
+      valueType: "option",
+      width: 200,
+      render: (_, record) => [
+        type === "plan" ? (
+          <Button
+            key={2}
+            style={{ padding: 0 }}
+            type="link"
+            onClick={() => {
+              navigate(`/purchase/plan/edit?id=${record.id}`);
+            }}
+          >
+            修改
+          </Button>
+        ) : null,
+
+        type === "bill" ? (
+          <Button
+            key={4}
+            style={{ padding: 0 }}
+            type="link"
+            onClick={() => {
+              navigate(`/purchase/bill/edit?id=${record.id}`);
+            }}
+          >
+            采购
+          </Button>
+        ) : null,
+
+        type === "inStore" ? (
+          <Button
+            key={5}
+            style={{ padding: 0 }}
+            type="link"
+            onClick={() => {
+              navigate(`/purchase/inStore/edit?id=${record.id}`);
+            }}
+          >
+            入库
+          </Button>
+        ) : null,
+
+        type === "plan" ? (
+          <Popconfirm
+            key={3}
+            title="您是否确认删除 ?"
+            onConfirm={() => handleDelete(record.id)}
+            okText="确定"
+            cancelText="取消"
+          >
+            {/* manualPush */}
+            <Button style={{ padding: 0 }} type="link">
+              删除
+            </Button>
+          </Popconfirm>
+        ) : null,
+      ],
+    },
+  ];
+
+  return (
+    <PageContainer>
+      <ProTable
+        actionRef={actionRef}
+        rowKey="id"
+        params={type === "inStore"? {isCompleted:true}:{}}
+        toolBarRender={() => [
+          type === "plan" ? (
+            <Button
+              key="2"
+              type="primary"
+              onClick={() => {
+                navigate("/purchase/plan/edit");
+              }}
+            >
+              新增
+            </Button>
+          ) : null,
+        ]}
+        // search={false}
+        request={queryTable(getPurchaseList)}
+        columns={columns}
+      />
+    </PageContainer>
+  );
+};
+
+export default StockList;

src/pages/stock/list/index.jsx

@@ -93,7 +93,7 @@ const StockList = (props) => {
           style={{ padding: 0 }}
           type="link"
           onClick={() => {
-            navigate(`/stock/edit?id=${record.id}`);
+            navigate(`/stock/add?id=${record.id}`);
           }}
         >
           修改
@@ -126,7 +126,7 @@ const StockList = (props) => {
             key="2"
             type="primary"
             onClick={() => {
-              navigate('/stock/edit');
+              navigate('/stock/add');
             }}
           >
             新增

src/pages/stock/outAndIn/index.jsx

@@ -18,7 +18,7 @@ const OutAndIn = (props) => {
         amount: tabKey === 'out' ? -values.amount : values.amount,
         optType: tabKey,
       }).then((res) => {
-        message.success('操作成功');
+        
 
         onSuccess();
       });

src/routes/routes.jsx

@@ -6,31 +6,37 @@ import {
   MenuFoldOutlined,
   MenuUnfoldOutlined,
   PieChartOutlined,
-} from '@ant-design/icons';
-import { Navigate } from 'react-router-dom';
-import AuthLayout from '@/layouts/AuthLayout';
-import Container from '@/layouts/Container';
-import Login from '@/pages/login';
-import Page404 from '@/pages/404';
-import Home from '@/pages/sample/home';
-import BasicForm from '@/pages/sample/form';
-import BasicTable from '@/pages/sample/table';
-import GuaranteeTaskList from '@/pages/guaranteeTask';
-import GuaranteeTaskEdit from '@/pages/guaranteeTask/Edit';
-import GuaranteeTaskPrint from '@/pages/guaranteeTask/print';
-import DishList from '@/pages/dish/list';
-import DishEdit from '@/pages/dish/edit';
-import PackageList from '@/pages/package/List';
-import StockList from '@/pages/stock/list';
-import StockEdit from '@/pages/stock/edit';
-import StockInOut from '@/pages/stock/outAndIn';
-import StockLog from '@/pages/stock/stockLog';
-import StockClassificationList from '@/pages/stockClassification/list';
-import StockClassificationEdit from '@/pages/stockClassification/edit';
-import RotationChartList from '@/pages/rotationChart/list';
-import RotationChartEdit from '@/pages/rotationChart/edit';
-import RotationChartIntroduction from '@/pages/rotationChart/introduction';
-import Roles from '@/pages/roles/index';
+} from "@ant-design/icons";
+import { Navigate } from "react-router-dom";
+import AuthLayout from "@/layouts/AuthLayout";
+import Container from "@/layouts/Container";
+import Login from "@/pages/login";
+import Page404 from "@/pages/404";
+import Home from "@/pages/sample/home";
+import BasicForm from "@/pages/sample/form";
+import BasicTable from "@/pages/sample/table";
+import GuaranteeTaskList from "@/pages/guaranteeTask";
+import GuaranteeTaskEdit from "@/pages/guaranteeTask/Edit";
+import GuaranteeTaskPrint from "@/pages/guaranteeTask/print";
+import EmergencyPlanList from "@/pages/cms/emergencyPlan/list";
+import EmergencyPlanEdit from "@/pages/cms/emergencyPlan/edit";
+import DishList from "@/pages/dish/list";
+import DishEdit from "@/pages/dish/edit";
+import PackageList from "@/pages/package/List";
+import StockList from "@/pages/stock/list";
+import StockEdit from "@/pages/stock/edit";
+import StockInOut from "@/pages/stock/outAndIn";
+import StockLog from "@/pages/stock/stockLog";
+import StockClassificationList from "@/pages/stockClassification/list";
+import StockClassificationEdit from "@/pages/stockClassification/edit";
+import RotationChartList from "@/pages/rotationChart/list";
+import RotationChartEdit from "@/pages/rotationChart/edit";
+import RotationChartIntroduction from "@/pages/rotationChart/introduction";
+import Roles from "@/pages/roles/index";
+import PurchasePlanList from "@/pages/purchase/plan/list";
+import PurchasePlanEdit from "@/pages/purchase/plan/edit";
+import PurchaseBillEdit from "@/pages/purchase/bill/edit";
+import PurchaseInStoreEdit from "@/pages/purchase/inStore/edit";
 
 /**
  * meta 用来扩展自定义数据数据
@@ -44,7 +50,7 @@ import Roles from '@/pages/roles/index';
 
 export default [
   {
-    path: '/',
+    path: "/",
     element: <AuthLayout />,
     children: [
       {
@@ -52,245 +58,311 @@ export default [
         element: <Home />,
       },
       {
-        path: 'home',
+        path: "home",
         element: <Home />,
         meta: {
-          title: '首页',
+          title: "首页",
           icon: <DesktopOutlined />,
         },
       },
       {
-        path: 'task',
+        path: "task",
         element: <Container />,
         meta: {
-          title: '军供任务',
+          title: "军供任务",
           icon: <AppstoreOutlined />,
         },
         children: [
           {
             index: true,
-            element: <Navigate to='guaranteeTask' replace />,
+            element: <Navigate to="guaranteeTask" replace />,
           },
           {
-            path: 'guaranteeTask',
+            path: "guaranteeTask",
             element: <GuaranteeTaskList />,
             meta: {
-              title: '军供通报',
+              title: "军供通报",
             },
           },
           {
-            path: 'guaranteeTask/edit',
+            path: "guaranteeTask/edit",
             element: <GuaranteeTaskEdit />,
             meta: {
-              title: '任务配置',
+              title: "任务配置",
             },
           },
           {
-            path: 'guaranteeTask/print',
+            path: "guaranteeTask/print",
             element: <GuaranteeTaskPrint />,
             meta: {
               hideInMenu: true,
               noLayout: true,
-              target: '_blank',
-              title: '任务执行',
+              target: "_blank",
+              title: "任务执行",
             },
-          }
-        ]
+          },
+        ],
       },
       {
-        path: 'material',
+        path: "material",
         element: <Container />,
         meta: {
-          title: '物资管理',
+          title: "物资管理",
           icon: <AppstoreOutlined />,
         },
         children: [
           {
             index: true,
-            element: <Navigate to='dish/list' replace />,
+            element: <Navigate to="dish/list" replace />,
           },
           {
-            path: 'dish/list',
+            path: "dish/list",
             element: <DishList />,
             meta: {
-              title: '菜肴管理',
+              title: "菜肴管理",
             },
           },
           {
-            path: 'dish/edit',
+            path: "dish/edit",
             element: <DishEdit />,
             meta: {
               hideInMenu: true,
-              title: '菜肴维护',
+              title: "菜肴维护",
             },
           },
           {
-            path: 'package/list',
+            path: "package/list",
             element: <PackageList />,
             meta: {
-              title: '套餐管理',
+              title: "套餐管理",
             },
           },
-        ]
+        ],
       },
       {
-        path: 'stock',
+        path: "stock",
         element: <Container />,
         meta: {
-          title: '库存管理',
+          title: "库存管理",
           icon: <AppstoreOutlined />,
         },
         children: [
           {
             index: true,
-            element: <Navigate to='list' replace />,
+            element: <Navigate to="list" replace />,
           },
           {
-            path: 'list',
+            path: "list",
             element: <StockList />,
             meta: {
-              title: '库存列表',
+              title: "库存列表",
             },
           },
           {
-            path: 'add',
+            path: "add",
             element: <StockEdit />,
             meta: {
-              title: '库存维护',
+              title: "库存维护",
             },
           },
         ],
       },
       {
-        path: 'cms',
+        path: "cms",
         element: <Container />,
         meta: {
-          title: '公告文件',
+          title: "公告文件",
         },
         children: [
           {
             index: true,
-            element: <Navigate to='rotationChart/list' replace />,
+            element: <Navigate to="rotationChart/list" replace />,
           },
           {
-            path: 'station',
+            path: "station",
             element: null,
             meta: {
-              title: '本站信息',
+              title: "本站信息",
             },
           },
           {
-            path: 'rotationChart/list',
+            path: "rotationChart/list",
             element: <RotationChartList />,
             meta: {
-              title: '公告内容',
+              title: "公告内容",
             },
           },
           {
-            path: 'rotationChart/edit',
+            path: "rotationChart/edit",
             element: <RotationChartEdit />,
             meta: {
-              title: '公告维护',
+              title: "公告维护",
             },
           },
           {
-            path: 'rotationChart/introduction',
+            path: "rotationChart/introduction",
             element: <RotationChartIntroduction />,
             meta: {
-              title: '本站信息简介',
+              title: "本站信息简介",
             },
           },
           {
-            path: 'regulation',
+            path: "regulation",
             element: null,
             meta: {
-              title: '规章制度',
+              title: "规章制度",
             },
           },
           {
-            path: 'emergency-plan',
-            element: null,
+            path: "emergency-plan",
+            element: <EmergencyPlanList />,
             meta: {
-              title: '应急预案',
+              title: "应急预案",
             },
           },
           {
-            path: 'files',
+            path: "emergency-plan/edit",
+            element: <EmergencyPlanEdit />,
+            meta: {
+              title: "应急预案维护",
+              hideInMenu: true,
+            },
+          },
+          {
+            path: "files",
             element: null,
             meta: {
-              title: '文件管理',
+              title: "文件管理",
             },
           },
         ],
       },
       {
-        path: 'static',
+        path: "static",
         element: <Container />,
         meta: {
-          title: '数据分析',
+          title: "数据分析",
         },
       },
       {
-        path: 'system',
+        path: "system",
         element: <Container />,
         meta: {
-          title: '系统管理',
+          title: "系统管理",
         },
         children: [
           {
             index: true,
-            element: <Navigate to='stockClassification/list' replace />,
+            element: <Navigate to="stockClassification/list" replace />,
           },
           {
-            path: 'stockClassification/list',
+            path: "stockClassification/list",
             element: <StockClassificationList />,
             meta: {
-              title: '库存分类管理',
+              title: "库存分类管理",
             },
           },
           {
-            path: 'stockClassification/edit',
+            path: "stockClassification/edit",
             element: <StockClassificationEdit />,
             meta: {
-              title: '库存分类维护',
+              title: "库存分类维护",
               hideInMenu: true,
             },
           },
           {
-            path: 'log',
+            path: "log",
             element: <StockLog />,
             meta: {
-              title: '库存操作日志',
+              title: "库存操作日志",
             },
           },
           {
-            path: 'roles',
+            path: "roles",
             element: <Roles />,
             meta: {
-              title: '系统角色管理',
+              title: "系统角色管理",
             },
           },
           {
-            path: 'user',
+            path: "user",
             element: null,
             meta: {
-              title: '系统用户管理',
+              title: "系统用户管理",
             },
-          }
+          },
         ],
       },
       {
-        path: '*',
-        element: <Page404 />
-      }
+        path: "purchase",
+        element: <Container />,
+        meta: {
+          title: "采购管理",
+        },
+        children: [
+          {
+            index: true,
+            element: <Navigate to="plan/list" replace />,
+          },
+          {
+            path: "plan/list",
+            element: <PurchasePlanList type="plan" />,
+            meta: {
+              title: "采购计划",
+            },
+          },
+          {
+            path: "plan/edit",
+            element: <PurchasePlanEdit />,
+            meta: {
+              title: "采购计划维护",
+              hideInMenu: true,
+            },
+          },
+          {
+            path: "bill/list",
+            element: <PurchasePlanList type="bill" />,
+            meta: {
+              title: "采购账单",
+            },
+          },
+          {
+            path: "bill/edit",
+            element: <PurchaseBillEdit />,
+            meta: {
+              title: "采购账单维护",
+              hideInMenu: true,
+            },
+          },
+          {
+            path: "inStore/list",
+            element: <PurchasePlanList type="inStore" />,
+            meta: {
+              title: "采购入库",
+            },
+          },
+          {
+            path: "inStore/edit",
+            element: <PurchaseInStoreEdit  />,
+            meta: {
+              title: "采购入库维护",
+              hideInMenu: true,
+            },
+          },
+        ],
+      },
+      {
+        path: "*",
+        element: <Page404 />,
+      },
     ],
   },
   {
-    path: '/login',
+    path: "/login",
     element: <Login />,
   },
   {
-    path: '*',
-    element: <Page404 />
-  }
-]
+    path: "*",
+    element: <Page404 />,
+  },
+];

src/services/posts.js

@@ -0,0 +1,10 @@
+import { restful } from "@/utils/request";
+
+/**
+ * 构造 Service
+ * @returns
+ */
+const [getPostsList, getPostsDetail, savePosts, updatePosts, deletePosts] =
+  restful("/posts");
+
+export { getPostsList, getPostsDetail, savePosts, updatePosts, deletePosts };

src/services/purchase.js

@@ -0,0 +1,43 @@
+import request, { restful } from "@/utils/request";
+
+/**
+ * 构造 Service
+ * @returns
+ */
+const [
+  getPurchaseList,
+  getPurchaseDetail,
+  savePurchase,
+  updatePurchase,
+  deletePurchase,
+] = restful("/purchase");
+
+/**
+ * 新增
+ *  @param {*} id
+ * @param {*} data
+ * @returns
+ */
+  const savePurchaseInStore = (id) => request(`/purchase/${id}/in-store`, { method: 'put'});
+
+//  const [
+//   getResourceList,
+//   getResourceDetail,
+//   saveResource,
+//   updateResource,
+//   deleteResource,
+//  ] = restful('/resources');
+
+export {
+  getPurchaseList,
+  getPurchaseDetail,
+  savePurchase,
+  updatePurchase,
+  deletePurchase,
+  savePurchaseInStore,
+  //   getResourceList,
+  //   getResourceDetail,
+  //   saveResource,
+  //   updateResource,
+  //   deleteResource,
+};

src/services/stock.js

@@ -6,7 +6,7 @@ import request from '@/utils/request';
  * @param {*} params
  * @returns
  */
-export const getStoreList = (params) => request('/store', { params });
+export const getStoreList = (params) => request('/store', { params,successTip:false });
 
 /**
  * 新增
@@ -51,7 +51,7 @@ export const storeExport = (params) => request('/store/export',  { download: tru
  * @param {*} params
  * @returns
  */
-export const getStoreTypeList = (params) => request('/storeType', { params });
+export const getStoreTypeList = (params) => request('/storeType', { params,successTip:false });
 
 /**
  * 新增

src/services/user.js

@@ -8,7 +8,7 @@ import request from '@/utils/request';
  * @param {*} 
  * @returns
  */
- export const queryCurrentUser = () => request('/users/current', { silent: true });
+ export const queryCurrentUser = () => request('/users/current', { silent: true,successTip:false });
 
  /**
   * 登录

src/utils/index.jsx

@@ -0,0 +1,75 @@
+let toNonExponential = (num) => {
+  var m = num.toExponential().match(/\d(?:\.(\d*))?e([+-]\d+)/);
+  return num.toFixed(Math.max(0, (m[1] || "").length - m[2]));
+};
+
+/**
+ * 乘法 - js运算精度丢失问题
+ * @param arg1  数1
+ * @param arg2  数2
+ * 0.0023 * 100 ==> 0.22999999999999998
+ * {{ 0.0023 | multiply(100) }} ==> 0.23
+ */
+export const floatMultiply = (arg1, arg2) => {
+  console.log("==222==");
+  arg1 = Number(arg1);
+  arg2 = Number(arg2);
+  if ((!arg1 && arg1 !== 0) || (!arg2 && arg2 !== 0)) {
+    return null;
+  }
+  arg1 = toNonExponential(arg1);
+  arg2 = toNonExponential(arg2);
+  let n1, n2;
+  let r1, r2; // 小数位数
+  try {
+    r1 = arg1.toString().split(".")[1].length;
+  } catch (e) {
+    r1 = 0;
+  }
+  try {
+    r2 = arg2.toString().split(".")[1].length;
+  } catch (e) {
+    r2 = 0;
+  }
+  n1 = Number(arg1.toString().replace(".", ""));
+  n2 = Number(arg2.toString().replace(".", ""));
+  return (n1 * n2) / Math.pow(10, r1 + r2);
+};
+
+/**
+ * 除法 - js运算精度丢失问题
+ * @param arg1  数1
+ * @param arg2  数2
+ * 0.0023 / 0.00001 ==> 229.99999999999997
+ * {{ 0.0023 | divide(0.00001) }} ==> 230
+ */
+ export const floatDivide = (arg1, arg2) => {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+        return null;
+    }
+    if (!arg1 && arg1!==0) {
+        return null;
+    }else if(arg1===0) {
+        return 0;
+    }
+    arg1 = toNonExponential(arg1);
+    arg2 = toNonExponential(arg2);
+    let n1, n2;
+    let r1, r2; // 小数位数
+    try {
+        r1 = arg1.toString().split(".")[1].length;
+    } catch (e) {
+        r1 = 0;
+    }
+    try {
+        r2 = arg2.toString().split(".")[1].length;
+    } catch (e) {
+        r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace(".", ""));
+    n2 = Number(arg2.toString().replace(".", ""));
+    return floatMultiply((n1 / n2), Math.pow(10, r2 - r1));
+    // return (n1 / n2) * Math.pow(10, r2 - r1);   // 直接乘法还是会出现精度问题
+}

src/utils/request.js

@@ -3,7 +3,7 @@ import { message } from 'antd';
 
 const instance = axios.create({
   baseURL: import.meta.env.VITE_SERVER_BASE,
-  timeout: 1000,
+  timeout: 10000,
 });
 
 
@@ -118,7 +118,7 @@ export function queryDict(apiRequest) {
 
 export function restful(url) {
   const list = params => instance.get(url, { params, successTip: false });
-  const get = id => instance.get(`${url}/${id}`);
+  const get = id => instance.get(`${url}/${id}`,{ successTip: false });
   const add = data => instance.post(url, data);
   const update = (id, data) => instance.put(`${url}/${id}`, data);
   const del = id => instance.delete(`${url}/${id}`);

vite.config.js

@@ -9,7 +9,7 @@ export default defineConfig({
     proxy: {
       '/api/': {
         // 要代理的地址
-        target: 'http://127.0.0.1:8087',
+        target: 'http://192.168.89.147:8087',
         // 配置了这个可以从 http 代理到 https
         // 依赖 origin 的功能可能需要这个，比如 cookie
         changeOrigin: true,