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

11.15

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-15 18:02:49 +08:00
parent 83b1ce776d
commit d9711844e8
7 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuintAdmin/src/views/power/linkManage.vue
View File

@ -35,7 +35,7 @@
</el-form-item>
</el-form>
<div style="height: 76vh;overflow: auto">
<div style="height: 77vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" align="center" label="序号"></el-table-column>
<el-table-column prop="pageName" align="center" label="页面/功能名称"></el-table-column>
@ -239,5 +239,8 @@ export default {
</script>
<style lang="scss" scoped>
.app-container{
box-sizing: border-box;
padding-bottom: 0px;
}
</style>

4
fuintAdmin/src/views/power/operateLog.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="app-container" style="padding: 10px">
<div class="app-container" style="padding: 10px;padding-bottom: 0px">
<div class="card-change">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="40px">
@ -80,7 +80,7 @@
</el-form>
</div>
<div style="height: 76vh;overflow: auto;width: 100%;scrollbar-width: none">
<div style="height: 77vh;overflow: auto;width: 100%;scrollbar-width: none">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="createAccount" label="登录账号"></el-table-column>

1
fuintCashierWeb/src/views/cashier/NewComponents/Vip.vue
View File

@ -901,6 +901,7 @@ export default {
this.resetForm("queryForm");
this.queryParams.storeId = '';
this.queryParams.official = "";
this.queryParams.userStatus = "";
this.ifBalance = ""
this.storeIds = [];
this.beginTime = ""

25
fuintCashierWeb/src/views/cashier/NewComponents/WriteOff.vue
View File

@ -25,10 +25,10 @@
<div style="margin-left: 30%;width: 57%">
<!-- 券名称 -->
<div class="box-hei">{{item.exchangeName}} </div>
<div class="box-hui"><span>领取人：</span> <span>{{item.mobile || '匿名'}}</span> </div>
<div class="box-hui"><span>核销码：</span> <span>{{item.ticketCode}}</span> </div>
<div class="box-hui"><span>兑换内容：</span> <span>{{item.exchangeContent}}</span> </div>
<div class="box-hui"><span>有效期：</span> <span>{{item.exchangeFrom}}</span> </div>
<div class="box-hui"><span class="bt_">领取人：</span> <span class="nr_">{{item.mobile || '匿名'}}</span> </div>
<div class="box-hui"><span class="bt_">核销码：</span> <span class="nr_">{{item.ticketCode}}</span> </div>
<div class="box-hui"><span class="bt_">兑换内容：</span> <span class="nr_">{{item.exchangeContent}}</span> </div>
<div class="box-hui"><span class="bt_">有效期：</span> <span class="nr_">{{item.exchangeFrom}}</span> </div>
</div>
<div class="hx_">
立即核销
@ -192,16 +192,17 @@ export default {
}
.w_box{
width: 98%;
width: 99%;
background: #fff;
box-sizing: border-box;
padding: 15px;
border-radius: 8px;
min-height: 92vh;
height: 94vh;
margin: 10px auto;
margin-bottom: 0px;
}
.w_boxs{
width: 98%;
width: 99%;
box-sizing: border-box;
margin: 10px auto;
@ -212,7 +213,6 @@ export default {
background: #fff;
display: flex;
box-sizing: border-box;
margin-bottom: 15px;
}
@ -258,4 +258,13 @@ export default {
width: 14px;
margin-left: 12px;
}
.bt_{
width: 40%;
}
.nr_{
width: 60%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
</style>

4
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -594,7 +594,7 @@
</el-dialog>
<!-- 批量挂账归还-->
<el-dialog :close-on-click-modal="false" title="批量挂账归还" :visible.sync="open3" append-to-body>
<el-dialog width="60%" :close-on-click-modal="false" title="批量挂账归还" :visible.sync="open3" append-to-body>
<div>
<el-table
ref="multipleTable"
@ -615,7 +615,7 @@
<el-table-column
prop="repaidAmount"
label="归还金额"
width="120">
>
<template slot-scope="scope">
<el-input-number size="mini" style="width: 100px"
v-model="scope.row.repaidAmount"

3
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -2282,7 +2282,7 @@ input {
box-sizing: border-box;
height: 100vh;
box-sizing: border-box;
padding: 20px;
padding: 10px;
padding-bottom: 0px;
display: flex;
@ -2567,6 +2567,7 @@ input {
font-size: 14px;
color: #555555;
font-weight: bold;
margin-bottom: 2px;
}
.tab-kuang {

3
fuintCashierWeb/src/views/cashier/NewComponents/writeList.vue
View File

@ -180,8 +180,9 @@ export default {
}
.table-box {
width: 100%;
height: 66vh;
height: 69vh;
overflow: auto;
scrollbar-width: none;
background: #FFF;
box-sizing: border-box;
padding: 15px;