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

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-08-05 14:59:51 +08:00
commit 63ea54e1ed
6 changed files with 148 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,17 +67,17 @@
:data="orderList" :data="orderList"
style="width: 100%"> style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/> <el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="车队名称"></el-table-column> <el-table-column prop="fleetName" align="center" label="车队名称"></el-table-column>
<el-table-column prop="parentName" align="center" label="卡名称"></el-table-column> <el-table-column prop="cardType" align="center" label="卡类型"></el-table-column>
<el-table-column prop="payMoney" align="center" label="车队负责人"></el-table-column> <el-table-column prop="fleetLeader" align="center" label="车队负责人"></el-table-column>
<el-table-column prop="count" align="center" label="手机号"></el-table-column> <el-table-column prop="mobile" align="center" label="手机号"></el-table-column>
<el-table-column prop="refMoney" align="center" label="会员等级"></el-table-column> <el-table-column prop="gradeId" align="center" label="会员等级"></el-table-column>
<el-table-column prop="refCount" align="center" label="油站负责人"></el-table-column> <el-table-column prop="staffId" align="center" label="油站负责人"></el-table-column>
<el-table-column align="center" prop="date" label="总余额"></el-table-column> <el-table-column align="center" prop="totalBalance" label="总余额"></el-table-column>
<el-table-column align="center" prop="date" label="充值本金"></el-table-column> <el-table-column align="center" prop="rechargeAmount" label="充值本金"></el-table-column>
<el-table-column align="center" prop="date" label="赠送金额"></el-table-column> <el-table-column align="center" prop="giveAmount" label="赠送金额"></el-table-column>
<el-table-column align="center" prop="date" label="公司名称"></el-table-column> <el-table-column align="center" prop="corporateName" label="公司名称"></el-table-column>
<el-table-column align="center" prop="date" label="状态"> <el-table-column align="center" prop="status" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.status" v-model="scope.row.status"
@ -88,9 +88,9 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="date" label="备注"></el-table-column> <el-table-column align="center" prop="remark" label="备注"></el-table-column>
<el-table-column align="center" prop="date" label="创建人"></el-table-column> <el-table-column align="center" prop="createBy" label="创建人"></el-table-column>
<el-table-column align="center" prop="date" label="创建时间"></el-table-column> <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" label="操作"> <el-table-column align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -125,25 +125,45 @@
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="车队名称" prop="realName"> <el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form.realName" placeholder="请输入车队名称" maxlength="30" style="width: 270px"/> <el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" style="width: 270px"/>
</el-form-item> </el-form-item>
<el-form-item label="卡类型" prop="gongneng"> <el-form-item label="卡类型" prop="cardType">
<!-- <el-checkbox-group v-model="form.gongneng">--> <el-checkbox-group v-model="form.cardType">
<el-checkbox v-model="form.gongneng" label="储值卡"></el-checkbox> <el-checkbox label="储值卡" name="type"></el-checkbox>
<el-checkbox v-model="form.gongneng" label="囤油卡"></el-checkbox> <el-checkbox label="囤油卡" name="type"></el-checkbox>
<!-- </el-checkbox-group>--> </el-checkbox-group>
</el-form-item> </el-form-item>
<el-form-item label="车队负责人" prop="pinpai"> <el-form-item label="车队负责人" prop="fleetLeader">
<el-input v-model="form.pinpai" placeholder="请输入车队负责人姓名" maxlength="30" style="width: 270px"/> <el-input v-model="form.fleetLeader" placeholder="请输入车队负责人姓名" maxlength="30" style="width: 270px"/>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="zhongduan"> <el-form-item label="手机号" prop="mobile">
<el-input v-model="form.zhongduan" placeholder="请输入手机号" /> <el-input v-model="form.mobile" placeholder="请输入手机号" />
</el-form-item> </el-form-item>
<el-form-item label="会员等级" prop="miyao"> <el-form-item label="会员等级" prop="gradeId">
<el-select v-model="form1.zhongduan" placeholder="请选择会员等级"> <el-select v-model="form1.gradeId" placeholder="请选择会员等级">
<el-option
v-for="item in userGradeList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="油站负责人" prop="staffId">
<el-select v-model="form1.staffId" placeholder="请选择油站负责人">
<el-option
v-for="item in staffList"
:key="item.id"
:label="item.realName"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员标签" prop="userLabelId">
<el-select v-model="form1.userLabelId" placeholder="请选择会员标签">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
@ -152,29 +172,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="油站负责人" prop="miyao">
<el-select v-model="form1.zhongduan" placeholder="请选择油站负责人">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="会员标签" prop="miyao">
<el-select v-model="form1.zhongduan" placeholder="请选择会员标签">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="关联员工" prop="staffId">
<el-input v-model="form.staffId" placeholder="请输入关联员工" />
</el-form-item>
<el-form-item label="用户状态" prop="status"> <el-form-item label="用户状态" prop="status">
@ -188,7 +185,7 @@
</el-form-item> </el-form-item>
<el-form-item label="备注" > <el-form-item label="备注" >
<el-input v-model="form.desc" placeholder="请输入备注" type="textarea"/> <el-input v-model="form.remark" placeholder="请输入备注" type="textarea"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -202,23 +199,23 @@
<el-dialog :title="title" :visible.sync="open1" width="30%" append-to-body> <el-dialog :title="title" :visible.sync="open1" width="30%" append-to-body>
<el-form ref="form1" :model="form1" :rules="rules" label-width="120px"> <el-form ref="form1" :model="form1" :rules="rules" label-width="120px">
<el-form-item label="车队名称" prop="realName"> <el-form-item label="车队名称" prop="fleetName">
<el-input v-model="form1.realName" placeholder="请输入车队名称" maxlength="30" style="width: 270px"/> <el-input v-model="form1.fleetName" placeholder="请输入车队名称" maxlength="30" style="width: 270px"/>
</el-form-item> </el-form-item>
<el-form-item label="充值金额" prop="pinpai"> <el-form-item label="充值金额" prop="rechargeAmount">
<el-input v-model="form1.pinpai" placeholder="请输入充值金额" maxlength="30" style="width: 270px"> <el-input v-model="form1.rechargeAmount" placeholder="请输入充值金额" maxlength="30" style="width: 270px">
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="赠送金额" prop="zhongduan"> <el-form-item label="赠送金额" prop="giveAmount">
<el-input v-model="form1.zhongduan" placeholder="请输入赠送金额" > <el-input v-model="form1.giveAmount" placeholder="请输入赠送金额" >
<template slot="append">元</template> <template slot="append">元</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="支付方式" prop="miyao"> <el-form-item label="支付方式" prop="paymentType">
<el-select v-model="form1.zhongduan" placeholder="请选择支付方式"> <el-select v-model="form1.paymentType" placeholder="请选择支付方式">
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item.value" :key="item.value"
@ -229,10 +226,10 @@
</el-form-item> </el-form-item>
<el-form-item label="备注" > <el-form-item label="备注" >
<el-input v-model="form1.desc" placeholder="请输入备注" type="textarea"/> <el-input v-model="form1.remark" placeholder="请输入备注" type="textarea"/>
</el-form-item> </el-form-item>
<el-form-item label="操作密码" prop="miyao"> <el-form-item label="操作密码" prop="password">
<el-input v-model="form1.miyao" placeholder="请输入操作密码" type="password" /> <el-input v-model="form1.password" placeholder="请输入操作密码" type="password" />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -246,7 +243,9 @@
<script> <script>
import {delStaff} from "@/api/staff/staff"; import {delStaff, queryStaffs} from "@/api/staff/staff";
import {getFleetInfoList} from "@/api/fleet/fleetinfo";
import {listUserGrade} from "@/api/staff/user/usergrade";
export default { export default {
dicts: ['zhzt'], dicts: ['zhzt'],
@ -263,7 +262,11 @@ export default {
// 收银台订单列表 // 收银台订单列表
orderList: [], orderList: [],
deptList: [], deptList: [],
form:{}, userGradeList:[],
staffList:[],
form:{
cardType:[]
},
form1:{}, form1:{},
options: [{ options: [{
value: '选项1', value: '选项1',
@ -289,35 +292,59 @@ export default {
total: 0, total: 0,
// 表单校验 // 表单校验
rules: { rules: {
realName: [ fleetName: [
{required: true, message: "设备名称不能为空", trigger: "blur"}, {required: true, message: "车队名称不能为空", trigger: "blur"},
], ],
pinpai: [ cardType: [
{required: true, message: "品牌不能为空", trigger: "blur"}, {required: true, message: "卡类型不能为空", trigger: "blur"},
], ],
gongneng: [ fleetLeader: [
{required: true, message: "设备功能不能为空", trigger: "blur"} {required: true, message: "车队负责人不能为空", trigger: "blur"}
], ],
zhongduan: [ mobile: [
{required: true, message: "设备终端号不能为空", trigger: "blur"} {required: true, message: "手机号不能为空", trigger: "blur"}
], ],
miyao: [ gradeId: [
{required: true, message: "密钥不能为空", trigger: "blur"} {required: true, message: "会员等级不能为空", trigger: "blur"}
], ],
staffId: [ staffId: [
{required: true, message: "关联员工不能为空", trigger: "blur"} {required: true, message: "油站负责人不能为空", trigger: "blur"}
], ],
status: [ status: [
{required: true, message: "状态不能为空", trigger: "blur"} {required: true, message: "状态不能为空", trigger: "blur"}
],
rechargeAmount: [
{required: true, message: "充值金额不能为空", trigger: "blur"}
],
giveAmount: [
{required: true, message: "赠送金额不能为空", trigger: "blur"}
],
paymentType: [
{required: true, message: "支付方式不能为空", trigger: "blur"}
],
password: [
{required: true, message: "操作密码不能为空", trigger: "blur"}
] ]
} }
} }
}, },
created() { created() {
this.getList(); this.getList();
this.getUserGradeList()
this.getStaffList()
}, },
methods: { methods: {
// 查询会员等级列表
getUserGradeList(){
listUserGrade({page:1,pageSize:1000}).then(res => {
this.userGradeList = res.data.records
})
},
getStaffList(){
queryStaffs().then(res => {
this.staffList = res.data
})
},
getDeptList() { getDeptList() {
// getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => { // getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
// this.deptList = response.data.records; // this.deptList = response.data.records;
@ -330,6 +357,10 @@ export default {
dateRange.push(this.beginTime.toLocaleDateString()) dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString()) dateRange.push(this.endTime.toLocaleDateString())
} }
getFleetInfoList(this.addDateRange(this.queryParams, dateRange)).then(res => {
this.orderList = res.data.records
this.total = res .data.total
})
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {

6
fuintAdmin_zt/src/views/components/Service/payment.vue
View File

@ -406,15 +406,14 @@
</el-input> </el-input>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="show = false">取 消</el-button> <el-button @click="show = false">取 消</el-button>
<el-button type="primary" @click="submitRemark">确 定</el-button> <el-button type="primary" @click="submitRemark">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 编辑通道规则--> <!-- 编辑通道规则-->
<el-dialog :title="title" :visible.sync="dialogFormVisible" <el-dialog :title="title" :visible.sync="dialogFormVisible"
width="30%"> width="30%">
<el-form :model="form" ref="form"> <el-form :model="form" ref="form">
<el-form-item label="支付通道" :label-width="formLabelWidth" width="300px"> <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
<el-select v-model="form.merchConfigId" <el-select v-model="form.merchConfigId"
@change="changeMerch" @change="changeMerch"
@ -548,6 +547,9 @@ export default {
tableData: [], tableData: [],
tableData1: [], tableData1: [],
rules: { rules: {
merchConfigId:[
{required: true, message: '请选择商户配置', trigger: 'blur'}
],
merchantName: [ merchantName: [
{required: true, message: '请选择支付通道', trigger: 'blur'}, {required: true, message: '请选择支付通道', trigger: 'blur'},
], ],

23
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -116,13 +116,11 @@
<div class="hui-hang"></div> <div class="hui-hang"></div>
<div class="h-tt" >活跃油站</div> <div class="h-tt" >活跃油站</div>
<div class="d-s" style="justify-content: space-around" > <div class="d-s" style="justify-content: space-around" >
<div id="ccc" style="width: 750px;height: 600px;"></div> <div id="ccc" style="width: 400px;height: 350px;"></div>
<div>
<div id="cttt" style="width: 350px;height: 300px;"></div> <div id="cttt" style="width: 350px;height: 300px;"></div>
<div id="ccct" style="width: 350px;height: 300px;"></div> <div id="ccct" style="width: 350px;height: 300px;"></div>
</div> </div>
</div> </div>
</div>
<div class="right-box-t"> <div class="right-box-t">
<!-- <div class="h-tt" >硬件设备</div>--> <!-- <div class="h-tt" >硬件设备</div>-->
<div class="title_"> <div class="title_">
@ -400,12 +398,10 @@ export default {
trigger: 'item', trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)' formatter: '{a} <br/>{b}: {c} ({d}%)'
}, },
legend: { legend: {
top: '0%', bottom: '0%',
left: 'center' left: 'center'
}, },
series: [ series: [
{ {
name: '', name: '',
@ -436,17 +432,20 @@ export default {
length: 30 length: 30
}, },
label: { label: {
formatter: '{a|{a}}{abg|}\n{hr|}\n {b|{b}：}{c} {per|{d}%} ', // show: false,
position: 'inner',
formatter: ' {d}% ',
rich: { rich: {
b: { b: {
color: '#4C5058', color: '#fff',
fontSize: 14, fontSize: 14,
fontWeight: 'bold', fontWeight: 'bold',
lineHeight: 14 lineHeight: 14
}, },
per: { per: {
color: '#fff', color: '#fff',
backgroundColor: '#4C5058',
padding: [3, 4], padding: [3, 4],
borderRadius: 4 borderRadius: 4
} }
@ -512,9 +511,9 @@ export default {
radius: ['40%', '80%'], radius: ['40%', '80%'],
avoidLabelOverlap: false, avoidLabelOverlap: false,
itemStyle: { itemStyle: {
borderRadius: 10,
borderColor: '#fff', borderColor: '#fff',
borderWidth: 10
}, },
data: [ data: [
@ -758,7 +757,7 @@ export default {
height: 100%; height: 100%;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
height: 808px; height: 558px;
overflow: auto; overflow: auto;
} }
.san-box{ .san-box{

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/entity/FleetInfo.java
View File

@ -59,11 +59,11 @@ public class FleetInfo extends BaseEntity implements Serializable {
/** /**
* 员工id * 员工id
*/ */
private Integer staffId; private String staffId;
/** /**
* 会员标签id * 会员标签id
*/ */
private Integer userLabelId; private String userLabelId;
/** /**
* 会员状态 * 会员状态
*/ */
@ -79,11 +79,11 @@ public class FleetInfo extends BaseEntity implements Serializable {
/** /**
* 充值金额 * 充值金额
*/ */
private Double rechargeAmount; private String rechargeAmount;
/** /**
* 赠送金额 * 赠送金额
*/ */
private Double giveAmount; private String giveAmount;
/** /**
* 公司名称 * 公司名称
*/ */

20
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetInfoVo.java Normal file
View File

@ -0,0 +1,20 @@
package com.fuint.business.fleet.vo;
import com.fuint.business.fleet.entity.FleetInfo;
import lombok.Data;
@Data
public class FleetInfoVo extends FleetInfo {
/**
* 等级名称
*/
private String gradeName;
/**
* 创建人
*/
private String accountName;
/**
* 油站负责人
*/
private String oilHead;
}

9
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,15 +1,10 @@
# \u57FA\u672C\u914D\u7F6E # \u57FA\u672C\u914D\u7F6E
server.port=8081 server.port=8081
env.profile=dev env.profile=dev
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/ #env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/ #env.properties.path=F:/work/oilSystem/fuintBackend/configure/
env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
#env.properties.path=D:/code/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/oilSystem/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/ #env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E # \u6570\u636E\u5E93\u914D\u7F6E