From 24504eacd78e87d9d670b47a5a31db49bfe4d0c5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-369JRHT\\12997" <9> Date: Sat, 6 Jul 2024 15:32:25 +0800 Subject: [PATCH] no message --- .../runningWater/tab/oilDepot.vue | 2 + fuintAdmin/src/views/order/order_Added.vue | 13 ++++++ fuintAdmin/src/views/order/order_Cashier.vue | 44 ++++++++++++------- fuintAdmin/src/views/order/order_Goods.vue | 26 ++++++++--- fuintAdmin/src/views/order/order_Integral.vue | 15 +++++++ fuintAdmin/src/views/order/order_Oil.vue | 25 ++++++++--- fuintAdmin/src/views/order/order_Vip.vue | 26 ++++++++--- 7 files changed, 118 insertions(+), 33 deletions(-) diff --git a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue index 49dc6f905..562aa13cf 100644 --- a/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue +++ b/fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue @@ -292,12 +292,14 @@ import {getInstituionListApi, getRunningWaterByDataApi, exportExcelOilDeptApi, g width: 100%; display: flex; align-items: center; + flex-wrap: wrap; } .box{ //box-sizing: border-box; padding: 5px; //background: #f9f9f9; margin-right: 20px; + margin-bottom: 20px; padding-left: 20px; width: 211px; diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue index d1292792f..fac497df0 100644 --- a/fuintAdmin/src/views/order/order_Added.vue +++ b/fuintAdmin/src/views/order/order_Added.vue @@ -617,5 +617,18 @@ export default { height: 100%; } } +.box1{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + width: 211px; + height: 60px; + background: rgba(255,150,85,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; +} diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index 8dad533d2..f8d365a84 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -63,15 +63,6 @@ -
-
{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}
-
-
订单总金额
-
- -
-
-
{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}
@@ -90,30 +81,39 @@
-
+
+
{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}
+
+
订单总金额
+
+ +
+
+
+
{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}
油品总金额
- +
-
+
{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}
商品总金额
- +
-
+
{{ seekZeroAmount }}
找零总金额
- +
@@ -698,6 +698,7 @@ import {refundApi} from "@/api/order/refund"; padding: 5px; //background: #f9f9f9; margin-right: 20px; + margin-bottom: 20px; padding-left: 20px; width: 211px; @@ -778,5 +779,18 @@ import {refundApi} from "@/api/order/refund"; color: grey; margin: 10px 0; } +.box1{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + width: 211px; + height: 60px; + background: rgba(255,150,85,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; +} diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index 3af3778fc..744a3ab77 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -120,30 +120,30 @@
-
+
{{orderStatistics.wechat}}
微信
- +
-
+
{{orderStatistics.alipay}}
支付宝
- +
-
+
{{orderStatistics.cash}}
现金
- +
@@ -615,6 +615,7 @@ export default { //background: #f9f9f9; margin-right: 20px; padding-left: 20px; + margin-bottom: 20px; width: 211px; height: 60px; @@ -689,5 +690,18 @@ export default { height: 100%; } } +.box1{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + width: 211px; + height: 60px; + background: rgba(255,150,85,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; +} diff --git a/fuintAdmin/src/views/order/order_Integral.vue b/fuintAdmin/src/views/order/order_Integral.vue index 27fe04b33..be1cc81e4 100644 --- a/fuintAdmin/src/views/order/order_Integral.vue +++ b/fuintAdmin/src/views/order/order_Integral.vue @@ -421,4 +421,19 @@ export default { .hgang{ display: flex; } + +.box1{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(255,150,85,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; +} diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue index 5db79f391..a1f7a24fa 100644 --- a/fuintAdmin/src/views/order/order_Oil.vue +++ b/fuintAdmin/src/views/order/order_Oil.vue @@ -154,30 +154,30 @@
-
+
{{orderStatistics.wechat}}
微信
- +
-
+
{{orderStatistics.alipay}}
支付宝
- +
-
+
{{orderStatistics.cash}}
现金
- +
@@ -889,5 +889,18 @@ height: 100%; } } +.box1{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + width: 211px; + height: 60px; + background: rgba(255,150,85,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; +} diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue index 29f3fd3a8..784167710 100644 --- a/fuintAdmin/src/views/order/order_Vip.vue +++ b/fuintAdmin/src/views/order/order_Vip.vue @@ -117,30 +117,30 @@
-
+
{{orderStatistics.wechat?orderStatistics.wechat:0}}
微信
- +
-
+
{{orderStatistics.alipay?orderStatistics.alipay:0}}
支付宝
- +
-
+
{{orderStatistics.cash}}
现金
- +
@@ -536,6 +536,7 @@ export default { padding: 5px; margin-right: 20px; padding-left: 20px; + margin-bottom: 20px; width: 211px; height: 60px; @@ -615,5 +616,18 @@ export default { height: 100%; } } +.box1{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + width: 211px; + height: 60px; + background: rgba(255,150,85,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #FF9655; +}