From a71d2c93500fd247efe634fcb3f58a938f807d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 29 Jul 2026 12:03:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor(cargo-type):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=B8=83=E5=B1=80=E5=B9=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将功能按钮从自定义紧凑搜索栏迁移至 avue-crud 的 menu-left 插槽，恢复 Avue 原生搜索
- 删除紧凑搜索栏及相关样式和方法，减少冗余代码
- 为按钮补齐 Element Plus 图标，统一界面风格
- 修改导出参数，去除 ids 限制，始终按搜索条件导出数据
- 隐藏 Avue 内置新增按钮，仅保留自定义新增按钮
- 调整 searchShow 配置，启用原生搜索表单功能
---
 .workbuddy/memory/2026-07-29.md |  22 +++--
 src/option/base/cargo-type.js   |   2 +-
 src/views/base/cargo-type.vue   | 140 ++++++--------------------------
 3 files changed, 43 insertions(+), 121 deletions(-)

diff --git a/.workbuddy/memory/2026-07-29.md b/.workbuddy/memory/2026-07-29.md
index 00f1bab..4e80ead 100644
--- a/.workbuddy/memory/2026-07-29.md
+++ b/.workbuddy/memory/2026-07-29.md
@@ -1,12 +1,22 @@
 # 2026-07-29 工作日志
 
 ## cargo-type 顶部按钮区优化
-- **文件**: `src/views/base/cargo-type.vue`
+- **文件**: `src/views/base/cargo-type.vue` + `src/option/base/cargo-type.js`
 - **改动**:
   1. 新增按钮文字 `添加分类` → `新增`（与截图一致）
   2. 为 4 个按钮补齐 Element Plus 图标：批量导入(Upload)、下载模板(Download)、批量导出(Download)、批量删除(Delete)，均带 `el-icon--left`
-  3. 图标导入注册：`import { Search, Plus, Upload, Download, Delete }`，components 同步注册
-  4. 补充规范样式：`:deep(.basic-container__card) > .el-card__body { padding: 0 }`（去除内层卡片 padding，符合 AGENTS.md 4.4）
-- **排查确认无需改动项**:
-  - 操作列菜单（查看/编辑/删除）menuWidth:220 已符合规范
-  - `empty-pagination` 组件已靠右、`total` 在前、`sizes` 在 total 右侧，符合分页规范；avue-crud 默认分页 layout 同规范（customer-type 同模块也未自定义）
+  3. 图标导入注册：`import { Plus, Upload, Download, Delete }`（移除不再需要的 Search），components 同步注册
+  4. 补充规范样式：`:deep(.basic-container__card) > .el-card__body { padding: 0 }`
+
+## cargo-type 按钮迁移至 menu-left + 移除紧凑搜索栏（本次）
+- **用户要求**：功能按钮从自定义紧凑搜索栏迁移到 avue-crud 的 `menu-left` 插槽（表格工具栏右侧），同时删除自定义紧凑搜索栏，恢复 Avue 原生搜索。
+- **模板改动**：
+  - 删除整个 `.compact-search` 自定义搜索栏 div（含 el-select + el-input + 按钮）
+  - 在 `<avue-crud>` 内新增 `<template #menu-left>` 插槽，放置全部 5 个按钮（新增/批量导入/下载模板/批量导出/批量删除）
+- **Option 改动**：`searchShow: false` → `searchShow: true`，恢复 Avue 原生搜索表单（类型 radio + 货物类型编码 input）
+- **清理**：移除 `Search` 图标导入、`handleCompactSearch()` 方法、`.compact-search` 相关样式、隐藏 `.avue-crud__search-btn` 规则
+- **确认无需改动项**：操作列(220px)、分页组件布局均符合规范
+
+## cargo-type 导出逻辑修复 + 去重新增按钮（本次）
+- **导出逻辑**：`buildExportParams()` 移除 `ids` 参数拼接，始终按当前搜索条件导出（不再受勾选行影响）
+- **去重新增按钮**：Avue 内置 addBtn 由 `validData(permission, false)` 改为 `false`，隐藏内置"新增"按钮；仅保留 `menu-left` 插槽中带图标的"新增"按钮
diff --git a/src/option/base/cargo-type.js b/src/option/base/cargo-type.js
index 7032f87..8fae2a5 100644
--- a/src/option/base/cargo-type.js
+++ b/src/option/base/cargo-type.js
@@ -33,7 +33,7 @@ export const getCargoTypeOption = ctx => ({
   emptyBtnText: '重置',
   saveBtnText: '提交',
   updateBtnText: '提交',
-  searchShow: false,
+  searchShow: true,
   searchIcon: false,
   searchMenuSpan: 24,
   searchIndex: 8,
diff --git a/src/views/base/cargo-type.vue b/src/views/base/cargo-type.vue
index 58901ed..904a566 100644
--- a/src/views/base/cargo-type.vue
+++ b/src/views/base/cargo-type.vue
@@ -1,34 +1,26 @@
 <template>
   <basic-container class="cargo-type-page">
-    <!-- 紧凑搜索栏 -->
-    <div class="compact-search">
-      <div class="compact-search__form">
-        <el-select
-          v-model="query.typeLevel"
-          placeholder="选择类型"
-          clearable
-          class="compact-search__select"
-          @change="handleCompactSearch"
-        >
-          <el-option label="一级货物类型" :value="1" />
-          <el-option label="二级货物类型" :value="2" />
-        </el-select>
-        <el-input
-          v-model="query.keyword"
-          placeholder="搜索分类名称"
-          clearable
-          class="compact-search__input"
-          @keyup.enter="handleCompactSearch"
-          @clear="handleCompactSearch"
-        >
-          <template #append>
-            <el-button @click="handleCompactSearch">
-              <el-icon><Search /></el-icon>
-            </el-button>
-          </template>
-        </el-input>
-      </div>
-      <div class="compact-search__actions">
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model:page="page"
+      v-model:form="form"
+      ref="crud"
+      :permission="permissionList"
+      :before-open="beforeOpen"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left>
         <el-button type="primary" v-if="permission.cargo_type_add" @click="$refs.crud.rowAdd()">
           <el-icon class="el-icon--left"><Plus /></el-icon>新增
         </el-button>
@@ -56,29 +48,7 @@
           v-if="permission.cargo_type_delete"
           @click="handleDelete"
         ><el-icon class="el-icon--left"><Delete /></el-icon>批量删除</el-button>
-      </div>
-    </div>
-
-    <avue-crud
-      :option="option"
-      :table-loading="loading"
-      :data="data"
-      v-model:page="page"
-      v-model="form"
-      ref="crud"
-      :permission="permissionList"
-      :before-open="beforeOpen"
-      @row-save="rowSave"
-      @row-update="rowUpdate"
-      @row-del="rowDel"
-      @search-change="searchChange"
-      @search-reset="searchReset"
-      @selection-change="selectionChange"
-      @current-change="currentChange"
-      @size-change="sizeChange"
-      @refresh-change="refreshChange"
-      @on-load="onLoad"
-    >
+      </template>
 
       <template #parentCargoName="{ row }">
         {{ row.typeLevel === 1 ? '/' : row.parentCargoName || '/' }}
@@ -176,7 +146,7 @@ import { openImportDialog } from '@/utils/import-excel';
 import { getToken } from '@/utils/auth';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
-import { Search, Plus, Upload, Download, Delete } from '@element-plus/icons-vue';
+import { Plus, Upload, Download, Delete } from '@element-plus/icons-vue';
 
 // 导入失败明细中，每个错误文本对应的「字段列」与「规则说明」
 const CARGO_TYPE_FAIL_RULES = [
@@ -273,7 +243,7 @@ export const decorateCargoTypeFailDetail = async workbook => {
 };
 
 export default {
-  components: { Search, Plus, Upload, Download, Delete },
+  components: { Plus, Upload, Download, Delete },
   data() {
     return {
       form: {},
@@ -327,7 +297,7 @@ export default {
     ...mapGetters(['permission']),
     permissionList() {
       return {
-        addBtn: this.validData(this.permission.cargo_type_add, false),
+        addBtn: false,
       };
     },
     ids() {
@@ -538,17 +508,6 @@ export default {
       this.syncColumnDisplay();
       done();
     },
-    handleCompactSearch() {
-      this.page.currentPage = 1;
-      const params = {};
-      if (this.query.typeLevel != null) {
-        params.typeLevel = this.query.typeLevel;
-      }
-      if (this.query.keyword) {
-        params.cargoName = this.query.keyword;
-      }
-      this.onLoad(this.page, params);
-    },
     searchReset() {
       this.query = {};
       this.page.currentPage = 1;
@@ -595,11 +554,7 @@ export default {
       });
     },
     buildExportParams() {
-      const params = { ...this.query };
-      if (this.ids) {
-        params.ids = this.ids;
-      }
-      return params;
+      return { ...this.query };
     },
     handleExport() {
       this.$confirm('是否导出货物类型数据?', '提示', {
@@ -657,49 +612,6 @@ export default {
     padding: 0;
   }
 
-  // 隐藏表格工具栏中的搜索图标按钮
-  :deep(.avue-crud__search-btn) {
-    display: none !important;
-  }
-
-  // 紧凑搜索栏
-  .compact-search {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    padding: 12px 16px;
-    margin-bottom: 8px;
-    background: #fff;
-    border-radius: 4px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    gap: 16px;
-
-    &__form {
-      display: flex;
-      align-items: center;
-      flex: 1;
-      gap: 12px;
-      min-width: 0;
-    }
-
-    &__select {
-      width: 160px;
-      flex-shrink: 0;
-    }
-
-    &__input {
-      width: 280px;
-      flex-shrink: 0;
-    }
-
-    &__actions {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-      flex-shrink: 0;
-    }
-  }
-
   :deep(.el-table) {
     --el-table-border-color: #eff1f7;
     --el-table-row-hover-bg-color: #f5f7fa;