dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

11.11收银台订单边距调整

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-11 10:11:50 +08:00
parent adccfd43fd
commit 407425018b
9 changed files with 97 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
View File

@ -64,13 +64,12 @@ export default {
<style scoped>
.app-center{
width: 100%;
box-sizing: border-box;
//padding: 10px;
}
.hui_box{
box-sizing: border-box;
padding: 10px;
padding-bottom: 0px;
}
.app-top{
width: 100%;

35
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -1,7 +1,7 @@
<!-- 支付通道分析-->
<template>
<div style="padding-top: 15px; padding-right: 20px; background: #f6f8f9;padding-bottom: 15px">
<div class="card-change2-1" style="" shadow="never">
<div >
<div class="top_box" style="" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s" style="margin-bottom: 0px;justify-content: space-between">
<div class="d-s">
@ -56,7 +56,7 @@
</div>
</div>
</div>
<div class="card-change-1" style="min-height: 500px; margin-top: 20px;" shadow="never">
<div class="center_box" shadow="never">
<div class="table-box">
<el-table
:data="orderList"
@ -354,23 +354,32 @@ export default {
</script>
<style scoped>
.box-card {
.top_box{
border-radius: 6px;
background: #fff;
box-sizing: border-box;
padding: 10px;
width: 100%;
margin: 0px 20px 4px 20px;
border: none;
box-shadow: none;
}
.table-box{
width: 100%;
height: 62vh;
scrollbar-width: none;
overflow: auto;
}
.center_box{
border-radius: 6px;
background: #fff;
box-sizing: border-box;
padding: 10px;
width: 100%;
margin: 5px auto;
}
.el-form--inline .el-form-item {
margin-right: 20px;
}
.table-box {
width: 100%;
height: 56vh;
overflow: auto;
}
.wrap-boxs {
width: 100%;
display: flex;

2
fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
View File

@ -101,7 +101,7 @@ export default {
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 15px;
}
.tab_ {

49
fuintCashierWeb/src/views/cashier/NewComponents/integralOrder/pointsCashier.vue
View File

@ -1,6 +1,6 @@
<template>
<!-- 积分商城订单-->
<div class="app-containers">
<div class="box_conter">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="giftName">
@ -280,43 +280,13 @@ export default {
</script>
<style scoped>
.app-container {
width: 100%;
height: 100%;
background: #f6f8f9;
}
.icon-img{
//margin-left: 110px;
width: 100%;
height: 20px;
margin-right: 5px;
img{
float: right;
//width: 100%;
width: 20px;
height: 100%;
}
}
.table-box {
width: 100%;
height: 66vh;
overflow: auto;
}
.box{
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
padding-left: 20px;
margin-bottom: 20px;
width: 211px;
height: 60px;
background: rgba(64,158,255,0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #fe8c4a;
.box_conter{
box-sizing: border-box;
padding: 10px;
border-bottom: 0px;
background: #f2f2f2;
padding-bottom: 0px;
}
.el-form--inline .el-form-item {
margin-right: 15px;
@ -371,13 +341,14 @@ export default {
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
width: 100%;
margin: 0px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
border-bottom: 1px solid #eceff1;
padding-bottom: 0px;
margin-bottom: 10px;
height: 64px;
}
@ -391,7 +362,7 @@ export default {
}
.cont_box_b{
background: #fff;
width: 98%;
width: 100%;
margin: 5px auto;
border-radius: 8px;
box-sizing: border-box;

22
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -1,6 +1,6 @@
<!--增值交易订单-->
<template>
<div class="contenr_new">
<div class="box_conter">
<!-- 表单查询-->
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
@ -559,25 +559,25 @@ export default {
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 5px auto;
width: 100%;
margin: 0px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
height: 64px;
margin-bottom: 10px;
}
.cont_new{
background: #fff;
width: 98%;
margin: 10px auto;
border-radius: 8px;
.box_conter{
box-sizing: border-box;
padding: 15px
padding: 10px;
border-bottom: 0px;
background: #f2f2f2;
padding-bottom: 0px;
}
.bottom_new{
background: #fff;
width: 98%;
margin: 5px auto;
width: 100%;
margin: 0px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;

91
fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div>
<div class="box_conter">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="0px">
<el-form-item label="" prop="staffId">
@ -1428,23 +1428,7 @@ export default {
</script>
<style scoped>
.app-top {
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
}
.clearfix {
width: 100%;
}
.box-card {
width: 100%;
margin-bottom: 15px;
}
.box-gang {
width: 100%;
@ -1453,30 +1437,12 @@ export default {
flex-wrap: wrap; /* 允许内容换行 */
}
.box {
padding: 5px;
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 #fe8c4a;
}
.box1 {
padding: 5px;
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;
.box_conter{
box-sizing: border-box;
padding: 10px;
border-bottom: 0px;
background: #f2f2f2;
padding-bottom: 0px;
}
.box2 {
padding: 5px;
@ -1509,41 +1475,10 @@ export default {
}
}
.size-bole {
height: 31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 24px;
color: #555555;
text-align: left;
font-style: normal;
text-transform: none;
}
.icon-img {
width: 20px;
height: 20px;
margin-right: 5px;
img {
width: 20px;
height: 20px;
}
}
.wgang {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.table-box {
width: 100%;
height: 65vh;
height: 64vh;
overflow: auto;
}
@ -1565,7 +1500,7 @@ export default {
margin: 10px 0;
}
.cot-box {
width: 98%;
width: 100%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
@ -1578,12 +1513,12 @@ export default {
justify-content: space-between;
height: 65px;
background: #fff;
width: 98%;
margin: 5px auto;
width: 100%;
margin: 0px auto;
margin-bottom: 10px;
border-radius: 8px;
box-sizing: border-box;
padding: 15px
padding: 15px;
}
.makeupticket{
cursor:pointer;

103
fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
View File

@ -1,6 +1,6 @@
<!--商品交易列表-->
<template>
<div>
<div class="box_conter">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" style="width: 100%" :inline="true" v-show="showSearch">
<el-form-item label="" prop="staffId">
@ -797,23 +797,6 @@ export default {
</script>
<style scoped>
.app-top {
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
}
.clearfix {
width: 100%;
}
.box-card {
width: 100%;
margin-bottom: 15px;
}
.box-gang {
width: 100%;
@ -822,21 +805,6 @@ export default {
flex-wrap: wrap;
}
.box {
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
margin-bottom: 20px;
width: 211px;
height: 60px;
background: rgba(64, 158, 255, 0.05);
border-radius: 6px 6px 6px 6px;
border: 1px solid #fe8c4a;
}
.size-hui {
display: flex;
@ -854,44 +822,12 @@ export default {
}
}
.size-bole {
height: 31px;
font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 24px;
color: #555555;
text-align: left;
font-style: normal;
text-transform: none;
}
.icon-img {
width: 20px;
height: 20px;
margin-right: 5px;
img {
float: right;
width: 20px;
height: 20px;
}
}
.wgang {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 20px;
}
.table-box {
width: 100%;
height: 65vh;
height: 64vh;
overflow: auto;
}
.pagination-box {
width: 100%;
margin: 10px auto;
@ -899,30 +835,11 @@ export default {
align-items: center;
justify-content: flex-end;
}
.top-app-sou {
width: 20%;
}
.tk {
text-align: center;
color: grey;
margin: 10px 0;
}
.box1 {
padding: 5px;
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;
}
.box2 {
padding: 5px;
margin-right: 20px;
@ -935,7 +852,7 @@ export default {
}
.cot-box {
width: 98%;
width: 100%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
@ -949,12 +866,20 @@ export default {
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 5px auto;
width: 100%;
margin: 0px auto;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
height: 64px;
height: 115px;
margin-bottom: 10px;
}
.box_conter{
box-sizing: border-box;
padding: 10px;
border-bottom: 0px;
background: #f2f2f2;
padding-bottom: 0px;
}
.x_size{
white-space: nowrap;

20
fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
View File

@ -1,7 +1,6 @@
<!--油品订单-->
<template>
<div>
<div class="box_conter">
<div class="top_new">
<el-form :model="queryParams" width="100%" ref="queryForm" size="small" :inline="true" label-width="68px">
<div style=" width: 1645px; display: flex; justify-content: space-between">
@ -1051,7 +1050,7 @@ export default {
}
.cot-box {
width: 98%;
width: 100%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
@ -1059,17 +1058,26 @@ export default {
margin: 0 auto;
height: 79vh;
}
.box_conter{
box-sizing: border-box;
padding: 10px;
border-bottom: 0px;
background: #f2f2f2;
padding-bottom: 0px;
}
.top_new{
display: flex;
justify-content: space-between;
height: 120px;
height: 115px;
background: #fff;
width: 98%;
margin: 5px auto;
width: 100%;
margin: 0px auto;
margin-bottom: 10px;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
}
.new_bottom{
height: 59vh;
overflow: auto;

41
fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
View File

@ -1,6 +1,6 @@
<!--会员充值订单-->
<template>
<div>
<div class="box_conter">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" >
<el-form-item label="" prop="staffId">
@ -622,22 +622,7 @@ export default {
</script>
<style scoped>
.app-top {
width: 100%;
height: 60px;
box-sizing: border-box;
padding: 10px;
}
.clearfix {
width: 100%;
}
.box-card {
width: 100%;
margin-bottom: 15px;
}
.box-gang {
width: 100%;
@ -645,17 +630,12 @@ export default {
align-items: center;
flex-wrap: wrap;
}
.box {
padding: 5px;
margin-bottom: 20px;
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 #fe8c4a;
.box_conter{
box-sizing: border-box;
padding: 10px;
border-bottom: 0px;
background: #f2f2f2;
padding-bottom: 0px;
}
@ -723,7 +703,7 @@ export default {
}
.cot-box {
width: 98%;
width: 100%;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
@ -736,8 +716,9 @@ export default {
display: flex;
justify-content: space-between;
background: #fff;
width: 98%;
margin: 5px auto;
width: 100%;
margin: 0px auto;
margin-bottom: 10px;
border-radius: 8px;
box-sizing: border-box;
padding: 15px;