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

10.29

Browse Source
This commit is contained in:
ds 2024-10-29 16:27:05 +08:00
parent 839c5f5226
commit 1c908a1d1d
13 changed files with 81 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ export default {
.app-top{
width: 100%;
//margin-bottom: 20px;
height: 50px;
height: 52px;
box-sizing: border-box;
}
@ -77,13 +77,13 @@ export default {
}
.box{
cursor: pointer;
/* margin-top: 10px ; */
margin-top: 10px ;
margin-left: 50px;
height: 68px;
//height: 40px;
display: flex;
background-color: #FFFFFF;
align-items: center;
border: 0px solid #EBEEF5;
//border: 1px solid #EBEEF5;
}
.nbox{
margin-right: 30px;

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

@ -270,12 +270,9 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
.table-box{
width: 100%;
height: 66vh;
min-height: 650px;
overflow: auto;
}
.card-change {
min-height: 100vh;
}
</style>

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

@ -266,10 +266,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{
width: 100%;
height: 66vh;
min-height: 650px;
overflow: auto;
}
.card-change {
min-height: 100vh;
}
</style>

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

@ -273,11 +273,8 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
.table-box{
width: 100%;
height: 66vh;
min-height: 650px;
overflow: auto;
}
.card-change {
min-height: 100vh;
}
</style>

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

@ -278,11 +278,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{
width: 100%;
height: 66vh;
min-height: 650px;
overflow: auto;
}
.card-change {
min-height: 100vh;
}
</style>

23
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
View File

@ -63,24 +63,24 @@
<el-table
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="100" align="center" label="序号"/>
<el-table-column prop="storeName" label="机构名称" width="200" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (元)" width="200" align="center">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (元)" width="150" align="center">
<template>
{{this.orderStatistics.paidInfo}}
</template>
</el-table-column>
<el-table-column prop="count" label="累计交易笔数" width="160" align="center"></el-table-column>
<el-table-column prop="exchangeQuantity" label="兑换商品数量" width="160" align="center"></el-table-column>
<el-table-column prop="integral" label="累计消费积分" width="160" align="center"></el-table-column>
<el-table-column prop="count" label="累计交易笔数" width="130" align="center"></el-table-column>
<el-table-column prop="exchangeQuantity" label="兑换商品数量" width="130" align="center"></el-table-column>
<el-table-column prop="integral" label="累计消费积分" width="130" align="center"></el-table-column>
<el-table-column label="热门商品信息" align="center">
<el-table-column prop="giftName" label="商品名称" width="160" align="center"></el-table-column>
<el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="160"
<el-table-column prop="giftName" label="商品名称" width="130" align="center"></el-table-column>
<el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="130"
align="center"></el-table-column>
<el-table-column prop="paidInfo" label="销售金额 (元)" width="160" align="center"></el-table-column>
<el-table-column prop="integralBy" label="消费积分" width="160" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="销售金额 (元)" width="130" align="center"></el-table-column>
<el-table-column prop="integralBy" label="消费积分" width="130" align="center"></el-table-column>
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="400" align="center">
<el-table-column prop="statDate" label="统计日期" align="center">
<template>
{{this.value2[0]}} 至 {{this.value2[1]}}
</template>
@ -303,6 +303,7 @@ export default {
.table-box {
width: 100%;
height: 52vh;
min-height: 600px;
overflow: auto;
}

1
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
View File

@ -353,6 +353,7 @@ import {parseTime} from "@/utils/fuint";
.table-box{
width: 100%;
height: 52vh;
min-height: 600px;
overflow: auto;
}
.wrap-box{

1
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
View File

@ -326,6 +326,7 @@ import {parseTime} from "@/utils/fuint";
.table-box{
width: 100%;
height: 52vh;
min-height: 600px;
overflow: auto;
}
.wrap-box{

23
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
View File

@ -63,23 +63,23 @@
<el-table-column prop="userName" align="center" label="会员名称" > </el-table-column>
<el-table-column prop="mobile" align="center" label="会员手机号码"> </el-table-column>
<el-table-column prop="physicalCard" align="center" label="会员卡号"></el-table-column>
<el-table-column prop="storeName" align="center" label="所属机构"> </el-table-column>
<el-table-column prop="gradeName" align="center" label="会员等级" > </el-table-column>
<el-table-column prop="amount" align="center" label="累计充值金额（元）" > </el-table-column>
<el-table-column prop="countNum" align="center" label="累计充值次数" > </el-table-column>
<el-table-column prop="leijiMoney" align="center" label="累计消费金额（元）" > </el-table-column>
<el-table-column prop="leijiNum" align="center" label="累计消费笔数" > </el-table-column>
<el-table-column prop="fuelAmount" align="center" label="囤油卡剩余油量（L）" > </el-table-column>
<el-table-column prop="storeName" align="center" label="所属机构" width="200px"> </el-table-column>
<el-table-column prop="gradeName" align="center" label="会员等级" width="100px" > </el-table-column>
<el-table-column prop="amount" align="center" label="累计充值金额（元）" width="100px"> </el-table-column>
<el-table-column prop="countNum" align="center" label="累计充值次数" width="100px" > </el-table-column>
<el-table-column prop="leijiMoney" align="center" label="累计消费金额（元）" width="100px" > </el-table-column>
<el-table-column prop="leijiNum" align="center" label="累计消费笔数" width="100px" > </el-table-column>
<el-table-column prop="fuelAmount" align="center" label="囤油卡剩余油量（L）" width="100px"> </el-table-column>
<el-table-column prop="cardBalance" align="center" label="储值卡余额" >
<el-table-column prop="cardBalance" align="center" label="储值卡余额" width="100px" >
<template v-slot="scope">
{{ formatBalance(scope.row.cardBalance) }}
</template>
</el-table-column>
<!-- <el-table-column prop="createTime" align="center" label="累计余额" > </el-table-column>-->
<el-table-column prop="leijiMoneyRef" align="center" label="累计退款金额" > </el-table-column>
<el-table-column prop="leijiNumRef" align="center" label="累计退款笔数" > </el-table-column>
<!-- <el-table-column prop="createTime" align="center" label="累计余额" width="100px" > </el-table-column>-->
<el-table-column prop="leijiMoneyRef" align="center" label="累计退款金额" width="100px"> </el-table-column>
<el-table-column prop="leijiNumRef" align="center" label="累计退款笔数" width="100px"> </el-table-column>
</el-table>
</div>
@ -250,6 +250,7 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
.table-box{
width: 100%;
height: 52vh;
min-height: 600px;
overflow: auto;
}
.wrap-box{

20
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -126,7 +126,7 @@
<el-form-item label="banner名称" prop="bannerName">
<el-input v-model="deviceInfo.bannerName" style="width: 100%" placeholder="请输入banner名称"></el-input>
</el-form-item>
<el-form-item label="图片" prop="uploadAction">
<el-form-item label="图片" prop="productImage">
<el-upload
ref="uploadRef"
@ -141,7 +141,7 @@
:disable-transition="true"
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<div slot="file" slot-scope="{file}" class="centered-image">
<img
class="el-upload-list__item-thumbnail"
:src="file.url" alt=""
@ -276,7 +276,7 @@ export default {
bannerName: [
{ required: true, message: '请填写banner名称', trigger: 'blur' }
],
uploadAction: [
productImage: [
{ required: true, message: '请上传banner图', trigger: 'blur' }
],
systemPosition: [
@ -321,9 +321,10 @@ export default {
},
methods: {
handleRemove(file) {
console.log('删除文件', file)
console.log('删除文件', this.uploadFiles)
// 从 uploadFiles 数组中移除该文件
this.uploadFiles = this.uploadFiles.filter(item => item.uid !== file.uid);
// 清空 deviceInfo.productImage
this.deviceInfo.productImage = '';
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
@ -502,5 +503,12 @@ export default {
width: 98px;
height: 98px;
}
.centered-image {
display: flex;
justify-content: center;
align-items: center;
height: 100%;
}
</style>

2
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -46,7 +46,7 @@
</el-form-item>
</el-form>
<div style="overflow: auto">
<div style="height: 70vh; overflow: auto;">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="商品名称"></el-table-column>

18
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div class="card-change">
<div class="card-change" style="min-height: 80vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="notificationName">
<el-input
@ -99,12 +99,12 @@
<el-form :model="form" ref="form" :rules="rules" label-width="120px">
<!-- 通知名称 -->
<el-form-item label="通知名称" prop="notificationName">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px" ></el-input>
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 100%" ></el-input>
</el-form-item>
<!-- 通知类型 -->
<el-form-item label="通知类型" prop="notificationType">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 100%">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="系统升级" value="系统升级"></el-option>
<!-- 添加其他选项 -->
@ -113,7 +113,8 @@
<!-- 通知模板 -->
<el-form-item label="通知模板" prop="templateContent">
<el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit style="width: 300px"></el-input>
<el-input type="textarea" v-model="form.templateContent" :rows="3" placeholder="请输入通知内容" :maxlength="200" show-word-limit
style="width: 100%"></el-input>
<div>
<span @click = "insertText('{系统到期日期}')">{系统到期日期}</span>
<span @click = "insertText('{剩余交易流量}')">{剩余交易流量}</span>
@ -124,7 +125,7 @@
<!-- 接收角色 -->
<el-form-item label="接收角色" prop="recipientRoles">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 300px">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" style="width: 100%">
<el-option v-for="item in dutyList1" :label="item.dutyName" :value="item.dutyId" ></el-option>
</el-select>
</el-form-item>
@ -137,7 +138,7 @@
<!-- 发送条件 -->
<el-form-item label="发送条件" style="margin-bottom: 10px" prop="conditions">
<div v-for="(condition, index) in form.conditions" :key="index" class="condition-group" style="margin-bottom: 10px">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 150px;margin-right: 10px" @change="changeField(index)">
<el-select v-model="condition.field" placeholder="请选择条件" style="width: 45%;margin-right: 10px" @change="changeField(index)">
<el-option label="系统到期日期" value="系统到期日期"></el-option>
<el-option label="剩余交易量" value="剩余交易量"></el-option>
<el-option label="系统服务费统计" value="系统服务费统计"></el-option>
@ -149,10 +150,11 @@
<!-- <el-option label="小于" value="小于"></el-option>-->
<!-- &lt;!&ndash; 添加其他选项 &ndash;&gt;-->
<!-- </el-select>-->
<el-input v-model="condition.value" placeholder="请输入数值" style="width: 200px;margin-right: 10px">
<el-input v-model="condition.value" placeholder="请输入数值" style="width: 45%;margin-right: 10px">
<template slot="append">{{ condition.field === '剩余交易量' || condition.field === '系统服务费统计' ? '万元' : '天' }}</template>
</el-input>
<el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button>
<!-- <el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button> -->
<i @click="removeCondition(index)" class="el-icon-delete" circle></i>
</div>
<el-button @click="addCondition" type="primary" icon="el-icon-plus">添加条件</el-button>
</el-form-item>

25
fuintAdmin_zt/src/views/system/notify/page/record.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<div class="card-change">
<div class="card-change" style="min-height: 80vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="deptName">
<el-input
@ -111,13 +111,13 @@
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="27%" append-to-body>
<el-form ref="form" :model="form" label-width="120px" :rules="rules" >
<!-- 通知名称 -->
<el-form-item label="通知名称" prop="notificationName">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 300px;"></el-input>
<el-form-item label="通知名称" prop="notificationName" style="margin-left: -30px;">
<el-input v-model="form.notificationName" placeholder="请输入通知名称" style="width: 100%;"></el-input>
</el-form-item>
<!-- 通知类型 -->
<el-form-item label="通知类型" prop="notificationType" >
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 300px;">
<el-form-item label="通知类型" prop="notificationType" style="margin-left: -30px;">
<el-select v-model="form.notificationType" placeholder="请选择通知类型" style="width: 100%;">
<el-option label="到期提醒" value="到期提醒"></el-option>
<el-option label="系统升级" value="系统升级"></el-option>
<!-- 添加其他选项 -->
@ -126,21 +126,21 @@
</el-form-item>
<!-- 通知模板 -->
<el-form-item label="通知内容" prop="templateContent">
<el-form-item label="通知内容" prop="templateContent" style="margin-left: -30px;">
<el-input type="textarea" v-model="form.templateContent" placeholder="请输入通知内容" :maxlength="200"
show-word-limit style="width: 300px;"></el-input>
show-word-limit style="width: 100%;"></el-input>
</el-form-item>
<!-- 接收角色 -->
<el-form-item label="接收角色" prop="recipientRoles">
<el-form-item label="接收角色" prop="recipientRoles" style="margin-left: -30px;">
<el-select v-model="form.recipientRoles" multiple placeholder="请选择角色" @change="getUserByRoles"
style="width: 300px;">
style="width: 100%;">
<el-option v-for="item in dutyList1" :key="item.id" :label="item.dutyName" :value="item.dutyId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="接收用户" prop="recipientUser">
<el-form-item label="接收用户" prop="recipientUser" style="margin-left: -30px;">
<div
style="border: 1px solid #DCDFE6;width: 300px;height: 100px; border-radius: 4px; flex-wrap: wrap;overflow-y: scroll;">
style="border: 1px solid #DCDFE6; width: 100%; height: 100px; border-radius: 4px; flex-wrap: wrap;overflow-y :hidden;">
<div style="display: flex;margin: 10px;">
<div @click="clickAdd" style="height: 32px;display: flex;
justify-content: center; /* 水平居中 */
@ -162,8 +162,9 @@
<!-- </el-form-item>-->
</el-form>
<div style="margin-left: 160px;">
<el-button style="margin-right: 20px" type="primary" @click="userEnter1('form')">确定</el-button>
<el-button @click="userCe2">取 消</el-button>
<el-button style="margin-left: 30px;" type="primary" @click="userEnter1('form')">保 存</el-button>
</div>
</el-dialog>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open1" width="50%" append-to-body>