From e816fcf889a87923bfde9aca031e77bd527d41d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 20 Sep 2025 11:44:36 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(=E5=88=86=E9=A1=B5):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC=E4=B8=8D=E5=90=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E5=88=86=E9=A1=B5=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductSelect/BomPanel/BomItem.vue        |  4 +-
 .../src/components/Renderer/BomInfoMini.vue   | 64 ++++++++++++++++---
 .../src/views/info/construction/detail.vue    |  4 +-
 .../src/views/info/construction/index.vue     |  4 +-
 gear-ui3/src/views/info/express/index.vue     |  4 +-
 gear-ui3/src/views/info/express/question.vue  |  4 +-
 gear-ui3/src/views/info/feedback/index.vue    |  4 +-
 gear-ui3/src/views/info/report/index.vue      |  4 +-
 gear-ui3/src/views/oms/customer/index.vue     |  4 +-
 gear-ui3/src/views/oms/jounery/index.vue      |  2 +-
 .../src/views/oms/order/panels/orderPage.vue  |  4 +-
 gear-ui3/src/views/oms/pay/index.vue          |  4 +-
 gear-ui3/src/views/oms/receive/index.vue      |  4 +-
 .../src/views/product/components/BomItem.vue  |  4 +-
 gear-ui3/src/views/product/info/index.vue     | 18 +++++-
 gear-ui3/src/views/wms/ledger/index.vue       |  4 +-
 gear-ui3/src/views/wms/stock/index.vue        |  2 +-
 gear-ui3/src/views/wms/stockIo/index.vue      |  4 +-
 .../src/views/wms/stockIo/panels/detail.vue   |  4 +-
 .../views/wms/stockIo/panels/returnCreate.vue |  2 +-
 .../views/wms/stockIo/panels/stockIoPage.vue  |  2 +-
 21 files changed, 105 insertions(+), 45 deletions(-)

diff --git a/gear-ui3/src/components/ProductSelect/BomPanel/BomItem.vue b/gear-ui3/src/components/ProductSelect/BomPanel/BomItem.vue
index 316e493..b837aa9 100644
--- a/gear-ui3/src/components/ProductSelect/BomPanel/BomItem.vue
+++ b/gear-ui3/src/components/ProductSelect/BomPanel/BomItem.vue
@@ -69,8 +69,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/components/Renderer/BomInfoMini.vue b/gear-ui3/src/components/Renderer/BomInfoMini.vue
index 021986e..4b33d4e 100644
--- a/gear-ui3/src/components/Renderer/BomInfoMini.vue
+++ b/gear-ui3/src/components/Renderer/BomInfoMini.vue
@@ -1,9 +1,35 @@
 <template>
   <div v-if="bomInfo.length > 0">
-    <el-tooltip :content="bomInfo.map(item => item.attrKey + ':' + item.attrValue).join(',')" class="bom-info"
-      placement="top">
-      <span>{{bomInfo.map(item => item.attrKey).join(',')}}</span>
-    </el-tooltip>
+    <!-- 始终显示带溢出隐藏的文本 -->
+    <template v-if="props.detail">
+      <!-- 当detail为true时，显示可弹出的popover -->
+      <el-popover
+        placement="top"
+        trigger="hover"
+        :width="500"
+      >
+        <div>
+          <el-descriptions column="2" border>
+            <el-descriptions-item 
+              v-for="item in bomInfo" 
+              :key="item.attrKey"
+              :label="item.attrKey"
+            >
+              {{ item.attrValue }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+        
+        <template #reference>
+          <span class="bom-info">{{ bomInfo.map(item => item.attrKey).join(',') }}</span>
+        </template>
+      </el-popover>
+    </template>
+    
+    <template v-else>
+      <!-- 当detail为false时，仅显示文本，不弹出popover -->
+      <span class="bom-info">{{ bomInfo.map(item => item.attrKey).join(',') }}</span>
+    </template>
   </div>
   <div v-else>
     无
@@ -13,6 +39,7 @@
 <script setup>
 import { ref, watch } from 'vue';
 import useProductStore from '@/store/modules/product';
+import { ElPopover, ElDescriptions, ElDescriptionsItem } from 'element-plus';
 
 // 定义组件props
 const props = defineProps({
@@ -27,6 +54,11 @@ const props = defineProps({
   itemId: {
     type: [String, Number],
     required: false
+  },
+  detail: {
+    type: Boolean,
+    required: false,
+    default: true  // 默认显示popover
   }
 });
 
@@ -44,7 +76,6 @@ const getBomInfo = async () => {
 
   let bomId = props.bomId;
   if (!bomId) {
-    // 这里假设productMap是productStore中的属性
     bomId = productStore.productMap?.[props.itemId]?.bomId;
   }
 
@@ -74,10 +105,27 @@ watch(
 <style scoped>
 .bom-info {
   cursor: pointer;
-  /* 溢出隐藏显示省略号 */
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;
-  max-width: 100px;
+  max-width: 150px;
+  /* 当不需要弹出时，指针样式改为默认 */
+  &:not(:hover) {
+    cursor: default;
+  }
+}
+
+/* 弹窗样式优化 */
+:deep(.el-popover) {
+  padding: 10px;
+}
+
+/* 描述列表样式优化 */
+:deep(.el-descriptions) {
+  font-size: 14px;
+}
+
+:deep(.el-descriptions__label) {
+  font-weight: 600;
 }
 </style>
diff --git a/gear-ui3/src/views/info/construction/detail.vue b/gear-ui3/src/views/info/construction/detail.vue
index 5893f02..0e3ab1d 100644
--- a/gear-ui3/src/views/info/construction/detail.vue
+++ b/gear-ui3/src/views/info/construction/detail.vue
@@ -135,8 +135,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/info/construction/index.vue b/gear-ui3/src/views/info/construction/index.vue
index 69ebd15..5ba9817 100644
--- a/gear-ui3/src/views/info/construction/index.vue
+++ b/gear-ui3/src/views/info/construction/index.vue
@@ -113,8 +113,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/info/express/index.vue b/gear-ui3/src/views/info/express/index.vue
index 85dd54b..329790c 100644
--- a/gear-ui3/src/views/info/express/index.vue
+++ b/gear-ui3/src/views/info/express/index.vue
@@ -222,8 +222,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/info/express/question.vue b/gear-ui3/src/views/info/express/question.vue
index 64b60c4..567617d 100644
--- a/gear-ui3/src/views/info/express/question.vue
+++ b/gear-ui3/src/views/info/express/question.vue
@@ -120,8 +120,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/info/feedback/index.vue b/gear-ui3/src/views/info/feedback/index.vue
index 11996e6..08ec80c 100644
--- a/gear-ui3/src/views/info/feedback/index.vue
+++ b/gear-ui3/src/views/info/feedback/index.vue
@@ -6,8 +6,8 @@
         <el-card class="list-container">
           <pagination
             :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
             @pagination="getList"
           />
           <div
diff --git a/gear-ui3/src/views/info/report/index.vue b/gear-ui3/src/views/info/report/index.vue
index 321e71d..ea82273 100644
--- a/gear-ui3/src/views/info/report/index.vue
+++ b/gear-ui3/src/views/info/report/index.vue
@@ -141,8 +141,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/oms/customer/index.vue b/gear-ui3/src/views/oms/customer/index.vue
index 4de1347..2c53757 100644
--- a/gear-ui3/src/views/oms/customer/index.vue
+++ b/gear-ui3/src/views/oms/customer/index.vue
@@ -115,8 +115,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/oms/jounery/index.vue b/gear-ui3/src/views/oms/jounery/index.vue
index 7801e0f..8c647ac 100644
--- a/gear-ui3/src/views/oms/jounery/index.vue
+++ b/gear-ui3/src/views/oms/jounery/index.vue
@@ -76,7 +76,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 添加或修改资金日记账对话框 -->
diff --git a/gear-ui3/src/views/oms/order/panels/orderPage.vue b/gear-ui3/src/views/oms/order/panels/orderPage.vue
index 317d15a..673724f 100644
--- a/gear-ui3/src/views/oms/order/panels/orderPage.vue
+++ b/gear-ui3/src/views/oms/order/panels/orderPage.vue
@@ -26,8 +26,8 @@
         </klp-list>
 
         <!-- 分页组件 -->
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize" @pagination="getList" class="mt-4" layout="total, pager" />
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize" @pagination="getList" class="mt-4" layout="total, pager" />
       </el-col>
 
       <!-- 右侧：详情区（占18列） -->
diff --git a/gear-ui3/src/views/oms/pay/index.vue b/gear-ui3/src/views/oms/pay/index.vue
index ac10fae..f45564a 100644
--- a/gear-ui3/src/views/oms/pay/index.vue
+++ b/gear-ui3/src/views/oms/pay/index.vue
@@ -113,8 +113,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/oms/receive/index.vue b/gear-ui3/src/views/oms/receive/index.vue
index 0cfb721..05bc60d 100644
--- a/gear-ui3/src/views/oms/receive/index.vue
+++ b/gear-ui3/src/views/oms/receive/index.vue
@@ -113,8 +113,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/product/components/BomItem.vue b/gear-ui3/src/views/product/components/BomItem.vue
index d271397..d69b457 100644
--- a/gear-ui3/src/views/product/components/BomItem.vue
+++ b/gear-ui3/src/views/product/components/BomItem.vue
@@ -68,8 +68,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/product/info/index.vue b/gear-ui3/src/views/product/info/index.vue
index 272e3da..be41655 100644
--- a/gear-ui3/src/views/product/info/index.vue
+++ b/gear-ui3/src/views/product/info/index.vue
@@ -10,6 +10,9 @@
       <el-form-item label="负责人" prop="salesManager">
         <el-input v-model="queryParams.owner" :multiple="false" placeholder="请填写负责人" />
       </el-form-item>
+      <el-form-item label="展示BOM">
+        <el-checkbox v-model="showDetail" @change="handleQuery" />
+      </el-form-item>
       <!-- <el-form-item label="是否启用" prop="isEnabled">
         <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
           <el-option
@@ -57,7 +60,7 @@
       </el-table-column>
       <el-table-column label="BOM" align="center">
         <template #default="scope">
-          <BomInfoMini :bomId="scope.row.bomId" />
+          <BomInfoMini :bomId="scope.row.bomId" :detail="showDetail" />
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -71,8 +74,13 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改产品对话框 -->
     <el-dialog :title="title" v-model="open" width="800px" append-to-body>
@@ -190,6 +198,8 @@ export default {
       itemId: undefined,
 
       installManualDialogVisible: false,
+
+      showDetail: false,
     };
   },
   created() {
@@ -217,7 +227,9 @@ export default {
     },
     /** 查询产品列表 */
     getList() {
+      console.log('getList');
       this.loading = true;
+      console.log(this.queryParams);
       listProduct(this.queryParams).then(response => {
         this.productList = response.rows;
         this.total = response.total;
diff --git a/gear-ui3/src/views/wms/ledger/index.vue b/gear-ui3/src/views/wms/ledger/index.vue
index 303436a..6648626 100644
--- a/gear-ui3/src/views/wms/ledger/index.vue
+++ b/gear-ui3/src/views/wms/ledger/index.vue
@@ -77,8 +77,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/wms/stock/index.vue b/gear-ui3/src/views/wms/stock/index.vue
index 514cc8c..4f877bb 100644
--- a/gear-ui3/src/views/wms/stock/index.vue
+++ b/gear-ui3/src/views/wms/stock/index.vue
@@ -64,7 +64,7 @@
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
         @pagination="getList" />
 
       <!-- 添加或修改库存对话框（保持不变） -->
diff --git a/gear-ui3/src/views/wms/stockIo/index.vue b/gear-ui3/src/views/wms/stockIo/index.vue
index f483f14..9259ac3 100644
--- a/gear-ui3/src/views/wms/stockIo/index.vue
+++ b/gear-ui3/src/views/wms/stockIo/index.vue
@@ -149,8 +149,8 @@
     <pagination
       v-show="total>0"
       :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
 
diff --git a/gear-ui3/src/views/wms/stockIo/panels/detail.vue b/gear-ui3/src/views/wms/stockIo/panels/detail.vue
index 5ed7741..3c56556 100644
--- a/gear-ui3/src/views/wms/stockIo/panels/detail.vue
+++ b/gear-ui3/src/views/wms/stockIo/panels/detail.vue
@@ -156,8 +156,8 @@
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
         @pagination="getList"
       />
       <!-- 操作按钮 -->
diff --git a/gear-ui3/src/views/wms/stockIo/panels/returnCreate.vue b/gear-ui3/src/views/wms/stockIo/panels/returnCreate.vue
index 9a40518..89ab85b 100644
--- a/gear-ui3/src/views/wms/stockIo/panels/returnCreate.vue
+++ b/gear-ui3/src/views/wms/stockIo/panels/returnCreate.vue
@@ -59,7 +59,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
         @pagination="getList" />
       <!-- 操作按钮 -->
       <div style="margin-top: 20px; text-align: right;">
diff --git a/gear-ui3/src/views/wms/stockIo/panels/stockIoPage.vue b/gear-ui3/src/views/wms/stockIo/panels/stockIoPage.vue
index 2c4c6cc..8788947 100644
--- a/gear-ui3/src/views/wms/stockIo/panels/stockIoPage.vue
+++ b/gear-ui3/src/views/wms/stockIo/panels/stockIoPage.vue
@@ -81,7 +81,7 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
       @pagination="getList" />
 
     <!-- 添加或修改出入库单主对话框 -->