diff --git a/src/components/WareManager/Stock.jsx b/src/components/WareManager/Stock.jsx
index cf7c9b39c243f0b5e0ee819cee8427f59582153a..b321b9e86c275870ba134a5a9634682f851f909b 100644
--- a/src/components/WareManager/Stock.jsx
+++ b/src/components/WareManager/Stock.jsx
@@ -9,18 +9,23 @@ import { wareCategories } from "../../utils/data";
 import Selector from "../Selector";
 import InputArea from "../InputArea";
 
-const onChange = (date, dateString) => {
-  console.log(date, dateString);
-};
-
 const Stock = () => {
-  const [cate, setCate] = useState("全部");
-  const [status, setStatus] = useState("全部");
+  const onChange = (date, dateString) => {
+    setTime(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 [dataSource, setDataSource] = useState([]);
 
   useEffect(() => {
     axios.get("/admin/ware-manager/stock").then((res) => {
       setMockStockData(res.data.result.list);
+      setDataSource(res.data.result.list);
       // setSearchRes(res.data.result.list);
     });
   }, []);
@@ -47,7 +52,7 @@ const Stock = () => {
       dataIndex: "type",
     },
     {
-      title: "货主IC",
+      title: "货主名称",
       dataIndex: "owner",
     },
     {
@@ -57,6 +62,58 @@ 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(
+        dataSource.filter(
+          (item) => item.ower == info || item.type == info || item.name == info
+        )
+      );
+    } else if (cate == null && time != null && info != null) {
+      setMockStockData(
+        dataSource.filter(
+          (item) =>
+            item.time == time &&
+            (item.ower == info || item.type == info || item.name == info)
+        )
+      );
+    } else if (cate != null && time != null && info == null) {
+      setMockStockData(
+        dataSource.filter(
+          (item) => item.time == time && item.repository == cate
+        )
+      );
+    } else if (cate != null && time == null && info != null) {
+      setMockStockData(
+        dataSource.filter(
+          (item) =>
+            item.repository == cate &&
+            (item.ower == info || item.type == info || item.name == info)
+        )
+      );
+    } else if (cate != null && time != null && info != null) {
+      setMockStockData(
+        dataSource.filter(
+          (item) =>
+            item.time == time &&
+            item.repository == cate &&
+            (item.ower == info || item.type == info || item.name == info)
+        )
+      );
+    }
+
+    //setMockStockData(dataSource.filter(item=>item.repository==cate&&item.time==time));
+    console.log(cate);
+    console.log(time);
+    event.preventDefault();
+  };
+
   return (
     <div>
       <div className="flex items-center px-6 pt-6 pb-4 gap-4">
@@ -81,12 +138,14 @@ const Stock = () => {
           </ConfigProvider>
 
           <InputArea
+            onChange={(e) => setInfo(e.target.value)}
             placeholder={"货主名称/货品名称/货品类型"}
             className={
               "w-[200px] pl-2 py-1 outline-none border-gray-300 border-2 rounded"
             }
           />
           <button
+            onClick={query}
             type="submit"
             className="p-2 flex justify-center items-center rounded bg-[#008df9]"
           >
@@ -94,6 +153,7 @@ const Stock = () => {
           </button>
         </form>
       </div>
+
       <div className="pl-6 pr-6 md:pr-10">
         <Table
           columns={columns}