diff --git a/src/components/Accountant/Query.jsx b/src/components/Accountant/Query.jsx
index 8010ea860c0485bc297ba70765f129dbbdcbbb4b..0b90bc84792a0922ee6284e12207951d8bd1f95e 100644
--- a/src/components/Accountant/Query.jsx
+++ b/src/components/Accountant/Query.jsx
@@ -15,8 +15,8 @@ import Selector from "../Selector";
 import OrderDetail from "./OrderDetail";
 
 const Query = () => {
-  const [cate, setCate] = useState("全部");
-  const [status, setStatus] = useState("全部");
+  const [cate, setCate] = useState(5);
+  const [status, setStatus] = useState(3);
   const [curData, setCurData] = useState("");
   const [mockOrderData, setMockOrderData] = useState([]);
   const [isModalVisible, setIsModalVisible] = useState(false);
diff --git a/src/components/Accountant/WareIn.jsx b/src/components/Accountant/WareIn.jsx
index 65bc41be4594b7b0d448e1c342b51ecbb36e5110..bc12c301f94f6d97523510041f38d2b066d7bf65 100644
--- a/src/components/Accountant/WareIn.jsx
+++ b/src/components/Accountant/WareIn.jsx
@@ -1,16 +1,27 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { useLocation } from "react-router-dom";
+
 import InputArea from "../InputArea";
+import Selector from "../Selector";
+import { taskCategories } from "../../utils/data";
 
 const WareIn = () => {
   const location = useLocation();
 
+  const [cate, setCate] = useState(null);
   const [amount, setAmount] = useState(null);
 
+  // todo 存在多个amount
+
   const wareInHandler = (e) => {
     e.preventDefault();
   };
 
+  useEffect(() => {
+    //orderid:location.state.record.id
+    //getOrder,获取orderdetailsList,【map】渲染
+  }, []);
+
   return (
     <div className="px-6 pt-8">
       {/* Owner */}
@@ -37,11 +48,11 @@ const WareIn = () => {
         <div className="bg-white pl-8 pt-2 pb-4 rounded-md">
           <h className="text-lg font-bold">货物信息</h>
           <div className="flex flex-col pl-4 pt-4 pb-2 gap-4">
+            <div>
+              货物名称：
+              <label>雪碧</label>
+            </div>
             <div className="flex items-center gap-12">
-              <div>
-                货物名称：
-                <label>雪碧</label>
-              </div>
               <div>
                 <label className="text-right before:content-['*'] before:text-red-500">
                   数量：
@@ -68,8 +79,27 @@ const WareIn = () => {
                 />
                 <label className="pl-2 font-semibold">元/天/件</label>
               </div>
+              <div>
+                <label className="text-right before:content-['*'] before:text-red-500">
+                  货品类型：
+                </label>
+                <Selector
+                  value={cate}
+                  onChange={(e) => setCate(e.target.value)}
+                  categories={taskCategories}
+                />
+              </div>
+              <div>
+                <label className="text-right before:content-['*'] before:text-red-500">
+                  类型2：
+                </label>
+                <Selector
+                  value={cate}
+                  onChange={(e) => setCate(e.target.value)}
+                  categories={taskCategories}
+                />
+              </div>
             </div>
-
             <div>
               <label className="text-right before:content-['*'] before:text-red-500">
                 货物总重量：
@@ -127,7 +157,9 @@ const WareIn = () => {
             </button>
             <button
               type="reset"
-              onClick={()=>{setAmount(null)}}
+              onClick={() => {
+                setAmount(null);
+              }}
               className="px-6 py-2 justify-center items-center border-gray-300 border-2 rounded bg-white"
             >
               {"重置"}
diff --git a/src/components/System/AuthManage/Auth.jsx b/src/components/System/AuthManage/Auth.jsx
index 3cb686819437c87794246fe34c970e8542296eb9..71a022eb0bfaee40026c5a12a2b8988d5c1b5baf 100644
--- a/src/components/System/AuthManage/Auth.jsx
+++ b/src/components/System/AuthManage/Auth.jsx
@@ -1,14 +1,18 @@
 import React, { useState, useEffect } from "react";
 import axios from "axios";
-import { Tabs, Table, Modal } from "antd";
+import { Tabs, Table, Modal, Button } from "antd";
+
 import { priority } from "../../../utils/data";
 import AlterAuth from "./AlterAuth";
+
 const { TabPane } = Tabs;
 
 const Auth = () => {
   const [curData, setCurData] = useState("");
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [isCancelModalVisible, setIsCancelModalVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+
   const [employeeData, setEmployeeData] = useState([]);
 
   const [formPriority, setFormPriority] = useState(null);
@@ -20,7 +24,7 @@ const Auth = () => {
   };
 
   const handleOk = (e) => {
-    setIsModalVisible(false);
+    setLoading(true);
     handleSubmit(e);
   };
 
@@ -40,8 +44,13 @@ const Auth = () => {
   const handleSubmit = (e) => {
     e.preventDefault();
     console.log(formPriority);
-    // const [priority] = document.forms[0];
-    // console.log(priority);
+    // curData id
+    // formPriority
+    // axios post
+    setTimeout(() => {
+      setLoading(false);
+      setIsModalVisible(false);
+    }, 1500);
   };
 
   useEffect(() => {
@@ -120,10 +129,20 @@ const Auth = () => {
           title="权限信息"
           visible={isModalVisible}
           closable={false}
-          onOk={handleOk}
-          onCancel={handleCancel}
-          okText={"确认"}
-          cancelText={"放弃修改"}
+          footer={[
+            <Button key="back" onClick={handleCancel}>
+              {"放弃修改"}
+            </Button>,
+            <Button
+              key="submit"
+              type="primary"
+              loading={loading}
+              onClick={handleOk}
+              disabled={!formPriority}
+            >
+              {"确认"}
+            </Button>,
+          ]}
         >
           <form id="alterAuth" onSubmit={handleSubmit}>
             <AlterAuth item={curData} setFormPriority={setFormPriority} />
diff --git a/src/components/System/Customer/Custom.jsx b/src/components/System/Customer/Custom.jsx
index 3d74bd71a85caf76c29d317d5efc78e686be4f30..e225cbb1b4d597563dc380b830ea5c9188138963 100644
--- a/src/components/System/Customer/Custom.jsx
+++ b/src/components/System/Customer/Custom.jsx
@@ -60,7 +60,11 @@ const Custom = () => {
   };
 
   const deleteHandleOk = () => {
+    // axios get
+    //resolved
     setIsDeleteModalVisible(false);
+    //rejected
+    // 出错啦...
   };
 
   const deleteHandleCancel = () => {
@@ -115,10 +119,10 @@ const Custom = () => {
       title: "登录账号",
       dataIndex: "username",
     },
-    {
-      title: "登录密码",
-      dataIndex: "password",
-    },
+    // {
+    //   title: "登录密码",
+    //   dataIndex: "password",
+    // },
     {
       title: "性别",
       dataIndex: "sex",
@@ -210,9 +214,6 @@ const Custom = () => {
           closable={false}
           onOk={handleOk}
           onCancel={handleCancel}
-          // destroyOnClose={true}
-          // okText={"确认"}
-          // cancelText={"放弃修改"}
           footer={[
             <Button key="back" onClick={handleCancel}>
               {"放弃修改"}
diff --git a/src/components/System/Employee/Employee.jsx b/src/components/System/Employee/Employee.jsx
index ae04bef353016a978f5c6374d2cb9f6c4a2af996..5179f9e53dea7f1ebf8e6236baa4f71c22ea7231 100644
--- a/src/components/System/Employee/Employee.jsx
+++ b/src/components/System/Employee/Employee.jsx
@@ -72,7 +72,11 @@ const Employee = () => {
   };
 
   const deleteHandleOk = () => {
+    // axios get
+    //resolved
     setIsDeleteModalVisible(false);
+    //rejected
+    // 出错啦...
   };
 
   const deleteHandleCancel = () => {
@@ -148,10 +152,10 @@ const Employee = () => {
       title: "登录账号",
       dataIndex: "username",
     },
-    {
-      title: "登录密码",
-      dataIndex: "password",
-    },
+    // {
+    //   title: "登录密码",
+    //   dataIndex: "password",
+    // },
     {
       title: "性别",
       dataIndex: "sex",
diff --git a/src/components/WareClerk/Tasks.jsx b/src/components/WareClerk/Tasks.jsx
index e60a1916f1053e10f38cba876ae17b18325f2e6b..eb0535e53c9ee509dfb28eed7a994917fdfc9e7f 100644
--- a/src/components/WareClerk/Tasks.jsx
+++ b/src/components/WareClerk/Tasks.jsx
@@ -8,19 +8,17 @@ import Selector from "../Selector";
 import { taskCategories } from "../../utils/data";
 
 const Tasks = () => {
-  const [cate, setCate] = useState("全部");
+  const [cate, setCate] = useState(3);
   const [mockOrderData, setMockOrderData] = useState([]);
   const [searchRes, setSearchRes] = useState([]);
 
   const cateHandler = (e) => {
     e.preventDefault();
     const [type] = document.forms[0];
-    if (type.value === "入库") {
-      setSearchRes(mockOrderData.filter((data) => data.type === 0));
-    } else if (type.value === "出库") {
-      setSearchRes(mockOrderData.filter((data) => data.type === 2));
-    } else {
+    if (type.value === "3") {
       setSearchRes(mockOrderData);
+    } else {
+      setSearchRes(mockOrderData.filter((data) => data.type == type.value));
     }
   };
 
diff --git a/src/components/WareManager/Stock.jsx b/src/components/WareManager/Stock.jsx
index b321b9e86c275870ba134a5a9634682f851f909b..92783ad32404ef9af53dbed530fce8d9a22d5572 100644
--- a/src/components/WareManager/Stock.jsx
+++ b/src/components/WareManager/Stock.jsx
@@ -1,30 +1,28 @@
 import React, { useState, useEffect } from "react";
 import axios from "axios";
-import { Table } from "antd";
 import { FiSearch } from "react-icons/fi";
-import { DatePicker, Space, ConfigProvider } from "antd";
+import { Table, DatePicker, Space, ConfigProvider } from "antd";
 import locale from "antd/lib/locale/zh_CN";
 
-import { wareCategories } from "../../utils/data";
 import Selector from "../Selector";
 import InputArea from "../InputArea";
 
 const Stock = () => {
   const onChange = (date, dateString) => {
     setTime(dateString);
-    console.log(date, dateString);
+    // console.log(date, dateString);
   };
 
   const [cate, setCate] = useState(null);
   const [time, setTime] = useState(null);
   const [info, setInfo] = useState(null);
 
-  const [mockStockData, setMockStockData] = useState([]);
+  const [searchRes, setSearchRes] = useState([]);
   const [dataSource, setDataSource] = useState([]);
 
   useEffect(() => {
     axios.get("/admin/ware-manager/stock").then((res) => {
-      setMockStockData(res.data.result.list);
+      setSearchRes(res.data.result.list);
       setDataSource(res.data.result.list);
       // setSearchRes(res.data.result.list);
     });
@@ -63,52 +61,54 @@ const Stock = () => {
   ];
 
   const query = (event) => {
-    if (cate == null && time == null && info == null) {
-      setMockStockData(dataSource);
-    } else if (cate != null && time == null && info == null) {
-      setMockStockData(dataSource.filter((item) => item.repository == cate));
-    } else if (cate == null && time != null && info == null) {
-      setMockStockData(dataSource.filter((item) => item.time == time));
-    } else if (cate == null && time == null && info != null) {
-      setMockStockData(
+    if (!cate && !time && !info) {
+      setSearchRes(dataSource);
+    } else if (cate && !time && !info) {
+      setSearchRes(dataSource.filter((item) => item.repository == cate));
+    } else if (!cate && time && !info) {
+      setSearchRes(
+        dataSource.filter((item) => item.time.split(" ")[0] == time)
+      );
+    } else if (!cate && !time && info) {
+      setSearchRes(
         dataSource.filter(
-          (item) => item.ower == info || item.type == info || item.name == info
+          (item) => item.owner == info || item.type == info || item.name == info
         )
       );
-    } else if (cate == null && time != null && info != null) {
-      setMockStockData(
+    } else if (!cate && time && info) {
+      setSearchRes(
         dataSource.filter(
           (item) =>
-            item.time == time &&
-            (item.ower == info || item.type == info || item.name == info)
+            item.time.split(" ")[0] == time &&
+            (item.owner == info || item.type == info || item.name == info)
         )
       );
-    } else if (cate != null && time != null && info == null) {
-      setMockStockData(
+    } else if (cate && time && !info) {
+      setSearchRes(
         dataSource.filter(
-          (item) => item.time == time && item.repository == cate
+          (item) => item.time.split(" ")[0] == time && item.repository == cate
         )
       );
-    } else if (cate != null && time == null && info != null) {
-      setMockStockData(
+    } else if (cate && !time && info) {
+      setSearchRes(
         dataSource.filter(
           (item) =>
             item.repository == cate &&
-            (item.ower == info || item.type == info || item.name == info)
+            (item.owner == info || item.type == info || item.name == info)
         )
       );
-    } else if (cate != null && time != null && info != null) {
-      setMockStockData(
+    } else if (cate && time && info) {
+      setSearchRes(
         dataSource.filter(
           (item) =>
-            item.time == time &&
+            item.time.split(" ")[0] == time &&
             item.repository == cate &&
-            (item.ower == info || item.type == info || item.name == info)
+            (item.owner == info || item.type == info || item.name == info)
         )
       );
     }
 
-    //setMockStockData(dataSource.filter(item=>item.repository==cate&&item.time==time));
+    //setSearchRes(dataSource.filter(item=>item.repository===cate&&item.time===time));
     console.log(cate);
     console.log(time);
     event.preventDefault();
@@ -122,7 +122,7 @@ const Stock = () => {
           <Selector
             value={cate}
             onChange={(e) => setCate(e.target.value)}
-            categories={mockStockData.map((item) =>
+            categories={dataSource.map((item) =>
               Object.assign({}, { id: item.repository, name: item.repository })
             )}
           />
@@ -138,6 +138,7 @@ const Stock = () => {
           </ConfigProvider>
 
           <InputArea
+            required={false}
             onChange={(e) => setInfo(e.target.value)}
             placeholder={"货主名称/货品名称/货品类型"}
             className={
@@ -157,7 +158,7 @@ const Stock = () => {
       <div className="pl-6 pr-6 md:pr-10">
         <Table
           columns={columns}
-          dataSource={mockStockData.map((item) => ({
+          dataSource={searchRes.map((item) => ({
             ...item,
             key: item.id,
           }))}
diff --git a/src/components/WareManager/WareQuery.jsx b/src/components/WareManager/WareQuery.jsx
index ad7f466d92196345086ecf2354346b7f2e3b405b..27f6022b785795f64832f274de2a02ade4ef74b1 100644
--- a/src/components/WareManager/WareQuery.jsx
+++ b/src/components/WareManager/WareQuery.jsx
@@ -3,22 +3,102 @@ import { Tabs, Table, DatePicker, Space, ConfigProvider } from "antd";
 import { FiSearch } from "react-icons/fi";
 import locale from "antd/lib/locale/zh_CN";
 import axios from "axios";
+import moment from "moment";
 
 import Selector from "../Selector";
 import { taskCategories } from "../../utils/data";
+
 const { TabPane } = Tabs;
-const onChange = (date, dateString) => {
-  console.log(date, dateString);
-};
 
+// 流水查询
 const WareQuery = () => {
-  const [cate, setCate] = useState("全部");
-  // const [status, setStatus] = useState("全部");
-  const [mockQueryData, setMockQueryData] = useState([]);
+  const [cate, setCate] = useState(3);
+  const [inTime, setInTime] = useState(null);
+  const [outTime, setOutTime] = useState(null);
+  const [inTime2, setInTime2] = useState(null);
+  const [outTime2, setOutTime2] = useState(null);
+
+  const [dateError, setDateError] = useState(false);
+  const [dateError2, setDateError2] = useState(false);
+
+  const [inOutWare, setInOutWare] = useState([]);
+  const [changeWare, setChangeWare] = useState([]);
+  const [inOutSearchRes, setInOutSearchRes] = useState([]);
+  const [changeWareSearchRes, setChangeWareSearchRes] = useState([]);
+
+  const inOutSubmitHandler = (e) => {
+    e.preventDefault();
+    if (!inTime && !outTime) {
+      // 不填时间
+      if (+cate === 3) {
+        setInOutSearchRes(inOutWare);
+      } else {
+        setInOutSearchRes(inOutWare.filter((item) => item.type == cate));
+      }
+    } else {
+      if (+cate === 3) {
+        if (!inTime) {
+          setInOutSearchRes(
+            inOutWare.filter((item) => item.out.split(" ")[0] == outTime)
+          );
+        } else if (!outTime) {
+          setInOutSearchRes(
+            inOutWare.filter((item) => item.in.split(" ")[0] == inTime)
+          );
+        } else {
+          setInOutSearchRes(
+            inOutWare.filter(
+              (item) =>
+                item.in.split(" ")[0] == inTime &&
+                item.out.split(" ")[0] == outTime
+            )
+          );
+        }
+      } else {
+        if (!inTime) {
+          setInOutSearchRes(
+            inOutWare.filter(
+              (item) => item.type == cate && item.out.split(" ")[0] == outTime
+            )
+          );
+        } else if (!outTime) {
+          setInOutSearchRes(
+            inOutWare.filter(
+              (item) => item.type == cate && item.in.split(" ")[0] == inTime
+            )
+          );
+        } else {
+          setInOutSearchRes(
+            inOutWare.filter(
+              (item) =>
+                item.type == cate &&
+                item.in.split(" ")[0] == inTime &&
+                item.out.split(" ")[0] == outTime
+            )
+          );
+        }
+      }
+    }
+    // console.log(cate, inTime, outTime);
+  };
+
+  const changeWareSubmitHandler = (e) => {
+    e.preventDefault();
+    if (!inTime2 && !outTime2) {
+      setChangeWareSearchRes(changeWare);
+    } else if (!inTime2) {
+      setChangeWareSearchRes(changeWare.filter((item) => item.out == outTime2));
+    } else {
+      setChangeWareSearchRes(changeWare.filter((item) => item.in == inTime2));
+    }
+    // console.log(inTime2, outTime2);
+  };
 
   useEffect(() => {
     axios.get("/admin/ware-manager/query").then((res) => {
-      setMockQueryData(res.data.result.list);
+      setInOutWare(res.data.result.list);
+      // setInOutWare(res.data.result.list.filter(item=>item.type===0||item.type===2))
+      setInOutSearchRes(res.data.result.list);
     });
   }, []);
 
@@ -91,7 +171,10 @@ const WareQuery = () => {
       <Tabs defaultActiveKey="1">
         <TabPane tab="出入库流水" key="1">
           <div className="pt-2">
-            <form className="flex items-center gap-2">
+            <form
+              onSubmit={inOutSubmitHandler}
+              className="flex items-center gap-2"
+            >
               <label className="text-sm font-semibold">类型</label>
               <Selector
                 value={cate}
@@ -104,7 +187,13 @@ const WareQuery = () => {
                   className="border-gray-300 border rounded"
                   direction="vertical"
                 >
-                  <DatePicker onChange={onChange} />
+                  <DatePicker
+                    status={dateError && "error"}
+                    onChange={(date, dateString) => {
+                      setDateError(moment(dateString).isAfter(outTime));
+                      setInTime(dateString);
+                    }}
+                  />
                 </Space>
               </ConfigProvider>
               <ConfigProvider locale={locale}>
@@ -113,12 +202,19 @@ const WareQuery = () => {
                   className="border-gray-300 border rounded"
                   direction="vertical"
                 >
-                  <DatePicker onChange={onChange} />
+                  <DatePicker
+                    status={dateError && "error"}
+                    onChange={(date, dateString) => {
+                      setDateError(moment(dateString).isBefore(inTime));
+                      setOutTime(dateString);
+                    }}
+                  />
                 </Space>
               </ConfigProvider>
               <button
+                disabled={dateError}
                 type="submit"
-                className="p-2 flex justify-center items-center rounded bg-[#008df9]"
+                className="p-2 flex justify-center items-center rounded bg-[#008df9] disabled:bg-gray-300 disabled:hover:cursor-not-allowed"
               >
                 <FiSearch className="text-white font-semibold" />
               </button>
@@ -127,7 +223,7 @@ const WareQuery = () => {
           <div className="pt-4">
             <Table
               columns={columns}
-              dataSource={mockQueryData.map((item) => ({
+              dataSource={inOutSearchRes.map((item) => ({
                 ...item,
                 key: item.id,
               }))}
@@ -140,16 +236,26 @@ const WareQuery = () => {
             />
           </div>
         </TabPane>
+
         <TabPane tab="移库流水" key="2">
           <div className="pt-2">
-            <form className="flex items-center gap-2">
+            <form
+              onSubmit={changeWareSubmitHandler}
+              className="flex items-center gap-2"
+            >
               <label className="text-sm font-semibold">入库时间</label>
               <ConfigProvider locale={locale}>
                 <Space
                   className="border-gray-300 border rounded"
                   direction="vertical"
                 >
-                  <DatePicker onChange={onChange} />
+                  <DatePicker
+                    status={dateError2 && "error"}
+                    onChange={(date, dateString) => {
+                      setDateError2(moment(dateString).isAfter(outTime2));
+                      setInTime2(dateString);
+                    }}
+                  />
                 </Space>
               </ConfigProvider>
               <ConfigProvider locale={locale}>
@@ -158,12 +264,19 @@ const WareQuery = () => {
                   className="border-gray-300 border rounded"
                   direction="vertical"
                 >
-                  <DatePicker onChange={onChange} />
+                  <DatePicker
+                    status={dateError2 && "error"}
+                    onChange={(date, dateString) => {
+                      setDateError2(moment(dateString).isBefore(inTime2));
+                      setOutTime2(dateString);
+                    }}
+                  />
                 </Space>
               </ConfigProvider>
               <button
+                disabled={dateError2}
                 type="submit"
-                className="p-2 flex justify-center items-center rounded bg-[#008df9]"
+                className="p-2 flex justify-center items-center rounded bg-[#008df9] disabled:bg-gray-300 disabled:hover:cursor-not-allowed"
               >
                 <FiSearch className="text-white font-semibold" />
               </button>
@@ -172,7 +285,7 @@ const WareQuery = () => {
           <div className="pt-4">
             <Table
               columns={column}
-              dataSource={mockQueryData.map((item) => ({
+              dataSource={changeWareSearchRes.map((item) => ({
                 ...item,
                 key: item.id,
               }))}
diff --git a/src/mock/index.js b/src/mock/index.js
index 803eb190c05c28282fbf5f375242d7bdf23afe1e..eec6722a42868c4f4fd35ce8c1c289260dda111b 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -91,7 +91,7 @@ Mock.mock("/admin/ware-manager/stock", {
         in: /[1-7][0-9]/,
         out: /[1-7][0-9]/,
         recent: /[1-7][0-9]/,
-        time: "@date",
+        time: "@datetime",
       },
     ],
   },
@@ -104,7 +104,7 @@ Mock.mock("/admin/ware-manager/query", {
   result: {
     "list|10": [
       {
-        "type|1": [0,1],
+        "type|1": [0,2],
         owner: /IC\d{4}/,
         repository: /\d{2}/,
         position: /\d{2}/,
diff --git a/src/utils/data.js b/src/utils/data.js
index b84102bd73973ba59f62afb09a0b0aa2e8c3ea7d..d1684b62cdaa28c5b510f3ccc13c3c7b683af20c 100644
--- a/src/utils/data.js
+++ b/src/utils/data.js
@@ -98,8 +98,8 @@ export const wareCategories = [
 
 export const taskCategories = [
   { id: 0, name: "入库" },
-  { id: 1, name: "出库" },
-  { id: 2, name: "全部" },
+  { id: 2, name: "出库" },
+  { id: 3, name: "全部" },
 ];
 
 export const statusCategories = [