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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
sw 2024-11-20 14:17:56 +08:00
commit ad0adc0c08
8 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card :body-style="{ padding: '0px' }" style="margin-top: 1px;">
<div class="box">
<div :body-style="{ padding: '0px' }" style="margin-top: 1px;background:#fff">
<div class="box" style="margin-top: 0px;padding-top: 10px">
<div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
<div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
<div class="heng-box" v-if="radio1 == '支付方式分析'"></div>
@ -15,7 +15,7 @@
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
</div>
</el-card>
</div>
</div>

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

@ -1,6 +1,6 @@
<!-- 支付通道分析-->
<template>
<div >
<div style="width: 100%;height: 85vh; " >
<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">
@ -363,7 +363,7 @@ export default {
}
.table-box{
width: 100%;
height: 62vh;
height: 63vh;
scrollbar-width: none;
overflow: auto;
}

5
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div >
<div style="width: 100%;height: 85vh; " >
<div class="top_box" shadow="never" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s" style="justify-content: space-between">
@ -302,7 +302,7 @@ export default {
}
.table-box{
width: 100%;
height: 60vh;
height: 61vh;
scrollbar-width: none;
overflow: auto;
}
@ -315,6 +315,7 @@ export default {
margin: 5px auto;
}
.el-form--inline .el-form-item {
margin-right: 20px;
}

8
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
View File

@ -1,8 +1,8 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card :body-style="{ padding: '0px'}" style="margin-top: 1px;">
<div class="box">
<div class="app-top" >
<div :body-style="{ padding: '0px'}" style="margin-top: 1px; background: #fff;">
<div class="box" style="margin-top: 0px;padding-top: 10px">
<div class="nbox" :class="pointerClass" @click="updateRedio('会员充值订单')">
<div class="fount-box" :style="{ color: radio1 === '会员充值订单' ? '#FF770F' : '#999999' }">会员充值订单</div>
<div class="heng-box" v-if="radio1 == '会员充值订单'"></div>
@ -26,7 +26,7 @@
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>
</div>
</el-card>
</div>
</div>

5
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;">
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -282,9 +282,10 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
.table-box{
width: 100%;
height: 66vh;
height: 75vh;
min-height: 650px;
overflow: auto;
scrollbar-width: none;
}

4
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;">
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -76,7 +76,7 @@
</el-form>
<!-- </el-card>-->
<!-- <el-card class="box-card">-->
<div class="table-box" style="width: 100%;height: 65vh;overflow: auto">
<div class="table-box" style="width: 100%;height: 70vh;overflow: auto;scrollbar-width: none">
<el-table
:data="orderList"
style="width: 100%">

8
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;">
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -74,8 +74,7 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- </el-card>-->
<!-- <el-card class="box-card">-->
<div class="table-box">
<el-table
:data="orderList"
@ -284,9 +283,10 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
.table-box{
width: 100%;
height: 66vh;
height: 75vh;
min-height: 650px;
overflow: auto;
scrollbar-width: none;
}
</style>

2
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 10px;" >
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px" >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">