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 @@
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row[$attrs.prop] }}
+
+
+
+
+ {{ scope.row[$attrs.prop] }}
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
目录单价(¥) |
折扣 |
单价(¥) |
- 现金折扣 |
+ 商业折扣 |
总价(¥) |
折后总价(¥) |
税率(%) |
@@ -69,7 +69,7 @@
目录单价(¥) |
折扣 |
单价(¥) |
- 现金折扣 |
+ 商业折扣 |
总价(¥) |
折后总价(¥) |
税率(%) |
@@ -125,7 +125,7 @@
目录单价(¥) |
折扣 |
单价(¥) |
- 现金折扣 |
+ 商业折扣 |
总价(¥) |
折后总价(¥) |
税率(%) |
@@ -179,7 +179,7 @@
- 现金折扣
+ 商业折扣
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -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 @@
{{ scope.row.deliveryTimeType == '0' ? '立即发货' : scope.row.deliveryTime }}
-
-
+
+
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('商业折扣')
}