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

11.1

Browse Source
This commit is contained in:
ds 2024-11-01 15:08:04 +08:00
parent 5874346362
commit 2c2ebef9d0
48 changed files with 85 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -9,7 +9,7 @@
</div>
<div class="rp-box">
<!-- 营销活动-->
<div class="bai-box" style="height: 84.5vh;overflow: auto" v-show="tabindex == 0">
<div class="bai-box" style="overflow: auto" v-show="tabindex == 0">
<div class="d-s">
<div class="gang"></div>
<div style="font-weight: bold">会员营销</div>
@ -217,7 +217,7 @@
<el-button icon="el-icon-refresh-right" @click="resetQuery">重置</el-button>
</div>
</div>
<div style="height: 70vh;overflow: auto">
<div style="height: 66vh;overflow: auto">
<el-table
:data="tableData"
border
@ -312,7 +312,7 @@
<el-button icon="el-icon-refresh-right" @click="resetOldQuery">重置</el-button>
</div>
</div>
<div style="height: 70vh;overflow: auto">
<div style="height: 66vh;overflow: auto">
<el-table
:data="oldTableData"
border
@ -733,7 +733,7 @@ export default {
.bai-box {
width: 100%;
height: 100%;
height: 83vh;
background: #fff;
border-radius: 10px;
box-sizing: border-box;

4
fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
View File

@ -804,7 +804,7 @@ export default {
}
.table-box{
width: 100%;
height: 70vh;
height: 68vh;
overflow: auto;
scrollbar-width: none;
//padding: 15px;
@ -916,7 +916,7 @@ export default {
.card-boxs {
width: 100%;
height: 85vh;
height: 83.5vh;
background: #fff;
box-sizing: border-box;
padding: 15px;

2
fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
View File

@ -25,7 +25,7 @@
<el-button type="primary" @click="addCertificate">新增优惠券</el-button>
</div>
</div>
<div style="height: 71vh;overflow: auto">
<div style="height: 68.5vh;overflow: auto">
<el-table border :data="tableData" style="width: 100%">
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column prop="number" label="优惠券编号"></el-table-column>

2
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -75,7 +75,7 @@
<div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
</div>
<div style="height: 68vh;overflow: auto">
<div style="height: 66vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange"
border

2
fuintAdmin/src/views/convenienceStore/goodsSale.vue
View File

@ -44,7 +44,7 @@
</el-form-item>
</el-form>
<div style="height: 71vh;overflow: auto">
<div style="height: 69vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">

2
fuintAdmin/src/views/convenienceStore/pinlei.vue
View File

@ -28,7 +28,7 @@
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div style="height: 68vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
<el-table-column type="expand">
<template slot-scope="props">

2
fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
View File

@ -52,7 +52,7 @@
</el-form-item>
</el-form>
<div style="height: 71vh;overflow: auto;scrollbar-width: none">
<div style="height: 69vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables" border
v-loading="loading"
:data="purchaseList"

2
fuintAdmin/src/views/convenienceStore/returns/index.vue
View File

@ -53,7 +53,7 @@
</el-form-item>
</el-form>
<div style="height: 71vh;overflow: auto">
<div style="height: 69vh;overflow: auto">
<el-table ref="tables" border
v-loading="loading"
:data="returnsList"

2
fuintAdmin/src/views/convenienceStore/stockStatistic.vue
View File

@ -93,7 +93,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 71vh;overflow: auto;scrollbar-width: none">
<div style="height: 69vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">

4
fuintAdmin/src/views/convenienceStore/supplier.vue
View File

@ -42,7 +42,7 @@
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div style="height: 68vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
@ -309,7 +309,7 @@ export default {
<style lang="scss" scoped>
.app-container {
width: 100%;
height: 100vh;
height: 100%;
background: #f6f8f9;
}
</style>

2
fuintAdmin/src/views/duty/index.vue
View File

@ -32,7 +32,7 @@
</el-form-item>
</el-form>
<div style="height: 76vh;overflow: auto">
<div style="height: 74vh;overflow: auto">
<el-table ref="tables"
border
v-loading="loading"

2
fuintAdmin/src/views/feedBack/index.vue
View File

@ -32,7 +32,7 @@
</el-form>
<div style="height: 76.5vh;overflow: auto">
<div style="height: 74vh;overflow: auto">
<el-table border v-loading="loading" :data="list">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column align="center" prop="storeName" label="所属机构"/>

2
fuintAdmin/src/views/financialStatement/buy/tab/em.vue
View File

@ -371,7 +371,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 80vh;
height: 78vh;
}
.pagination-box{
width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
View File

@ -371,7 +371,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 80vh;
height: 78vh;
}
.pagination-box{
width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
View File

@ -365,7 +365,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 80vh;
height: 78%;
}
.pagination-box{
width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
View File

@ -340,7 +340,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 80.5vh;
height: 78vh;
}
.pagination-box{
width: 100%;

2
fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
View File

@ -369,7 +369,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 80vh;
height: 78vh;
}
.pagination-box{
width: 100%;

2
fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
View File

@ -569,7 +569,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 73vh;
height: 72vh;
}
</style>

4
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -532,7 +532,7 @@ export default {
}
.table-box{
width: 100%;
height: 58vh;
height: 52vh;
overflow: auto;
}
.pagination-box{
@ -567,7 +567,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 72vh;
height: 71vh;
}
</style>

4
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -560,7 +560,7 @@ export default {
.table-box {
width: 100%;
height: 56vh;
height: 52vh;
overflow: auto;
scrollbar-width: none;
}
@ -601,7 +601,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 73vh;
height: 71vh;
}
</style>

2
fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -383,7 +383,7 @@ export default {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 79vh;
height: 78vh;
}
.pagination-box{
width: 100%;

2
fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -369,7 +369,7 @@ import {
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 79vh;
height: 78vh;
}
.pagination-box{
width: 100%;

4
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -477,7 +477,7 @@ export default {
.table-box {
width: 100%;
height: 73.5vh;
height: 70vh;
overflow: auto;
scrollbar-width: none;
}
@ -541,6 +541,6 @@ export default {
background: #fff;
box-sizing: border-box;
padding: 15px;
height: 87vh;
height: 85vh;
}
</style>

6
fuintAdmin/src/views/fleet/tab/fleetMember.vue
View File

@ -107,7 +107,7 @@
</template>
</el-table-column>
<el-table-column align="center" prop="accountName" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间" width="150"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间" width="180"></el-table-column>
<el-table-column align="center" label="操作" width="230">
<template slot-scope="scope">
<el-button
@ -826,7 +826,7 @@ export default {
.table-boxs {
width: 100%;
height: 78vh;
height: 74vh;
overflow: auto;
}
@ -848,6 +848,6 @@ export default {
box-sizing: border-box;
padding: 15px;
padding-bottom: 0px;
height: 87vh;
height: 85vh;
}
</style>

4
fuintAdmin/src/views/integral/gift/gift.vue
View File

@ -1255,10 +1255,10 @@ export default {
height: 98px;
}
.card-change{
height: 87vh;
height: 85vh;
}
.table_box{
height: 70vh;
height: 68vh;
overflow: auto;
scrollbar-width: none;
}

4
fuintAdmin/src/views/integral/order/index.vue
View File

@ -73,13 +73,13 @@
</el-date-picker>
</el-form-item>
<el-form-item style="float: right">
<el-form-item style="float: right; margin-right: 0px;">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button type="primary" @click="exportExcelVip">导出</el-button>
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div style="height: 73.5vh;overflow: auto">
<el-table ref="tables"
v-loading="loading"

2
fuintAdmin/src/views/member/creditIndex.vue
View File

@ -57,7 +57,7 @@
</el-form-item>
</el-form>
<div style="height: 77vh;overflow: auto" >
<div style="height: 75vh;overflow: auto" >
<el-table border ref="tables" v-loading="loading" :data="list" >
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="单位名称" prop="unitName" align="center" />

6
fuintAdmin/src/views/member/index.vue
View File

@ -164,7 +164,7 @@
</el-form>
</div>
<div style="height: 62vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
<div style="height: 58vh;overflow: auto;margin-top: 15px;margin-bottom: 15px">
<el-table ref="tables" v-loading="loading" :data="list" border
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
@ -318,7 +318,7 @@
</el-form>
</div>
<!-- -->
<div style="height: 72vh;overflow: auto">
<div style="height: 70vh;overflow: auto">
<el-table
:data="massSendRecordList"
border
@ -1448,7 +1448,7 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
height: 87vh;
height: 86vh;
}

6
fuintAdmin/src/views/member/manage.vue
View File

@ -43,7 +43,7 @@
</el-form>
</div>
<!-- -->
<div style="height: 72vh;overflow: auto">
<div style="height: 70vh;overflow: auto">
<el-table
:data="userGroupList"
border
@ -156,7 +156,7 @@
</el-form>
</div>
<!-- -->
<div style="height: 72vh;overflow: auto">
<div style="height: 70vh;overflow: auto">
<el-table
:data="massSendList"
border
@ -272,7 +272,7 @@
</el-form>
</div>
<!-- -->
<div style="height: 72vh;overflow: auto">
<div style="height: 70vh;overflow: auto">
<el-table
:data="massSendRecordList"
border

2
fuintAdmin/src/views/member/userLabel.vue
View File

@ -280,7 +280,7 @@ export default {
.table-box {
width: 100%;
height: 77vh;
height: 75vh;
overflow: auto;
}

2
fuintAdmin/src/views/oilConfig/oilGun/list.vue
View File

@ -48,7 +48,7 @@
</el-form-item>
</el-form>
<div>
<div style="width: 100%;overflow: auto;height: 72vh">
<div style="width: 100%;overflow: auto;height: 69vh">
<el-table ref="tables"
v-loading="loading"
:data="gunList"

2
fuintAdmin/src/views/oilConfig/oilInventory/list.vue
View File

@ -53,7 +53,7 @@
</el-form-item>
</el-form>
<div style="height: 76vh;overflow: auto;scrollbar-width: none">
<div style="height: 74vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables"
v-loading="loading"
:data="inventoryList"

2
fuintAdmin/src/views/oilConfig/oilPurchase/list.vue
View File

@ -63,7 +63,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 75vh;overflow: auto;scrollbar-width: none">
<div style="height: 73vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables"
v-loading="loading"
:data="purchaseList"

2
fuintAdmin/src/views/oilConfig/oilStatistics/list.vue
View File

@ -46,7 +46,7 @@
</el-form-item>
</el-form>
<div style="height: 77vh;overflow: auto">
<div style="height: 75vh;overflow: auto">
<el-table key="2" ref="tables"
v-loading="loading"
:data="statisticsList"

2
fuintAdmin/src/views/oilConfig/oilSuppliers/list.vue
View File

@ -43,7 +43,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 76vh;overflow: auto">
<div style="height: 74vh;overflow: auto">
<el-table ref="tables"
v-loading="loading"
:data="suppliersList"

2
fuintAdmin/src/views/oilConfig/oilTank/list.vue
View File

@ -53,7 +53,7 @@
<!-- </div>-->
<!-- 列表-->
<div style="height: 72vh;overflow: auto">
<div style="height: 69vh;overflow: auto">
<el-table ref="tables"
v-loading="loading"
:data="tankList"

4
fuintAdmin/src/views/order/order_Added.vue
View File

@ -425,6 +425,8 @@ export default {
.box-card {
width: 100%;
height: 89vh;
border-radius: 8px;
margin-bottom: 15px;
background: #fff;
box-sizing: border-box;
@ -495,7 +497,7 @@ export default {
.table-box {
width: 100%;
height: 75vh;
height: 73vh;
overflow: auto;
}

9
fuintAdmin/src/views/order/order_Goods.vue
View File

@ -1,7 +1,7 @@
<!--商品交易列表-->
<template>
<div class="app-container">
<div class="card-change">
<div class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
<el-form-item label="" prop="orderNo">
<el-input
@ -551,6 +551,11 @@ export default {
.box-card {
width: 100%;
height: 89vh;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 10px;
margin-bottom: 15px;
}
@ -626,7 +631,7 @@ export default {
.table-box {
width: 100%;
height: 70vh;
height: 66vh;
overflow: auto;
}

11
fuintAdmin/src/views/order/order_Oil.vue
View File

@ -2,7 +2,7 @@
<template>
<div class="app-container">
<div class="card-change">
<div class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="">
<el-input v-model="queryParams.orderNo" clearable placeholder="请输入订单号"></el-input>
@ -713,8 +713,13 @@
width: 100%;
}
.box-card{
.box-card {
width: 100%;
height: 89vh;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
padding: 10px;
margin-bottom: 15px;
}
.box-gang{
@ -775,7 +780,7 @@
}
.table-box{
width: 100%;
height: 69vh;
height: 66vh;
overflow: auto;
scrollbar-width: none;
}

3
fuintAdmin/src/views/order/order_Vip.vue
View File

@ -422,6 +422,7 @@ export default {
.box-card {
width: 100%;
height: 89vh;
border-radius: 8px;
background: #fff;
box-sizing: border-box;
@ -490,7 +491,7 @@ export default {
.table-box {
width: 100%;
height: 78vh;
height: 72vh;
overflow: auto;
}

2
fuintAdmin/src/views/power/message.vue
View File

@ -1155,7 +1155,7 @@ export default {
box-sizing: border-box;
padding: 15px;
margin: 10px;
height: 86vh;
height: 84.5vh;
}
.common-dialog > > > .el-upload--picture-card {

4
fuintAdmin/src/views/power/page/mode.vue
View File

@ -40,7 +40,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div style="height: 68vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
@ -479,7 +479,7 @@ export default {
}
.cards-change{
height: 83vh;
height: 81vh;
}
</style>

2
fuintAdmin/src/views/power/page/record.vue
View File

@ -557,7 +557,7 @@ export default {
}
.cards-change{
height: 83vh;
height: 81vh;
}
</style>

2
fuintAdmin/src/views/setting/device/content/youqiji.vue
View File

@ -318,7 +318,7 @@ export default {
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
height: 87vh;
height: 85vh;
}
</style>

4
fuintAdmin/src/views/setting/print/index.vue
View File

@ -49,7 +49,7 @@
<el-button type="primary" icon="el-icon-search" @click="handleAdd">新增设备</el-button>
</el-form-item>
</el-form>
<div style="width: 100%; height: 674px; overflow: auto; ">
<div style="width: 100%; height: 68vh; overflow: auto; ">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="deviceName" label="设备名称"></el-table-column>
@ -427,7 +427,7 @@ export default {
border-radius: 8px;
box-sizing: border-box;
padding: 15px;
height: 87vh;
height: 85vh;
}
</style>

2
fuintAdmin/src/views/staff/list.vue
View File

@ -48,7 +48,7 @@
</el-form-item>
</el-form>
<div style="height: 78.5vh;overflow: auto">
<div style="height: 76vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" border @selection-change="handleSelectionChange"
:default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="index" width="80" align="center" label="序号"/>

4
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -60,7 +60,7 @@
</el-form>
</div>
<div style="height: 72vh;overflow: auto">
<div style="height: 70vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="staffCommissionList" border>
<el-table-column type="index" width="80" align="center" label="序号"/>
<!-- <el-table-column label="员工信息" align="center">-->
@ -179,7 +179,7 @@
</el-form-item>
</el-form>
</div>
<div style="height: 72vh; overflow: auto ">
<div style="height: 70vh; overflow: auto ">
<el-table ref="tables" v-loading="loading" :data="list" border

6
fuintAdmin/src/views/userGrade/index.vue
View File

@ -169,7 +169,7 @@
</el-form>
</div>
<div style="height: 72vh;overflow: auto">
<div style="height: 69vh;overflow: auto">
<el-table ref="tables" v-loading="loading" :data="list" border>
<el-table-column label="序号" align="center" type="index" width="55"/>
<el-table-column label="会员等级名称" align="center" prop="name">
@ -269,7 +269,7 @@
</el-form>
</div>
<!-- -->
<div style="height: 72vh;overflow: auto">
<div style="height: 69vh;overflow: auto">
<el-table
:data="discountList"
border
@ -1932,7 +1932,7 @@ export default {
box-sizing: border-box;
padding: 20px;
margin: 0 auto;
height: 86vh;
height: 85vh;
}
.tab-box {