From f2b754126c5083310a7af8765078d79158b39d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 20 Nov 2025 11:27:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(UI=E7=BB=84=E4=BB=B6):=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E4=BA=A7=E5=93=81=E4=B8=8E=E5=8E=9F=E6=9D=90=E6=96=99?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E5=92=8C?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化产品选择(ProductSelect)和原材料选择(RawMaterialSelect)组件的UI样式和交互逻辑：
1. 将触发按钮改为输入框样式，提升视觉一致性
2. 简化卡片布局，移除冗余的选择按钮
3. 优化选中状态显示，增加规格和材质信息
4. 调整表单样式，减小字体大小和间距
5. 更新空状态提示文案为"暂无发货记录"和"暂无入库记录"
6. 在package.json中添加volta配置指定node版本
---
 klp-ui/package.json                           |   5 +-
 klp-ui/src/assets/styles/element-ui.scss      |  15 +-
 .../KLPService/ProductSelect/index.vue        | 148 ++++------------
 .../KLPService/RawMaterialSelect/index.vue    | 166 +++++-------------
 klp-ui/src/views/wms/coil/do/ship.vue         |   2 +-
 klp-ui/src/views/wms/coil/do/warehousing.vue  |   8 +-
 klp-ui/src/views/wms/product/index.vue        |   2 +-
 7 files changed, 101 insertions(+), 245 deletions(-)

diff --git a/klp-ui/package.json b/klp-ui/package.json
index 7d74ba07..1e2ce6fc 100644
--- a/klp-ui/package.json
+++ b/klp-ui/package.json
@@ -107,5 +107,8 @@
   "browserslist": [
     "> 1%",
     "last 2 versions"
-  ]
+  ],
+  "volta": {
+    "node": "16.20.2"
+  }
 }
diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss
index 6408bb53..63e1b6a3 100644
--- a/klp-ui/src/assets/styles/element-ui.scss
+++ b/klp-ui/src/assets/styles/element-ui.scss
@@ -590,14 +590,15 @@ body {
 // ---------------------- 3.3 表单/输入（金属内阴影 + 统一高度）----------------------
 // 表单项布局
 .el-form-item {
-  margin-bottom: $--form-item-margin !important;
-  font-size: 13px;
+  margin-bottom: 0 !important;
+  margin-right: 4px;
+  font-size: 12px;
 
   // 标签样式
   .el-form-item__label {
     color: $--color-text-secondary;
     padding-right: $--spacing-base;
-    font-size: 13px;
+    font-size: 12px;
   }
 
   // 搜索表单 inline 布局
@@ -606,6 +607,14 @@ body {
     margin-right: $--spacing-base;
     vertical-align: middle;
   }
+
+  .el-form-item__error {
+    font-size: 12px;
+    top: 50%;
+    transform: translateY(-50%);
+    right: 6px;
+    left: auto;
+  }
 }
 
 // 输入框（统一高度 + 金属内阴影）
diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
index 6c16cb63..48e24a4e 100644
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -1,66 +1,33 @@
 <template>
   <div class="product-selector">
     <!-- 触发器按钮 -->
-    <el-button
-      v-if="!readonly"
-      type="text"
-      :icon="multiple ? 'el-icon-checks' : 'el-icon-check'"
-      @click="dialogVisible = true"
-    >
-      {{ buttonText }}
-    </el-button>
+    <div class="el-input" v-if="!readonly" type="text" @click="dialogVisible = true">
+      <div class="el-input__inner">
+        <el-icon class="el-icon-search"></el-icon>
+        {{ buttonText }}
+      </div>
+    </div>
     <span v-else class="readonly-text">{{ displayText }}</span>
 
     <!-- 选择对话框 -->
-    <el-dialog
-      append-to-body
-      title="选择产品"
-      :visible.sync="dialogVisible"
-      width="1200px"
-      :close-on-click-modal="false"
-      @close="handleClose"
-    >
+    <el-dialog append-to-body title="选择产品" :visible.sync="dialogVisible" width="1200px" :close-on-click-modal="false"
+      @close="handleClose">
       <!-- 搜索区域（保持不变） -->
       <el-form :inline="true" :model="queryParams" class="search-form" size="small">
         <el-form-item label="产品编号">
-          <el-input
-            v-model="queryParams.productCode"
-            placeholder="请输入产品编号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.productCode" placeholder="请输入产品编号" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="产品名称">
-          <el-input
-            v-model="queryParams.productName"
-            placeholder="请输入产品名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="负责人">
-          <el-input
-            v-model="queryParams.owner"
-            placeholder="请填写负责人"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.productName" placeholder="请输入产品名称" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="规格">
-          <el-input
-            v-model="queryParams.specification"
-            placeholder="请输入规格"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.specification" placeholder="请输入规格" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质">
-          <el-input
-            v-model="queryParams.material"
-            placeholder="请输入材质"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.material" placeholder="请输入材质" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -70,21 +37,12 @@
 
       <!-- 卡片布局（替换原表格） -->
       <div v-loading="loading" class="card-container">
-        <div 
-          v-for="(item, index) in productList" 
-          :key="index + item.productId"
-          class="product-card"
-          :class="{ 'selected-card': isSelected(item.productId) }"
-          @click="handleRowClick(item)"
-        >
+        <div v-for="(item, index) in productList" :key="index + item.productId" class="product-card"
+          :class="{ 'selected-card': isSelected(item.productId) }" @click="handleRowClick(item)">
           <!-- 多选勾选框 -->
-          <el-checkbox
-            v-if="multiple"
-            :checked="isSelected(item.productId)"
-            @change="(val) => handleCardSelection(val, item)"
-            class="card-checkbox"
-          />
-          
+          <el-checkbox v-if="multiple" :checked="isSelected(item.productId)"
+            @change="(val) => handleCardSelection(val, item)" class="card-checkbox" />
+
           <!-- 卡片内容（包含所有原表格字段） -->
           <div class="card-content">
             <div class="card-title">
@@ -92,23 +50,12 @@
               <span class="code">[{{ item.productCode }}]</span>
             </div>
             <div class="card-info">
-              <div class="info-item">负责人：<span>{{ item.owner || '-' }}</span></div>
               <div class="info-item">规格：<span>{{ item.specification || '-' }}</span></div>
               <div class="info-item">材质：<span>{{ item.material || '-' }}</span></div>
             </div>
-            
-            <!-- 选择按钮 -->
-            <el-button 
-              type="text" 
-              size="small" 
-              class="select-btn"
-              @click.stop="handleSelect(item)"
-            >
-              选择
-            </el-button>
           </div>
         </div>
-        
+
         <!-- 空数据提示 -->
         <div class="empty-tip" v-if="productList.length === 0 && !loading">
           暂无匹配的产品数据
@@ -116,21 +63,12 @@
       </div>
 
       <!-- 分页（保持不变） -->
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button 
-          type="primary" 
-          @click="confirmSelection" 
-          v-if="multiple"
-        >
+        <el-button type="primary" @click="confirmSelection" v-if="multiple">
           确认选择
         </el-button>
       </div>
@@ -185,19 +123,22 @@ export default {
   },
   computed: {
     buttonText() {
+      // 如果为选中任何产品，显示选择产品
+      // 如果为选中多个产品，显示已选 X 项
+      // 如果为选中单个产品，显示产品名称
+      if (this.selectedIds.length === 0) {
+        return '请选择产品';
+      }
       if (this.multiple) {
-        return this.selectedIds.length > 0 
-          ? `已选 ${this.selectedIds.length} 项` 
-          : '选择产品';
+        return `已选 ${this.selectedIds.length} 项`;
       } else {
-        console.log(this.selectedRows);
-        return this.selectedRows[0]?.productName || '选择产品';
+        return `${this.selectedRows[0]?.productName}[${this.selectedRows[0]?.specification || '-'}] (${this.selectedRows[0]?.material || '-'})`;
       }
     },
     displayText() {
       if (this.multiple) {
-        return this.selectedIds.length > 0 
-          ? `已选 ${this.selectedIds.length} 项` 
+        return this.selectedIds.length > 0
+          ? `已选 ${this.selectedIds.length} 项`
           : '未选择';
       } else {
         return this.selectedRows[0]?.productName || '未选择';
@@ -295,7 +236,7 @@ export default {
     handleSelect(row) {
       if (this.multiple) {
         const index = this.selectedIds.indexOf(row.productId);
-        index > -1 
+        index > -1
           ? (this.selectedIds.splice(index, 1), this.selectedRows.splice(index, 1))
           : (this.selectedIds.push(row.productId), this.selectedRows.push(row));
       } else {
@@ -362,8 +303,8 @@ export default {
 /* 卡片样式 */
 .product-card {
   border: 1px solid #e6e6e6;
-  border-radius: 8px;
-  padding: 16px;
+  border-radius: 0px;
+  padding: 4px;
   cursor: pointer;
   transition: all 0.3s ease;
   position: relative;
@@ -390,7 +331,8 @@ export default {
 
 /* 卡片内容样式 */
 .card-content {
-  margin-right: 24px; /* 给多选框留空间 */
+  margin-right: 24px;
+  /* 给多选框留空间 */
 }
 
 .card-title {
@@ -427,18 +369,6 @@ export default {
   margin-left: 4px;
 }
 
-/* 选择按钮样式 */
-.select-btn {
-  position: absolute;
-  bottom: 16px;
-  right: 16px;
-  color: #409eff;
-
-  &:hover {
-    color: #66b1ff;
-  }
-}
-
 /* 空数据提示 */
 .empty-tip {
   grid-column: 1 / -1;
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index c1ef09a5..393a61fb 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -1,82 +1,33 @@
 <template>
   <div class="raw-material-selector">
     <!-- 触发器按钮 -->
-    <el-button
-      v-if="!readonly"
-      type="text"
-      :icon="multiple ? 'el-icon-checks' : 'el-icon-check'"
-      @click="dialogVisible = true"
-    >
-      {{ buttonText }}
-    </el-button>
+    <div class="el-input" v-if="!readonly" type="text" @click="dialogVisible = true">
+      <div class="el-input__inner">
+        <el-icon class="el-icon-search"></el-icon>
+        {{ buttonText }}
+      </div>
+    </div>
     <span v-else class="readonly-text">{{ displayText }}</span>
 
     <!-- 选择对话框 -->
-    <el-dialog
-      title="选择原材料"
-      :visible.sync="dialogVisible"
-      width="1200px"
-      :close-on-click-modal="false"
-      @close="handleClose"
-      append-to-body
-    >
+    <el-dialog title="选择原材料" :visible.sync="dialogVisible" width="1200px" :close-on-click-modal="false"
+      @close="handleClose" append-to-body>
       <!-- 搜索区域（保持不变） -->
       <el-form :inline="true" :model="queryParams" class="search-form" size="small">
-        <el-form-item label="原材料编号">
-          <el-input
-            v-model="queryParams.rawMaterialCode"
-            placeholder="请输入原材料编号"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+        <el-form-item label="编号">
+          <el-input v-model="queryParams.rawMaterialCode" placeholder="请输入原材料编号" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
-        <el-form-item label="原材料名称">
-          <el-input
-            v-model="queryParams.rawMaterialName"
-            placeholder="请输入原材料名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+        <el-form-item label="名称">
+          <el-input v-model="queryParams.rawMaterialName" placeholder="请输入原材料名称" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="规格">
-          <el-input
-            v-model="queryParams.specification"
-            placeholder="请输入规格"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.specification" placeholder="请输入规格" clearable
+            @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="材质">
-          <el-input
-            v-model="queryParams.material"
-            placeholder="请输入材质"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="厂家">
-          <el-input
-            v-model="queryParams.manufacturer"
-            placeholder="请输入厂家"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="表面处理">
-          <el-input
-            v-model="queryParams.surfaceTreatmentDesc"
-            placeholder="请输入表面处理"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="锌层">
-          <el-input
-            v-model="queryParams.zincLayer"
-            placeholder="请输入锌层"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
+          <el-input v-model="queryParams.material" placeholder="请输入材质" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -86,21 +37,12 @@
 
       <!-- 卡片布局（替换原表格） -->
       <div v-loading="loading" class="card-container">
-        <div 
-          v-for="(item, index) in rawMaterialList" 
-          :key="index + item.rawMaterialId"
-          class="material-card"
-          :class="{ 'selected-card': isSelected(item.rawMaterialId) }"
-          @click="handleRowClick(item)"
-        >
+        <div v-for="(item, index) in rawMaterialList" :key="index + item.rawMaterialId" class="material-card"
+          :class="{ 'selected-card': isSelected(item.rawMaterialId) }" @click="handleRowClick(item)">
           <!-- 多选勾选框 -->
-          <el-checkbox
-            v-if="multiple"
-            :checked="isSelected(item.rawMaterialId)"
-            @change="(val) => handleCardSelection(val, item)"
-            class="card-checkbox"
-          />
-          
+          <el-checkbox v-if="multiple" :checked="isSelected(item.rawMaterialId)"
+            @change="(val) => handleCardSelection(val, item)" class="card-checkbox" />
+
           <!-- 卡片内容（包含所有原表格字段） -->
           <div class="card-content">
             <div class="card-title">
@@ -115,19 +57,9 @@
               <div class="info-item">表面处理：<span>{{ item.surfaceTreatmentDesc || '-' }}</span></div>
               <div class="info-item">锌层：<span>{{ item.zincLayer || '-' }}</span></div>
             </div>
-            
-            <!-- 选择按钮 -->
-            <el-button 
-              type="text" 
-              size="small" 
-              class="select-btn"
-              @click.stop="handleSelect(item)"
-            >
-              选择
-            </el-button>
           </div>
         </div>
-        
+
         <!-- 空数据提示 -->
         <div class="empty-tip" v-if="rawMaterialList.length === 0 && !loading">
           暂无匹配的原材料数据
@@ -135,21 +67,12 @@
       </div>
 
       <!-- 分页（保持不变） -->
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-      />
+      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+        @pagination="getList" />
 
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取消</el-button>
-        <el-button 
-          type="primary" 
-          @click="confirmSelection" 
-          v-if="multiple"
-        >
+        <el-button type="primary" @click="confirmSelection" v-if="multiple">
           确认选择
         </el-button>
       </div>
@@ -203,18 +126,22 @@ export default {
   },
   computed: {
     buttonText() {
+      // 如果为选中任何原材料，显示选择原材料
+      // 如果为选中多个原材料，显示已选 X 项
+      // 如果为选中单个原材料，显示原材料名称
+      if (this.selectedIds.length === 0) {
+        return '请选择原材料';
+      }
       if (this.multiple) {
-        return this.selectedIds.length > 0 
-          ? `已选 ${this.selectedIds.length} 项` 
-          : '选择原材料';
+        return `已选 ${this.selectedIds.length} 项`;
       } else {
-        return this.selectedRows[0]?.rawMaterialName || '选择原材料';
+        return `${this.selectedRows[0]?.rawMaterialName}[${this.selectedRows[0]?.specification || '-'}] (${this.selectedRows[0]?.material || '-'})`;
       }
     },
     displayText() {
       if (this.multiple) {
-        return this.selectedIds.length > 0 
-          ? `已选 ${this.selectedIds.length} 项` 
+        return this.selectedIds.length > 0
+          ? `已选 ${this.selectedIds.length} 项`
           : '未选择';
       } else {
         return this.selectedRows[0]?.rawMaterialName || '未选择';
@@ -311,7 +238,7 @@ export default {
     handleSelect(row) {
       if (this.multiple) {
         const index = this.selectedIds.indexOf(row.rawMaterialId);
-        index > -1 
+        index > -1
           ? (this.selectedIds.splice(index, 1), this.selectedRows.splice(index, 1))
           : (this.selectedIds.push(row.rawMaterialId), this.selectedRows.push(row));
       } else {
@@ -378,8 +305,8 @@ export default {
 /* 卡片样式 */
 .material-card {
   border: 1px solid #e6e6e6;
-  border-radius: 8px;
-  padding: 16px;
+  border-radius: 0px;
+  padding: 4px;
   cursor: pointer;
   transition: all 0.3s ease;
   position: relative;
@@ -406,7 +333,8 @@ export default {
 
 /* 卡片内容样式 */
 .card-content {
-  margin-right: 24px; /* 给多选框留空间 */
+  margin-right: 24px;
+  /* 给多选框留空间 */
 }
 
 .card-title {
@@ -448,18 +376,6 @@ export default {
   color: #303133;
 }
 
-/* 选择按钮样式 */
-.select-btn {
-  position: absolute;
-  bottom: 16px;
-  right: 16px;
-  color: #409eff;
-
-  &:hover {
-    color: #66b1ff;
-  }
-}
-
 /* 空数据提示 */
 .empty-tip {
   grid-column: 1 / -1;
diff --git a/klp-ui/src/views/wms/coil/do/ship.vue b/klp-ui/src/views/wms/coil/do/ship.vue
index a7be6d18..8107ccba 100644
--- a/klp-ui/src/views/wms/coil/do/ship.vue
+++ b/klp-ui/src/views/wms/coil/do/ship.vue
@@ -150,7 +150,7 @@
           <div v-loading="actionLoading" class="card-grid-container">
             <div v-if="pendingActions.length === 0" class="empty-state">
               <i class="el-icon-document"></i>
-              <p>暂无待操作任务</p>
+              <p>暂无发货记录</p>
             </div>
             <div
               v-for="(item, index) in pendingActions"
diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue
index 828fa10a..19705c1a 100644
--- a/klp-ui/src/views/wms/coil/do/warehousing.vue
+++ b/klp-ui/src/views/wms/coil/do/warehousing.vue
@@ -58,10 +58,8 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item :label="getItemLabel" prop="itemId" v-if="!form.coilId">
-                  <product-select v-if="form.itemType == 'product'" v-model="form.itemId" placeholder="请选择成品"
-                    style="width: 100%;" clearable />
-                  <raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId"
-                    placeholder="请选择原料" style="width: 100%;" clearable />
+                  <product-select v-if="form.itemType == 'product'" v-model="form.itemId" clearable />
+                  <raw-material-select v-else-if="form.itemType == 'raw_material'" v-model="form.itemId" clearable />
                   <div v-else>请先选择材料类型</div>
                 </el-form-item>
               </el-col>
@@ -140,7 +138,7 @@
           <div v-loading="actionLoading" class="card-grid-container">
             <div v-if="pendingActions.length === 0" class="empty-state">
               <i class="el-icon-document"></i>
-              <p>暂无待操作任务</p>
+              <p>暂无入库记录</p>
             </div>
             <div
               v-for="(item, index) in pendingActions"
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index fc91a26f..95e66303 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -70,7 +70,7 @@
           <BomInfoMini :bomId="scope.row.bomId" />
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>