feat: 🚀 厂商查询

src/components/templete/index.vue

@@ -78,43 +78,52 @@ const dwTemplate = async () => {
 </script>
 
 <template>
-  <div class="bg-white w-full h-full p-5">
-    <!-- 下载模版模块 -->
-    <div>
-      <p>
-        1、<span>下载导入模版</span> <span>根据模版中的填写须知完成表格</span>
-      </p>
-      <span
-        class="inline-block bg-gray-100 py-2 px-8 ml-4 mt-4 cursor-pointer"
-        @click="dwTemplate"
-      >
-        下载模版
-      </span>
-    </div>
-    <!-- 上传模版模块 -->
-    <div class="mt-10">
-      <p>
-        1、<span>下载导入模版</span> <span>根据模版中的填写须知完成表格</span>
-      </p>
-      <el-upload
-        class="upload-demo w-90 mt-3"
-        drag
-        :http-request="uploadFile"
-        multiple
-        :on-success="handleAvatarSuccess"
-        :before-upload="beforeAvatarUpload"
-      >
-        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-        <div class="el-upload__text">
-          将您的文件拖放到此处，或者 <em>点击上传</em>
-        </div>
-        <template #tip>
-          <div class="el-upload__tip">2M以内，支持xlsx、xls格式</div>
-        </template>
-      </el-upload>
+  <div class="bg-white w-full h-full relative">
+    <div class="p-5">
+      <!-- 下载模版模块 -->
+      <div>
+        <p>
+          1、<span>下载导入模版</span> <span>根据模版中的填写须知完成表格</span>
+        </p>
+
+        <span
+          class="flex items-center bg-gray-100 w-40 py-2 px-8 ml-4 mt-4 cursor-pointer"
+          @click="dwTemplate"
+        >
+          <IconifyIconOnline
+            class="cursor-pointer mr-2"
+            icon="meteor-icons:download"
+          />
+          下载模版
+        </span>
+      </div>
+      <!-- 上传模版模块 -->
+      <div class="mt-10">
+        <p>
+          1、<span>下载导入模版</span> <span>根据模版中的填写须知完成表格</span>
+        </p>
+        <el-upload
+          class="upload-demo w-90 mt-3"
+          drag
+          :http-request="uploadFile"
+          multiple
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+        >
+          <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+          <div class="el-upload__text">
+            将您的文件拖放到此处，或者 <em>点击上传</em>
+          </div>
+          <template #tip>
+            <div class="el-upload__tip">2M以内，支持xlsx、xls格式</div>
+          </template>
+        </el-upload>
+      </div>
     </div>
     <!-- 底部放一个取消和确认按钮 -->
-    <div class="position border text-center w-full bg-white mt-40 py-1 px-5">
+    <div
+      class="absolute bottom-0 border-2 text-right w-full bg-white py-3 px-15"
+    >
       <el-button type="primary" @click="confirm">确认</el-button>
       <el-button class="ml-4">取消</el-button>
     </div>

src/router/modules/Manufacturer.ts

@@ -7,7 +7,7 @@ export default {
   },
   children: [
     {
-      path: "/fac-manage/fac-edit2",
+      path: "/fac-manage/fac-edit",
       name: "FacCreate",
       component: () => import("@/views/fac-manage/fac-create/index.vue"),
       meta: {

src/views/fac-manage/fac-list/index.vue

@@ -20,7 +20,8 @@
           class="w-50 m-2"
           placeholder="厂商名称/简称/总部地址"
         >
-          <template #append> <el-button :icon="Search" /> </template
+          <template #append>
+            <el-button :icon="Search" @click="onSearch" /> </template
         ></el-input>
       </el-form-item>
     </el-form>

src/views/fac-manage/fac-list/utils/hook.tsx

@@ -146,7 +146,7 @@ export function useFacList() {
       return;
     }
     router.push({
-      path: "/fac-manage/fac-edit2",
+      path: "/fac-manage/fac-edit",
       query: { id: multipleSelection.value[0].id }
     });
     console.log("multipleSelection", multipleSelection.value);
@@ -167,8 +167,9 @@ export function useFacList() {
   const getFacList = async () => {
     const { data } = await getManufacturerList({
       pageNum: pagination.currentPage,
-      pageSize: pagination.pageSize
+      pageSize: pagination.pageSize,
       // manufacturerType: manufacturerType.value
+      listQueryCondition: form.searchName ? form.searchName : null
     });
     dataList.value = data.records;
     pagination.total = data.total;

src/views/fac-manage/fac-select/utils/hook.tsx

@@ -299,6 +299,13 @@ export function useFacList() {
       pageNum: pagination.currentPage,
       pageSize: pagination.pageSize
     };
+    // 过滤掉参数为空的值
+    delete params["facTypeList"];
+    for (const key in params) {
+      if (params[key] === "") {
+        delete params[key];
+      }
+    }
     const { data } = await getManufacturerList(params);
     dataList.value = data.records;
     pagination.total = data.total;