diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index a49bc0753..aabd34ea3 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -2,10 +2,10 @@
- + @@ -16,13 +16,13 @@ - + - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue index dd4e7ea29..3fae33654 100644 --- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue @@ -2,10 +2,10 @@
- + @@ -16,13 +16,13 @@ - - + + - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index 15d953038..85258d3f2 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -3,10 +3,10 @@ - +
@@ -18,13 +18,13 @@ - + - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 1df89074b..cef865e02 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -5,7 +5,7 @@ @@ -17,12 +17,12 @@ - + - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue index cd5df1f92..20433448f 100644 --- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue @@ -30,7 +30,7 @@ - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue index a40ea1b8e..7eaea8fc8 100644 --- a/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardExchangeRecord/index.vue @@ -27,7 +27,7 @@ - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue index 48fb81bff..06f7a841c 100644 --- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue @@ -25,7 +25,7 @@ <!– –> --> - + 搜索 diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue index e40c1641f..981af3770 100644 --- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue @@ -11,7 +11,7 @@
- + - + - 搜索 + 搜索
diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue index 63029d650..b296d33db 100644 --- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue +++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue @@ -2,15 +2,15 @@
- + - + 搜索 diff --git a/fuintAdmin/src/views/integral/order/pointsCashier.vue b/fuintAdmin/src/views/integral/order/pointsCashier.vue index 1a6a27941..c53a62af5 100644 --- a/fuintAdmin/src/views/integral/order/pointsCashier.vue +++ b/fuintAdmin/src/views/integral/order/pointsCashier.vue @@ -67,32 +67,49 @@
- 笔数 - {{statisticsForm.num}} +
{{statisticsForm.num}}
+
+
笔数
+
+ +
+
- 商品数量 - {{statisticsForm.exchangeQuantity?statisticsForm.exchangeQuantity:0}} +
{{statisticsForm.exchangeQuantity?statisticsForm.exchangeQuantity:0}}
+
+
商品数量
+
+ +
+ +
- 积分 - {{statisticsForm.integral?statisticsForm.integral:0}} +
{{statisticsForm.integral?statisticsForm.integral:0}}
+
+
积分
+
+ +
+
+
- 支付总额 - - - - - {{statisticsForm.amount?statisticsForm.amount:0}} +
{{statisticsForm.amount?statisticsForm.amount:0}}
+
+
支付总额
+
+ +
+
@@ -265,19 +282,65 @@ export default { padding-top: 0px; padding: 0px } - .box { - padding: 10px; - height: 80px; - width: 150px; - margin-right: 0px; - background-color: rgba(204, 204, 204, 0.3); - border-radius: 8px; - display: flex; - flex-direction: column; - justify-content: center; - align-items: left; - text-align: left; + +.icon-img{ + //margin-left: 110px; + width: 100%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; } +} +.box{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; +} +.el-form--inline .el-form-item { + margin-right: 44px; +} +.size-hui{ + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; + } +} +.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; +} .font-chinese { font-size: 15px; diff --git a/fuintAdmin/src/views/order/index.vue b/fuintAdmin/src/views/order/index.vue index 832df41ea..25a7d8682 100644 --- a/fuintAdmin/src/views/order/index.vue +++ b/fuintAdmin/src/views/order/index.vue @@ -2,11 +2,11 @@
- + {{ item.realName }} @@ -14,10 +14,10 @@ - + @@ -29,23 +29,23 @@ /> - + - + - + - + 查询 重置 diff --git a/fuintAdmin/src/views/order/order_Added.vue b/fuintAdmin/src/views/order/order_Added.vue index 1894a673c..de5f705ff 100644 --- a/fuintAdmin/src/views/order/order_Added.vue +++ b/fuintAdmin/src/views/order/order_Added.vue @@ -3,20 +3,20 @@
- + - + @@ -24,23 +24,23 @@ - + - + - + - + - + + @@ -81,7 +82,7 @@ placeholder="结束日期"> - + 查询 重置 @@ -94,24 +95,49 @@
-
挂账笔数
{{ total }}
+
+
挂账笔数
+
+ +
+
-
挂账总额
{{ allAmount }}
+
+
挂账总额
+
+ +
+
-
归还笔数
{{ returnTotal }}
+
+
归还笔数
+
+ +
+
-
归还总额
{{ returnAllAmount }}
+
+
归还总额
+
+ +
+
-
未还金额
{{ noReturnAllAmount }}
+
+
未还金额
+
+ +
+
@@ -512,20 +538,50 @@ export default { align-items: center; } .box{ - width: 200px; - box-sizing: border-box; - padding: 10px; - background: #f9f9f9; - height: 86px; - margin-right: 10px; + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; +} +.el-form--inline .el-form-item { + margin-right: 44px; } .size-hui{ - font-size: 14px; - margin-bottom: 10px; - margin-top: 10px; + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; + } } .size-bole{ - font-weight: bold; + //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; } .wgang{ width: 100%; @@ -549,5 +605,17 @@ export default { width: 20%; } +.icon-img{ + //margin-left: 110px; + width: 100%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; + } +} diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index 5d5b1b750..fa1ef279a 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -3,11 +3,11 @@
- + {{ item.realName }} @@ -15,10 +15,10 @@ - + - + @@ -33,17 +33,17 @@ v-model="beginTime" style="width: 140px" type="date" - placeholder="开始日期"> + placeholder="交易开始日期"> 至 + placeholder="交易结束日期"> - + 搜索 重置 @@ -55,32 +55,67 @@
-
笔数
{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}
+
+
笔数
+
+ +
+
-
订单总金额
{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}
+
+
订单总金额
+
+ +
+
-
实付总金额
{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}
+
+
实付总金额
+
+ +
+
-
油品优惠
{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}
+
+
油品优惠
+
+ +
+
-
油品总金额
{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}
+
+
油品总金额
+
+ +
+
-
商品总金额
{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}
+
+
商品总金额
+
+ +
+
-
找零总金额
{{ seekZeroAmount }}
+
+
找零总金额
+
+ +
+
@@ -657,22 +692,65 @@ import {refundApi} from "@/api/order/refund"; display: flex; align-items: center; } - .box{ - width: 200px; - box-sizing: border-box; - padding: 10px; - background: #f9f9f9; - height: 86px; - margin-right: 10px; +.box{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; +} +.el-form--inline .el-form-item { + margin-right: 44px; +} +.size-hui{ + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; } - .size-hui{ - font-size: 14px; - margin-bottom: 10px; - margin-top: 10px; - } - .size-bole{ - font-weight: bold; +} +.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%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; } +} .wgang{ width: 100%; display: flex; diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue index 18456580d..513378eed 100644 --- a/fuintAdmin/src/views/order/order_Goods.vue +++ b/fuintAdmin/src/views/order/order_Goods.vue @@ -5,11 +5,11 @@ - + {{ item.realName }} @@ -17,10 +17,10 @@ - + @@ -32,23 +32,23 @@ /> - + - + - + @@ -73,7 +73,7 @@ placeholder="结束日期"> - + 查询 重置 @@ -85,32 +85,67 @@
-
商品笔数
{{orderStatistics.numberOfProducts}}
+
+
商品笔数
+
+ +
+
-
总金额
{{orderStatistics.theTotalAmount || 0}}
+
+
总金额
+
+ +
+
-
商品总数量
{{orderStatistics.theTotalNumberOfUnits || 0}}
+
+
商品总数量
+
+ +
+
-
优惠金额
{{orderStatistics.discountAmount || 0}}
+
+
优惠金额
+
+ +
+
-
微信
{{orderStatistics.wechat}}
+
+
微信
+
+ +
+
-
支付宝
{{orderStatistics.alipay}}
+
+
支付宝
+
+ +
+
-
现金
{{orderStatistics.cash}}
+
+
现金
+
+ +
+
@@ -118,7 +153,7 @@
-
商品交易列表
+
导出订单
@@ -575,20 +610,50 @@ export default { align-items: center; } .box{ - width: 200px; - box-sizing: border-box; - padding: 10px; - background: #f9f9f9; - height: 86px; - margin-right: 10px; + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; +} +.el-form--inline .el-form-item { + margin-right: 44px; } .size-hui{ - font-size: 14px; - margin-bottom: 10px; - margin-top: 10px; + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; + } } .size-bole{ - font-weight: bold; + //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; } .wgang{ width: 100%; @@ -612,5 +677,17 @@ export default { width: 20%; } +.icon-img{ + //margin-left: 110px; + width: 100%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; + } +} diff --git a/fuintAdmin/src/views/order/order_Oil.vue b/fuintAdmin/src/views/order/order_Oil.vue index aa7aae847..5db79f391 100644 --- a/fuintAdmin/src/views/order/order_Oil.vue +++ b/fuintAdmin/src/views/order/order_Oil.vue @@ -6,11 +6,11 @@ - + {{ item.realName }} @@ -18,11 +18,11 @@ - + - + - + - + - + - + @@ -83,17 +83,17 @@ v-model="beginTime" style="width: 140px" type="date" - placeholder="开始日期"> + placeholder="交易开始日期"> 至 + placeholder="交易开始日期"> - + 搜索 重置 @@ -110,36 +110,76 @@
-
油品笔数
{{orderStatistics.numberOfOilPens}}
+
+
油品笔数
+
+ +
+
-
油品总金额
{{orderStatistics.theTotalAmountOfOil || 0}}
+
+
油品总金额
+
+ +
+
-
优惠总额
{{orderStatistics.theTotalAmountOfTheOffer || 0}}
+
+
优惠总额
+
+ +
+
-
交易数量
{{orderStatistics.numberOfTransactions || 0}}
+
+
交易数量
+
+ +
+
-
实收总额
-
{{orderStatistics.totalAmountReceived || 0}}
+
{{orderStatistics.totalAmountReceived || 0}}
+
+
实收总额
+
+ +
+
-
微信
-
{{orderStatistics.wechat}}
+
{{orderStatistics.wechat}}
+
+
微信
+
+ +
+
-
支付宝
-
{{orderStatistics.alipay}}
+
{{orderStatistics.alipay}}
+
+
支付宝
+
+ +
+
-
现金
-
{{orderStatistics.cash}}
+
{{orderStatistics.cash}}
+
+
现金
+
+ +
+
@@ -147,7 +187,8 @@
-
油品订单列表
+ +
导出订单
@@ -755,26 +796,59 @@ margin-bottom: 15px; } .box-gang{ - width: 100%; + //width: 1920px; display: flex; align-items: center; + flex-wrap: wrap; /* 允许内容换行 */ + } - .box{ - width: 200px; - box-sizing: border-box; - padding: 10px; - background: #f9f9f9; - height: 86px; - margin-right: 10px; - } - .size-hui{ - font-size: 14px; - margin-bottom: 10px; - margin-top: 10px; - } - .size-bole{ - font-weight: bold; +.box{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; +} +.el-form--inline .el-form-item { + margin-right: 44px; +} +.size-hui{ + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; } +} +.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; +} .wgang{ width: 100%; display: flex; @@ -802,4 +876,18 @@ margin: 10px 0; } + +.icon-img{ + //margin-left: 110px; + width: 100%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; + } +} + diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue index 8a6c48c00..5adef63be 100644 --- a/fuintAdmin/src/views/order/order_Vip.vue +++ b/fuintAdmin/src/views/order/order_Vip.vue @@ -15,11 +15,11 @@ - + {{ item.realName }} @@ -27,11 +27,11 @@ - + - - + + - + @@ -58,17 +58,17 @@ v-model="beginTime" style="width: 160px" type="date" - placeholder="开始日期"> + placeholder="交易开始日期"> 至 + placeholder="交易结束日期"> - + 搜索 重置 @@ -82,32 +82,67 @@
-
充值笔数
{{orderStatistics.numberOfTopUps?orderStatistics.numberOfTopUps:0}}
+
+
充值笔数
+
+ +
+
-
充值总金额
{{orderStatistics.theTotalAmountOfTopUp?orderStatistics.theTotalAmountOfTopUp:0}}
+
+
充值总金额
+
+ +
+
-
赠送总额
{{orderStatistics.theTotalAmountOfTheCredit?orderStatistics.theTotalAmountOfTheCredit:0}}
+
+
赠送总额
+
+ +
+
-
实收总额
{{orderStatistics.totalAmountReceived?orderStatistics.totalAmountReceived:0}}
+
+
实收总额
+
+ +
+
-
微信
{{orderStatistics.wechat?orderStatistics.wechat:0}}
+
+
微信
+
+ +
+
-
支付宝
{{orderStatistics.alipay?orderStatistics.alipay:0}}
+
+
支付宝
+
+ +
+
-
现金
{{orderStatistics.cash}}
+
+
现金
+
+ +
+
@@ -115,7 +150,8 @@
-
会员充值列表
+ +
导出订单
@@ -497,26 +533,52 @@ export default { display: flex; align-items: center; } - .box{ - width: 200px; - box-sizing: border-box; - padding: 10px; - background: rgba(64,158,255,0.05); - height: 86px; - margin-right: 10px; - border-radius: 6px; - border: 1px solid #409EFF; - } - .size-hui{ - font-size: 20px; - color: #555555; - font-weight: bold; +.box{ + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + padding-left: 20px; + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; +} +.el-form--inline .el-form-item { + margin-right: 44px; +} +.size-hui{ + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; } - .size-bole{ - font-size: 14px; - color: #888888; - } +} +.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; +} .wgang{ width: 100%; display: flex; @@ -544,4 +606,17 @@ export default { margin: 10px 0; } +.icon-img{ + //margin-left: 110px; + width: 100%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; + } +} + diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue index 9194bc635..a8dee0104 100644 --- a/fuintAdmin/src/views/setting/print/index.vue +++ b/fuintAdmin/src/views/setting/print/index.vue @@ -2,17 +2,17 @@
- + - + 搜索 重置 diff --git a/fuintCashierWeb/src/assets/fonts/Source Han Sans CN Regular.otf b/fuintCashierWeb/src/assets/fonts/Source Han Sans CN Regular.otf new file mode 100644 index 000000000..886f82f87 Binary files /dev/null and b/fuintCashierWeb/src/assets/fonts/Source Han Sans CN Regular.otf differ diff --git a/fuintCashierWeb/src/assets/fonts/YouSheBiaoTiHei.ttf b/fuintCashierWeb/src/assets/fonts/YouSheBiaoTiHei.ttf new file mode 100644 index 000000000..3729151a2 Binary files /dev/null and b/fuintCashierWeb/src/assets/fonts/YouSheBiaoTiHei.ttf differ diff --git a/fuintCashierWeb/src/assets/images/cut/组 4666@2x.png b/fuintCashierWeb/src/assets/images/cut/组 4666@2x.png new file mode 100644 index 000000000..447eb3884 Binary files /dev/null and b/fuintCashierWeb/src/assets/images/cut/组 4666@2x.png differ diff --git a/fuintCashierWeb/src/assets/styles/fonts.css b/fuintCashierWeb/src/assets/styles/fonts.css new file mode 100644 index 000000000..92c023f44 --- /dev/null +++ b/fuintCashierWeb/src/assets/styles/fonts.css @@ -0,0 +1,8 @@ +@font-face { + font-family: 'YouSheBiaoTiHei'; + src: url("../fonts/YouSheBiaoTiHei.ttf"); +} +@font-face { + font-family: 'Source Han Sans CN'; + src: url("../fonts/Source Han Sans CN Regular.otf"); +} diff --git a/fuintCashierWeb/src/assets/styles/fuint.scss b/fuintCashierWeb/src/assets/styles/fuint.scss index 7ccb89a79..9d559fd87 100644 --- a/fuintCashierWeb/src/assets/styles/fuint.scss +++ b/fuintCashierWeb/src/assets/styles/fuint.scss @@ -196,6 +196,12 @@ font-size: 13px; } + + .el-form--inline .el-form-item { + margin-right: 44px; + } + + .pull-right { float: right !important; } diff --git a/fuintCashierWeb/src/main.js b/fuintCashierWeb/src/main.js index 9fe53b677..5ebd5096a 100644 --- a/fuintCashierWeb/src/main.js +++ b/fuintCashierWeb/src/main.js @@ -33,7 +33,7 @@ import ImagePreview from "@/components/ImagePreview" import VueMeta from 'vue-meta' // 打印插件 import Print from 'vue-print-nb' - +import '@/assets/styles/fonts.css'; // 全局方法挂载 Vue.prototype.parseTime = parseTime Vue.prototype.resetForm = resetForm diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index 5ee8cb73b..c6ddae992 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -3,11 +3,11 @@
- + {{ item.realName }} @@ -15,10 +15,10 @@ - + - + @@ -43,7 +43,7 @@ placeholder="结束日期"> - + 搜索 重置 @@ -54,43 +54,88 @@ 收银台订单统计
-
-
-
笔数
+ +
{{ orderStatistics.numberOfStrokes?orderStatistics.numberOfStrokes:0 }}
+
+
笔数
+
+ +
+
-
-
油品笔数
+
{{ orderStatistics.numberOfStrokesByOil?orderStatistics.numberOfStrokesByOil:0 }}
+
+
油品笔数
+
+ +
+
-
-
商品笔数
+
{{ orderStatistics.numberOfStrokesByGoods?orderStatistics.numberOfStrokesByGoods:0 }}
+
+
商品笔数
+
+ +
+
+
+ +
+
{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}
+
+
订单总金额
+
+ +
-
订单总金额
-
{{ orderStatistics.theTotalAmountOfTheOrder?orderStatistics.theTotalAmountOfTheOrder:0 }}
-
-
-
实付总金额
{{ orderStatistics.theTotalAmountPaid?orderStatistics.theTotalAmountPaid:0 }}
+
+
实付总金额
+
+ +
+
-
油品优惠
{{ orderStatistics.oilDiscounts?orderStatistics.oilDiscounts:0 }}
+
+
油品优惠
+
+ +
+
-
油品总金额
{{ orderStatistics.theTotalAmountOfOil?orderStatistics.theTotalAmountOfOil:0 }}
+
+
油品总金额
+
+ +
+
-
商品总金额
{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}
+
+
商品总金额
+
+ +
+
-
找零总金额
{{ seekZeroAmount }}
+
+
找零总金额
+
+ +
+
@@ -1223,22 +1268,67 @@ import {ifRefPassApi} from "@/api/staff/store"; width: 100%; display: flex; align-items: center; + flex-wrap: wrap; /* 允许内容换行 */ + } .box{ - width: 200px; - box-sizing: border-box; - padding: 10px; - background: #f9f9f9; - height: 86px; - margin-right: 10px; + //box-sizing: border-box; + padding: 5px; + //background: #f9f9f9; + margin-right: 20px; + margin-bottom: 20px; + padding-left: 20px; + + width: 211px; + height: 60px; + background: rgba(64,158,255,0.05); + border-radius: 6px 6px 6px 6px; + border: 1px solid #409EFF; + } + .el-form--inline .el-form-item { + margin-right: 44px; } .size-hui{ - font-size: 14px; - margin-bottom: 10px; - margin-top: 10px; + display: flex; + align-items: center; + //width: 200px; + 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; + .nei { + width: 150px; + } } .size-bole{ - font-weight: bold; + //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%; + height: 20px; + margin-right: 5px; + img{ + float: right; + //width: 100%; + width: 20px; + height: 100%; + } } .wgang{ width: 100%;