Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
efaf87cb3e
BIN
fuintAdmin/src/assets/images/box-left.png
Normal file
BIN
fuintAdmin/src/assets/images/box-left.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
fuintAdmin/src/assets/images/loginback.png
Normal file
BIN
fuintAdmin/src/assets/images/loginback.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 226 KiB |
@ -173,7 +173,7 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="会员等级" prop="region" v-if="form.groupOriented == '2' " >
|
||||
<el-select v-model="form.membershipLevel" placeholder="会员等级" >
|
||||
<el-select v-model="form.membershipLevel" multiple placeholder="会员等级" >
|
||||
<el-option v-for="(item,index) in vipname" :key="index" :label="item.name" :value="item.name"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
@ -657,7 +657,7 @@
|
||||
activeStatus:'1',
|
||||
paymentValue:'1',
|
||||
amountCommission:'',
|
||||
membershipLevel:'',
|
||||
membershipLevel:[],
|
||||
percentageCommissions:'',
|
||||
fringeBenefit:'',
|
||||
cardValueChildList:[],
|
||||
@ -823,7 +823,7 @@
|
||||
chongzhi(){
|
||||
this.form = {
|
||||
sort:1,
|
||||
membershipLevel:'',
|
||||
membershipLevel:[],
|
||||
groupOriented: '1',
|
||||
rechargeBalance:'',
|
||||
giftBalance:'',
|
||||
|
||||
@ -340,9 +340,6 @@
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
|
||||
|
||||
|
||||
<el-form-item label="参与条件" prop="participationCondition">
|
||||
<el-select v-model="form.participationCondition" clearable placeholder="请选择天参与条件">
|
||||
<el-option label="不限制" value="0"></el-option>
|
||||
@ -765,12 +762,13 @@ export default {
|
||||
this.$message.error("该商品已存在")
|
||||
return
|
||||
}
|
||||
this.pdswidlist.push( this.shopdata.goodsId.id)
|
||||
this.pdswidlist.push( this.shopdata.goodsId.id,)
|
||||
let data = {
|
||||
activeGift: 4,
|
||||
goodsIds : this.shopdata.goodsId.id,
|
||||
goodsName: this.shopdata.goodsId.name,
|
||||
goodsTotal:1
|
||||
|
||||
goodsTotal:this.shopdata.count
|
||||
}
|
||||
this.form.shiwudata.push(data)
|
||||
|
||||
|
||||
@ -322,7 +322,7 @@
|
||||
<el-col v-if="showList.je" :span="8">
|
||||
<el-form-item label="兑换金额" prop="exchangeAmount">
|
||||
<el-input v-model="dataForm.exchangeAmount" placeholder="" maxlength="30" style="width: 202px;">
|
||||
<template slot="append">积分</template>
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -423,9 +423,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 打开商品界面 -->
|
||||
|
||||
|
||||
<!-- 打开商品界面 -->
|
||||
<el-dialog title="选择商品" :visible.sync="openCommodity" width="1000px" append-to-body :close-on-click-modal="false">
|
||||
<el-container>
|
||||
<el-header style="">
|
||||
@ -438,7 +436,7 @@
|
||||
placeholder="全部"
|
||||
clearable
|
||||
>
|
||||
<el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
|
||||
<el-option v-for="item in giftCategoryList" :key="item.id" :label="item.name" :value="item.id"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -747,11 +745,12 @@ export default {
|
||||
isRecovery:0,
|
||||
},
|
||||
|
||||
// 商品分类列表
|
||||
|
||||
cvsGoodList:[],
|
||||
// 供应商列表
|
||||
supplierList:[],
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
@ -865,27 +864,26 @@ export default {
|
||||
|
||||
this.cardFavorableApi();
|
||||
this.cardExchangeApi();
|
||||
this.selectGiftCategory();
|
||||
|
||||
|
||||
// 处理图片
|
||||
let fileList = JSON.parse(data.giftImages);
|
||||
this.giftImages = [],
|
||||
|
||||
this.giftImages = fileList;
|
||||
|
||||
console.log( this.giftImages);
|
||||
|
||||
this.giftImages.forEach(image=>{
|
||||
let sp = image.url.split('//')
|
||||
image.url = this.imagePath + '/'+sp[2]
|
||||
})
|
||||
console.log("data",data.deliveryMethod);
|
||||
|
||||
|
||||
// data.deliveryMethod = JSON.parse(data.deliveryMethod);
|
||||
|
||||
// 查询兑换卷和优惠券列表
|
||||
|
||||
this.dataForm = data;
|
||||
this.changeGiftType(this.dataForm.giftType)
|
||||
this.changeExchange(this.dataForm.exchangeMethod)
|
||||
this.changeExpressEDIT()
|
||||
|
||||
|
||||
console.log(" this.dataForm", this.dataForm)
|
||||
|
||||
this.open = true;
|
||||
this.getList();
|
||||
},
|
||||
@ -1001,6 +999,7 @@ export default {
|
||||
},
|
||||
// 选择礼品类型
|
||||
changeGiftType(newVal) {
|
||||
console.log("")
|
||||
let this_ = this
|
||||
if (newVal == '优惠券') {
|
||||
this_.showList.coupon = true
|
||||
@ -1041,30 +1040,46 @@ export default {
|
||||
this_.showList.jfjq = true
|
||||
}
|
||||
},
|
||||
// 快递
|
||||
// 快递（处理选择）
|
||||
changeExpress(data,flag){
|
||||
let this_ = this
|
||||
// express: false,
|
||||
console.log("data",data)
|
||||
// shippingFee: false
|
||||
console.log("flag",flag)
|
||||
console.log("this.dataForm.deliveryMethod",this.dataForm.deliveryMethod)
|
||||
if(flag === 1) {
|
||||
if (!this.dataForm.deliveryMethod) {
|
||||
this.dataForm.deliveryMethod = [];
|
||||
this.showList.express= false
|
||||
}
|
||||
if (!Array.isArray(this.dataForm.deliveryMethod)) {
|
||||
this.dataForm.deliveryMethod = JSON.parse(this.dataForm.deliveryMethod);
|
||||
|
||||
}
|
||||
// const jsonArray = JSON.parse(this.dataForm.deliveryMethod);
|
||||
// const index = jsonArray.indexOf(data);
|
||||
const index = this.dataForm.deliveryMethod.indexOf(data);
|
||||
if (index === -1) {
|
||||
this.dataForm.deliveryMethod.push(data);
|
||||
// const jsonArray = JSON.parse(this.dataForm.deliveryMethod);
|
||||
// jsonArray.push(data)
|
||||
// this.dataForm.deliveryMethod = jsonArray
|
||||
console.log("data1",data)
|
||||
|
||||
if(data == '物流配送') {
|
||||
this.showList.express= true
|
||||
}
|
||||
} else {
|
||||
this.dataForm.deliveryMethod.splice(index, 1);
|
||||
console.log("data2",data)
|
||||
this.dataForm.deliveryMethod.splice(index, 1)
|
||||
// const jsonArray = JSON.parse(this.dataForm.deliveryMethod);
|
||||
// jsonArray.splice(index, 1);
|
||||
// this.dataForm.deliveryMethod = JSON.stringify(jsonArray)
|
||||
|
||||
if(data == '物流配送') {
|
||||
this.showList.express= false
|
||||
}
|
||||
}
|
||||
console.log("data",this.dataForm.deliveryMethod)
|
||||
} else {
|
||||
if (data == '包邮') {
|
||||
this.showList.shippingFee= false
|
||||
@ -1073,6 +1088,31 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
// 快递 修改时处理
|
||||
changeExpressEDIT(){
|
||||
if (!this.dataForm.deliveryMethod) {
|
||||
this.dataForm.deliveryMethod = [];
|
||||
this.showList.express= false
|
||||
}
|
||||
if(!this.dataForm.expressShippingFee) {
|
||||
this.dataForm.expressShippingFee= ''
|
||||
this.showList.shippingFee= false
|
||||
}
|
||||
let this_ = this
|
||||
if (!Array.isArray(this_.dataForm.deliveryMethod)) {
|
||||
this_.dataForm.deliveryMethod = JSON.parse(this_.dataForm.deliveryMethod);
|
||||
}
|
||||
if (this_.dataForm.deliveryMethod.includes("物流配送")) {
|
||||
this.showList.express= true
|
||||
|
||||
}
|
||||
if (this_.dataForm.expressShippingFee == "统一运费") {
|
||||
this.showList.shippingFee= true
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
|
||||
// 点击按钮处理
|
||||
handleIsopenSelect() {
|
||||
|
||||
@ -1,17 +1,25 @@
|
||||
<template>
|
||||
<div class="login">
|
||||
<div class="login-main">
|
||||
<div class="caption">
|
||||
<h4 class="caption-title">{{ systemName }}</h4>
|
||||
<p class="caption-remark">欢迎使用 {{ systemName }}，您的卡券、储值卡、计次卡等会员营销小管家！</p>
|
||||
<div class="box-center">
|
||||
<div class="box-left">
|
||||
<div class="bai-size">蓝鲸智慧加油站</div>
|
||||
<div class="bact-box">
|
||||
<div class="sanhh">活动营销</div>
|
||||
<div class="sanhh">节省人力</div>
|
||||
<div class="sanhh">精准定位</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="login-form">
|
||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules">
|
||||
<div class="title">
|
||||
<img class="logo" src="@/assets/logo/logo.png"/>
|
||||
<span class="name">{{ systemName }}</span>
|
||||
<div class="box-right">
|
||||
<div class="box-title">
|
||||
<div style="margin-right: 15px;cursor: pointer " v-for="(item,index) in dlyzm" :key="index" @click="actindex = item.type " >
|
||||
<div>{{item.text}}</div>
|
||||
<div class="gangs" v-if="item.type == actindex " ></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 0" >
|
||||
|
||||
|
||||
<el-form-item prop="username">
|
||||
<el-input
|
||||
v-model="loginForm.username"
|
||||
@ -36,18 +44,23 @@
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="captchaCode" v-if="captchaOnOff">
|
||||
<div style="display: flex;align-items: center">
|
||||
|
||||
<div>
|
||||
<el-input
|
||||
v-model="loginForm.captchaCode"
|
||||
auto-complete="off"
|
||||
placeholder="请输入验证码"
|
||||
style="width: 63%"
|
||||
style="width: 90%"
|
||||
clearable
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
<div class="login-code">
|
||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
||||
</div>
|
||||
<div class="login-code">
|
||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||
@ -63,7 +76,77 @@
|
||||
<span v-else>登 录 中...</span>
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-form>
|
||||
<!-- 验证码-->
|
||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 1" >
|
||||
<!-- <div class="title">-->
|
||||
<!-- <img class="logo" src="@/assets/logo/logo.png"/>-->
|
||||
<!-- <span class="name">{{ systemName }}</span>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<el-form-item prop="username">
|
||||
<el-input
|
||||
v-model="loginForm.username"
|
||||
type="text"
|
||||
auto-complete="off"
|
||||
clearable
|
||||
placeholder="账号"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="captchaCode" v-if="captchaOnOff">
|
||||
<div style="display: flex;align-items: center">
|
||||
|
||||
<div>
|
||||
<el-input
|
||||
v-model="loginForm.captchaCode"
|
||||
auto-complete="off"
|
||||
placeholder="请输入验证码"
|
||||
style="width: 90%"
|
||||
clearable
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</div>
|
||||
<div>
|
||||
<span class="anniulan" v-show="show" @click="getCode" >获取验证码</span>
|
||||
<span v-show="!show" class="count">{{count}}s后重新获取</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||
<el-form-item style="width:100%;">
|
||||
<el-button
|
||||
:loading="loading"
|
||||
size="medium"
|
||||
type="primary"
|
||||
style="width:100%;line-height: 24px;font-size: 16px;"
|
||||
@click.native.prevent=""
|
||||
>
|
||||
<span v-if="!loading">立即登录</span>
|
||||
<span v-else>登 录 中...</span>
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<!-- <div class="login-main">-->
|
||||
<!-- <div class="caption">-->
|
||||
<!-- <h4 class="caption-title">{{ systemName }}</h4>-->
|
||||
<!-- <p class="caption-remark">欢迎使用 {{ systemName }}，您的卡券、储值卡、计次卡等会员营销小管家！</p>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
|
||||
|
||||
<div class="login-form">
|
||||
|
||||
<div class="copy-right">
|
||||
<span>Copyright © 2020-2023 <a class="link" href="https://www.fuint.cn">fuint.cn</a> All Rights Reserved.</span>
|
||||
</div>
|
||||
@ -75,11 +158,21 @@
|
||||
import { getCodeImg } from "@/api/login";
|
||||
import Cookies from "js-cookie";
|
||||
import { encrypt, decrypt } from '@/utils/jsencrypt'
|
||||
import BalanceRecharge from "@/views/member/balanceRecharge.vue";
|
||||
|
||||
export default {
|
||||
name: "Login",
|
||||
components: {BalanceRecharge},
|
||||
data() {
|
||||
return {
|
||||
show: true,
|
||||
count: '',
|
||||
timer: null,
|
||||
dlyzm:[
|
||||
{text:'登录',type:'0'},
|
||||
{text: "验证码",type:'1'}
|
||||
],
|
||||
actindex:0,
|
||||
codeUrl: "",
|
||||
systemName : process.env.VUE_APP_TITLE,
|
||||
loginForm: {
|
||||
@ -115,11 +208,27 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getCode();
|
||||
this.getCodeimg();
|
||||
this.getCookie();
|
||||
},
|
||||
methods: {
|
||||
getCode() {
|
||||
const TIME_COUNT = 60;
|
||||
if (!this.timer) {
|
||||
this.count = TIME_COUNT;
|
||||
this.show = false;
|
||||
this.timer = setInterval(() => {
|
||||
if (this.count > 0 && this.count <= TIME_COUNT) {
|
||||
this.count--;
|
||||
} else {
|
||||
this.show = true;
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
}
|
||||
}, 1000)
|
||||
}
|
||||
},
|
||||
getCodeimg() {
|
||||
const app = this
|
||||
getCodeImg().then(response => {
|
||||
app.codeUrl = response.data.captcha
|
||||
@ -171,9 +280,86 @@ export default {
|
||||
|
||||
<style rel="stylesheet/scss" lang="scss">
|
||||
.login {
|
||||
height: 100%;
|
||||
height: 100vh;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
background-image: url("../assets/images/loginback.png");
|
||||
overflow: hidden;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
.box-center{
|
||||
width: 1000px;
|
||||
height: 580px;
|
||||
border-radius: 8px;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0px 4px 10px 0px rgba(20,61,129,0.1);
|
||||
border-radius: 16px 16px 16px 16px;
|
||||
opacity: 1;
|
||||
margin: 150px auto;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
|
||||
}
|
||||
.gangs{
|
||||
width: 100%;
|
||||
height: 5px;
|
||||
background: #00aaff;
|
||||
border-radius: 50px;
|
||||
}
|
||||
.box-left{
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
background: #00aaff;
|
||||
background-image: url("../assets/images/box-left.png");
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
}
|
||||
.box-right{
|
||||
width: 50%;
|
||||
box-sizing: border-box;
|
||||
padding: 80px;
|
||||
}
|
||||
.box-title{
|
||||
width: 100%;
|
||||
//text-align: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.bai-size{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
font-size: 40px;
|
||||
font-weight: bold;
|
||||
color: #FFFFFF;
|
||||
margin-top: 65px;
|
||||
|
||||
}
|
||||
.bact-box{
|
||||
width: 85%;
|
||||
margin: 15px auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 40px;
|
||||
|
||||
}
|
||||
.sanhh{
|
||||
width: 112px;
|
||||
height: 34px;
|
||||
background: linear-gradient(90deg, #E1EBFF 0%, #FFFFFF 100%);
|
||||
border-radius: 2px 2px 2px 2px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 16px;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #1755D0;
|
||||
}
|
||||
|
||||
.login-main {
|
||||
background-image: url("../assets/images/login-bg.png");
|
||||
position: fixed;
|
||||
|
||||
@ -337,7 +337,7 @@
|
||||
<el-input placeholder="请输入充值金额"
|
||||
size="medium"
|
||||
v-model.number="cardValueForm.amount"
|
||||
@change="valueAmoutChange(cardValueForm.amount)">
|
||||
@input="valueAmoutChange(cardValueForm.amount)">
|
||||
<template slot="prepend">自定义</template>
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
@ -1017,6 +1017,18 @@ export default {
|
||||
},
|
||||
|
||||
valueAmoutChange(data) {
|
||||
|
||||
|
||||
this.cardValueForm.points = ''
|
||||
this.cardValueForm.bidBalance =''
|
||||
this.cardValueForm.giftBalance =''
|
||||
this.cardValueForm.growthValue = ''
|
||||
this.cardValueForm.rechargeBalance = ''
|
||||
|
||||
this.cardValueForm.royaltyType = ''
|
||||
this.cardValueForm.percentageCommissions = ''
|
||||
this.cardValueForm.amountCommission = ''
|
||||
|
||||
this.cardValueForm.rechargeBalance = data
|
||||
|
||||
if (this.cardValueList.length > 0){
|
||||
@ -1033,6 +1045,7 @@ export default {
|
||||
this.cardValueForm.percentageCommissions = change.percentageCommissions
|
||||
this.cardValueForm.amountCommission = change.amountCommission
|
||||
|
||||
|
||||
// 计算员工提成金额
|
||||
if (change.royaltyType === "3") {
|
||||
// 当按比例提成时 计算对应的金额
|
||||
@ -1047,6 +1060,7 @@ export default {
|
||||
})
|
||||
}
|
||||
console.log("data",data)
|
||||
console.log("this.cardValueForm",this.cardValueForm)
|
||||
},
|
||||
// 存油卡查询
|
||||
getCardFuelDieselList() {
|
||||
|
||||
@ -163,6 +163,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
|
||||
this.$forceUpdate()
|
||||
},
|
||||
getList() {
|
||||
this.gunList = []
|
||||
getGunApi().then(response => {
|
||||
this.gunList = response.data;
|
||||
})
|
||||
@ -224,7 +225,8 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
|
||||
if (response.code == 200) {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.dialogVisible = false;
|
||||
// this.getList();
|
||||
this.getList();
|
||||
|
||||
}else {
|
||||
|
||||
}
|
||||
@ -235,17 +237,18 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
|
||||
if (response.code == 200) {
|
||||
this.$modal.msgSuccess("修改成功");
|
||||
this.dialogVisible = false;
|
||||
// this.getList();
|
||||
this.getList();
|
||||
this.dialogVisible = false
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
this.dialogVisible = false
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
});
|
||||
this.getList();
|
||||
// this.getList();
|
||||
},
|
||||
chooseName() {
|
||||
var this_ = this
|
||||
|
||||
@ -401,15 +401,14 @@ export default {
|
||||
|
||||
// 改变数字时
|
||||
change(data) {
|
||||
// new BigNumber
|
||||
console.log("data",data)
|
||||
// 库存差异升数
|
||||
data.stockDifference = data.inventoryVolume - data.currentInventoryVolume
|
||||
// 盈亏金额
|
||||
data.profitLossAmount = data.inventoryVolume * data.stockDifference
|
||||
data.profitLossAmount = data.stockDifference * data.currentAveragePrice
|
||||
|
||||
this.sumMethod(this.orderList)
|
||||
// 进行保存
|
||||
// this.orderForm = data
|
||||
// this.edit()
|
||||
},
|
||||
|
||||
|
||||
@ -441,20 +440,24 @@ export default {
|
||||
// 添加油罐到订单列表
|
||||
addOrder () {
|
||||
let this_ = this
|
||||
// let oilInventoryOrder = []
|
||||
//
|
||||
// this.multipleSelection.forEach(mul=>{
|
||||
// let now = {
|
||||
// tankId: mul.id,
|
||||
// numberId: mul.numberId,
|
||||
// currentAveragePrice: mul.discountedPrice,
|
||||
// currentInventoryVolume: mul.storedQuantity
|
||||
// }
|
||||
// oilInventoryOrder.push(now)
|
||||
// })
|
||||
|
||||
console.log("this.multipleSelection",this.multipleSelection)
|
||||
this.multipleSelection.forEach(mul=>{
|
||||
const isDuplicate = false
|
||||
if (this.orderList.length > 0) {
|
||||
isDuplicate = this.orderList.some(order => order.tankId === mul.id);
|
||||
}
|
||||
|
||||
if (isDuplicate || isDuplicate == '') {
|
||||
console.log("isDuplicate222")
|
||||
|
||||
this.$message({
|
||||
message: '油罐已经存在，请重新选择',
|
||||
type: 'warning'
|
||||
});
|
||||
this.multipleSelection = []
|
||||
return;
|
||||
}
|
||||
|
||||
let now = {
|
||||
tankId: mul.id,
|
||||
tankName: mul.tankName,
|
||||
@ -466,21 +469,13 @@ export default {
|
||||
}
|
||||
this_.orderList.push(now)
|
||||
})
|
||||
// this_.getList();
|
||||
this_.open = false
|
||||
this.multipleSelection = []
|
||||
|
||||
this_.open = false
|
||||
this.numberOfTanks = this.numberOfTanks+1
|
||||
|
||||
this_.sumMethod(this_.orderList);
|
||||
|
||||
// this_.orderList
|
||||
|
||||
// insertBatchInventoryOrderApi(oilInventoryOrder).then(response => {
|
||||
// this_.$modal.msgSuccess("保存成功");
|
||||
// this_.getList();
|
||||
// this_.open = false
|
||||
// }).catch(response=>{
|
||||
//
|
||||
// })
|
||||
|
||||
},
|
||||
// 表格选择器
|
||||
handleSelectionChange(val) {
|
||||
|
||||
@ -311,7 +311,7 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="当前油站价">
|
||||
<el-input v-model="oilPresetPrices.currentGbPrice" style="width: 217px" readonly>
|
||||
<el-input v-model="oilPresetPrices.currentGbPrice" style="width: 217px" readonly disabled>
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
@ -321,7 +321,7 @@
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="当前国标价">
|
||||
<el-input v-model="oilPresetPrices.currentPetrolPrices" style="width: 217px" readonly>
|
||||
<el-input v-model="oilPresetPrices.currentPetrolPrices" style="width: 217px" readonly disabled>
|
||||
<template slot="append">元</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
@ -631,7 +631,8 @@ import {
|
||||
if (valid) {
|
||||
insertOilNumber(this.oilNumber).then( response => {
|
||||
var list = response.data
|
||||
if (list == 0) {
|
||||
if (list < 0) {
|
||||
this.getList();
|
||||
this.$modal.msgWarning("有重复油号");
|
||||
}else if(list > 0){
|
||||
this.$modal.msgSuccess("新增油号成功");
|
||||
@ -639,7 +640,6 @@ import {
|
||||
this.getList();
|
||||
}
|
||||
|
||||
console.log("updateOilNumber",list)
|
||||
});
|
||||
}
|
||||
})
|
||||
@ -655,6 +655,7 @@ import {
|
||||
updateOilNumber(this_.oilNumber).then( response => {
|
||||
var list = response.data
|
||||
if ( list < 0) {
|
||||
this.getList();
|
||||
this.$modal.msgWarning("油品重复");
|
||||
} else {
|
||||
this.getList();
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
|
||||
<el-form-item label="状态" v-model="queryParams.status" prop="status">
|
||||
<el-select v-model="queryParams.status" placeholder="请选择供应商" style="width:100%" clearable
|
||||
<el-select v-model="queryParams.status" placeholder="请选择状态" style="width:100%" clearable
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.oilPurchasedStatus"
|
||||
|
||||
@ -15,7 +15,7 @@ public interface OilConfigMapper extends BaseMapper<OilConfig> {
|
||||
* 查询油品配置列表信息
|
||||
* @return
|
||||
*/
|
||||
public List<OilConfigVo> selectOilConfigList();
|
||||
public List<OilConfigVo> selectOilConfigList(Integer storeId);
|
||||
|
||||
/**
|
||||
* 根据id查询支付配置信息
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
|
||||
<select id="selectOilConfigList" resultType="com.fuint.api.fuyou.vo.OilConfigVo">
|
||||
<include refid="selectOilConfig"></include>
|
||||
where oc.store_id = #{storeId}
|
||||
</select>
|
||||
<select id="selectOilConfigById" resultType="com.fuint.api.fuyou.vo.OilConfigVo" parameterType="int">
|
||||
<include refid="selectOilConfig"></include>
|
||||
|
||||
@ -61,7 +61,8 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
|
||||
|
||||
@Override
|
||||
public List<OilConfigVo> selectOilConfigList() {
|
||||
List<OilConfigVo> oilConfigs = baseMapper.selectOilConfigList();
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<OilConfigVo> oilConfigs = baseMapper.selectOilConfigList(nowAccountInfo.getStoreId());
|
||||
return oilConfigs;
|
||||
}
|
||||
|
||||
|
||||
@ -88,9 +88,11 @@
|
||||
ig.update_by,
|
||||
ig.used_inventory,
|
||||
ig.market,
|
||||
igc.category_name
|
||||
igc.category_name,
|
||||
mg.name goodsName
|
||||
from integral_gift ig
|
||||
left join integral_gift_category igc ON ig.category_id = igc.id
|
||||
left join mt_goods mg ON ig.goods_id = mg.id
|
||||
<where>
|
||||
ig.store_id = #{integralGift.storeId}
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@ import lombok.Data;
|
||||
public class IntegralGiftVO extends IntegralGift {
|
||||
// 分类名称
|
||||
private String categoryName;
|
||||
private String goodsName;
|
||||
// 商品
|
||||
// 优惠卷
|
||||
}
|
||||
|
||||
@ -95,6 +95,12 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
|
||||
String orderNo = timestamp+randomString;
|
||||
cardValueRecordDTO.setPaymentNo(orderNo);
|
||||
cardValueRecordDTO.setStoreId(nowAccountInfo.getStoreId());
|
||||
if (ObjectUtil.isEmpty(cardValueRecordDTO.getBidBalance())) cardValueRecordDTO.setBidBalance(0.0);
|
||||
if (cardValueRecordDTO.getBidBalance() <= 0.0) {
|
||||
BigDecimal bigDecimal = new BigDecimal(cardValueRecordDTO.getBidBalance());
|
||||
bigDecimal = bigDecimal.add(new BigDecimal(cardValueRecordDTO.getGiftBalance()).add(new BigDecimal(cardValueRecordDTO.getRechargeBalance())));
|
||||
cardValueRecordDTO.setBidBalance(bigDecimal.doubleValue());
|
||||
}
|
||||
baseMapper.insert(cardValueRecordDTO);
|
||||
|
||||
double epsilon = 1e-10; // 阈值
|
||||
@ -215,7 +221,10 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
|
||||
|
||||
// 计算之后修改对应余额
|
||||
BigDecimal bigBidBalance = new BigDecimal(cardValueRecordDTO.getBidBalance());
|
||||
BigDecimal addCardValance = bigBidBalance.add(new BigDecimal(ljUserVos.getCardBalance()));
|
||||
// BigDecimal recharge = new BigDecimal(cardValueRecordDTO.getRechargeBalance());
|
||||
|
||||
BigDecimal addCardValance = bigBidBalance.add(new BigDecimal(ljUserVos.getCardBalance())); //
|
||||
// BigDecimal addCardValance = bigBidBalance.add(new BigDecimal(ljUserVos.getCardBalance()));
|
||||
|
||||
// 计算积分
|
||||
BigDecimal bigPoints = new BigDecimal(cardValueRecordDTO.getPoints());
|
||||
|
||||
@ -35,7 +35,7 @@ public class HandoverRecordController extends BaseController {
|
||||
* @return 查询结果
|
||||
*/
|
||||
@GetMapping("queryByPage")
|
||||
public ResponseObject queryByPage(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
|
||||
public ResponseObject queryByPage(@RequestParam(value = "page",defaultValue = "1") Integer pageNo,
|
||||
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
|
||||
@Param("handoverRecord") HandoverRecord handoverRecord) {
|
||||
Page page = new Page(pageNo, pageSize);
|
||||
@ -93,7 +93,10 @@ public class HandoverRecordController extends BaseController {
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 交班
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("handover")
|
||||
public ResponseObject handover() {
|
||||
return getSuccessResult(handoverRecordService.handover());
|
||||
|
||||
@ -27,6 +27,9 @@ public class HandoverRecord extends BaseEntity {
|
||||
* 交班数据记录
|
||||
*/
|
||||
private String recordData;
|
||||
private String staffName;
|
||||
private String type;
|
||||
private String status;
|
||||
/**
|
||||
* 交班开始时间
|
||||
*/
|
||||
|
||||
@ -85,15 +85,25 @@ public interface HandoverRecordMapper {
|
||||
int deleteById(Integer id);
|
||||
|
||||
// 油品交易信息
|
||||
Map<String, String> oilOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
Map<String, Object> oilOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
// 会员储值交易信息
|
||||
Map<String, String> cardOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
Map<String, Object> cardOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
// 油卡交易信息
|
||||
Map<String, String> fuelOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
Map<String, Object> fuelOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
// 普通交易
|
||||
Map<String, String> goodsOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
Map<String, Object> goodsOrderStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
List<Map<String, String>> paymentAggregation(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
List<Map<String, Object>> paymentAggregation(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
List<Map<String, Object>> oilNumberStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
List<Map<String, Object>> greaseGunStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
List<Map<String, Object>> employeeStatistics(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
List<Map<String, Object>> billingDetails(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
List<Map<String, Object>> returnedToTheAccount(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("storeId") Integer storeId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -35,6 +35,18 @@
|
||||
left join mt_staff ms ON hr.staff_id = ms.id
|
||||
where
|
||||
hr.store_id = #{handoverRecord.storeId}
|
||||
<if test="handoverRecord.status != null and handoverRecord.status != ''">
|
||||
and hr.status = #{handoverRecord.status}
|
||||
</if>
|
||||
<if test="handoverRecord.type != null and handoverRecord.type != ''">
|
||||
and hr.type = #{handoverRecord.type}
|
||||
</if>
|
||||
<if test="handoverRecord.params.beginTime != null and handoverRecord.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and date_format(end_time,'%y%m%d') >= date_format(#{handoverRecord.params.beginTime},'%y%m%d')
|
||||
</if>
|
||||
<if test="handoverRecord.params.endTime != null and handoverRecord.params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and date_format(end_time,'%y%m%d') <= date_format(#{handoverRecord.params.endTime},'%y%m%d')
|
||||
</if>
|
||||
|
||||
</select>
|
||||
|
||||
@ -119,7 +131,7 @@ limit 1
|
||||
<!--新增所有列-->
|
||||
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
||||
insert into handover_record(staff_id, record_data, start_time, end_time, store_id, create_time, update_time, create_by, update_by,status,type)
|
||||
values (#{staffId}, #{recordData}, #{startTime}, #{createTime}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{status},{type})
|
||||
values (#{staffId}, #{recordData}, #{startTime}, #{createTime}, #{storeId}, #{createTime}, #{createTime}, #{createBy}, #{updateBy},#{status},#{type})
|
||||
</insert>
|
||||
|
||||
<insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
|
||||
@ -241,6 +253,8 @@ limit 1
|
||||
SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount,
|
||||
SUM(IF(order_status='refund', pay_amount, 0)) AS refundAmount
|
||||
FROM oil_order
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY pay_type
|
||||
|
||||
UNION ALL
|
||||
@ -251,6 +265,8 @@ limit 1
|
||||
SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
|
||||
SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount
|
||||
FROM card_value_record
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY payment_type
|
||||
|
||||
UNION ALL
|
||||
@ -261,6 +277,8 @@ limit 1
|
||||
SUM(IF(pay_status='paid', recharge_balance, 0)) AS paidAmount,
|
||||
SUM(IF(pay_status='refund', recharge_balance, 0)) AS refundAmount
|
||||
FROM card_fuel_record
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY payment_type
|
||||
|
||||
UNION ALL
|
||||
@ -271,10 +289,157 @@ limit 1
|
||||
SUM(IF(status='paid', pay_amount, 0)) AS paidAmount,
|
||||
SUM(IF(status='refund', pay_amount, 0)) AS refundAmount
|
||||
FROM mt_order
|
||||
GROUP BY pay_type;
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY pay_type
|
||||
|
||||
UNION ALL
|
||||
|
||||
SELECT
|
||||
'point' AS flag,
|
||||
payment_type AS payType,
|
||||
SUM(IF(status='status', amount, 0)) AS paidAmount,
|
||||
SUM(IF(status='refund', amount, 0)) AS refundAmount
|
||||
FROM integral_orders
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY payment_type
|
||||
having payment_type is not null
|
||||
</select>
|
||||
|
||||
<select id="oilNumberStatistics" resultType="java.util.Map">
|
||||
SELECT
|
||||
on1.oil_name oilId,
|
||||
concat(onn.oil_type,' ',onn.oil_name) oilName,
|
||||
SUM(IF(order_status='paid', oil_num, 0)) AS oilNum,
|
||||
SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount,
|
||||
SUM(IF(order_status='paid', discount_amount, 0)) AS paidDiscount,
|
||||
count(order_status='paid') numberOfDeals
|
||||
|
||||
from
|
||||
oil_number on1
|
||||
left join oil_name onn on on1.oil_name = onn.id
|
||||
left join oil_order oo on oo.oils = onn.id
|
||||
where on1.store_id = #{storeId}
|
||||
and oo.create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY oo.oils
|
||||
</select>
|
||||
|
||||
|
||||
<select id="greaseGunStatistics" resultType="java.util.Map">
|
||||
SELECT
|
||||
oo.oil_gun_num gunName,
|
||||
SUM(IF(order_status='paid', pay_amount, 0)) AS paidAmount,
|
||||
SUM(IF(order_status='paid', oil_num, 0)) AS oilNum,
|
||||
count(order_status='paid') numberOfDeals
|
||||
FROM oil_order oo
|
||||
left join oil_gun og on oo.oil_gun_num = og.id
|
||||
where oo.store_id = #{storeId}
|
||||
and oo.create_time BETWEEN #{startTime} AND #{endTime}
|
||||
|
||||
GROUP BY oo.oil_gun_num
|
||||
</select>
|
||||
|
||||
<select id="employeeStatistics" resultType="java.util.Map">
|
||||
select
|
||||
a.staffId AS staffId,
|
||||
sum( a.numberOfDeals ) AS numberOfDeals,
|
||||
SUM( a.paidAmount) AS paidAmount,
|
||||
ms.real_name name
|
||||
from
|
||||
(SELECT
|
||||
'oil' AS flag,
|
||||
staff_id staffId,
|
||||
count( order_status = 'paid' ) numberOfDeals,
|
||||
SUM(IF( order_status = 'paid', pay_amount, 0 )) AS paidAmount
|
||||
FROM
|
||||
oil_order
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY
|
||||
staff_id UNION ALL
|
||||
SELECT
|
||||
'card' AS flag,
|
||||
mt_staff_id staffId,
|
||||
count( pay_status = 'paid' ) numberOfDeals,
|
||||
SUM(IF( pay_status = 'paid', recharge_balance, 0 )) AS paidAmount
|
||||
FROM
|
||||
card_value_record
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY
|
||||
mt_staff_id UNION ALL
|
||||
SELECT
|
||||
'fuel' AS flag,
|
||||
mt_staff_id staffId,
|
||||
count( pay_status = 'paid' ) numberOfDeals,
|
||||
SUM(IF( pay_status = 'paid', recharge_balance, 0 )) AS paidAmount
|
||||
FROM
|
||||
card_fuel_record
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY
|
||||
mt_staff_id UNION ALL
|
||||
SELECT
|
||||
'goods' AS flag,
|
||||
staff_id staffId,
|
||||
count( STATUS = 'paid' ) numberOfDeals,
|
||||
SUM(IF( STATUS = 'paid', pay_amount, 0 )) AS paidAmount
|
||||
FROM
|
||||
mt_order
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY
|
||||
staff_id UNION ALL
|
||||
|
||||
SELECT
|
||||
'point' AS flag,
|
||||
staff_id staffId,
|
||||
count( STATUS = 'paid' ) numberOfDeals,
|
||||
SUM(IF(status='status', amount, 0)) AS paidAmount
|
||||
FROM
|
||||
integral_orders
|
||||
where store_id = #{storeId}
|
||||
and create_time BETWEEN #{startTime} AND #{endTime}
|
||||
GROUP BY payment_type
|
||||
having staff_id is not null
|
||||
) AS a
|
||||
left join mt_staff ms ON a.staffId = ms.id
|
||||
GROUP BY a.staffId
|
||||
HAVING a.staffId is not null
|
||||
</select>
|
||||
|
||||
|
||||
<select id="billingDetails" resultType="java.util.Map">
|
||||
select
|
||||
cu.unit_name name,
|
||||
hb.credit_unit_id ,
|
||||
sum(amount) amount,
|
||||
count(*) numberOfDeals
|
||||
from
|
||||
hang_bill hb
|
||||
left join credit_unit cu ON hb.credit_unit_id = cu.id
|
||||
where hb.status = 0
|
||||
and hb.store_id = #{storeId}
|
||||
and hb.create_time BETWEEN #{startTime} AND #{endTime}
|
||||
group by hb.credit_unit_id
|
||||
</select>
|
||||
|
||||
|
||||
<select id="returnedToTheAccount" resultType="java.util.Map">
|
||||
select
|
||||
cu.unit_name name,
|
||||
hb.credit_unit_id ,
|
||||
sum(amount) amount,
|
||||
count(*) numberOfDeals
|
||||
from
|
||||
hang_bill hb
|
||||
left join credit_unit cu ON hb.credit_unit_id = cu.id
|
||||
where (hb.status = 0 or hb.status = 1)
|
||||
and hb.store_id = #{storeId}
|
||||
and hb.update_time BETWEEN #{startTime} AND #{endTime}
|
||||
group by hb.credit_unit_id
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
||||
|
||||
@ -59,7 +59,7 @@ public interface HandoverRecordService {
|
||||
*/
|
||||
boolean deleteById(Integer id);
|
||||
|
||||
public Map<String, Map<String,String>> handover();
|
||||
public Map<String, Object> handover();
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -3,12 +3,22 @@ package com.fuint.business.order.service.impl;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.fuint.business.member.entity.LJStaff;
|
||||
import com.fuint.business.member.service.ILJStaffService;
|
||||
import com.fuint.business.order.entity.HandoverRecord;
|
||||
import com.fuint.business.order.mapper.HandoverRecordMapper;
|
||||
import com.fuint.business.order.mapper.OilOrderMapper;
|
||||
import com.fuint.business.order.service.HandoverRecordService;
|
||||
import com.fuint.business.store.entity.MtStore;
|
||||
import com.fuint.business.store.mapper.MtStoreMapper;
|
||||
import com.fuint.business.store.service.StoreService;
|
||||
import com.fuint.business.userManager.mapper.LJUserMapper;
|
||||
import com.fuint.business.userManager.vo.LJUserVo;
|
||||
import com.fuint.framework.exception.BusinessCheckException;
|
||||
import com.fuint.system.dict.entity.SysDictData;
|
||||
import com.fuint.system.dict.entity.SysDictType;
|
||||
import com.fuint.system.dict.service.ISysDictDataService;
|
||||
import com.fuint.system.dict.service.ISysDictTypeService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.fuint.common.util.TokenUtil;
|
||||
import io.lettuce.core.dynamic.annotation.Param;
|
||||
@ -23,6 +33,7 @@ import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -38,9 +49,14 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
|
||||
@Resource
|
||||
private HandoverRecordMapper handoverRecordMapper;
|
||||
@Resource
|
||||
private MtStoreMapper mtStoreMapper;
|
||||
private StoreService storeService;
|
||||
@Resource
|
||||
private OilOrderMapper oilOrderMapper;
|
||||
private LJUserMapper ljUserMapper;
|
||||
@Resource
|
||||
ILJStaffService iljStaffService;
|
||||
@Resource
|
||||
ISysDictDataService iSysDictDataService;
|
||||
|
||||
|
||||
/**
|
||||
* 通过ID查询单条数据
|
||||
@ -115,19 +131,22 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Map<String,String>> handover() {
|
||||
public Map<String, Object> handover() {
|
||||
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
// MtStore mtStore = mtStoreMapper.queryStoreById(nowAccountInfo.getStoreId());
|
||||
MtStore mtStore = new MtStore();
|
||||
try {
|
||||
mtStore = storeService.queryStoreById2(nowAccountInfo.getStoreId());
|
||||
} catch (BusinessCheckException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// 获取当前日期
|
||||
LocalDate today = LocalDate.now();
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
||||
|
||||
// 获取当前日期的零点时间
|
||||
LocalDateTime midnight = today.atStartOfDay();
|
||||
// 格式化当前时间
|
||||
String formattedEndTime = LocalDateTime.now().format(formatter);
|
||||
|
||||
Map<String, Map<String,String>> handoverMap = new HashMap<>();
|
||||
Map<String, Object> handoverMap = new HashMap<>();
|
||||
|
||||
String startTime = "2023-01-01 12:12:12";
|
||||
HandoverRecord handoverRecord = selectByTime();
|
||||
@ -136,98 +155,230 @@ public class HandoverRecordServiceImpl implements HandoverRecordService {
|
||||
startTime = sdf.format(handoverRecord.getEndTime());
|
||||
}
|
||||
|
||||
LJStaff ljStaff = iljStaffService.selectStaffById(nowAccountInfo.getStaffId());
|
||||
String handover = iSysDictDataService.selectDictLabel("handover", ljStaff.getHandoverMode());
|
||||
String handoverType = "未知";
|
||||
|
||||
if (!ObjectUtil.isEmpty(handover)) {
|
||||
handoverType = handover;
|
||||
}
|
||||
// 填充 baseInfo
|
||||
Map<String, String> baseInfo = new HashMap<>();
|
||||
// baseInfo.put("storeName", mtStore.getName());
|
||||
Map<String, Object> baseInfo = new HashMap<>();
|
||||
baseInfo.put("storeName", mtStore.getName());
|
||||
baseInfo.put("realName", nowAccountInfo.getRealName());
|
||||
baseInfo.put("handoverType", "门店统一交班");
|
||||
baseInfo.put("handoverType", handoverType);
|
||||
baseInfo.put("startTime", startTime);
|
||||
baseInfo.put("endTime", formattedEndTime);
|
||||
baseInfo.put("handoverPrem", ljStaff.getHandoverPrem()); // 交班权限
|
||||
baseInfo.put("handoverOut", ljStaff.getHandoverOut()); // 交班是否退出
|
||||
handoverMap.put("baseInfo",baseInfo);
|
||||
// 获取订单汇总
|
||||
Map<String, String> orderSummaryMap = orderSummary(startTime, formattedEndTime);
|
||||
Map<String, Object> orderSummaryMap = orderSummary(startTime, formattedEndTime);
|
||||
handoverMap.put("orderSummary",orderSummaryMap);
|
||||
// 支付方式汇总
|
||||
Map<String, String> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime);
|
||||
List<Map<String, Object>> paymentAggregationMap = paymentAggregation(startTime, formattedEndTime);
|
||||
handoverMap.put("paymentAggregation",paymentAggregationMap);
|
||||
|
||||
// 退款汇总
|
||||
// 实收汇总
|
||||
// 油品订单
|
||||
// 商品订单
|
||||
// 普通订单
|
||||
// 会员储值
|
||||
// 油号统计
|
||||
// 优惠统计
|
||||
List<Map<String, Object>> oilNumberStatisticsMap = oilNumberStatistics(startTime, formattedEndTime);
|
||||
handoverMap.put("oilNumberStatistics",oilNumberStatisticsMap);
|
||||
// 油枪统计
|
||||
List<Map<String, Object>> greaseGunStatisticsMap = greaseGunStatistics(startTime, formattedEndTime);
|
||||
handoverMap.put("greaseGunStatistics",greaseGunStatisticsMap);
|
||||
// 员工统计
|
||||
List<Map<String, Object>> employeeStatisticsMap = employeeStatistics(startTime, formattedEndTime);
|
||||
handoverMap.put("employeeStatistics",employeeStatisticsMap);
|
||||
// 挂账详情
|
||||
List<Map<String, Object>> billingDetailsMap = billingDetails(startTime, formattedEndTime);
|
||||
handoverMap.put("billingDetails",billingDetailsMap);
|
||||
// 挂账归还
|
||||
List<Map<String, Object>> returnedToTheAccountMap = returnedToTheAccount(startTime, formattedEndTime);
|
||||
handoverMap.put("returnedToTheAccount",returnedToTheAccountMap);
|
||||
// 合计
|
||||
return handoverMap;
|
||||
}
|
||||
public Map<String, String> orderSummary(String startTime, String endTime) {
|
||||
|
||||
public Map<String, Object> orderSummary(String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
// 油品订单(订单) 油品订单(退款) 油品订单(实收) 油品优惠(实收) 油品交易(实收)
|
||||
Map<String, String> oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
Map<String, Object> oilOrderStatistics = handoverRecordMapper.oilOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
// 会员储值(订单) 会员储值(退款) 会员储值(实收) 储值赠送(订单) 储值赠送(退款) 储值赠送(实际)
|
||||
Map<String, String> cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
Map<String, String> fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
Map<String, Object> cardOrderStatistics = handoverRecordMapper.cardOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
Map<String, Object> fuelOrderStatistics = handoverRecordMapper.fuelOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
// 普通收款(订单) 普通收款(退款) 普通收款(实收)
|
||||
Map<String, String> goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
Map<String, Object> goodsOrderStatistics = handoverRecordMapper.goodsOrderStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
if (!ObjectUtil.isEmpty(oilOrderStatistics)) {
|
||||
if(!ObjectUtil.isEmpty(cardOrderStatistics)) {
|
||||
oilOrderStatistics.putAll(cardOrderStatistics);
|
||||
}
|
||||
if(!ObjectUtil.isEmpty(fuelOrderStatistics)) {
|
||||
oilOrderStatistics.putAll(fuelOrderStatistics);
|
||||
}
|
||||
if(!ObjectUtil.isEmpty(goodsOrderStatistics)) {
|
||||
oilOrderStatistics.putAll(goodsOrderStatistics);
|
||||
}
|
||||
}
|
||||
|
||||
if(!ObjectUtil.isEmpty(cardOrderStatistics)) {
|
||||
oilOrderStatistics.putAll(cardOrderStatistics);
|
||||
}
|
||||
if(!ObjectUtil.isEmpty(fuelOrderStatistics)) {
|
||||
oilOrderStatistics.putAll(fuelOrderStatistics);
|
||||
}
|
||||
if(!ObjectUtil.isEmpty(goodsOrderStatistics)) {
|
||||
oilOrderStatistics.putAll(goodsOrderStatistics);
|
||||
}
|
||||
return oilOrderStatistics;
|
||||
}
|
||||
|
||||
public Map<String, String> paymentAggregation(String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, String>> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
// 共有四个 转为普通map
|
||||
Map<String, String> allAggreMap = new HashMap<>();
|
||||
Map<String, String> allRefundMap = new HashMap<>();
|
||||
Map<String, String> oilMap = new HashMap<>();
|
||||
Map<String, String> goodsMap = new HashMap<>();
|
||||
Map<String, String> cardMap = new HashMap<>();
|
||||
if (!ObjectUtil.isEmpty(paymentAggregation)) {
|
||||
for (Map<String, String> stringStringMap : paymentAggregation) {
|
||||
/**
|
||||
* 汇总统计
|
||||
*/
|
||||
|
||||
// 计算退款汇总
|
||||
// if ( allRefundMap.containsKey("refALl"+stringStringMap.get("payType"))) {
|
||||
// allRefundMap.put("refALl"+stringStringMap.get("payType"),
|
||||
// (new BigDecimal( stringStringMap.get("refundAmount")).add(new BigDecimal(stringStringMap.get("refundAmount")))).toString());
|
||||
// }else {
|
||||
// allAggreMap.put("refALl"+stringStringMap.get("payType"), allRefundMap.get(stringStringMap.get("refundAmount")));
|
||||
// }
|
||||
public List<Map<String, Object>> paymentAggregation(String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
List<Map<String, Object>> allRefundMapList = new ArrayList<>();
|
||||
if (!ObjectUtil.isEmpty(paymentAggregation)) {
|
||||
for (Map<String, Object> stringStringMap : paymentAggregation) {
|
||||
// 汇总
|
||||
aggregateCalculations(allRefundMapList, stringStringMap);
|
||||
}
|
||||
}
|
||||
if (!ObjectUtil.isEmpty(allRefundMapList)){
|
||||
paymentAggregation.addAll(allRefundMapList);
|
||||
}
|
||||
return paymentAggregation;
|
||||
}
|
||||
|
||||
/**
|
||||
* 汇总
|
||||
*/
|
||||
public List<Map<String, Object>> aggregateCalculations(List<Map<String, Object>> mapList,Map<String, Object> map) {
|
||||
Map<String, Object> returnMap = new HashMap<>();
|
||||
|
||||
boolean flag = true;
|
||||
for (Map<String, Object> stringObjectMap : mapList) {
|
||||
if (map.get("payType").equals(stringObjectMap.get("payType"))) {
|
||||
BigDecimal paidAmount = new BigDecimal(stringObjectMap.get("paidAmount").toString()).add(new BigDecimal(map.get("paidAmount").toString()));
|
||||
BigDecimal refundAmount = new BigDecimal(stringObjectMap.get("refundAmount").toString()).add(new BigDecimal(map.get("refundAmount").toString()));
|
||||
stringObjectMap.put("paidAmount",paidAmount.toString());
|
||||
stringObjectMap.put("refundAmount",refundAmount.toString());
|
||||
flag = false;
|
||||
}
|
||||
}
|
||||
if (flag) {
|
||||
returnMap.put("flag","all");
|
||||
returnMap.put("payType",map.get("payType"));
|
||||
returnMap.put("paidAmount",map.get("paidAmount").toString());
|
||||
returnMap.put("refundAmount",map.get("refundAmount").toString());
|
||||
mapList.add(returnMap);
|
||||
}
|
||||
return mapList;
|
||||
}
|
||||
|
||||
public Map<String, Object> paymentAggregation2(String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> paymentAggregation = handoverRecordMapper.paymentAggregation(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
// 共有四个 转为普通map
|
||||
Map<String, Object> allAggreMap = new HashMap<>();
|
||||
Map<String, Object> allRefundMap = new HashMap<>();
|
||||
Map<String, Object> oilMap = new HashMap<>();
|
||||
Map<String, Object> goodsMap = new HashMap<>();
|
||||
Map<String, Object> cardMap = new HashMap<>();
|
||||
if (!ObjectUtil.isEmpty(paymentAggregation)) {
|
||||
|
||||
for (Map<String, Object> stringStringMap : paymentAggregation) {
|
||||
|
||||
String payType = stringStringMap.get("payType").toString();
|
||||
// 退款汇总
|
||||
String refALlKey = "refALl" + payType;
|
||||
summaryExtraction(stringStringMap, allRefundMap, refALlKey);
|
||||
|
||||
// 总汇总
|
||||
// if ( allAggreMap.containsKey("agreALL"+stringStringMap.get("payType"))) {
|
||||
// allAggreMap.put("agreALL"+stringStringMap.get("payType"),
|
||||
// (new BigDecimal( stringStringMap.get("paidAmount")).add(new BigDecimal(stringStringMap.get("paidAmount")))).toString());
|
||||
// }else {
|
||||
// allAggreMap.put("agreALL"+stringStringMap.get("payType"), allAggreMap.get(stringStringMap.get("paidAmount")));
|
||||
// }
|
||||
|
||||
String agreALLKey = "agreALL" + payType;
|
||||
summaryExtraction(stringStringMap, allAggreMap, agreALLKey);
|
||||
|
||||
if ("oil".equals(stringStringMap.get("flag"))){
|
||||
// 油品订单汇总
|
||||
|
||||
|
||||
}else if ("card".equals(stringStringMap.get("flag"))) {
|
||||
String oilKey = "oil" + payType;
|
||||
summaryExtraction(stringStringMap, oilMap, oilKey);
|
||||
}else if ("goods".equals(stringStringMap.get("flag"))) {
|
||||
// 商品订单汇总
|
||||
}else if ("fuel".equals(stringStringMap.get("flag")) || "goods".equals(stringStringMap.get("flag")) ) {
|
||||
String goodsKey = "goods" + payType;
|
||||
summaryExtraction(stringStringMap, goodsMap, goodsKey);
|
||||
}else if ("fuel".equals(stringStringMap.get("flag")) || "card".equals(stringStringMap.get("flag")) ) {
|
||||
// 会员储值汇总
|
||||
String cardKey = "card" + payType;
|
||||
summaryExtraction(stringStringMap, cardMap, cardKey);
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
||||
if (!ObjectUtil.isEmpty(allAggreMap)) {
|
||||
allRefundMap.putAll(allAggreMap);
|
||||
}
|
||||
if (!ObjectUtil.isEmpty(allRefundMap)) {
|
||||
allRefundMap.putAll(allRefundMap);
|
||||
}
|
||||
if (!ObjectUtil.isEmpty(oilMap)) {
|
||||
allRefundMap.putAll(oilMap);
|
||||
}
|
||||
if (!ObjectUtil.isEmpty(goodsMap)) {
|
||||
allRefundMap.putAll(goodsMap);
|
||||
}
|
||||
if (!ObjectUtil.isEmpty(cardMap)) {
|
||||
allRefundMap.putAll(cardMap);
|
||||
}
|
||||
return allRefundMap;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 油号统计
|
||||
*/
|
||||
public List<Map<String, Object>> oilNumberStatistics (String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> oilNumberStatistics = handoverRecordMapper.oilNumberStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
return oilNumberStatistics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 油枪统计
|
||||
*/
|
||||
public List<Map<String, Object>> greaseGunStatistics (String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> greaseGunStatistics = handoverRecordMapper.greaseGunStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
return greaseGunStatistics;
|
||||
}
|
||||
|
||||
/**
|
||||
* 员工统计
|
||||
*/
|
||||
public List<Map<String, Object>> employeeStatistics (String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> employeeStatistics = handoverRecordMapper.employeeStatistics(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
return employeeStatistics;
|
||||
}
|
||||
|
||||
// 挂账详情
|
||||
public List<Map<String, Object>> billingDetails (String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> billingDetails = handoverRecordMapper.billingDetails(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
return billingDetails;
|
||||
}
|
||||
// 挂账归还
|
||||
public List<Map<String, Object>> returnedToTheAccount (String startTime, String endTime) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
List<Map<String, Object>> returnedToTheAccount = handoverRecordMapper.returnedToTheAccount(startTime, endTime, nowAccountInfo.getStoreId());
|
||||
return returnedToTheAccount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 汇总抽取
|
||||
*/
|
||||
public Map<String, Object> summaryExtraction(Map<String, Object> sourceMap,Map<String, Object> map,String key) {
|
||||
if (map.containsKey(key)) {
|
||||
// 如果已经包含了该 payType，则累加退款金额
|
||||
BigDecimal currentRefundAmount = new BigDecimal(map.get(key).toString());
|
||||
BigDecimal newRefundAmount = new BigDecimal(sourceMap.get("paidAmount").toString());
|
||||
|
||||
map.put(key, currentRefundAmount.add(newRefundAmount).toString());
|
||||
} else {
|
||||
// 如果还没有该 payType，则直接添加新记录
|
||||
map.put(key, sourceMap.get("paidAmount").toString());
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -19,7 +19,7 @@ public interface OilPresetPricesMapper extends BaseMapper<OilPresetPrices> {
|
||||
* @param page
|
||||
* @return
|
||||
*/
|
||||
public IPage<OilPresetPrices> selectOilPresetPricesList(Page page, @Param("oilNumber") OilPresetPrices presetPrices);
|
||||
public IPage<OilPresetPrices> selectOilPresetPricesList(Page page, @Param("presetPrices") OilPresetPrices presetPrices);
|
||||
|
||||
/**
|
||||
* 根据id查询员工信息
|
||||
|
||||
@ -107,8 +107,10 @@
|
||||
from oil_number onm
|
||||
left join oil_name name on onm.oil_name = name.id
|
||||
<where>
|
||||
onm.state = '启用'
|
||||
|
||||
<if test="storeId != null">
|
||||
onm.store_id = #{storeId}
|
||||
and onm.store_id = #{storeId}
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
@ -117,9 +119,9 @@
|
||||
from oil_gun
|
||||
where
|
||||
gun_name = #{oilGun.gunName}
|
||||
and tank_id = #{oilGun.tankId}
|
||||
and store_id = #{oilGun.storeId}
|
||||
</select>
|
||||
<!-- -- and tank_id = #{oilGun.tankId}-->
|
||||
|
||||
<!--新增所有列-->
|
||||
<insert id="insert" keyProperty="id" useGeneratedKeys="true">
|
||||
|
||||
@ -155,6 +155,7 @@
|
||||
LEFT JOIN mt_staff ms1 ON op.creator = ms1.id
|
||||
LEFT JOIN mt_staff ms2 ON op.reviewer = ms2.id
|
||||
<where>
|
||||
op.store_id = #{oilInventory.storeId}
|
||||
<if test="oilInventory.status != null and oilInventory.status != ''">
|
||||
and op.status = #{oilInventory.status}
|
||||
</if>
|
||||
|
||||
@ -105,6 +105,7 @@
|
||||
left join oil_name name on onm.oil_name = name.id
|
||||
<where>
|
||||
onm.store_id = #{storeId}
|
||||
and onm.state = '启用'
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
@ -31,6 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<select id="selectOilPresetPricesList"
|
||||
resultType="com.fuint.business.petrolStationManagement.entity.OilPresetPrices">
|
||||
<include refid="selectOilPresetPrices"></include>
|
||||
where store_id = #{presetPrices.storeId}
|
||||
|
||||
</select>
|
||||
<!-- older by preset_id desc-->
|
||||
|
||||
|
||||
@ -172,6 +172,8 @@
|
||||
LEFT JOIN mt_staff ms1 ON op.creator = ms1.id
|
||||
LEFT JOIN mt_staff ms2 ON op.reviewer = ms2.id
|
||||
<where>
|
||||
op.store_id = #{oilPurchase.storeId}
|
||||
|
||||
<if test="oilPurchase.beginTime != null and oilPurchase.endTime != null">
|
||||
and created_at >= #{oilPurchase.beginTime} and created_at <= #{oilPurchase.endTime}
|
||||
</if>
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
id, supplier_name, contact_person, contact_phone, contact_address, remarks, create_time, update_time, create_by, update_by
|
||||
from oil_suppliers
|
||||
<where>
|
||||
store_id = #{oilSuppliers.storeId}
|
||||
<if test="oilSuppliers.id != null">
|
||||
and id = #{oilSuppliers.id}
|
||||
</if>
|
||||
@ -60,9 +61,7 @@
|
||||
<if test="oilSuppliers.updateBy != null">
|
||||
and update_by = #{oilSuppliers.updateBy}
|
||||
</if>
|
||||
<if test="oilSuppliers.storeId != null">
|
||||
and store_id = #{oilSuppliers.storeId}
|
||||
</if>
|
||||
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
||||
@ -91,8 +91,8 @@ public class OilGunServiceImpl implements OilGunService {
|
||||
AccountInfo accountInfo = TokenUtil.getNowAccountInfo();
|
||||
oilGun.setStoreId(accountInfo.getStoreId());
|
||||
oilGun.setCreateBy(accountInfo.getStaffId().toString());
|
||||
boolean check = checkData(oilGun);
|
||||
if (check) {
|
||||
int i = checkData(oilGun);
|
||||
if (i>0) {
|
||||
return false;
|
||||
}
|
||||
oilGun.setCreateBy(accountInfo.getId().toString());
|
||||
@ -101,9 +101,9 @@ public class OilGunServiceImpl implements OilGunService {
|
||||
}
|
||||
|
||||
// 判断是否有同一名称的数据
|
||||
public boolean checkData(OilGun oilGun) {
|
||||
public int checkData(OilGun oilGun) {
|
||||
List<OilGun> oilGunList = oilGunDao.checkData(oilGun);
|
||||
return oilGunList.size() > 1;
|
||||
return oilGunList.size();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -116,8 +116,8 @@ public class OilGunServiceImpl implements OilGunService {
|
||||
public boolean update(OilGun oilGun) {
|
||||
AccountInfo accountInfo = TokenUtil.getNowAccountInfo();
|
||||
oilGun.setStoreId(accountInfo.getStoreId());
|
||||
boolean check = checkData(oilGun);
|
||||
if (check) {
|
||||
int i = checkData(oilGun);
|
||||
if (i>1) {
|
||||
return false;
|
||||
}
|
||||
oilGun.setUpdateBy(accountInfo.getId().toString());
|
||||
|
||||
@ -49,8 +49,8 @@ public class OilNumberServiceImpl extends ServiceImpl<OilNumberMapper, OilNumber
|
||||
oilNumber.setCreateBy(nowAccountInfo.getStaffId().toString());
|
||||
// 根据id查询这个店铺是否加过该型号的油
|
||||
int i = baseMapper.selectOilNameByStore(oilNumber);
|
||||
if ( i> 1) {
|
||||
return 0;
|
||||
if ( i >= 1) {
|
||||
return -1;
|
||||
}
|
||||
return baseMapper.insertOilNumber(oilNumber);
|
||||
}
|
||||
|
||||
@ -41,6 +41,8 @@ public class OilPresetPricesServiceImpl extends ServiceImpl<OilPresetPricesMappe
|
||||
|
||||
@Override
|
||||
public IPage<OilPresetPrices> selectOilPresetPricesList(Page page, OilPresetPrices presetPrices) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
presetPrices.setStoreId(nowAccountInfo.getStoreId());
|
||||
return baseMapper.selectOilPresetPricesList(page, presetPrices);
|
||||
}
|
||||
|
||||
|
||||
@ -58,6 +58,8 @@ public class OilPurchaseServiceImpl implements OilPurchaseService {
|
||||
*/
|
||||
@Override
|
||||
public IPage<OilPurchase> queryByPage(@Param("page") Page page, @Param("OilPurchase") OilPurchase oilPurchase) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
oilPurchase.setStoreId(nowAccountInfo.getStoreId());
|
||||
return oilPurchaseDao.queryAllByLimit(page, oilPurchase);
|
||||
}
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ public interface MtStoreMapper extends BaseMapper<MtStore> {
|
||||
|
||||
MtStore queryStoreByName(@Param("name") String name);
|
||||
|
||||
public MtStore queryStoreById(@Param("id") Integer id);
|
||||
// public MtStore queryStoreById(@Param("id") Integer id);
|
||||
|
||||
List<MtStore> findStoresByIds(@Param("ids") List<Integer> ids);
|
||||
|
||||
|
||||
@ -48,6 +48,8 @@ public interface StoreService extends IService<MtStore> {
|
||||
*/
|
||||
MtStore queryStoreById(Integer id) throws BusinessCheckException;
|
||||
|
||||
MtStore queryStoreById2(Integer id) throws BusinessCheckException;
|
||||
|
||||
/**
|
||||
* 根据店铺id列表获取店铺信息
|
||||
*
|
||||
|
||||
@ -158,6 +158,14 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
|
||||
return mtStoreMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public MtStore queryStoreById2(Integer id) {
|
||||
if (id == null) {
|
||||
return null;
|
||||
}
|
||||
return mtStoreMapper.selectById(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取系统默认店铺
|
||||
*
|
||||
|
||||
@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<include refid="selectDictTypeVo"/>
|
||||
where dict_type = #{dictType} limit 1
|
||||
</select>
|
||||
|
||||
|
||||
<delete id="deleteDictTypeById" parameterType="Long">
|
||||
delete from sys_dict_type where dict_id = #{dictId}
|
||||
</delete>
|
||||
|
||||
@ -8,3 +8,12 @@ export function getOilNumberById(id) {
|
||||
// data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 查询所有油号
|
||||
export function oilNumberList() {
|
||||
return request({
|
||||
url: '/business/petrolStationManagement/oilNumber/getList',
|
||||
method: 'get',
|
||||
// data: data
|
||||
})
|
||||
}
|
||||
|
||||
@ -8,3 +8,12 @@ export function selectPreferential(data) {
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
// 查询优惠券信息
|
||||
export function selectCoupon(data) {
|
||||
return request({
|
||||
url: '/business/marketingActivity/activeExchange/selectCardFavorableList',
|
||||
method: 'get',
|
||||
params: data
|
||||
})
|
||||
}
|
||||
|
||||
BIN
fuintCashierWeb/src/assets/images/box-left.png
Normal file
BIN
fuintCashierWeb/src/assets/images/box-left.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
fuintCashierWeb/src/assets/images/loginback.png
Normal file
BIN
fuintCashierWeb/src/assets/images/loginback.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 226 KiB |
@ -48,7 +48,7 @@ export const constantRoutes = [
|
||||
{
|
||||
path: '',
|
||||
component: Layout,
|
||||
redirect: 'index',
|
||||
redirect: '/login',
|
||||
children: [
|
||||
{
|
||||
path: 'index',
|
||||
|
||||
@ -15,18 +15,18 @@
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>交班方式:</div>
|
||||
<div>门店统一交班</div>
|
||||
<el-tag size="small" >{{handoverList && handoverList.baseInfo ? handoverList.baseInfo.handoverType : '未知'}}</el-tag>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>开始时间:</div>
|
||||
<!-- <div>{{ handoverList.baseInfo.startTime }}</div>-->
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.startTime : '/--/' }}</div>
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.startTime : '-' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>结束时间:</div>
|
||||
<!-- <div>{{ handoverList.baseInfo.endTime }}</div>-->
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.endTime : '/--/' }}</div>
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.endTime : '-' }}</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@ -139,10 +139,14 @@
|
||||
<div>支付方式</div>
|
||||
<div>退款金额</div>
|
||||
</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('all')" v-if="item.refundAmount > 0">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.refundAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div class="input-box" >
|
||||
<div>合计</div>
|
||||
<div>￥2164.55</div>
|
||||
<div>￥{{refundAggregateTotal}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -152,26 +156,14 @@
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>现金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值卡</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>加油金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>银行转1</div>
|
||||
<div>￥2164.55</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('all')" v-if="item.paidAmount > 0">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥2164.55</div>
|
||||
<div>￥{{totalTotalOfActualReceipts}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -181,26 +173,14 @@
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>现金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值卡</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>加油金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>银行转1</div>
|
||||
<div>￥2164.55</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('oil')">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥2164.55</div>
|
||||
<div>￥{{totalOilOrders}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
@ -209,40 +189,66 @@
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥0.00</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">普通订单</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('goods')">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥0.00</div>
|
||||
<div>￥{{totalOfProductOrders}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="box-ge">-->
|
||||
<!-- <div class="boloicon">普通订单</div>-->
|
||||
<!-- <div class="input-hui">-->
|
||||
<!-- <div>支付方式</div>-->
|
||||
<!-- <div>金额</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box" v-for="item in paymentAggregation('goods')">-->
|
||||
<!-- <div>{{calculateThePaymentMethod(item.payType)}}</div>-->
|
||||
<!-- <div>￥{{item.paidAmount}}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <el-divider></el-divider>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>合计</div>-->
|
||||
<!-- <div>￥0.00</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">会员储值</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>现金</div>
|
||||
<div>￥888.88</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('fg')">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalMemberStoredValue}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">积分商城</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('point')" v-if="item.paidAmount>0">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥{{pointsMallStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">油号统计</div>
|
||||
<div class="input-hui-frou">
|
||||
@ -251,23 +257,16 @@
|
||||
<div>升数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>92#</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
<div class="input-box-frou" v-for="item in oilNumberStatistics()">
|
||||
<div>{{item.oilName}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div>{{item.oilNum}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>92#</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalOilNumberStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
@ -276,14 +275,14 @@
|
||||
<div>油品</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>92#</div>
|
||||
<div>￥888.88</div>
|
||||
<div class="input-box" v-for="item in oilNumberStatistics()">
|
||||
<div>{{item.oilName}}</div>
|
||||
<div>{{item.paidDiscount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{discountStatisticsTotal}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
@ -294,23 +293,16 @@
|
||||
<div>升数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>一号枪</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
<div class="input-box-frou" v-for="item in greaseGunStatistics()">
|
||||
<div>{{item.gunName}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div>{{item.oilNum}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>二号枪</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalOfOilGunStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -319,35 +311,66 @@
|
||||
<div class="input-hui-frou">
|
||||
<div>员工姓名</div>
|
||||
<div>笔数</div>
|
||||
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>一号员工</div>
|
||||
<div>9</div>
|
||||
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
<div class="input-box-frou" v-for="item in employeeStatistics()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>二号员工</div>
|
||||
<div>9</div>
|
||||
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalOfEmployeeStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">挂账统计</div>
|
||||
<el-divider>挂账详情</el-divider>
|
||||
<div class="input-hui-frou">
|
||||
<div>挂账单位</div>
|
||||
<div>笔数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou" v-for="item in billingDetails()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.amount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥{{statisticsOfAccountDetails}}</div>
|
||||
</div>
|
||||
|
||||
|
||||
<el-divider>归还详情</el-divider>
|
||||
<div class="input-hui-frou">
|
||||
<div>挂账单位</div>
|
||||
<div>笔数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou" v-for="item in returnedToTheAccount()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.amount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥{{postedAccountReturnStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div style="width: 100%; height: 100px"></div>
|
||||
<div class="app-bottom">
|
||||
<el-card >
|
||||
<div class="bottom-xz">
|
||||
<div class="anniu" @click="shift">交班</div>
|
||||
<div class="anniu" v-if="handoverList && handoverList.baseInfo && handoverList.baseInfo.handoverPrem == 'yqx'" @click="shift">交班</div>
|
||||
<div class="anniu-lv">云打印</div>
|
||||
<div class="anniu-lv">本地打印</div>
|
||||
<div ><el-link type="primary" @click="recording">交班记录</el-link></div>
|
||||
@ -360,12 +383,15 @@
|
||||
|
||||
<script>
|
||||
import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
import BigNumber from "bignumber.js";
|
||||
import {removeUserId} from "@/utils/auth";
|
||||
|
||||
export default {
|
||||
name: "Handover",
|
||||
data() {
|
||||
name: "Handover",
|
||||
data() {
|
||||
return {
|
||||
handoverList : {},
|
||||
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -378,7 +404,91 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
console.log("this.handoverList",this.handoverList)
|
||||
})
|
||||
},
|
||||
orderSummary() {
|
||||
// 汇总
|
||||
},
|
||||
paymentAggregation(flag) {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
this.handoverList.paymentAggregation.forEach(res=> {
|
||||
if (flag == 'fg') {
|
||||
if (res.flag == 'fuel' || res.flag == 'card') {
|
||||
let existingElementIndex = count.findIndex(item => item.payType === res.payType);
|
||||
if (existingElementIndex !== -1) {
|
||||
// let existingElement = count[existingElementIndex];
|
||||
// 确保 paidAmount 和 refundAmount 是有效的数字类型
|
||||
// existingElement.paidAmount = (Number(existingElement.paidAmount) || 0) + (Number(res.paidAmount) || 0);
|
||||
// existingElement.refundAmount = (Number(existingElement.refundAmount) || 0) + (Number(res.refundAmount) || 0);
|
||||
|
||||
// 如果需要将结果转换为字符串
|
||||
// existingElement.paidAmount = existingElement.paidAmount.toString();
|
||||
// existingElement.refundAmount = existingElement.refundAmount.toString();
|
||||
}else {
|
||||
count.push(res);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (res.flag == flag) {
|
||||
count.push(res)
|
||||
}
|
||||
})
|
||||
}
|
||||
return count;
|
||||
},
|
||||
|
||||
calculateThePaymentMethod(payType) {
|
||||
switch (payType) {
|
||||
case 'ALIPAY':
|
||||
return '支付宝'
|
||||
break;
|
||||
case 'WECHAT':
|
||||
return '微信'
|
||||
break;
|
||||
case 'UNIONPAY':
|
||||
return '银联二维码'
|
||||
break;
|
||||
case 'CASH':
|
||||
return '现金'
|
||||
break;
|
||||
}
|
||||
return '未知'
|
||||
},
|
||||
oilNumberStatistics() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.oilNumberStatistics) {
|
||||
return this.handoverList.oilNumberStatistics
|
||||
}
|
||||
return count;
|
||||
},
|
||||
greaseGunStatistics() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.greaseGunStatistics) {
|
||||
return this.handoverList.greaseGunStatistics
|
||||
}
|
||||
return count;
|
||||
},
|
||||
employeeStatistics() {
|
||||
console.log("this.employeeStatistics",this.handoverList.employeeStatistics)
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.employeeStatistics) {
|
||||
return this.handoverList.employeeStatistics
|
||||
}
|
||||
return count;
|
||||
},
|
||||
billingDetails() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.billingDetails) {
|
||||
return this.handoverList.billingDetails
|
||||
}
|
||||
return count;
|
||||
},
|
||||
returnedToTheAccount() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.returnedToTheAccount) {
|
||||
return this.handoverList.returnedToTheAccount
|
||||
}
|
||||
return count;
|
||||
},
|
||||
// 交班记录
|
||||
recording() {
|
||||
this.$router.push({
|
||||
@ -388,22 +498,35 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
}
|
||||
});
|
||||
},
|
||||
// 交班
|
||||
shift() {
|
||||
this.$confirm('交班并退出系统, 是否继续?', '提示', {
|
||||
let msg = '交班并退出系统, 是否继续?'
|
||||
let flag = false
|
||||
if (this.handoverList && this.handoverList.baseInfo && this.handoverList.baseInfo.handoverOut == 'jbtc') {
|
||||
flag = true
|
||||
} else {
|
||||
msg = '确定交班？'
|
||||
}
|
||||
|
||||
this.$confirm(msg, '提示', {
|
||||
confirmButtonText: '确定',
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
let recordData = this.handoverList
|
||||
let handoverRecord = {
|
||||
startTime:this.handoverList.baseInfo.endTime,
|
||||
startTime:this.handoverList.baseInfo.startTime,
|
||||
recordData:JSON.stringify(recordData),
|
||||
type:0,
|
||||
status:0,
|
||||
status:this.handoverList.baseInfo.handoverType,
|
||||
}
|
||||
addHandoverApi(handoverRecord).then(res=>{
|
||||
|
||||
console.log("")
|
||||
if (flag) {
|
||||
removeUserId();
|
||||
this.$store.dispatch('LogOut').then(() => {
|
||||
location.href = '/';
|
||||
})
|
||||
}
|
||||
})
|
||||
//
|
||||
// this.$message({
|
||||
@ -417,6 +540,152 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
//退款汇总合计
|
||||
refundAggregateTotal() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "all"){
|
||||
num = num.plus(new BigNumber(res.refundAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//实收汇总合计
|
||||
totalTotalOfActualReceipts() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "all") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//油品订单合计
|
||||
totalOilOrders() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "oil") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//商品订单合计
|
||||
totalOfProductOrders() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "goods") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//会员储值合计
|
||||
totalMemberStoredValue() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "card" || res.flag == "fuel") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
// 积分商城统计
|
||||
pointsMallStatistics() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "point") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//油号统计合计
|
||||
totalOilNumberStatistics() {
|
||||
if (this.handoverList && this.handoverList.oilNumberStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.oilNumberStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
//优惠统计合计
|
||||
discountStatisticsTotal() {
|
||||
if (this.handoverList && this.handoverList.oilNumberStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.oilNumberStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidDiscount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
//油枪统计合计
|
||||
totalOfOilGunStatistics() {
|
||||
if (this.handoverList && this.handoverList.greaseGunStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.greaseGunStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
//员工统计合计
|
||||
totalOfEmployeeStatistics() {
|
||||
if (this.handoverList && this.handoverList.employeeStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.employeeStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
// 挂账详情统计
|
||||
statisticsOfAccountDetails(){
|
||||
if (this.handoverList && this.handoverList.billingDetails) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.billingDetails.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.amount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
// 挂账归还统计
|
||||
postedAccountReturnStatistics(){
|
||||
if (this.handoverList && this.handoverList.returnedToTheAccount) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.returnedToTheAccount.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.amount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -7,31 +7,35 @@
|
||||
<span>交班详情</span>
|
||||
</div>
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
|
||||
<el-form-item label="交班方式" prop="giftName">
|
||||
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班状态" clearable>
|
||||
<!-- <el-option label="未支付" value="0">交班</el-option>-->
|
||||
<!-- <el-option label="付款成功" value="1">未交班</el-option>-->
|
||||
<el-form-item label="交班方式" prop="status">
|
||||
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable>
|
||||
<el-option
|
||||
v-for="option in shiftHandoverList"
|
||||
:key="option.dictCode"
|
||||
:label="option.dictLabel"
|
||||
:value="option.dictLabel"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="交班状态">
|
||||
<el-select v-model="queryParams.type" style="width: 150px" placeholder="交班状态" clearable>
|
||||
<el-option label="未支付" value="0">交班</el-option>
|
||||
<el-option label="付款成功" value="1">未交班</el-option>
|
||||
<el-option label="交班" value="0">交班</el-option>
|
||||
<el-option label="未交班" value="1">未交班</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="交班时间">-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- v-model="dateRange"-->
|
||||
<!-- style="width: 240px"-->
|
||||
<!-- size="medium"-->
|
||||
<!-- value-format="yyyy-MM-dd"-->
|
||||
<!-- type="daterange"-->
|
||||
<!-- range-separator="-"-->
|
||||
<!-- clearable-->
|
||||
<!-- start-placeholder="开始日期"-->
|
||||
<!-- end-placeholder="结束日期"-->
|
||||
<!-- ></el-date-picker>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="交班时间">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
style="width: 240px"
|
||||
size="medium"
|
||||
value-format="yyyy-MM-dd"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
clearable
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
@ -110,6 +114,7 @@ export default {
|
||||
dataList:[],
|
||||
recordData:'',
|
||||
zhztList:'',
|
||||
shiftHandoverList:'',
|
||||
queryParams: {
|
||||
|
||||
status: '',
|
||||
@ -135,7 +140,7 @@ export default {
|
||||
created() {
|
||||
this.getList();
|
||||
this.getStatistics();
|
||||
|
||||
this.getStatus();
|
||||
},
|
||||
methods: {
|
||||
getList(){
|
||||
@ -158,6 +163,11 @@ export default {
|
||||
this.zhztList = response.data;
|
||||
})
|
||||
},
|
||||
getStatus() {
|
||||
getDicts("handover").then(response => {
|
||||
this.shiftHandoverList = response.data;
|
||||
})
|
||||
},
|
||||
|
||||
handleUpdate(){},
|
||||
handleQuery(){
|
||||
|
||||
@ -5,131 +5,148 @@
|
||||
<div class="box-title">
|
||||
交班统计
|
||||
<el-button style="float: right ;margin-left: 5px" size="mini" type="primary" plain>打印交班单</el-button>
|
||||
|
||||
</div>
|
||||
<!-- <div class="box-ge">-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油站名称:</div>-->
|
||||
<!-- <div>{{ handoverList.baseInfo.storeName }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>收银员:</div>-->
|
||||
<!-- <div>{{ handoverList.baseInfo.realName }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>交班方式:</div>-->
|
||||
<!-- <div>门店统一交班</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>开始时间:</div>-->
|
||||
<!-- <div>{{ handoverList.baseInfo.startTime }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>结束时间:</div>-->
|
||||
<!-- <div>{{ handoverList.baseInfo.endTime }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box-ge">-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>当前版本:</div>-->
|
||||
<!-- <div>V1.0.1</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box-ge">-->
|
||||
<!-- <div class="boloicon">订单汇总</div>-->
|
||||
<!-- <div class="input-hui">-->
|
||||
<!-- <div>类型</div>-->
|
||||
<!-- <div>金额</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油品订单(订单)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.oilOrder }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油品订单(退款)</div>-->
|
||||
<!-- <div>￥-{{ handoverList.orderSummary.oilRefund }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油品订单(实收)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.oilPaid }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油品优惠(实收)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.oilDiacount }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!--<!– <div class="input-box">–>-->
|
||||
<!--<!– <div>抹零总额(实收)</div>–>-->
|
||||
<!--<!– <div>￥2164.55</div>–>-->
|
||||
<!--<!– </div>–>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>油品交易(实收)????</div>-->
|
||||
<!-- <div>￥2164.55</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <el-divider></el-divider>-->
|
||||
<!--<!– 六个一条线 –>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>会员储值(订单)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.cardOrder }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>会员储值(退款)</div>-->
|
||||
<!-- <div>￥-{{ handoverList.orderSummary.cardRefund }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>会员储值(实收)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.cardPaid }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>储值赠送(订单)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.cardGiftOrder }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>储值赠送(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.cardGiftRefund }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>储值赠送(实际)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.cardGiftPaid }}</div>-->
|
||||
<!-- </div>-->
|
||||
<div class="box-ge">
|
||||
<div class="input-box">
|
||||
<div>油站名称:</div>
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.storeName : '未知油站' }}</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>收银员:</div>
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.realName : '未知姓名' }}</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>交班方式:</div>
|
||||
<div>门店统一交班</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>开始时间:</div>
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.startTime : '/--/' }}</div>
|
||||
|
||||
<!-- <el-divider></el-divider>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>存油储值(订单)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.fuelOrder }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>存油储值(退款)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.fuelRefund }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>存油储值(实收)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.fuelPaid }}</div>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>结束时间:</div>
|
||||
<div>{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.endTime : '/--/' }}</div>
|
||||
|
||||
<!-- <el-divider></el-divider>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>普通收款(订单)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.goodsOrder }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>普通收款(退款)</div>-->
|
||||
<!-- <div>￥-{{ handoverList.orderSummary.goodsRefund }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>普通收款(实收)</div>-->
|
||||
<!-- <div>￥{{ handoverList.orderSummary.goodsPaid }}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
<div class="input-box">
|
||||
<div>当前版本:</div>
|
||||
<div>V1.0.1</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">订单汇总</div>
|
||||
<div class="input-hui">
|
||||
<div>类型</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>油品订单(订单)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>油品订单(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilRefund : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>油品订单(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilPaid : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>油品优惠(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.oilDiacount : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>抹零总额(实收)</div>-->
|
||||
<!-- <div>￥2164.55</div>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<el-divider></el-divider>
|
||||
<!-- 六个一条线 -->
|
||||
<div class="input-box">
|
||||
<div>会员储值(订单)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>会员储值(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardRefund : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>会员储值(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardPaid : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值赠送(订单)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值赠送(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftRefund : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值赠送(实际)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.cardGiftPaid : '0' }}</div>
|
||||
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>存油储值(订单)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>存油储值(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelRefund : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>存油储值(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.fuelPaid : '0' }}</div>
|
||||
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>普通收款(订单)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.goodsOrder : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>普通收款(退款)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.goodsRefund : '0' }}</div>
|
||||
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>普通收款(实收)</div>
|
||||
<div>￥{{ handoverList && handoverList.orderSummary ? handoverList.orderSummary.goodsPaid : '0' }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">退款汇总</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>退款金额</div>
|
||||
</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('all')" v-if="item.refundAmount > 0">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.refundAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div class="input-box" >
|
||||
<div>合计</div>
|
||||
<div>￥2164.55</div>
|
||||
<div>￥{{refundAggregateTotal}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -139,26 +156,14 @@
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>现金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值卡</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>加油金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>银行转1</div>
|
||||
<div>￥2164.55</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('all')" v-if="item.paidAmount > 0">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥2164.55</div>
|
||||
<div>￥{{totalTotalOfActualReceipts}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -168,26 +173,14 @@
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>现金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>储值卡</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>加油金</div>
|
||||
<div>￥2164.55</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>银行转1</div>
|
||||
<div>￥2164.55</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('oil')">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥2164.55</div>
|
||||
<div>￥{{totalOilOrders}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
@ -196,40 +189,66 @@
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥0.00</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">普通订单</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('goods')">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥0.00</div>
|
||||
<div>￥{{totalOfProductOrders}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="box-ge">-->
|
||||
<!-- <div class="boloicon">普通订单</div>-->
|
||||
<!-- <div class="input-hui">-->
|
||||
<!-- <div>支付方式</div>-->
|
||||
<!-- <div>金额</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="input-box" v-for="item in paymentAggregation('goods')">-->
|
||||
<!-- <div>{{calculateThePaymentMethod(item.payType)}}</div>-->
|
||||
<!-- <div>￥{{item.paidAmount}}</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <el-divider></el-divider>-->
|
||||
<!-- <div class="input-box">-->
|
||||
<!-- <div>合计</div>-->
|
||||
<!-- <div>￥0.00</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">会员储值</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>现金</div>
|
||||
<div>￥888.88</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('fg')">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalMemberStoredValue}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">积分商城</div>
|
||||
<div class="input-hui">
|
||||
<div>支付方式</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box" v-for="item in paymentAggregation('point')" v-if="item.paidAmount>0">
|
||||
<div>{{calculateThePaymentMethod(item.payType)}}</div>
|
||||
<div>￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥{{pointsMallStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">油号统计</div>
|
||||
<div class="input-hui-frou">
|
||||
@ -238,23 +257,16 @@
|
||||
<div>升数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>92#</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
<div class="input-box-frou" v-for="item in oilNumberStatistics()">
|
||||
<div>{{item.oilName}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div>{{item.oilNum}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>92#</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalOilNumberStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
@ -263,14 +275,14 @@
|
||||
<div>油品</div>
|
||||
<div>金额</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>92#</div>
|
||||
<div>￥888.88</div>
|
||||
<div class="input-box" v-for="item in oilNumberStatistics()">
|
||||
<div>{{item.oilName}}</div>
|
||||
<div>{{item.paidDiscount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{discountStatisticsTotal}}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-ge">
|
||||
@ -281,23 +293,16 @@
|
||||
<div>升数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>一号枪</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
<div class="input-box-frou" v-for="item in greaseGunStatistics()">
|
||||
<div>{{item.gunName}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div>{{item.oilNum}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>二号枪</div>
|
||||
<div>9</div>
|
||||
<div>1447.03</div>
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalOfOilGunStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -306,47 +311,67 @@
|
||||
<div class="input-hui-frou">
|
||||
<div>员工姓名</div>
|
||||
<div>笔数</div>
|
||||
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>一号员工</div>
|
||||
<div>9</div>
|
||||
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
<div class="input-box-frou" v-for="item in employeeStatistics()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.paidAmount}}</div>
|
||||
</div>
|
||||
<div class="input-box-frou">
|
||||
<div>二号员工</div>
|
||||
<div>9</div>
|
||||
|
||||
<div style="text-align: right">￥888.88</div>
|
||||
</div>
|
||||
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥888.88</div>
|
||||
<div>￥{{totalOfEmployeeStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="box-ge">
|
||||
<div class="boloicon">挂账统计</div>
|
||||
<el-divider>挂账详情</el-divider>
|
||||
<div class="input-hui-frou">
|
||||
<div>挂账单位</div>
|
||||
<div>笔数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou" v-for="item in billingDetails()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.amount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥{{statisticsOfAccountDetails}}</div>
|
||||
</div>
|
||||
|
||||
|
||||
<el-divider>归还详情</el-divider>
|
||||
<div class="input-hui-frou">
|
||||
<div>挂账单位</div>
|
||||
<div>笔数</div>
|
||||
<div style="text-align: right">金额</div>
|
||||
</div>
|
||||
<div class="input-box-frou" v-for="item in returnedToTheAccount()">
|
||||
<div>{{item.name}}</div>
|
||||
<div>{{item.numberOfDeals}}</div>
|
||||
<div style="text-align: right">￥{{item.amount}}</div>
|
||||
</div>
|
||||
<el-divider></el-divider>
|
||||
<div class="input-box">
|
||||
<div>合计</div>
|
||||
<div>￥{{postedAccountReturnStatistics}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div style="width: 100%; height: 100px"></div>
|
||||
<!-- <div class="app-bottom">-->
|
||||
<!-- <el-card >-->
|
||||
<!-- <div class="bottom-xz">-->
|
||||
<!-- <div class="anniu" @click="shift">交班</div>-->
|
||||
<!-- <div class="anniu-lv">云打印</div>-->
|
||||
<!-- <div class="anniu-lv">本地打印</div>-->
|
||||
<!-- <div ><el-link type="primary" @click="recording">交班记录</el-link></div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-card>-->
|
||||
<!-- </div>-->
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
import BigNumber from "bignumber.js";
|
||||
|
||||
export default {
|
||||
name: "HandoverOnly",
|
||||
@ -360,8 +385,9 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
},
|
||||
created() {
|
||||
console.log("12312231",this.recordData)
|
||||
this.handoverList = this.recordData
|
||||
// this.getHandover();
|
||||
|
||||
this.handoverList = JSON.parse(this.recordData)
|
||||
// this.getHandover();
|
||||
},
|
||||
methods: {
|
||||
// getHandover() {
|
||||
@ -380,6 +406,89 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
paymentAggregation(flag) {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
this.handoverList.paymentAggregation.forEach(res=> {
|
||||
if (flag == 'fg') {
|
||||
if (res.flag == 'fuel' || res.flag == 'card') {
|
||||
let existingElementIndex = count.findIndex(item => item.payType === res.payType);
|
||||
if (existingElementIndex !== -1) {
|
||||
// let existingElement = count[existingElementIndex];
|
||||
// 确保 paidAmount 和 refundAmount 是有效的数字类型
|
||||
// existingElement.paidAmount = (Number(existingElement.paidAmount) || 0) + (Number(res.paidAmount) || 0);
|
||||
// existingElement.refundAmount = (Number(existingElement.refundAmount) || 0) + (Number(res.refundAmount) || 0);
|
||||
|
||||
// 如果需要将结果转换为字符串
|
||||
// existingElement.paidAmount = existingElement.paidAmount.toString();
|
||||
// existingElement.refundAmount = existingElement.refundAmount.toString();
|
||||
}else {
|
||||
count.push(res);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (res.flag == flag) {
|
||||
count.push(res)
|
||||
}
|
||||
})
|
||||
}
|
||||
return count;
|
||||
},
|
||||
|
||||
calculateThePaymentMethod(payType) {
|
||||
switch (payType) {
|
||||
case 'ALIPAY':
|
||||
return '支付宝'
|
||||
break;
|
||||
case 'WECHAT':
|
||||
return '微信'
|
||||
break;
|
||||
case 'UNIONPAY':
|
||||
return '银联二维码'
|
||||
break;
|
||||
case 'CASH':
|
||||
return '现金'
|
||||
break;
|
||||
}
|
||||
return '未知'
|
||||
},
|
||||
oilNumberStatistics() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.oilNumberStatistics) {
|
||||
return this.handoverList.oilNumberStatistics
|
||||
}
|
||||
return count;
|
||||
},
|
||||
greaseGunStatistics() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.greaseGunStatistics) {
|
||||
return this.handoverList.greaseGunStatistics
|
||||
}
|
||||
return count;
|
||||
},
|
||||
employeeStatistics() {
|
||||
console.log("this.employeeStatistics",this.handoverList.employeeStatistics)
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.employeeStatistics) {
|
||||
return this.handoverList.employeeStatistics
|
||||
}
|
||||
return count;
|
||||
},
|
||||
billingDetails() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.billingDetails) {
|
||||
return this.handoverList.billingDetails
|
||||
}
|
||||
return count;
|
||||
},
|
||||
returnedToTheAccount() {
|
||||
let count = [];
|
||||
if (this.handoverList && this.handoverList.returnedToTheAccount) {
|
||||
return this.handoverList.returnedToTheAccount
|
||||
}
|
||||
return count;
|
||||
},
|
||||
shift() {
|
||||
this.$confirm('交班并退出系统, 是否继续?', '提示', {
|
||||
confirmButtonText: '确定',
|
||||
@ -409,6 +518,152 @@ import {addHandoverApi, getHandoverApi} from "@/api/cashier/handover";
|
||||
});
|
||||
});
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
//退款汇总合计
|
||||
refundAggregateTotal() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "all"){
|
||||
num = num.plus(new BigNumber(res.refundAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//实收汇总合计
|
||||
totalTotalOfActualReceipts() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "all") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//油品订单合计
|
||||
totalOilOrders() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "oil") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//商品订单合计
|
||||
totalOfProductOrders() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "goods") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//会员储值合计
|
||||
totalMemberStoredValue() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "card" || res.flag == "fuel") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
// 积分商城统计
|
||||
pointsMallStatistics() {
|
||||
if (this.handoverList && this.handoverList.paymentAggregation) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.paymentAggregation.forEach(res => {
|
||||
if (res.flag == "point") {
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
}
|
||||
});
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0.00;
|
||||
},
|
||||
//油号统计合计
|
||||
totalOilNumberStatistics() {
|
||||
if (this.handoverList && this.handoverList.oilNumberStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.oilNumberStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
//优惠统计合计
|
||||
discountStatisticsTotal() {
|
||||
if (this.handoverList && this.handoverList.oilNumberStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.oilNumberStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidDiscount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
//油枪统计合计
|
||||
totalOfOilGunStatistics() {
|
||||
if (this.handoverList && this.handoverList.greaseGunStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.greaseGunStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
//员工统计合计
|
||||
totalOfEmployeeStatistics() {
|
||||
if (this.handoverList && this.handoverList.employeeStatistics) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.employeeStatistics.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.paidAmount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
// 挂账详情统计
|
||||
statisticsOfAccountDetails(){
|
||||
if (this.handoverList && this.handoverList.billingDetails) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.billingDetails.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.amount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
},
|
||||
// 挂账归还统计
|
||||
postedAccountReturnStatistics(){
|
||||
if (this.handoverList && this.handoverList.returnedToTheAccount) {
|
||||
let num = new BigNumber(0);
|
||||
this.handoverList.returnedToTheAccount.forEach(res=>{
|
||||
num = num.plus(new BigNumber(res.amount));
|
||||
})
|
||||
return Number(num.toString()); // 转换为数字
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -808,6 +808,7 @@ import {getDicts} from "@/api/dict/data";
|
||||
this.dialogVisiblej = false;
|
||||
this.open2 = false;
|
||||
this.open4 = false;
|
||||
this.getList();
|
||||
},
|
||||
// 收款
|
||||
collection(){
|
||||
|
||||
@ -60,31 +60,36 @@
|
||||
width="400"
|
||||
trigger="click">
|
||||
<div>
|
||||
<el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
|
||||
<el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.type" :key="index">
|
||||
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
||||
<div style="width: 200px">{{item.type}}</div>
|
||||
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
||||
<div style="color: red">-￥{{ fullReduction }}</div>
|
||||
<div style="color: grey" v-if="item.discount!=0">满{{ item.full }}元，打{{ item.discount }}折</div>
|
||||
<div style="color: grey" v-else>满{{ item.full }}元，减{{ item.reduce }}元</div>
|
||||
<div v-if="fullReduceDiscount.length>0">
|
||||
<el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
|
||||
<el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.type" :key="index">
|
||||
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
||||
<div style="width: 200px">{{item.type}}</div>
|
||||
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
||||
<div style="color: red">-￥{{ fullReduction }}</div>
|
||||
<div style="color: grey" v-if="item.discount!=0">满{{ item.full }}元，打{{ item.discount }}折</div>
|
||||
<div style="color: grey" v-else>满{{ item.full }}元，减{{ item.reduce }}元</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
<div v-else>
|
||||
暂无满减油品信息
|
||||
</div>
|
||||
</div>
|
||||
<div slot="reference">
|
||||
<el-checkbox :indeterminate="isIndeterminate1"
|
||||
<el-checkbox :disabled="fullReduceDiscount.length==0"
|
||||
style="color: black;font-size: 16px"
|
||||
v-model="checkAll1" @change="handleCheckAllChange1">
|
||||
</el-checkbox>
|
||||
</el-checkbox><!--:indeterminate="isIndeterminate1"-->
|
||||
满减活动
|
||||
</div>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div>-￥{{ fullReduction + goodsDiscount }}</div>
|
||||
<div>-￥{{ fullReduction }}</div>
|
||||
</div>
|
||||
<div class="center-left-hj" v-show="isMember">
|
||||
<div class="center-left-hj" v-show="isMember && gradeDiscount.length>0">
|
||||
<div>
|
||||
<el-popover
|
||||
placement="bottom-start"
|
||||
@ -117,67 +122,68 @@
|
||||
</div>
|
||||
<div class="center-left-hj" v-show="isMember && refuelMoney!=null">
|
||||
<div>
|
||||
<el-popover
|
||||
placement="bottom-start"
|
||||
width="400"
|
||||
trigger="click">
|
||||
<div>
|
||||
<el-checkbox-group v-model="checkedCities3" @change="handleCheckedCitiesChange3">
|
||||
<el-checkbox v-for="city in cities3" :label="city" :key="city">
|
||||
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
||||
<div style="width: 200px">{{city}}</div>
|
||||
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
||||
<div style="color: red">-￥1.56</div>
|
||||
<div style="color: grey">满100元每升优惠0.2元</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
<div slot="reference">
|
||||
<el-checkbox :indeterminate="isIndeterminate3"
|
||||
style="color: black;font-size: 16px"
|
||||
v-model="checkAll3" @change="handleCheckAllChange3">
|
||||
</el-checkbox>
|
||||
囤油卡
|
||||
<div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
|
||||
（{{ item.type }}卡
|
||||
<span style="color: #00afff">{{ item.oilType }}</span>
|
||||
余额：{{ item.refuelMoney }}L）
|
||||
</div>
|
||||
</div>
|
||||
</el-popover>
|
||||
<!-- <el-popover-->
|
||||
<!-- placement="bottom-start"-->
|
||||
<!-- width="400"-->
|
||||
<!-- trigger="click">-->
|
||||
<!-- <div>-->
|
||||
<!-- <el-checkbox-group v-model="checkedCities3" @change="handleCheckedCitiesChange3">-->
|
||||
<!-- <el-checkbox v-for="city in cities3" :label="city" :key="city">-->
|
||||
<!-- <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
|
||||
<!-- <div style="width: 200px">{{city}}</div>-->
|
||||
<!-- <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
|
||||
<!-- <div style="color: red">-￥1.56</div>-->
|
||||
<!-- <div style="color: grey">满100元每升优惠0.2元</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-checkbox>-->
|
||||
<!-- </el-checkbox-group>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div slot="reference">-->
|
||||
<!-- -->
|
||||
<!-- </div>-->
|
||||
<!-- </el-popover>-->
|
||||
<el-checkbox
|
||||
style="color: black;font-size: 16px"
|
||||
v-model="checkAll3" @change="handleCheckAllChange3">
|
||||
</el-checkbox><!--:indeterminate="isIndeterminate3"-->
|
||||
囤油卡
|
||||
<div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
|
||||
（{{ item.type }}卡
|
||||
<span style="color: #00afff">{{ item.oilType }}</span>
|
||||
余额：{{ item.refuelMoney }}L）
|
||||
</div>
|
||||
</div>
|
||||
<div>- {{ consumeRefuelMoney }}L</div>
|
||||
</div>
|
||||
<div class="center-left-hj" v-show="isMember">
|
||||
<div>
|
||||
<el-popover
|
||||
placement="bottom-start"
|
||||
width="400"
|
||||
trigger="click">
|
||||
<div>
|
||||
<el-checkbox-group v-model="checkedCities4" @change="handleCheckedCitiesChange4">
|
||||
<el-checkbox v-for="city in cities4" :label="city" :key="city">
|
||||
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
||||
<div style="width: 200px">{{city}}</div>
|
||||
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
||||
<div style="color: red">-￥1.56</div>
|
||||
<div style="color: grey">满100元每升优惠0.2元</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
</el-checkbox-group>
|
||||
</div>
|
||||
<div slot="reference">
|
||||
<el-checkbox :indeterminate="isIndeterminate4"
|
||||
style="color: black;font-size: 16px"
|
||||
v-model="checkAll4" @change="handleCheckAllChange4">
|
||||
</el-checkbox>
|
||||
储值卡
|
||||
<span>（账户余额：{{ balance }}元）</span>
|
||||
</div>
|
||||
</el-popover>
|
||||
<!-- <el-popover-->
|
||||
<!-- placement="bottom-start"-->
|
||||
<!-- width="400"-->
|
||||
<!-- trigger="click">-->
|
||||
<!-- <div>-->
|
||||
<!-- <el-checkbox-group v-model="checkedCities4" @change="handleCheckedCitiesChange4">-->
|
||||
<!-- <el-checkbox v-for="city in cities4" :label="city" :key="city">-->
|
||||
<!-- <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
|
||||
<!-- <div style="width: 200px">{{city}}</div>-->
|
||||
<!-- <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
|
||||
<!-- <div style="color: red">-￥1.56</div>-->
|
||||
<!-- <div style="color: grey">满100元每升优惠0.2元</div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </el-checkbox>-->
|
||||
<!-- </el-checkbox-group>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div slot="reference">-->
|
||||
<!-- -->
|
||||
<!-- </div>-->
|
||||
<!-- </el-popover>-->
|
||||
<el-checkbox style="color: black;font-size: 16px"
|
||||
v-model="checkAll4" @change="handleCheckAllChange4">
|
||||
</el-checkbox>
|
||||
储值卡
|
||||
<span>（账户余额：{{ balance }}元）</span>
|
||||
</div>
|
||||
<div>-￥{{ consumeAmount }}</div>
|
||||
</div>
|
||||
@ -188,13 +194,13 @@
|
||||
width="400"
|
||||
trigger="click">
|
||||
<div>
|
||||
<el-checkbox-group v-model="checkedCities5" @change="handleCheckedCitiesChange5">
|
||||
<el-checkbox v-for="city in cities5" :label="city" :key="city">
|
||||
<el-checkbox-group v-model="checkedCities5 && couponDiscount.length>0" @change="handleCheckedCitiesChange5">
|
||||
<el-checkbox v-for="(item,index) in couponDiscount" :label="item.name" :key="index">
|
||||
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
||||
<div style="width: 200px">{{city}}</div>
|
||||
<div style="width: 200px">{{item.name}}</div>
|
||||
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
||||
<div style="color: red">-￥1.56</div>
|
||||
<div style="color: grey">满100元每升优惠0.2元</div>
|
||||
<div style="color: red">-￥{{ item.reduce }}</div>
|
||||
<div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>
|
||||
</div>
|
||||
</div>
|
||||
</el-checkbox>
|
||||
@ -242,7 +248,7 @@
|
||||
<div class="bottom-price">￥{{ oilActualPay + goodsActualPay }}</div>
|
||||
<div class="price-red">优惠合计：{{ oilDiscount + goodsDiscount }}元/{{consumeRefuelMoney}}L</div>
|
||||
</div>
|
||||
<div class="center-left-lv" @click="settlement">立即结算</div>
|
||||
<div class="center-left-lv" @click="settlement" :disabled="(oilActualPay + goodsActualPay)==0">立即结算</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -267,8 +273,9 @@
|
||||
<div class="of-box" v-for="(item,index) in gunList" :key="index"
|
||||
:style="{'background-color': colorList[index%5].color}"
|
||||
@click="refuel(item)">
|
||||
<!-- <div>{{ getName(oilNameList,item.oilName) }}</div>-->
|
||||
<div>{{ item.oilNumber }}</div>
|
||||
<div>{{ getName(oilNameList,getOilNames(oilNumberList,item.numberId)) }}</div>
|
||||
<!-- <div>{{ getOilNames(oilNumberList,item.numberId) }}</div>-->
|
||||
<!-- <div>{{ item.oilNumber }}</div>-->
|
||||
|
||||
<div class="of-title" >{{item.gunName}}</div>
|
||||
<div style="display: flex;justify-content: space-between">
|
||||
@ -276,16 +283,21 @@
|
||||
<span style="font-size: 12px">{{ item.tankName }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="of-box" v-for="(item,index) in oilNumGunList" :key="index"-->
|
||||
<!-- :style="{'background-color': colorList[index%5].color}"-->
|
||||
<!-- @click="refuel(item.id)">-->
|
||||
<!-- <div>{{ getName(oilNameList,item.oilName) }}</div>-->
|
||||
<!-- 点击之后样式测试-->
|
||||
<div class="after-box">
|
||||
<div>11</div>
|
||||
|
||||
<!-- <div class="of-title" >{{item.oilGunNum}}号枪</div>-->
|
||||
<!-- <div>-->
|
||||
<div class="of-title" >1号枪</div>
|
||||
<div>
|
||||
<!-- <img src="../../../assets/images/jya.png" style="width: 18px;height: 18px;">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<span>
|
||||
<svg t="1700561564710" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9686" width="16" height="16"><path d="M661.8 868.4V455.8h27.9c15.3-0.1 27.8 12.3 27.9 27.6V746c-0.1 67.5 54.5 122.3 121.9 122.4S961.9 813.9 962 746.5V241.6c0.1-25.4-10.1-49.8-28.3-67.5l-99.4-98.5c-18-18-47.2-18-65.2 0s-18 47.2 0 65.2l64.3 64.8-47.7 49.5c-15.8 16-15.8 41.6 0 57.6 7.4 7.8 17.6 12.2 28.3 12.1h54v422.1c0 15.4-12.5 27.9-27.9 27.9-15.4 0-27.9-12.5-27.9-27.9V484.1c0.1-67.3-54.3-121.8-121.6-121.9H662.3v-225c-0.1-41.5-33.7-75.1-75.1-75.1H193.4c-41.5 0.1-75.1 33.7-75.1 75.1v731.2h-9.4c-25.8 0-46.8 21-46.8 46.8C62 941 83 962 108.8 962h562.5c25.8 0 46.8-20.9 46.8-46.8 0-25.8-20.9-46.8-46.8-46.8h-9.5zM253.2 155.6h273.6c22.8 0 41.3 18.4 41.4 41.2v199.1c0 22.8-18.4 41.3-41.2 41.4H253.2c-22.8 0-41.3-18.4-41.4-41.2V197c0-22.8 18.4-41.3 41.2-41.4h0.2z" fill="#FFFFFF" p-id="9687"></path></svg>
|
||||
</span>
|
||||
<span style="margin-right: 10px">
|
||||
<svg t="1700561410052" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5197" width="16" height="16"><path d="M365.714286 365.714286h109.714285v365.714285H365.714286V365.714286z m182.857143 0H658.285714v365.714285H548.571429V365.714286z m329.142857-36.571429v438.857143A182.857143 182.857143 0 0 1 694.857143 950.857143h-365.714286A182.857143 182.857143 0 0 1 146.285714 768v-438.857143h109.714286v416.256c0 45.129143 47.104 95.744 93.037714 95.744h326.217143c57.563429 0 92.745143-52.370286 92.745143-95.744V329.142857H877.714286zM676.571429 146.285714h182.857142a54.857143 54.857143 0 0 1 54.857143 54.857143v54.857143h-804.571428v-54.857143A54.857143 54.857143 0 0 1 164.571429 146.285714h182.857142l38.4-51.2a54.857143 54.857143 0 0 1 43.885715-21.942857h164.571428a54.857143 54.857143 0 0 1 43.885715 21.942857l38.4 51.2z" fill="#FFFFFF" p-id="5198"></path></svg>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -465,7 +477,7 @@
|
||||
<el-table-column label="数量" align="center" prop="num"/>
|
||||
<el-table-column label="金额" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.retailPrice * scope.row.num }}</span>
|
||||
<span>{{ (scope.row.retailPrice * scope.row.num).toFixed(2) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@ -795,8 +807,8 @@
|
||||
import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade";
|
||||
import {getOilGun} from "@/api/cashier/oilGuns";
|
||||
import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
import {getOilNumberById} from "@/api/cashier/oilnumber";
|
||||
import {selectPreferential} from "@/api/cashier/preferential";
|
||||
import {getOilNumberById, oilNumberList} from "@/api/cashier/oilnumber";
|
||||
import {selectCoupon, selectPreferential} from "@/api/cashier/preferential";
|
||||
import {addHangBill} from "@/api/cashier/hangbill";
|
||||
import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
|
||||
|
||||
@ -818,20 +830,21 @@
|
||||
cities2: cityOptions,
|
||||
gradeDiscount: [],
|
||||
// 囤油卡全选
|
||||
checkAll3: false,
|
||||
checkAll3: true,
|
||||
isIndeterminate3: true,
|
||||
checkedCities3: ['上海'],
|
||||
checkedCities3: [],
|
||||
cities3: cityOptions,
|
||||
// 储值卡全选
|
||||
checkAll4: false,
|
||||
checkAll4: true,
|
||||
isIndeterminate4: true,
|
||||
checkedCities4: ['上海'],
|
||||
checkedCities4: [],
|
||||
cities4: cityOptions,
|
||||
// 优惠券全选
|
||||
checkAll5: false,
|
||||
isIndeterminate5: true,
|
||||
checkedCities5: ['上海'],
|
||||
checkedCities5: [],
|
||||
cities5: cityOptions,
|
||||
couponDiscount: [],
|
||||
// 优惠券列表
|
||||
couponList:[],
|
||||
// 消费升数
|
||||
@ -870,6 +883,8 @@
|
||||
oilActualPay:0,
|
||||
// 油品优惠金额
|
||||
oilDiscount:0,
|
||||
// 囤油卡消费金额
|
||||
hoardAmount:0,
|
||||
// 商品优惠金额
|
||||
goodsDiscount:0,
|
||||
// 商品实付金额
|
||||
@ -1019,10 +1034,16 @@
|
||||
isQuery:true,
|
||||
// 油枪列表
|
||||
gunList:[],
|
||||
// 油号列表
|
||||
oilNumberList:[],
|
||||
// 是否可以点会员确定按钮
|
||||
isSure:true,
|
||||
// 优惠券消费金额
|
||||
couponAmount:0,
|
||||
// 是否为满减互斥
|
||||
isUseFull:false,
|
||||
// 是否为储值卡互斥
|
||||
isUseBalance:false,
|
||||
// 查询优惠活动信息所需参数
|
||||
preferentialData:{
|
||||
userId:"",
|
||||
@ -1060,6 +1081,19 @@
|
||||
this.getUnitList();
|
||||
},
|
||||
methods:{
|
||||
getOilNames(list,id){
|
||||
let name = ""
|
||||
let _this = this;
|
||||
if(list!=null && list!=""){
|
||||
list.forEach(item => {
|
||||
if (item.numberId == id){
|
||||
name = item.oilName;
|
||||
// _this.oilType = item.oilName;
|
||||
}
|
||||
})
|
||||
}
|
||||
return name;
|
||||
},
|
||||
// 挂账
|
||||
addCredits(){
|
||||
this.dialogVisibleCredit = true
|
||||
@ -1164,6 +1198,19 @@
|
||||
this.fullReduceDiscount.forEach(item => {
|
||||
list.push(item.type)
|
||||
})
|
||||
if (val){
|
||||
this.fullReduceDiscount.forEach(item => {
|
||||
if (item.discount!=0){
|
||||
this.fullReduction = this.oilAmount - (this.oilAmount * item.discount).toFixed(2)
|
||||
}else {
|
||||
this.fullReduction = item.reduce
|
||||
}
|
||||
})
|
||||
|
||||
}else {
|
||||
this.fullReduction = 0;
|
||||
this.getGrade(this.member.id)
|
||||
}
|
||||
this.checkedCities1 = val ? list : [];
|
||||
this.isIndeterminate1 = false;
|
||||
},
|
||||
@ -1186,8 +1233,25 @@
|
||||
this.isIndeterminate2 = checkedCount > 0 && checkedCount < this.gradeDiscount.length;
|
||||
},
|
||||
handleCheckAllChange3(val) {
|
||||
this.checkedCities3 = val ? cityOptions : [];
|
||||
this.isIndeterminate3 = false;
|
||||
if (val==false){
|
||||
this.consumeAmount = 0;
|
||||
if (this.isUseFull){
|
||||
this.countAmountFull()
|
||||
return;
|
||||
}else {
|
||||
this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
if (this.isUseBalance){
|
||||
this.countAmountUnBalance()
|
||||
return;
|
||||
}else {
|
||||
this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
}else {
|
||||
this.changeRefuelMoney()
|
||||
}
|
||||
},
|
||||
handleCheckedCitiesChange3(value) {
|
||||
let checkedCount = value.length;
|
||||
@ -1195,8 +1259,23 @@
|
||||
this.isIndeterminate3 = checkedCount > 0 && checkedCount < this.cities3.length;
|
||||
},
|
||||
handleCheckAllChange4(val) {
|
||||
this.checkedCities4 = val ? cityOptions : [];
|
||||
this.isIndeterminate4 = false;
|
||||
if (val==false){
|
||||
this.consumeAmount = 0;
|
||||
if (this.isUseFull){
|
||||
this.countAmountFull()
|
||||
return;
|
||||
}else {
|
||||
this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
if (this.isUseBalance){
|
||||
this.countAmountUnBalance()
|
||||
return;
|
||||
}else {
|
||||
this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
}
|
||||
},
|
||||
handleCheckedCitiesChange4(value) {
|
||||
let checkedCount = value.length;
|
||||
@ -1204,13 +1283,31 @@
|
||||
this.isIndeterminate4 = checkedCount > 0 && checkedCount < this.cities4.length;
|
||||
},
|
||||
handleCheckAllChange5(val) {
|
||||
this.checkedCities5 = val ? cityOptions : [];
|
||||
let list = []
|
||||
this.couponDiscount.forEach(item => {
|
||||
list.push(item.name)
|
||||
})
|
||||
if (val){
|
||||
this.couponAmount = 0
|
||||
this.couponDiscount.forEach(item2 => {
|
||||
this.couponAmount += item2.reduce
|
||||
})
|
||||
}else {
|
||||
this.couponAmount = 0
|
||||
}
|
||||
this.checkedCities5 = val ? list : [];
|
||||
this.isIndeterminate5 = false;
|
||||
},
|
||||
handleCheckedCitiesChange5(value) {
|
||||
this.couponAmount = 0;
|
||||
for (let i = 0; i < this.couponDiscount.length; i++){
|
||||
if (this.couponDiscount[i].name == value[i]){
|
||||
this.couponAmount += this.couponDiscount[i].reduce
|
||||
}
|
||||
}
|
||||
let checkedCount = value.length;
|
||||
this.checkAll5 = checkedCount === this.cities5.length;
|
||||
this.isIndeterminate5 = checkedCount > 0 && checkedCount < this.cities5.length;
|
||||
this.checkAll5 = checkedCount === this.couponDiscount.length;
|
||||
this.isIndeterminate5 = checkedCount > 0 && checkedCount < this.couponDiscount.length;
|
||||
},
|
||||
// 模糊查询商品信息
|
||||
querySearch(queryString, cb) {
|
||||
@ -1280,7 +1377,7 @@
|
||||
this.oilDiscount = 0;
|
||||
this.goodsDiscount = 0;
|
||||
this.userNo = "";
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount - this.couponAmount
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount
|
||||
this.goodsActualPay = this.goodsAmount - this.goodsDiscount
|
||||
this.isSure = true;
|
||||
this.handleChange();
|
||||
@ -1493,20 +1590,30 @@
|
||||
}
|
||||
})
|
||||
|
||||
let oilActualPay = _this.oilActualPay;
|
||||
// let oilActualPay = _this.oilActualPay;
|
||||
_this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
|
||||
_this.oilActualPay = oilActualPay - _this.oilDiscount;
|
||||
// _this.oilActualPay = oilActualPay - _this.oilDiscount;
|
||||
// 储值卡余额
|
||||
// 如果总金额为0 则表示没有使用囤油卡
|
||||
if (oilActualPay == 0){
|
||||
oilActualPay = _this.oilAmount - _this.oilDiscount;
|
||||
}
|
||||
if (_this.balance>=(_this.oilAmount - _this.oilDiscount)){
|
||||
_this.consumeAmount = _this.oilAmount - _this.oilDiscount;
|
||||
_this.oilActualPay = 0;
|
||||
// if (oilActualPay == 0){
|
||||
// oilActualPay = _this.oilAmount - _this.oilDiscount - _this.fullReduction;
|
||||
// }
|
||||
// if (_this.balance>=(_this.oilAmount - _this.oilDiscount)){
|
||||
// _this.consumeAmount = _this.oilAmount - _this.oilDiscount - _this.fullReduction;
|
||||
// _this.oilActualPay = 0;
|
||||
// }else {
|
||||
// _this.consumeAmount = _this.balance;
|
||||
// _this.oilActualPay = oilActualPay - _this.oilDiscount - _this.balance - _this.fullReduction;
|
||||
// }
|
||||
if (_this.isUseFull){
|
||||
_this.countAmountFull()
|
||||
}else {
|
||||
_this.consumeAmount = _this.balance;
|
||||
_this.oilActualPay = oilActualPay - _this.oilDiscount - _this.balance;
|
||||
_this.countAmountBalance()
|
||||
}
|
||||
if (_this.isUseBalance){
|
||||
_this.countAmountUnBalance()
|
||||
}else {
|
||||
_this.countAmountBalance()
|
||||
}
|
||||
})
|
||||
},
|
||||
@ -1524,12 +1631,130 @@
|
||||
this.preferentialData.userId = data.id;
|
||||
this.preferentialData.gradeId = data.gradeId;
|
||||
if (this.oilOrder.length>0){
|
||||
// this.oilOrder.forEach(item => {
|
||||
// this.preferentialData.oilName = item.oilName;
|
||||
// this.preferentialData.oilPrice = item.oilPrice;
|
||||
// this.preferentialData.oilLiters = item.liters;
|
||||
// })
|
||||
this.preferential();
|
||||
this.getCoupon();
|
||||
}
|
||||
},
|
||||
// 调用优惠券接口
|
||||
getCoupon(){
|
||||
let _this = this;
|
||||
_this.oilOrder.forEach(item1 => {
|
||||
_this.preferentialData.oilName = item1.oilName;
|
||||
_this.preferentialData.oilPrice = item1.oilPrice;
|
||||
_this.preferentialData.oilLiters = item1.liters;
|
||||
_this.couponDiscount =[];
|
||||
selectCoupon(_this.preferentialData).then(response => {
|
||||
let couponAmount = 0;
|
||||
if (response.data.length>0){
|
||||
response.data.forEach(item => {
|
||||
let discount = {type:item.type,discountType:item.discountType,name:item.name,full:0,reduce:0,discount:0}
|
||||
discount.full = item.satisfiedAmount
|
||||
if (item.type==0){
|
||||
// 油品券
|
||||
if (item.discountType==0){
|
||||
// 满减券
|
||||
discount.reduce = item.discountAmount
|
||||
}else {
|
||||
// 折扣券
|
||||
discount.discount = item.specialDiscount
|
||||
discount.reduce = item.discountOffset
|
||||
}
|
||||
}else if (item.type==1){
|
||||
// 商品券
|
||||
if (item.discountType==0){
|
||||
// 满减券
|
||||
discount.reduce = item.discountAmount
|
||||
}else {
|
||||
// 折扣券
|
||||
discount.discount = item.specialDiscount
|
||||
discount.reduce = item.discountOffset
|
||||
}
|
||||
}else {
|
||||
// 通用券
|
||||
if (item.discountType==0){
|
||||
// 满减券
|
||||
discount.reduce = item.discountAmount
|
||||
}else {
|
||||
// 折扣券
|
||||
discount.discount = item.specialDiscount
|
||||
discount.reduce = item.discountOffset
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.couponDiscount.push(discount)
|
||||
_this.checkedCities5.push(item.name)
|
||||
}
|
||||
if (item.exclusiveFunction == 0){
|
||||
// 满减互斥
|
||||
_this.checkAll1 = false
|
||||
_this.checkAll4 = true;
|
||||
_this.fullReduction = 0
|
||||
_this.isUseFull = true;
|
||||
}else {
|
||||
// 储值卡付款互斥
|
||||
_this.checkAll1 = true
|
||||
_this.checkAll4 = false;
|
||||
_this.consumeAmount = 0;
|
||||
_this.isUseBalance = true;
|
||||
}
|
||||
})
|
||||
}
|
||||
_this.couponDiscount.forEach(item2 => {
|
||||
couponAmount = item2.reduce
|
||||
_this.couponAmount += couponAmount
|
||||
})
|
||||
if (_this.isUseFull){
|
||||
_this.countAmountFull()
|
||||
return;
|
||||
}else {
|
||||
_this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
if (_this.isUseBalance){
|
||||
_this.countAmountUnBalance()
|
||||
return;
|
||||
}else {
|
||||
_this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
// 使用优惠券不使用满减
|
||||
countAmountFull(){
|
||||
if (this.isMember){
|
||||
// 满减互斥
|
||||
if (this.balance >= (this.oilAmount - this.oilDiscount - this.couponAmount)){
|
||||
this.oilActualPay = 0
|
||||
this.consumeAmount = this.oilAmount - this.oilDiscount - this.couponAmount - this.hoardAmount
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount -this.balance - this.oilDiscount - this.couponAmount - this.hoardAmount
|
||||
this.consumeAmount = this.balance
|
||||
}
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount
|
||||
}
|
||||
},
|
||||
// 使用优惠券不使用储值卡
|
||||
countAmountUnBalance(){
|
||||
if (this.isMember){
|
||||
this.oilActualPay = this.oilOrder - this.fullReduction - this.oilDiscount - this.couponAmount - this.hoardAmount
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount
|
||||
}
|
||||
},
|
||||
// 使用储值卡不使用优惠券 || 使用满减不使用优惠券
|
||||
countAmountBalance(){
|
||||
if (this.isMember){
|
||||
if (this.balance >= (this.oilAmount - this.oilDiscount - this.fullReduction)){
|
||||
this.oilActualPay = 0
|
||||
this.consumeAmount = this.oilAmount - this.oilDiscount - this.fullReduction - this.hoardAmount
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount -this.balance - this.oilDiscount - this.fullReduction - this.hoardAmount
|
||||
this.consumeAmount = this.balance
|
||||
}
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount
|
||||
}
|
||||
},
|
||||
// 调用优惠参数接口
|
||||
@ -1537,7 +1762,6 @@
|
||||
let _this = this;
|
||||
// _this.fullReduction = 0;
|
||||
let fullReduction = 0;
|
||||
let oilActualPay = _this.oilActualPay
|
||||
_this.fullReduction = 0;
|
||||
_this.oilOrder.forEach(item1 => {
|
||||
_this.preferentialData.oilName = item1.oilName;
|
||||
@ -1555,7 +1779,7 @@
|
||||
if (item1.amount>=activeList[0].amount){
|
||||
discount.full = activeList[0].amount;
|
||||
discount.discount = activeList[0].discount;
|
||||
fullReduction = item1.amount - item1.amount * (activeList[0].discount / 10);
|
||||
fullReduction = item1.amount - (item1.amount * (activeList[0].discount / 10)).toFixed(2);
|
||||
}else {
|
||||
fullReduction = 0
|
||||
}
|
||||
@ -1571,17 +1795,33 @@
|
||||
}
|
||||
}else {
|
||||
_this.fullReduction = 0;
|
||||
_this.oilActualPay = oilActualPay - _this.oilDiscount - _this.fullReduction - _this.balance
|
||||
// _this.countAmountBalance();
|
||||
// _this.oilActualPay = oilActualPay - _this.oilDiscount - _this.fullReduction - _this.balance
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0 || discount.discount!=0){
|
||||
_this.fullReduceDiscount.push(discount)
|
||||
_this.checkedCities1 = [item.name]
|
||||
_this.checkAll1 = true;
|
||||
}
|
||||
})
|
||||
}
|
||||
_this.fullReduction += +fullReduction
|
||||
_this.oilActualPay = oilActualPay - _this.oilDiscount - _this.fullReduction - _this.balance
|
||||
if (_this.isUseFull){
|
||||
_this.countAmountFull()
|
||||
return;
|
||||
}else {
|
||||
_this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
if (_this.isUseBalance){
|
||||
_this.countAmountUnBalance()
|
||||
return;
|
||||
}else {
|
||||
_this.countAmountBalance()
|
||||
return;
|
||||
}
|
||||
// _this.oilActualPay = oilActualPay - _this.oilDiscount - _this.fullReduction - _this.balance
|
||||
})
|
||||
})
|
||||
// selectPreferential(data).then( response => {
|
||||
@ -1624,10 +1864,6 @@
|
||||
// let oilActualPay = _this.oilActualPay
|
||||
// _this.oilActualPay = oilActualPay - _this.oilDiscount - _this.fullReduction
|
||||
// })
|
||||
},
|
||||
// 查询该会员是否可使用优惠券
|
||||
queryCoupon(list,id){
|
||||
|
||||
},
|
||||
// 选择会员信息
|
||||
handleChoose(data){
|
||||
@ -1669,9 +1905,9 @@
|
||||
let amount = 0;
|
||||
for (let i = 0; i<goods.length; i++){
|
||||
if (_this.isMember){
|
||||
amount += goods[i].memberPrice * goods[i].num
|
||||
amount += (goods[i].memberPrice * goods[i].num).toFixed(2)
|
||||
}else {
|
||||
amount += goods[i].retailPrice * goods[i].num
|
||||
amount += (goods[i].retailPrice * goods[i].num).toFixed(2)
|
||||
}
|
||||
if (goods[i].id == val.id){
|
||||
goods[i].num = goods[i].num + 1;
|
||||
@ -1717,6 +1953,7 @@
|
||||
this.consumeAmount = 0;
|
||||
this.consumeRefuelMoney = 0;
|
||||
this.fullReduction = 0;
|
||||
this.couponAmount = 0;
|
||||
if (this.member.refuelMoney!=null){
|
||||
this.refuelMoney = JSON.parse(this.member.refuelMoney)
|
||||
}
|
||||
@ -1738,7 +1975,7 @@
|
||||
this.form.liters = (Math.ceil(num*100)/100).toFixed(2)
|
||||
}else {
|
||||
this.form.liters = this.form.amount
|
||||
this.form.amount = this.form.oilPrice * this.form.amount
|
||||
this.form.amount = (this.form.oilPrice * this.form.amount).toFixed(2)
|
||||
}
|
||||
// 获取油号信息
|
||||
// let name1 = this.getName(this.oilNameList,this.form.oilName);
|
||||
@ -1747,21 +1984,21 @@
|
||||
|
||||
if (this.select == "元"){
|
||||
this.oilAmount = +this.form.amount + this.oilAmount;
|
||||
if (this.balance!=0){
|
||||
if (this.balance>=(this.oilAmount - this.oilDiscount)){
|
||||
this.consumeAmount = this.oilAmount - this.oilDiscount;
|
||||
this.oilActualPay = 0;
|
||||
}else {
|
||||
this.consumeAmount = this.balance;
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount - this.balance;
|
||||
}
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount;
|
||||
}
|
||||
// if (this.balance!=0){
|
||||
// if (this.balance>=(this.oilAmount - this.oilDiscount)){
|
||||
// this.consumeAmount = this.oilAmount - this.oilDiscount;
|
||||
// this.oilActualPay = 0;
|
||||
// }else {
|
||||
// this.consumeAmount = this.balance;
|
||||
// this.oilActualPay = this.oilAmount - this.oilDiscount - this.balance;
|
||||
// }
|
||||
// }else {
|
||||
// this.oilActualPay = this.oilAmount - this.oilDiscount;
|
||||
// }
|
||||
}else {
|
||||
this.oilAmount = this.form.amount + this.oilAmount;
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount;
|
||||
}
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount;
|
||||
|
||||
this.oilTotal += 1;
|
||||
this.select = "元";
|
||||
@ -1769,12 +2006,8 @@
|
||||
this.getGrade(this.member.gradeId)
|
||||
this.changeRefuelMoney();
|
||||
if (this.oilOrder.length>0){
|
||||
// this.oilOrder.forEach(item => {
|
||||
// this.preferentialData.oilName = item.oilName;
|
||||
// this.preferentialData.oilPrice = item.oilPrice;
|
||||
// this.preferentialData.oilLiters = item.liters;
|
||||
// })
|
||||
this.preferential();
|
||||
this.getCoupon();
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -1783,9 +2016,12 @@
|
||||
let _this = this;
|
||||
_this.consumeRefuelMoney = 0;
|
||||
_this.oilActualPay = 0;
|
||||
let oilActPay = 0;
|
||||
_this.hoardAmount = 0;
|
||||
_this.oilOrder.forEach(item => {
|
||||
let conRefMon = 0;
|
||||
let oilActualPay = 0;
|
||||
let hoardAmount = 0;
|
||||
if (_this.refuelMoney!=null){
|
||||
let result = false;
|
||||
for (let i = 0;i < _this.refuelMoney.length;i++){
|
||||
@ -1797,6 +2033,7 @@
|
||||
}else {
|
||||
conRefMon = _this.refuelMoney[i].refuelMoney
|
||||
oilActualPay = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
|
||||
hoardAmount = (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
|
||||
}
|
||||
result = true;
|
||||
}else {
|
||||
@ -1807,7 +2044,8 @@
|
||||
}
|
||||
}
|
||||
_this.consumeRefuelMoney += +conRefMon
|
||||
_this.oilActualPay += +oilActualPay
|
||||
oilActPay += +oilActualPay
|
||||
_this.hoardAmount += +hoardAmount
|
||||
})
|
||||
},
|
||||
// 选择“元”或“L”
|
||||
@ -1846,7 +2084,7 @@
|
||||
oilNameList.forEach(item => {
|
||||
if (item.id == id){
|
||||
name = item.oilName;
|
||||
_this.oilType = item.oilType;
|
||||
_this.oilType = item.oilName;
|
||||
}
|
||||
})
|
||||
}
|
||||
@ -1884,8 +2122,21 @@
|
||||
// 加油金额
|
||||
refuel(data){
|
||||
this.select = "元";
|
||||
this.rise = [
|
||||
{value:"￥100"},
|
||||
{value:"￥150"},
|
||||
{value:"￥200"},
|
||||
{value:"￥300"},
|
||||
];
|
||||
this.amount = 0
|
||||
this.dialogVisibleamount = true;
|
||||
// 判断是否存在此油品的数据
|
||||
this.oilOrder.forEach(item => {
|
||||
// if (item.==data.){
|
||||
// this.form = item
|
||||
// }
|
||||
// return;
|
||||
})
|
||||
getOilNumberById(data.numberId).then( response => {
|
||||
this.form = response.data;
|
||||
this.gunList.forEach(item => {
|
||||
@ -1894,9 +2145,6 @@
|
||||
}
|
||||
})
|
||||
})
|
||||
// getOilNumGunById(id).then( response => {
|
||||
// this.form = response.data;
|
||||
// })
|
||||
},
|
||||
// 确定收款
|
||||
collection(){
|
||||
@ -2102,9 +2350,9 @@
|
||||
goods.forEach(item => {
|
||||
num += item.num
|
||||
if (_this.isMember){
|
||||
amount += item.memberPrice*item.num;
|
||||
amount += (item.memberPrice*item.num).toFixed(2);
|
||||
}else {
|
||||
amount += item.retailPrice*item.num;
|
||||
amount += (item.retailPrice*item.num).toFixed(2);
|
||||
}
|
||||
})
|
||||
this.goodsTotal = num;
|
||||
@ -2147,6 +2395,9 @@
|
||||
getOilGun({numberId:numberId}).then(response => {
|
||||
this.gunList = response.data.records;
|
||||
})
|
||||
oilNumberList().then(response => {
|
||||
this.oilNumberList = response.data.records;
|
||||
})
|
||||
},
|
||||
},
|
||||
|
||||
@ -2154,6 +2405,17 @@
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.after-box{
|
||||
width: 31%;
|
||||
margin-right: 10px;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 8px;
|
||||
box-sizing: border-box;
|
||||
background-color: #0270ff;
|
||||
height: 110px;
|
||||
padding: 10px;
|
||||
color: white;
|
||||
}
|
||||
.but{
|
||||
width: 150px;
|
||||
height: 50px;
|
||||
|
||||
@ -1,49 +1,142 @@
|
||||
<template>
|
||||
<div class="login-container">
|
||||
<div class="login-from-box">
|
||||
<el-form class="login-form" ref="loginForm" :model="loginForm" :rules="loginRules" label-position="left">
|
||||
<h3 class="title">{{ systemName }}</h3>
|
||||
<el-form-item prop="username">
|
||||
<span class="svg-container svg-container_login">
|
||||
<svg-icon icon-class="user" />
|
||||
</span>
|
||||
<el-input name="username" type="text" clearable v-model="loginForm.username" autocomplete="on" placeholder="用户名" />
|
||||
</el-form-item>
|
||||
<el-form-item prop="password">
|
||||
<span class="svg-container svg-container_login">
|
||||
<svg-icon icon-class="password"></svg-icon>
|
||||
</span>
|
||||
<el-input name="password" :type="pwdType" clearable @keyup.enter.native="handleLogin()" v-model="loginForm.password"
|
||||
autocomplete="on" placeholder="密码"></el-input>
|
||||
<span class="show-pwd" @click="showPwd()">
|
||||
<svg-icon :icon-class="pwdType === 'password' ? 'eye' : 'eye-open'" />
|
||||
</span>
|
||||
</el-form-item>
|
||||
<el-form-item prop="captchaCode">
|
||||
<span class="svg-container svg-container_login">
|
||||
<svg-icon icon-class="validCode" />
|
||||
</span>
|
||||
<el-input
|
||||
v-model="loginForm.captchaCode"
|
||||
auto-complete="off"
|
||||
placeholder="请输入验证码"
|
||||
style="width: 63%"
|
||||
clearable
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
</el-input>
|
||||
<div class="login-code">
|
||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
||||
<div class="login">
|
||||
<div class="box-center">
|
||||
<div class="box-left">
|
||||
<div class="bai-size">蓝鲸智慧加油站收银台</div>
|
||||
<div class="bact-box">
|
||||
<div class="sanhh">活动营销</div>
|
||||
<div class="sanhh">节省人力</div>
|
||||
<div class="sanhh">精准定位</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-right">
|
||||
<div class="box-title">
|
||||
<div style="margin-right: 15px;cursor: pointer " v-for="(item,index) in dlyzm" :key="index" @click="actindex = item.type " >
|
||||
<div>{{item.text}}</div>
|
||||
<div class="gangs" v-if="item.type == actindex " ></div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<div class="login-btn">
|
||||
<button type="button" class="btn" @click="handleLogin()">立即登录</button>
|
||||
|
||||
</div>
|
||||
<div class="tips">
|
||||
<span>深蓝数科</span>
|
||||
</div>
|
||||
</el-form>
|
||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 0" >
|
||||
|
||||
|
||||
<el-form-item prop="username">
|
||||
<el-input
|
||||
v-model="loginForm.username"
|
||||
type="text"
|
||||
auto-complete="off"
|
||||
clearable
|
||||
placeholder="账号"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="password">
|
||||
<el-input
|
||||
v-model="loginForm.password"
|
||||
type="password"
|
||||
auto-complete="off"
|
||||
placeholder="密码"
|
||||
clearable
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="captchaCode" v-if="captchaOnOff">
|
||||
<div style="display: flex;align-items: center">
|
||||
|
||||
<div>
|
||||
<el-input
|
||||
v-model="loginForm.captchaCode"
|
||||
auto-complete="off"
|
||||
placeholder="请输入验证码"
|
||||
style="width: 90%"
|
||||
clearable
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</div>
|
||||
<div class="login-code">
|
||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
||||
</div>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||
<el-form-item style="width:100%;">
|
||||
<el-button
|
||||
:loading="loading"
|
||||
size="medium"
|
||||
type="primary"
|
||||
style="width:100%;line-height: 24px;font-size: 16px;"
|
||||
@click.native.prevent="handleLogin"
|
||||
>
|
||||
<span v-if="!loading">立即登录</span>
|
||||
<span v-else>登 录 中...</span>
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<!-- 验证码-->
|
||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" v-if="actindex == 1" >
|
||||
<!-- <div class="title">-->
|
||||
<!-- <img class="logo" src="@/assets/logo/logo.png"/>-->
|
||||
<!-- <span class="name">{{ systemName }}</span>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<el-form-item prop="username">
|
||||
<el-input
|
||||
v-model="loginForm.username"
|
||||
type="text"
|
||||
auto-complete="off"
|
||||
clearable
|
||||
placeholder="账号"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="captchaCode" v-if="captchaOnOff">
|
||||
<div style="display: flex;align-items: center">
|
||||
|
||||
<div>
|
||||
<el-input
|
||||
v-model="loginForm.captchaCode"
|
||||
auto-complete="off"
|
||||
placeholder="请输入验证码"
|
||||
style="width: 90%"
|
||||
clearable
|
||||
@keyup.enter.native="handleLogin"
|
||||
>
|
||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
||||
</el-input>
|
||||
</div>
|
||||
<div>
|
||||
<span class="anniulan" v-show="show" @click="getCode" >获取验证码</span>
|
||||
<span v-show="!show" class="count">{{count}}s后重新获取</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||
<el-form-item style="width:100%;">
|
||||
<el-button
|
||||
:loading="loading"
|
||||
size="medium"
|
||||
type="primary"
|
||||
style="width:100%;line-height: 24px;font-size: 16px;"
|
||||
@click.native.prevent=""
|
||||
>
|
||||
<span v-if="!loading">立即登录</span>
|
||||
<span v-else>登 录 中...</span>
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@ -55,6 +148,14 @@ export default {
|
||||
name: "Login",
|
||||
data() {
|
||||
return {
|
||||
show: true,
|
||||
count: '',
|
||||
timer: null,
|
||||
dlyzm:[
|
||||
{text:'登录',type:'0'},
|
||||
{text: "验证码",type:'1'}
|
||||
],
|
||||
actindex:0,
|
||||
codeUrl: "",
|
||||
pwdType: 'password',
|
||||
systemName : process.env.VUE_APP_TITLE,
|
||||
@ -91,17 +192,40 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getCode();
|
||||
this.getCodeimg();
|
||||
this.getCookie();
|
||||
},
|
||||
methods: {
|
||||
getCode() {
|
||||
const TIME_COUNT = 60;
|
||||
if (!this.timer) {
|
||||
this.count = TIME_COUNT;
|
||||
this.show = false;
|
||||
this.timer = setInterval(() => {
|
||||
if (this.count > 0 && this.count <= TIME_COUNT) {
|
||||
this.count--;
|
||||
} else {
|
||||
this.show = true;
|
||||
clearInterval(this.timer);
|
||||
this.timer = null;
|
||||
}
|
||||
}, 1000)
|
||||
}
|
||||
},
|
||||
getCodeimg() {
|
||||
const app = this
|
||||
getCodeImg().then(response => {
|
||||
app.codeUrl = response.data.captcha;
|
||||
app.loginForm.uuid = response.data.uuid;
|
||||
app.codeUrl = response.data.captcha
|
||||
app.loginForm.uuid = response.data.uuid
|
||||
})
|
||||
},
|
||||
// getCode() {
|
||||
// const app = this
|
||||
// getCodeImg().then(response => {
|
||||
// app.codeUrl = response.data.captcha;
|
||||
// app.loginForm.uuid = response.data.uuid;
|
||||
// })
|
||||
// },
|
||||
showPwd() {
|
||||
if (this.pwdType === "password") {
|
||||
this.pwdType = "";
|
||||
@ -164,6 +288,87 @@ $bg: #2d3a4b;
|
||||
$light_gray: #eee;
|
||||
$dark_gray: #889aa4;
|
||||
$light_gray: #eee;
|
||||
.login {
|
||||
height: 100vh;
|
||||
width: 100%;
|
||||
position: relative;
|
||||
background-image: url("../../assets/images/loginback.png");
|
||||
overflow: hidden;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
}
|
||||
.box-center{
|
||||
width: 1000px;
|
||||
height: 580px;
|
||||
border-radius: 8px;
|
||||
background: #FFFFFF;
|
||||
box-shadow: 0px 4px 10px 0px rgba(20,61,129,0.1);
|
||||
border-radius: 16px 16px 16px 16px;
|
||||
opacity: 1;
|
||||
margin: 150px auto;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
|
||||
}
|
||||
.gangs{
|
||||
width: 100%;
|
||||
height: 5px;
|
||||
background: #00aaff;
|
||||
border-radius: 50px;
|
||||
}
|
||||
.box-left{
|
||||
width: 50%;
|
||||
height: 100%;
|
||||
background: #00aaff;
|
||||
background-image: url("../../assets/images/box-left.png");
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
}
|
||||
.box-right{
|
||||
width: 50%;
|
||||
box-sizing: border-box;
|
||||
padding: 80px;
|
||||
}
|
||||
.box-title{
|
||||
width: 100%;
|
||||
//text-align: center;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.bai-size{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
font-size: 40px;
|
||||
font-weight: bold;
|
||||
color: #FFFFFF;
|
||||
margin-top: 65px;
|
||||
|
||||
}
|
||||
.bact-box{
|
||||
width: 85%;
|
||||
margin: 15px auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-top: 40px;
|
||||
|
||||
}
|
||||
.sanhh{
|
||||
width: 112px;
|
||||
height: 34px;
|
||||
background: linear-gradient(90deg, #E1EBFF 0%, #FFFFFF 100%);
|
||||
border-radius: 2px 2px 2px 2px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 16px;
|
||||
font-family: PingFang SC, PingFang SC;
|
||||
font-weight: 400;
|
||||
color: #1755D0;
|
||||
}
|
||||
|
||||
/* reset element-ui css */
|
||||
.login-container {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user