From 2814cc4da71f0162b6f9a8acb86c9e512b54d24f Mon Sep 17 00:00:00 2001
From: ChenQiuYu <chenqiuyu@jizhiweb.cn>
Date: Wed, 14 May 2025 17:03:47 +0800
Subject: [PATCH] dev

---
 src/views/inventory/apply.vue    | 118 +++++++++++++++++++++++++++--
 src/views/inventory/check.vue    | 121 ++++++++++++++++++++++++++++-
 src/views/inventory/supplier.vue | 126 +++++++++++++++++++++++++++++--
 3 files changed, 351 insertions(+), 14 deletions(-)

diff --git a/src/views/inventory/apply.vue b/src/views/inventory/apply.vue
index 215334d..7288d44 100644
--- a/src/views/inventory/apply.vue
+++ b/src/views/inventory/apply.vue
@@ -1,11 +1,34 @@
 <template>
   <div class="container-wrapper">
     <div class="top">
-      <div class="left"></div>
-      <div class="right">
-
+      <div class="search">
+        <div class="left">
+          <el-form :inline="true" :model="searchModel">
+            <el-form-item >
+              <el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px" :prefix-icon="Search"></el-input>
+            </el-form-item>
+            <el-form-item>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="right">
+          <div class="btn" @click="resetSearch">
+            <el-icon style="margin-right: 10px">
+              <Refresh/>
+            </el-icon>
+            重置
+          </div>
+          <div class="btn" @click="getList">
+            <el-icon style="margin-right: 10px">
+              <Search/>
+            </el-icon>
+            搜索
+          </div>
+        </div>
+      </div>
+      <div class="addBtn">
+        <span @click="clickApply">新增领用</span>
       </div>
-      <el-button type="primary" :icon="Plus" @click="clickApply">新增领用</el-button>
     </div>
     <div class="content">
       <el-table :data="dataList" style="width: 100%" @row-click="rowClick">
@@ -42,7 +65,7 @@ import AddApply from "@/components/inventory/apply/AddApply.vue";
 import {nextTick, onMounted, ref} from "vue";
 import {post} from "@/utils/request.ts";
 import DetailApply from "@/components/inventory/apply/DetailApply.vue";
-import {Plus} from "@element-plus/icons-vue";
+import {Refresh,Search} from "@element-plus/icons-vue";
 
 const is_add = ref(false)
 const is_detail = ref(false)
@@ -92,6 +115,22 @@ const clickApply = () => {
     addApplyRef.value?.getUserInfo()
   })
 }
+const searchModel=  ref({
+  code: "",
+  supplierIds: [],
+  managerUserIds: [],
+  startDate: "",
+  endDate: "",
+})
+const resetSearch=  () => {
+  searchModel.value = {
+    code: "",
+    supplierIds: [],
+    managerUserIds: [],
+    startDate: "",
+    endDate: "",
+  }
+}
 </script>
 
 <style scoped lang="scss">
@@ -126,5 +165,74 @@ const clickApply = () => {
   }
 }
 
+.top {
+  height: 110px;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
 
+  .search {
+    display: flex;
+    justify-content: space-between;
+    .left {
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      margin-right: 24px;
+      .el-form-item {
+        margin-right: 5px;
+      }
+    }
+    .right {
+      display: flex;
+      .btn {
+        width: 120px;
+        height: 42px;
+        background: #FFFFFF;
+        border-radius: 6px;
+        border: 1px solid #979797;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 24px;
+        cursor: pointer;
+        &:hover {
+          background: #4D6DE4;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+
+  }
+
+  .addBtn {
+    span {
+      display: inline-block;
+      width: 120px;
+      height: 42px;
+      background: #FFFFFF;
+      border-radius: 6px;
+      border: 1px solid #4D6DE4;
+      margin-right: 24px;
+      font-weight: 500;
+      font-size: 16px;
+      color: #4D6DE4;
+      text-align: center;
+      line-height: 42px;
+      cursor: pointer;
+      &:hover {
+        background: #4D6DE4;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+}
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 42px;
+}
+:deep(.el-select__wrapper) {
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/inventory/check.vue b/src/views/inventory/check.vue
index 883dc3a..2cec192 100644
--- a/src/views/inventory/check.vue
+++ b/src/views/inventory/check.vue
@@ -1,9 +1,35 @@
 <template>
   <div class="container-wrapper">
     <div class="top">
-      <el-dropdown>
-        <el-button type="primary" :icon="Plus" @click="openAdd">开始盘点</el-button>
-      </el-dropdown>
+      <div class="search">
+        <div class="left">
+          <el-form :inline="true" :model="searchModel">
+            <el-form-item>
+              <el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px"
+                        :prefix-icon="Search"></el-input>
+            </el-form-item>
+            <el-form-item>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="right">
+          <div class="btn" @click="resetSearch">
+            <el-icon style="margin-right: 10px">
+              <Refresh/>
+            </el-icon>
+            重置
+          </div>
+          <div class="btn" @click="getCheck">
+            <el-icon style="margin-right: 10px">
+              <Search/>
+            </el-icon>
+            搜索
+          </div>
+        </div>
+      </div>
+      <div class="addBtn">
+        <span @click="openAdd">开始盘点</span>
+      </div>
     </div>
     <div class="content_list">
       <el-scrollbar>
@@ -42,7 +68,7 @@ import {post} from "@/utils/request.ts";
 import Mask from "@/components/common/Mask.vue";
 import Add from "@/components/inventory/check/Add.vue";
 import Detail from "@/components/inventory/check/Detail.vue";
-import {Plus} from "@element-plus/icons-vue";
+import {Plus, Refresh, Search} from "@element-plus/icons-vue";
 
 const tableData = ref([])
 const getCheck = () => {
@@ -90,6 +116,14 @@ const formatDate = (isoStr: any) => {
   const date = new Date(isoStr);
   return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
 }
+const searchModel = ref({
+  code: ''
+})
+const resetSearch = () => {
+  searchModel.value = {
+    code: ''
+  }
+}
 </script>
 <style scoped lang="scss">
 @use "../../assets/scss/base.scss";
@@ -118,4 +152,83 @@ const formatDate = (isoStr: any) => {
     align-items: center;
   }
 }
+
+.top {
+  height: 110px;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+
+  .search {
+    display: flex;
+    justify-content: space-between;
+
+    .left {
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      margin-right: 24px;
+
+      .el-form-item {
+        margin-right: 5px;
+      }
+    }
+
+    .right {
+      display: flex;
+
+      .btn {
+        width: 120px;
+        height: 42px;
+        background: #FFFFFF;
+        border-radius: 6px;
+        border: 1px solid #979797;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 24px;
+        cursor: pointer;
+
+        &:hover {
+          background: #4D6DE4;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+
+  }
+
+  .addBtn {
+    span {
+      display: inline-block;
+      width: 120px;
+      height: 42px;
+      background: #FFFFFF;
+      border-radius: 6px;
+      border: 1px solid #4D6DE4;
+      margin-right: 24px;
+      font-weight: 500;
+      font-size: 16px;
+      color: #4D6DE4;
+      text-align: center;
+      line-height: 42px;
+      cursor: pointer;
+
+      &:hover {
+        background: #4D6DE4;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+}
+
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 42px;
+}
+
+:deep(.el-select__wrapper) {
+  height: 42px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/inventory/supplier.vue b/src/views/inventory/supplier.vue
index ab978aa..8cdc095 100644
--- a/src/views/inventory/supplier.vue
+++ b/src/views/inventory/supplier.vue
@@ -1,12 +1,38 @@
 <template>
   <div class="container-wrapper">
     <div class="top">
-      <el-dropdown>
-        <el-button type="primary" :icon="Plus" @click="addSupplier(null)">添加供应商</el-button>
-      </el-dropdown>
+      <div class="search">
+        <div class="left">
+          <el-form :inline="true" :model="searchModel">
+            <el-form-item>
+              <el-input v-model="searchModel.code" placeholder="请输入单号" style="width: 180px;height: 42px"
+                        :prefix-icon="Search"></el-input>
+            </el-form-item>
+            <el-form-item>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="right">
+          <div class="btn" @click="resetSearch">
+            <el-icon style="margin-right: 10px">
+              <Refresh/>
+            </el-icon>
+            重置
+          </div>
+          <div class="btn" @click="getSupplier">
+            <el-icon style="margin-right: 10px">
+              <Search/>
+            </el-icon>
+            搜索
+          </div>
+        </div>
+      </div>
+      <div class="addBtn">
+        <span @click="addSupplier(null)">添加供应商</span>
+      </div>
     </div>
     <div class="content_list">
-      <el-table :data="tableData" @row-click="editSupplier">
+      <el-table :data="tableData" @row-click="editSupplier" style="height: 100%">
         <el-table-column label="供应商名称" prop="name" width="250">
         </el-table-column>
         <el-table-column label="启用状态" prop="turn" width="80">
@@ -41,7 +67,7 @@ import {nextTick, onMounted, ref, watch} from "vue";
 import {post} from "@/utils/request.ts";
 import Mask from "@/components/common/Mask.vue";
 import AddSupplier from "@/components/inventory/supplier/AddSupplier.vue";
-import {Plus} from "@element-plus/icons-vue";
+import {Plus, Refresh, Search} from "@element-plus/icons-vue";
 
 const tableData = ref([])
 const getSupplier = () => {
@@ -79,6 +105,26 @@ let changePage = (value: number) => {
   page.value = value
   getSupplier()
 }
+const searchModel = ref({
+  code: null,
+  name: null,
+  turn: null,
+  licenseCode: null,
+  contactName: null,
+  contactTel: null,
+  reamark: null,
+})
+const resetSearch = () => {
+  searchModel.value = {
+    code: null,
+    name: null,
+    turn: null,
+    licenseCode: null,
+    contactName: null,
+    contactTel: null,
+    reamark: null,
+  }
+}
 </script>
 <style scoped lang="scss">
 @use "@/assets/scss/base.scss";
@@ -111,4 +157,74 @@ let changePage = (value: number) => {
     align-items: center;
   }
 }
+.top {
+  height: 110px;
+  background: #fff;
+  display: flex;
+  flex-direction: column;
+
+  .search {
+    display: flex;
+    justify-content: space-between;
+    .left {
+      flex: 1;
+      display: flex;
+      justify-content: space-between;
+      margin-right: 24px;
+      .el-form-item {
+        margin-right: 5px;
+      }
+    }
+    .right {
+      display: flex;
+      .btn {
+        width: 120px;
+        height: 42px;
+        background: #FFFFFF;
+        border-radius: 6px;
+        border: 1px solid #979797;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-left: 24px;
+        cursor: pointer;
+        &:hover {
+          background: #4D6DE4;
+          color: #fff;
+          border: none;
+        }
+      }
+    }
+
+  }
+
+  .addBtn {
+    span {
+      display: inline-block;
+      width: 120px;
+      height: 42px;
+      background: #FFFFFF;
+      border-radius: 6px;
+      border: 1px solid #4D6DE4;
+      margin-right: 24px;
+      font-weight: 500;
+      font-size: 16px;
+      color: #4D6DE4;
+      text-align: center;
+      line-height: 42px;
+      cursor: pointer;
+      &:hover {
+        background: #4D6DE4;
+        color: #fff;
+        border: none;
+      }
+    }
+  }
+}
+:deep(.el-range-editor.el-input__wrapper) {
+  height: 42px;
+}
+:deep(.el-select__wrapper) {
+  height: 42px;
+}
 </style>
\ No newline at end of file