From 54c1e03830a83636568f77cd7505eb7c3aaf8346 Mon Sep 17 00:00:00 2001
From: chenhao <chenhao2@unisinsight.com>
Date: Fri, 21 Nov 2025 16:49:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=9B=B4=E6=96=B0=E6=8A=98?=
 =?UTF-8?q?=E6=89=A3=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=95=86=E4=B8=9A=E6=8A=98?=
 =?UTF-8?q?=E6=89=A3=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC=E5=88=97?=
 =?UTF-8?q?=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将现金折扣统一修改为商业折扣
- 调整出库单和发货单表格列宽度以改善显示效果
- 新增 OverflowCopyColumn 组件支持内容省略与复制功能
---
 .../OverflowCopyColumn/OverflowCopyColumn.vue | 56 +++++++++++++++++++
 .../src/views/approve/order/ConfigInfo.vue    |  8 +--
 .../src/views/inventory/delivery/index.vue    | 19 +++----
 .../src/views/inventory/outer/index.vue       |  4 +-
 .../templates/project/order/approve.html      |  2 +-
 5 files changed, 72 insertions(+), 17 deletions(-)
 create mode 100644 oms_web/oms_vue/src/components/OverflowCopyColumn/OverflowCopyColumn.vue

diff --git a/oms_web/oms_vue/src/components/OverflowCopyColumn/OverflowCopyColumn.vue b/oms_web/oms_vue/src/components/OverflowCopyColumn/OverflowCopyColumn.vue
new file mode 100644
index 00000000..6bb791f2
--- /dev/null
+++ b/oms_web/oms_vue/src/components/OverflowCopyColumn/OverflowCopyColumn.vue
@@ -0,0 +1,56 @@
+<template>
+  <el-table-column v-bind="$attrs">
+    <template slot-scope="scope">
+      <!-- 允许自定义列内容 -->
+      <slot
+        v-if="$scopedSlots.default"
+        :row="scope.row"
+        :$index="scope.$index"
+      ></slot>
+
+      <!-- 默认渲染方案 -->
+      <template v-else>
+        <el-popover
+          placement="top"
+          trigger="hover"
+          popper-class="table-popover"
+        >
+          <!-- 展开内容，可复制 -->
+          <div class="popover-content">
+            {{ scope.row[$attrs.prop] }}
+          </div>
+
+          <!-- 表格单元格：省略显示 -->
+          <div slot="reference" class="cell-ellipsis">
+            {{ scope.row[$attrs.prop] }}
+          </div>
+        </el-popover>
+      </template>
+    </template>
+  </el-table-column>
+</template>
+
+<script>
+export default {
+  name: "OverflowCopyColumn",
+};
+</script>
+
+<style scoped>
+.cell-ellipsis {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  cursor: text;
+}
+.popover-content {
+  user-select: text;
+}
+</style>
+
+<!-- 全局样式，可放到全局样式文件 -->
+<style scoped>
+.table-popover {
+  max-width: 400px;
+}
+</style>
diff --git a/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue b/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue
index 6e20763d..b20a64f8 100644
--- a/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue
+++ b/oms_web/oms_vue/src/views/approve/order/ConfigInfo.vue
@@ -13,7 +13,7 @@
           <th v-if="!hidePrice" class="col-price">目录单价(¥)</th>
           <th v-if="!hidePrice" class="col-discount">折扣</th>
           <th class="col-price">单价(¥)</th>
-          <th class="col-discount">现金折扣</th>
+          <th class="col-discount">商业折扣</th>
           <th class="col-price">总价(¥)</th>
           <th class="col-price">折后总价(¥)</th>
           <th class="col-tax">税率(%)</th>
@@ -69,7 +69,7 @@
           <th v-if="!hidePrice" class="col-price">目录单价(¥)</th>
           <th v-if="!hidePrice" class="col-discount">折扣</th>
           <th class="col-price">单价(¥)</th>
-          <th class="col-discount">现金折扣</th>
+          <th class="col-discount">商业折扣</th>
           <th class="col-price">总价(¥)</th>
           <th class="col-price">折后总价(¥)</th>
           <th class="col-tax">税率(%)</th>
@@ -125,7 +125,7 @@
           <th v-if="!hidePrice" class="col-price">目录单价(¥)</th>
           <th v-if="!hidePrice" class="col-discount">折扣</th>
           <th class="col-price">单价(¥)</th>
-          <th class="col-discount">现金折扣</th>
+          <th class="col-discount">商业折扣</th>
           <th class="col-price">总价(¥)</th>
           <th class="col-price">折后总价(¥)</th>
           <th class="col-tax">税率(%)</th>
@@ -179,7 +179,7 @@
       </el-row>
       <el-row type="flex" justify="end" align="middle" class="summary-row">
         <el-col :span="18" style="text-align: center;">
-          <span style="margin-right: 5px;">现金折扣</span>
+          <span style="margin-right: 5px;">商业折扣</span>
           <el-select
             v-model="selectedDiscount"
             placeholder="请选择折扣率"
diff --git a/oms_web/oms_vue/src/views/inventory/delivery/index.vue b/oms_web/oms_vue/src/views/inventory/delivery/index.vue
index 6043e942..06cb0bb0 100644
--- a/oms_web/oms_vue/src/views/inventory/delivery/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/delivery/index.vue
@@ -49,15 +49,15 @@
     <!-- 数据表格 -->
     <el-table v-loading="loading" :data="deliveryList">
       <el-table-column label="序号" type="index" width="50" align="center"/>
-      <el-table-column label="出库单号" align="center" prop="outerCode" show-overflow-tooltip/>
-      <el-table-column label="物流单号" align="center" prop="logisticsCode" show-overflow-tooltip/>
-      <el-table-column label="项目编号" align="center" prop="projectCode" show-overflow-tooltip/>
-      <el-table-column label="合同编号" align="center" prop="orderCode" show-overflow-tooltip/>
-      <el-table-column label="项目名称" align="center" prop="projectName" show-overflow-tooltip/>
-      <el-table-column label="产品编码" align="center" prop="productCode" show-overflow-tooltip/>
-      <el-table-column label="产品型号" align="center" prop="model" show-overflow-tooltip/>
-      <el-table-column label="发货数量" align="center" prop="quantity"/>
-      <el-table-column label="发货方式" align="center" prop="deliveryType">
+      <el-table-column label="出库单号" align="center"  width="180" prop="outerCode" show-overflow-tooltip/>
+      <el-table-column label="物流单号" align="center"  width="180" prop="logisticsCode" show-overflow-tooltip/>
+      <el-table-column label="项目编号" align="center"  width="100" prop="projectCode" show-overflow-tooltip/>
+      <el-table-column label="合同编号" align="center" min-width="250" prop="orderCode" show-overflow-tooltip/>
+      <el-table-column label="项目名称" align="center"  width="180" prop="projectName" show-overflow-tooltip/>
+      <el-table-column label="产品编码" align="center"  width="180" prop="productCode" show-overflow-tooltip/>
+      <el-table-column label="产品型号" align="center"  width="180" prop="model" show-overflow-tooltip/>
+      <el-table-column label="发货数量" align="center"  width="100" prop="quantity"/>
+      <el-table-column label="发货方式" align="center"  width="100" prop="deliveryType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.delivery_type" :value="scope.row.deliveryType"/>
         </template>
@@ -139,7 +139,6 @@ import {
   exportDelivery,
 } from "@/api/inventory/delivery";
 import DeliveryDetail from "./Detail";
-
 export default {
   name: "Delivery",
   components: {DeliveryDetail},
diff --git a/oms_web/oms_vue/src/views/inventory/outer/index.vue b/oms_web/oms_vue/src/views/inventory/outer/index.vue
index 67e7b535..fe3a8136 100644
--- a/oms_web/oms_vue/src/views/inventory/outer/index.vue
+++ b/oms_web/oms_vue/src/views/inventory/outer/index.vue
@@ -42,8 +42,8 @@
           <span>{{ scope.row.deliveryTimeType == '0' ? '立即发货' : scope.row.deliveryTime }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="项目编号" prop="projectCode" width="150" show-overflow-tooltip/>
-      <el-table-column label="合同编号" prop="orderCode" width="150" show-overflow-tooltip/>
+      <el-table-column label="项目编号" prop="projectCode" width="100" show-overflow-tooltip/>
+      <el-table-column label="合同编号" prop="orderCode" min-width="250" show-overflow-tooltip />
       <el-table-column label="项目名称" prop="projectName" width="200" show-overflow-tooltip/>
       <el-table-column label="产品编码" prop="productCode" width="150" show-overflow-tooltip/>
       <el-table-column label="产品型号" prop="model" width="150" show-overflow-tooltip/>
diff --git a/ruoyi-admin/src/main/resources/templates/project/order/approve.html b/ruoyi-admin/src/main/resources/templates/project/order/approve.html
index 61701245..8afa2c2a 100644
--- a/ruoyi-admin/src/main/resources/templates/project/order/approve.html
+++ b/ruoyi-admin/src/main/resources/templates/project/order/approve.html
@@ -1307,7 +1307,7 @@ ${
                 // $('.discount-all').css("display", "none")
                 $('.all-total-price').css("border-bottom", "1px solid")
             }else{
-                $('.discount-text').text('现金折扣')
+                $('.discount-text').text('商业折扣')
             }