From d97300709ab2601befc252153f8ec1a37360facb Mon Sep 17 00:00:00 2001 From: xvv Date: Mon, 12 Aug 2024 15:53:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/orderComponents/order_Added.vue | 18 +++---- .../cashier/orderComponents/order_Cashier.vue | 50 +++++------------- .../cashier/orderComponents/order_Goods.vue | 27 ++++------ .../cashier/orderComponents/order_Oil.vue | 52 +++++-------------- .../cashier/orderComponents/order_Vip.vue | 48 ++++------------- 5 files changed, 55 insertions(+), 140 deletions(-) diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue index 31c182fff..94c84838c 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue @@ -99,7 +99,7 @@
挂账笔数
- +
@@ -109,7 +109,7 @@
归还笔数
- +
@@ -118,7 +118,7 @@
挂账总额
- +
@@ -127,7 +127,7 @@
归还总额
- +
@@ -136,7 +136,7 @@
未还金额
- +
@@ -559,7 +559,7 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE .size-hui{ display: flex; align-items: center; - //width: 200px; + justify-content: space-between; font-family: Source Han Sans CN, Source Han Sans CN; font-weight: 400; font-size: 13px; @@ -608,15 +608,15 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE width: 20%; } .icon-img{ - //margin-left: 110px; - width: 100%; + + width: 20px; height: 20px; margin-right: 5px; img{ float: right; //width: 100%; width: 20px; - height: 100%; + height: 20px; } } .box1{ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index dee33f339..9f855e3d3 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -19,16 +19,7 @@ - - - - - - - - - - +
笔数
- +
@@ -69,7 +60,7 @@
油品笔数
- +
@@ -78,7 +69,7 @@
商品笔数
- +
@@ -88,7 +79,7 @@
订单总金额
- +
@@ -97,7 +88,7 @@
实付总金额
- +
@@ -106,7 +97,7 @@
油品优惠
- +
@@ -115,7 +106,7 @@
油品总金额
- +
@@ -124,7 +115,7 @@
商品总金额
- +
@@ -133,7 +124,7 @@
找零总金额
- +
@@ -1272,9 +1263,7 @@ import {ifRefPassApi} from "@/api/staff/store"; } .box{ - //box-sizing: border-box; padding: 5px; - //background: #f9f9f9; margin-right: 20px; margin-bottom: 20px; padding-left: 20px; @@ -1286,13 +1275,10 @@ import {ifRefPassApi} from "@/api/staff/store"; border: 1px solid #409EFF; } .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); @@ -1305,12 +1291,10 @@ import {ifRefPassApi} from "@/api/staff/store"; .size-hui{ display: flex; align-items: center; - //width: 200px; - font-family: Source Han Sans CN, Source Han Sans CN; + justify-content: space-between; font-weight: 400; font-size: 13px; color: #888888; - //line-height: 0px; text-align: left; font-style: normal; text-transform: none; @@ -1319,29 +1303,23 @@ import {ifRefPassApi} from "@/api/staff/store"; } } .size-bole{ - //font-weight: bold; - - //width: 53px; height: 31px; font-family: YouSheBiaoTiHei; font-weight: 400; font-size: 24px; color: #555555; - //line-height: 0px; text-align: left; font-style: normal; text-transform: none; } .icon-img{ - //margin-left: 110px; - width: 100%; + width: 20px; height: 20px; margin-right: 5px; img{ - float: right; - //width: 100%; + width: 20px; - height: 100%; + height: 20px; } } .wgang{ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue index 00d940f2f..4f9a360be 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue @@ -87,7 +87,7 @@
商品笔数
- +
@@ -96,7 +96,7 @@
商品总数量
- +
@@ -105,7 +105,7 @@
总金额
- +
@@ -114,7 +114,7 @@
优惠金额
- +
@@ -123,7 +123,7 @@
微信
- +
@@ -132,7 +132,7 @@
支付宝
- +
@@ -141,7 +141,7 @@
现金
- +
@@ -847,12 +847,11 @@ export default { .size-hui{ display: flex; align-items: center; - //width: 200px; +justify-content: space-between; font-family: Source Han Sans CN, Source Han Sans CN; font-weight: 400; font-size: 13px; color: #888888; - //line-height: 0px; text-align: left; font-style: normal; text-transform: none; @@ -861,30 +860,24 @@ export default { } } .size-bole{ - //font-weight: bold; - - //width: 53px; height: 31px; font-family: YouSheBiaoTiHei; font-weight: 400; font-size: 24px; color: #555555; - //line-height: 0px; text-align: left; font-style: normal; text-transform: none; } .icon-img{ - //margin-left: 110px; - width: 100%; + width: 20px; height: 20px; margin-right: 5px; img{ float: right; - //width: 100%; width: 20px; - height: 100%; + height:20px; } } .wgang{ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue index b0907d0b4..42fe3c5c3 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue @@ -115,7 +115,7 @@
油品笔数
- +
@@ -124,7 +124,7 @@
油品总金额
- +
@@ -133,7 +133,7 @@
优惠总额
- +
@@ -142,7 +142,7 @@
交易数量
- +
@@ -151,7 +151,7 @@
实收总额
- +
@@ -160,7 +160,7 @@
微信
- +
@@ -169,7 +169,7 @@
支付宝
- +
@@ -178,7 +178,7 @@
现金
- +
@@ -197,28 +197,7 @@ v-loading="loading" :data="oilOrderList" style="width: 100%"> - - - - - - - - - - - - - - - - - - - - - - +