Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
ad81a123c6
@ -9,10 +9,11 @@ export function listOilConfig() {
|
||||
}
|
||||
|
||||
// 是否开启支付规则
|
||||
export function isOpenOilConfig(isOpen) {
|
||||
export function isOpenOilConfig(data) {
|
||||
return request({
|
||||
url: '/api/oilConfig/'+isOpen,
|
||||
method: 'get',
|
||||
url: '/api/oilConfig/isOpen',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -1,9 +1,18 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询会员详细
|
||||
// 查询配置信息
|
||||
export function getSysConfig(key) {
|
||||
return request({
|
||||
url: '/sysConfig/getByKey/' + key,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 修改配置信息
|
||||
export function editSysConfig(data) {
|
||||
return request({
|
||||
url: '/sysConfig/updateValue',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
BIN
fuintAdmin/src/assets/images/kkx.png
Normal file
BIN
fuintAdmin/src/assets/images/kkx.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
@ -11,7 +11,7 @@ $panGreen: #30B08F;
|
||||
// 默认菜单主题风格
|
||||
$base-menu-color:#ffffff;// 菜单全部字体颜色
|
||||
$base-menu-color-active:#ffffff;// 父级菜单激活的字体颜色
|
||||
$base-menu-background:#1a5982;
|
||||
$base-menu-background:#5a91ff;
|
||||
$base-logo-title-color: #ffffff;
|
||||
|
||||
$base-menu-light-color:#ffffff;
|
||||
|
||||
@ -111,7 +111,7 @@ export default {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
background: #144a6e;
|
||||
background-image: url("../../assets/images/bolang.png") ;
|
||||
background-image: url("../../assets/images/kkx.png") ;
|
||||
background-size: 100% 100%;
|
||||
background-size: cover;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
@ -9,14 +9,15 @@
|
||||
<el-menu
|
||||
:default-active="activeMenu"
|
||||
:collapse="false"
|
||||
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
|
||||
:background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
|
||||
text-color="#ffffff"
|
||||
:unique-opened="true"
|
||||
active-text-color="#409eff"
|
||||
active-text-color="#44DABF"
|
||||
:collapse-transition="false"
|
||||
mode="vertical"
|
||||
style="margin-bottom: 80px;"
|
||||
>
|
||||
|
||||
<sidebar-item
|
||||
v-for="(route, index) in sidebarRouters"
|
||||
:key="route.path + index"
|
||||
|
||||
@ -171,7 +171,7 @@
|
||||
<el-input type="textarea" v-model="form.giftName" placeholder="请输入兑换礼品名"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="卡券有效期" prop="validity">
|
||||
<el-input placeholder="请输入卡券有效期" v-model="form.validity">
|
||||
<el-input type="number" placeholder="请输入卡券有效期" v-model="form.validity">
|
||||
<template slot="append">天</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
@ -184,7 +184,7 @@
|
||||
<el-radio-group v-model="form.timeType">
|
||||
<!-- 0 -->
|
||||
<el-radio label="0" style="display: flex;align-items: center" >
|
||||
<div class="h-box"> <span>领券后立即生效，有效期</span> <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityZero">
|
||||
<div class="h-box"> <span>领券后立即生效，有效期</span> <el-input placeholder="有效天数" type="number" style="width: 200px" v-model="form.validityZero">
|
||||
<template slot="append">天</template>
|
||||
</el-input> </div>
|
||||
|
||||
@ -200,7 +200,7 @@
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
<span>有效期</span>
|
||||
<el-input placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input>
|
||||
<el-input type="number" placeholder="有效天数" style="width: 200px" v-model="form.validityOne"><template slot="append">天</template></el-input>
|
||||
</div>
|
||||
</el-radio>
|
||||
<!-- 2-->
|
||||
@ -208,7 +208,7 @@
|
||||
<div class="h-box">
|
||||
领券后第 <el-input style="width: 200px" placeholder="1" v-model="form.validityDay">
|
||||
<template slot="append">天生效</template>
|
||||
</el-input> 有效期 <el-input placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input>
|
||||
</el-input> 有效期 <el-input type="number" placeholder="有效天数" style="width: 200px" v-model="form.validityTwo"><template slot="append">天</template></el-input>
|
||||
</div>
|
||||
</el-radio>
|
||||
|
||||
@ -233,7 +233,7 @@
|
||||
</el-time-picker>
|
||||
</el-form-item>-->
|
||||
<el-form-item label="可用时段" prop="availablePeriod">
|
||||
<el-checkbox-group v-model="form.availablePeriod">
|
||||
<el-checkbox-group v-model="form.availablePeriod" size="mini" >
|
||||
<el-checkbox-button v-for="city in cities" :label="city" :key="city">{{city}}</el-checkbox-button>
|
||||
<!-- <el-checkbox-button v-for="(item,index) in cities" :key="index" :label="index">{{item}}</el-checkbox-button>-->
|
||||
</el-checkbox-group>
|
||||
@ -246,16 +246,18 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="每周可用时段" prop="checkTime" v-if="form.checkDateType == 'week' ">
|
||||
<el-checkbox-group v-model="form.checkTime">
|
||||
<el-checkbox-group v-model="form.checkTime" size="mini" >
|
||||
<el-checkbox-button v-for="city in zhou" :label="city" :key="city">{{city}}</el-checkbox-button>
|
||||
<!-- <el-checkbox-button v-for="(item,index) in cities" :key="index" :label="index">{{item}}</el-checkbox-button>-->
|
||||
</el-checkbox-group>
|
||||
</el-form-item>
|
||||
<el-form-item label="每月可用时段" prop="checkTime" v-if="form.checkDateType == 'month' " >
|
||||
<el-checkbox-group v-model="form.checkTime">
|
||||
<el-checkbox-group v-model="form.checkTime" size="mini" @input="yueinput" >
|
||||
<el-checkbox-button v-for="city in yue" :label="city" :key="city">{{city}}</el-checkbox-button>
|
||||
|
||||
<!-- <el-checkbox-button v-for="(item,index) in cities" :key="index" :label="index">{{item}}</el-checkbox-button>-->
|
||||
</el-checkbox-group>
|
||||
<div>每个月的： <span style="color: red;" v-for="(item,index) in lookyue " :key="index">{{item }},</span> 号</div>
|
||||
</el-form-item>
|
||||
|
||||
<!-- <el-form-item label="排除日期" prop="checkOutTime">-->
|
||||
@ -354,12 +356,10 @@
|
||||
<el-table-column property="endTime" label="有效期结束"></el-table-column>
|
||||
<el-table-column property="status" label="券状态">
|
||||
<template slot-scope="scope">
|
||||
|
||||
<span v-if="scope.row.status == 0">未使用</span>
|
||||
<span v-if="scope.row.status == 1">已使用</span>
|
||||
<span v-if="scope.row.status == 2">已过期</span>
|
||||
</template>
|
||||
|
||||
</el-table-column>
|
||||
<el-table-column property="exchangeFrom" label="描述信息"></el-table-column>
|
||||
</el-table>
|
||||
@ -405,6 +405,7 @@ export default {
|
||||
}],
|
||||
cities: ['1', '2', '3', '4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24'],
|
||||
yue: ['1', '2', '3', '4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31'],
|
||||
lookyue:[],
|
||||
zhou:['周一','周二','周三','周四','周五','周六','周天'],
|
||||
oillist:['92#','95#','98#','0#','-10#','LNG','CNG','京92#','京95#','京0#',],
|
||||
checkboxGroup1: ['1'],
|
||||
@ -530,6 +531,10 @@ export default {
|
||||
this.getList();
|
||||
},
|
||||
methods: {
|
||||
yueinput(e){
|
||||
console.log(e)
|
||||
this.lookyue = e
|
||||
},
|
||||
gettongji(){
|
||||
let data = {
|
||||
pageNum:this.tongji.pageNum,
|
||||
|
||||
@ -43,6 +43,7 @@
|
||||
<div class="tj-siez">剩余额度</div>
|
||||
</el-card>
|
||||
<el-card class="kar" style="cursor: pointer" >
|
||||
|
||||
<div class="tj-num"> <el-tag v-if="tjdata.exchangeStatus == 0" @click="putStatus(1)">启用</el-tag> <el-tag type="info" v-if="tjdata.exchangeStatus == 1 " @click="putStatus(0)">禁用</el-tag> </div>
|
||||
<div class="tj-siez">兑换功能状态</div>
|
||||
</el-card>
|
||||
|
||||
@ -48,7 +48,7 @@
|
||||
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
|
||||
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit()">保存并审核</el-button>
|
||||
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存</el-button>
|
||||
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
|
||||
<el-button type="warning" v-if="state !='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
|
||||
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
|
||||
|
||||
</div>
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
|
||||
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit()">生成差异单</el-button>
|
||||
<el-button type="success" v-if="state=='ysh'" :disabled="storageFlag" @click="storage">退货处理库存</el-button>
|
||||
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
|
||||
<el-button type="warning" v-if="state !='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
|
||||
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
|
||||
|
||||
</div>
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
<el-tag v-if ="scope.row.approvalStatus == 'await'" size="medium">待审核</el-tag>
|
||||
<el-tag v-if ="scope.row.approvalStatus == 'qrts'" type="success" size="medium">已审核入库</el-tag>
|
||||
<el-tag v-if ="scope.row.approvalStatus == 'yzf'" type="danger" size="medium">已作废</el-tag>
|
||||
<el-tag v-if ="scope.row.approvalStatus == 'ysh'" type="danger" size="medium">已审核</el-tag>
|
||||
<el-tag v-if ="scope.row.approvalStatus == 'ysh'" type="success" size="medium">已审核</el-tag>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -246,6 +246,8 @@ export default {
|
||||
// 重置
|
||||
resetQuery() {
|
||||
this.queryParams = {}
|
||||
this.getList();
|
||||
|
||||
},
|
||||
// 删除
|
||||
handleDel(data) {
|
||||
|
||||
@ -50,7 +50,7 @@
|
||||
<el-button type="primary" v-if="state=='await'" :disabled="saveFlag" @click="save()">保存</el-button>
|
||||
<el-button type="success" v-if="state=='await'" :disabled="auditFlag" @click="audit">保存并审核</el-button>
|
||||
<el-button type="success" v-if="state=='ysh'" :disabled=" storageFlag" @click="storage()">进货并入库</el-button>
|
||||
<el-button type="warning" v-if="state =='await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
|
||||
<el-button type="warning" v-if="state =='!await' || state=='ysh'" :disabled="voidFlag" @click="abolition()">作废</el-button>
|
||||
<el-button type="warning" v-if="state !='await'" @click="exportExcel()">导出</el-button>
|
||||
</div>
|
||||
|
||||
|
||||
@ -1,113 +1,23 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div class="overview">
|
||||
<div class="title">运营概况 </div>
|
||||
<div class="content" v-loading="loading">
|
||||
<el-row class="line">
|
||||
<el-col class="item" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641957967018" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7597" width="64" height="64"><path d="M917.504 376.832c-20.48 0-36.864 16.384-36.864 36.864v450.56c0 4.096 0 16.384-12.288 28.672-8.192 8.192-16.384 12.288-28.672 12.288H180.224c-20.48 0-40.96-16.384-40.96-40.96V155.648c0-20.48 16.384-40.96 40.96-40.96h344.064c20.48 0 36.864-16.384 36.864-36.864s-16.384-36.864-36.864-36.864H180.224C118.784 40.96 65.536 90.112 65.536 155.648v708.608c0 61.44 49.152 114.688 114.688 114.688h663.552c28.672 0 57.344-12.288 81.92-32.768 28.672-28.672 32.768-65.536 32.768-81.92V409.6c-4.096-16.384-20.48-32.768-40.96-32.768z" fill="#8a8a8a" p-id="7598"></path><path d="M782.336 528.384c0-20.48-20.48-40.96-40.96-40.96H266.24c-24.576 0-40.96 20.48-40.96 40.96v8.192c0 20.48 16.384 40.96 40.96 40.96h475.136c20.48 0 40.96-20.48 40.96-40.96v-8.192zM741.376 712.704H266.24c-24.576 0-40.96 20.48-40.96 40.96v8.192c0 20.48 16.384 40.96 40.96 40.96h475.136c20.48 0 40.96-20.48 40.96-40.96v-8.192c0-20.48-16.384-40.96-40.96-40.96zM584.04864 304.08704l298.43456-262.30784 62.17728 70.73792-298.43456 262.30784zM532.48 413.696l90.112-20.48-61.44-69.632z" fill="#8a8a8a" p-id="7599"></path></svg>
|
||||
<p class="text">今日新增订单数（笔）</p>
|
||||
<p class="number">{{ homeData.todayOrder }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641958321700" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10174" width="64" height="64"><path d="M204.8 438.528c-16.896 0-30.72-13.824-30.72-30.72 0-121.088 98.56-219.648 219.648-219.648 16.896 0 30.72 13.824 30.72 30.72s-13.824 30.72-30.72 30.72c-87.296 0-158.208 70.912-158.208 158.208 0 16.896-13.824 30.72-30.72 30.72zM393.728 856.064c-121.088 0-219.648-98.56-219.648-219.648 0-16.896 13.824-30.72 30.72-30.72s30.72 13.824 30.72 30.72c0 87.296 70.912 158.208 158.208 158.208 16.896 0 30.72 13.824 30.72 30.72 0 16.896-13.824 30.72-30.72 30.72zM622.336 856.064c-16.896 0-30.72-13.824-30.72-30.72 0-16.896 13.824-30.72 30.72-30.72 87.296 0 158.208-70.912 158.208-158.208 0-16.896 13.824-30.72 30.72-30.72 16.896 0 30.72 13.824 30.72 30.72 0 121.088-98.56 219.648-219.648 219.648zM811.264 438.528c-16.896 0-30.72-13.824-30.72-30.72 0-87.296-70.912-158.208-158.208-158.208-16.896 0-30.72-13.824-30.72-30.72s13.824-30.72 30.72-30.72c121.088 0 219.648 98.56 219.648 219.648 0 16.896-13.824 30.72-30.72 30.72z" fill="#8a8a8a" p-id="10175"></path><path d="M684.544 564.224H355.328c-16.896 0-30.72-13.824-30.72-30.72s13.824-30.72 30.72-30.72h329.216c16.896 0 30.72 13.824 30.72 30.72s-13.824 30.72-30.72 30.72z" fill="#8a8a8a" p-id="10176"></path></svg>
|
||||
<p class="text">今日交易金额（元）</p>
|
||||
<p class="number">{{ homeData.todayPay ? homeData.todayPay.toFixed(2) : 0.00.toFixed(2) }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641957839736" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6014" width="64" height="64"><path d="M624.6 211.8c58.3 0 105.7 46.3 105.7 103.2s-47.4 103.2-105.7 103.2S518.9 371.9 518.9 315s47.4-103.2 105.7-103.2m0-50c-86 0-155.7 68.6-155.7 153.2s69.7 153.2 155.7 153.2S780.3 399.6 780.3 315s-69.7-153.2-155.7-153.2zM427 314.9c0-24.3 5.9-47.3 16.5-67.7-22.8-19.5-52.9-31.4-85.8-31.4-71.2 0-128.9 55.2-128.9 123.4s57.7 123.4 128.9 123.4c43.2 0 81.4-20.3 104.8-51.6-22.3-26.2-35.5-59.6-35.5-96.1zM297.5 727.2v16.9c0-103.5 72.5-191.8 173.7-226.2-29.2-13.3-62.1-20.9-96.9-20.9h-28.5c-118.6 0-215.6 87.2-215.6 194.7v-13.6c0 56.3-4.5 102.3 57.6 102.3H298c-0.9-16.2-0.5-34.2-0.5-53.2z" p-id="6015" fill="#8a8a8a"></path><path d="M639.4 561c27.9 0 55.1 5.2 80.6 15.4 24.5 9.8 46.6 23.9 65.5 41.7 38.3 36.2 59.4 83.9 59.4 134.5h0.2c0.1 5.1 0.3 10 0.4 14.9 0.4 13 0.8 25.2 0.3 34.9-0.3 4.5-0.7 7.7-1.1 9.8-1.9 0.3-4.8 0.5-8.7 0.5H418.4c-8.1 0-12.1-1.1-13.7-1.6-0.7-1.6-2.3-5.9-3.4-15.6-1.3-11.8-1.3-26.8-1.2-42.8h0.1c0-50.6 21.1-98.3 59.4-134.5 18.9-17.9 40.9-31.9 65.5-41.7 25.5-10.2 52.6-15.4 80.6-15.4h33.7m0-50.1h-33.8c-140.5 0-255.5 108.3-255.5 241.6v-16.9c0 69.8-5.3 127 68.2 127H836c73.6 0 58.9-57.1 58.9-127v16.9c0-133.4-115-241.6-255.5-241.6z" p-id="6016" fill="#8a8a8a"></path><path d="M785.1 706.4c0 10.2-8.4 18.5-18.7 18.5h-37.9v36.4c0 10.2-8.4 18.5-18.7 18.5h-9.4c-10.3 0-18.7-8.3-18.7-18.5v-36.4h-39.8c-10.3 0-18.7-8.3-18.7-18.5v-9.2c0-10.2 8.4-18.5 18.7-18.5h39.8v-40.2c0-10.2 8.4-18.5 18.7-18.5h9.4c10.3 0 18.7 8.3 18.7 18.5v40.2h37.9c10.3 0 18.7 8.3 18.7 18.5v9.2z" p-id="6017" fill="#8a8a8a"></path></svg>
|
||||
<p class="text">今日新增会员数</p>
|
||||
<p class="number">{{ homeData.todayUser }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641958094548" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9210" width="64" height="64"><path d="M888.34834 0.000284H127.658773A126.776854 126.776854 0 0 0 0.853475 126.777138v295.82214a126.776854 126.776854 0 0 0 126.805298 126.805298v169.045287a211.313719 211.313719 0 0 0 169.045287 207.075498v46.506653a42.268433 42.268433 0 0 0 84.508421 0V887.466705c0-23.324438-18.91555-42.268433-42.268433-42.268433a126.776854 126.776854 0 0 1-126.776854-126.776854v-169.045286h302.16525a241.3226 241.3226 0 0 0-42.268433 146.63107 42.268433 42.268433 0 1 0 84.536865 0c-1.706666-146.63107 120.433744-146.63107 120.433745-146.63107a42.268433 42.268433 0 0 0 42.268433-42.268433 54.527985 54.527985 0 0 0 0-8.021331 44.799988 44.799988 0 0 0 0-8.021331v-142.421294a48.611542 48.611542 0 0 1 42.268432-52.849763 48.611542 48.611542 0 0 1 42.268433 52.849763v369.777675a126.776854 126.776854 0 0 1-126.805298 126.776854c-23.324438 0-42.239988 18.91555-42.239988 42.268433v84.536865a42.268433 42.268433 0 0 0 84.508421 0v-46.506654a211.313719 211.313719 0 0 0 169.045286-207.075498v-169.045286a126.776854 126.776854 0 0 0 126.805298-126.776854v-295.82214A126.776854 126.776854 0 0 0 888.319895 0.000284z m42.268433 422.627439c0 23.324438-18.91555 42.239988-42.268433 42.239988v-116.195523a132.693296 132.693296 0 0 0-126.776854-137.386629 122.993744 122.993744 0 0 0-105.642637 62.151094 150.015958 150.015958 0 1 0-21.134216 76.060423v115.370635H127.630329c-23.324438 0-42.239988-18.91555-42.239988-42.239988v-295.82214c0-23.352882 18.91555-42.268433 42.268432-42.268433H888.319895c23.324438 0 42.268433 18.91555 42.268433 42.239988v295.82214z m-359.224789-147.91107a63.402649 63.402649 0 1 1-126.776854 0 63.402649 63.402649 0 0 1 126.776854 0z" p-id="9211" fill="#8a8a8a"></path></svg>
|
||||
<p class="text">今日活跃会员数</p>
|
||||
<p class="number">{{ homeData.todayActiveUser }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row class="line">
|
||||
<el-col class="item second-line" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641957661068" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5770" width="64" height="64"><path d="M261.7 522.6h0.2c19.3 0 35-15.7 35-35s-15.7-35-35-35c-31.9 0-58.8-37.7-58.8-82.4s26.9-82.4 58.8-82.4c19.3 0 35-15.7 35-35s-15.7-35-35-35c-35.4 0-69.5 17.3-93.7 47.5-22.6 28.4-35.1 65.6-35.1 104.9s12.5 76.5 35.1 104.9c0.6 0.8 1.3 1.6 2 2.4-22.9 13.2-43.4 31-61.1 53.2-38.3 48-59.5 111.4-59.5 178.4 0 19.3 15.7 35 35 35s35-15.7 35-35c0-51.2 15.7-99.1 44.1-134.7 26.6-33.3 61.3-51.7 97.7-51.7 0.2 0 0.3-0.1 0.3-0.1zM914.8 530.7c-17.7-22.2-38.2-40-61.1-53.2 0.7-0.8 1.3-1.6 2-2.4 22.6-28.4 35.1-65.6 35.1-104.9s-12.5-76.5-35.1-104.9c-24.1-30.2-58.3-47.5-93.7-47.5-19.3 0-35 15.7-35 35s15.7 35 35 35c31.9 0 58.8 37.7 58.8 82.4s-26.9 82.4-58.8 82.4c-19.3 0-35 15.7-35 35s15.7 35 35 35H762.3c36.4 0 71.1 18.4 97.7 51.7 28.5 35.6 44.1 83.5 44.1 134.7 0 19.3 15.7 35 35 35s35-15.7 35-35c0.2-67-21-130.3-59.3-178.3z" p-id="5771" fill="#8a8a8a"></path><path d="M747.4 541c-30.9-30.8-66.9-54.7-106.1-70.8 40.3-34.7 65.8-86 65.8-143.2 0-104.2-84.8-188.9-188.9-188.9-104.2 0-188.9 84.8-188.9 188.9 0 57 25.4 108.2 65.4 142.9C355.2 486 318.9 510 287.8 541c-61.2 61.1-95.1 142.4-95.5 228.9V850.8c0 19.3 15.7 35 35 35h580.5c19.3 0 35-15.7 35-35v-80.2-0.8c-0.3-86.4-34.2-167.6-95.4-228.8zM518.2 208.1c65.6 0 118.9 53.4 118.9 118.9s-53.4 118.9-118.9 118.9S399.3 392.6 399.3 327s53.4-118.9 118.9-118.9z m254.7 607.8H262.3v-44.6-0.6c0.2-140.5 114.8-254.8 255.3-254.8s255 114.3 255.3 254.8v45.2z" p-id="5772" fill="#8a8a8a"></path></svg>
|
||||
<p class="text">总会员数</p>
|
||||
<p class="number">{{ homeData.totalUser }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item second-line" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641969647517" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3586" width="64" height="64"><path d="M128 544h128v288H128zM320 480h128v352H320zM512 320h128v512H512zM704 416h128v416H704z" p-id="3587" fill="#8a8a8a"></path><path d="M576 128L352 352h448L576 128z" p-id="3588" fill="#8a8a8a"></path></svg>
|
||||
<p class="text">总交易金额（元）</p>
|
||||
<p class="number">{{ homeData.totalPay ? homeData.totalPay : '0.00'}}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item second-line" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641957411945" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4780" width="64" height="64"><path d="M725.504 768C725.290667 768 725.333333 170.709333 725.333333 170.709333L640 170.666667V128h85.376C748.928 128 768 146.986667 768 170.709333v597.248A42.666667 42.666667 0 0 1 725.504 810.666667H170.496C147.029333 810.666667 128 791.68 128 767.957333V170.709333C128 147.114667 147.157333 128 170.624 128H256v42.666667H170.624L170.666667 767.957333 725.504 768z m124.949333-469.333333H810.666667v-42.666667h42.666666c23.573333 0 42.666667 18.986667 42.666667 42.709333v597.248A42.666667 42.666667 0 0 1 853.504 938.666667H298.496A42.453333 42.453333 0 0 1 256 896v-42.666667h42.666667v42.666667l554.666666-0.042667 0.021334-228.416c-0.042667-168.597333-0.021333-368.853333-0.021334-368.853333L850.453333 298.666667zM298.666667 341.333333h298.666666v42.666667H298.666667v-42.666667z m0 128h213.333333v42.666667H298.666667v-42.666667z m0-341.376C298.666667 104.405333 317.802667 85.333333 341.461333 85.333333h213.077334C578.176 85.333333 597.333333 104.490667 597.333333 127.957333v42.752A42.688 42.688 0 0 1 554.538667 213.333333h-213.077334A42.752 42.752 0 0 1 298.666667 170.709333V127.957333z m42.666666 42.752L554.538667 170.666667 554.666667 127.957333 341.461333 128 341.333333 170.709333z" fill="#8a8a8a" p-id="4781"></path></svg>
|
||||
<p class="text">总订单数</p>
|
||||
<p class="number">{{ homeData.totalOrder }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
<el-col class="item second-line" :span="6">
|
||||
<div class="do">
|
||||
<svg t="1641958462543" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13815" width="64" height="64"><path d="M983.696 422.704A480 480 0 1 0 40.72 602.72a469.456 469.456 0 0 0 69.44 172.688 36.4 36.4 0 1 0 60.672-40.24 408.16 408.16 0 0 1 3.664-452.224 400.832 400.832 0 0 1 260.24-171.2 407.136 407.136 0 1 1-112.576 760.288 36.8 36.8 0 0 0-34.352 65.12 477.024 477.024 0 0 0 223.68 54.88 467.984 467.984 0 0 0 89.92-8.784A481.424 481.424 0 0 0 983.712 422.72z" p-id="13816" fill="#8a8a8a"></path><path d="M471.712 579.84h-130.768a36.944 36.944 0 0 0 0 73.888h130.768v116.8a36.944 36.944 0 1 0 73.888 0v-116.8h130.768a36.944 36.944 0 1 0 0-73.888H545.6v-71.664a22.784 22.784 0 0 0-0.736-7.392h131.504a36.944 36.944 0 1 0 0-73.888H341.68a36.944 36.944 0 1 0 0 73.888h131.504a25.152 25.152 0 0 0-0.736 7.392v71.664z" p-id="13817" fill="#8a8a8a"></path><path d="M405.968 383.312a37.104 37.104 0 0 0 52.464-52.464l-79.792-79.792a37.104 37.104 0 1 0-52.464 52.464z" p-id="13818" fill="#8a8a8a"></path><path d="M602.48 383.312l79.792-79.792a37.088 37.088 0 1 0-52.448-52.464l-79.792 79.792a36.576 36.576 0 0 0 0 52.464 37.936 37.936 0 0 0 52.448 0z" p-id="13819" fill="#8a8a8a"></path></svg>
|
||||
<p class="text">总支付人数</p>
|
||||
<p class="number">{{ homeData.totalPayUser }}</p>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overview">
|
||||
<div class="title">常用功能</div>
|
||||
<div class="content">
|
||||
<el-row class="line home-tools">
|
||||
<el-col class="item no-border" :span="8"><div class="do" @click="toCashier('/cashier/index')"><img class="t-icon" src="@/assets/images/home/pay.png"><div class="text">收银下单</div></div></el-col>
|
||||
<el-col class="item no-border" :span="8"><div class="do" @click="toTarget('/coupon/confirm/index')"><img class="t-icon" src="@/assets/images/home/coupon.png"><div class="text">核销卡券</div></div></el-col>
|
||||
<el-col class="item no-border" :span="8"><div class="do" @click="toTarget('/member/index')"><img class="t-icon" src="@/assets/images/home/member.png"><div class="text">会员管理</div></div></el-col>
|
||||
</el-row>
|
||||
<el-row class="line home-tools">
|
||||
<el-col class="item no-border" :span="8"><div class="do" @click="toTarget('/order/index')"><img class="t-icon" src="@/assets/images/home/order.png"><div class="text">订单管理</div></div></el-col>
|
||||
<el-col class="item no-border" :span="8"><div class="do" @click="toTarget('/coupon/coupon/index')"><img class="t-icon" src="@/assets/images/home/card.png"><div class="text">卡券管理</div></div></el-col>
|
||||
<el-col class="item no-border" :span="8"><div class="do" @click="toTarget('/goods/goods/index')"><img class="t-icon" src="@/assets/images/home/goods.png"><div class="text">商品管理</div></div></el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overview">
|
||||
<div class="title">报表统计</div>
|
||||
<div class="content">
|
||||
<el-row>
|
||||
<el-col class="item" :span="12">
|
||||
<commonChart v-if="chartData1.length > 0" :title="chart1.title" :color="chart1.color" :chart-type="chart1.chartType" :head-list="chart1.header" :data-list="chartData1" width="100%" id="chart1" height="400px"/>
|
||||
</el-col>
|
||||
<el-col class="item" :span="12">
|
||||
<commonChart v-if="chartData2.length > 0" :title="chart2.title" :color="chart2.color" :chart-type="chart2.chartType" :head-list="chart2.header" :data-list="chartData2" width="100%" id="chart2" height="400px"/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
<div class="overview">
|
||||
<commonChartwo></commonChartwo>
|
||||
</div>
|
||||
<topindex></topindex>
|
||||
<centenrindex></centenrindex>
|
||||
<bottomindex></bottomindex>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { getHomeData, getStatisticData } from "@/api/home";
|
||||
import commonChart from './components/charts/index'
|
||||
import commonChartwo from './components/charts/chartstwo'
|
||||
import topindex from "@/views/indexcomponents/topindex.vue";
|
||||
import centenrindex from "@/views/indexcomponents/centenrindex.vue";
|
||||
import bottomindex from "@/views/indexcomponents/bottomindex.vue";
|
||||
export default {
|
||||
name: "HomePage",
|
||||
components: {
|
||||
commonChart,
|
||||
commonChartwo
|
||||
centenrindex,
|
||||
topindex,
|
||||
bottomindex
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
@ -171,6 +81,55 @@ export default {
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.app-container{
|
||||
height: 100%;
|
||||
}
|
||||
.top-box{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
.top-sl{
|
||||
width: 16%;
|
||||
background: #FFFFFF;
|
||||
border-radius: 8px;
|
||||
background: #FFFFFF;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
|
||||
}
|
||||
.box-title{
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
color: rgba(0,0,0,0.6);
|
||||
}
|
||||
.box-size{
|
||||
font-size: 28px;
|
||||
font-weight: 400;
|
||||
color: rgba(0,0,0,0.9);
|
||||
margin-top: 5px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.box-but{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
color: rgba(0,0,0,0.6);
|
||||
font-size: 14px;
|
||||
}
|
||||
.icon-lv{
|
||||
width: 71px;
|
||||
height: 24px;
|
||||
background: #E3F9E9;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 14px;
|
||||
color: #2BA471;
|
||||
}
|
||||
|
||||
.overview {
|
||||
min-height: 270px;
|
||||
background: #FFFFFF;
|
||||
@ -253,3 +212,4 @@ export default {
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
175
fuintAdmin/src/views/indexcomponents/bottomindex.vue
Normal file
175
fuintAdmin/src/views/indexcomponents/bottomindex.vue
Normal file
@ -0,0 +1,175 @@
|
||||
<template>
|
||||
<div class="center" >
|
||||
<div class="left-box">
|
||||
<div class="but-box">
|
||||
<div class="hui"><span class="title-hei">各油品销售额</span> </div>
|
||||
|
||||
<div >
|
||||
<el-radio-group v-model="radio" size="mini">
|
||||
<el-radio-button label="周"></el-radio-button>
|
||||
<el-radio-button label="月"></el-radio-button>
|
||||
<el-radio-button label="年"></el-radio-button>
|
||||
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
<div><span>15天交易金额总计：</span><span class="title-lan">79701</span> <span>元</span></div>
|
||||
<div id="charts" style="width: 100%; height: 400px;"></div>
|
||||
</div>
|
||||
<div class="left-box">
|
||||
<div class="but-box">
|
||||
<div class="hui"><span class="title-hei">油站油品交易笔数</span> </div>
|
||||
<div >
|
||||
<el-radio-group v-model="radio" size="mini">
|
||||
<el-radio-button label="周"></el-radio-button>
|
||||
<el-radio-button label="月"></el-radio-button>
|
||||
<el-radio-button label="年"></el-radio-button>
|
||||
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
<div><span>15天交易金额总计：</span><span class="title-lan">79701</span> <span>元</span></div>
|
||||
<div id="chartx" style="width: 100%; height: 400px;"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from "echarts";
|
||||
|
||||
export default {
|
||||
name: "bottomindex",
|
||||
data(){
|
||||
return{
|
||||
radio:'周'
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initChart()
|
||||
this.initChartwo()
|
||||
},
|
||||
methods:{
|
||||
initChart() {
|
||||
const chart = echarts.init(document.getElementById('charts'))
|
||||
|
||||
const option = {
|
||||
color: [
|
||||
'#77A8F9',
|
||||
'#86E1BB',
|
||||
'#8195F5',
|
||||
],
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
data: ['2023.1.1', '2023.2.1', '2023.3.1', '2023.4.1', '2023.5.1', '2023.6.1', '2023.7.1']
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: [250, 230, 224, 218, 135, 147, 260],
|
||||
type: 'line'
|
||||
},
|
||||
{
|
||||
data: [210, 230, 264, 318, 235, 247, 360],
|
||||
|
||||
|
||||
type: 'line'
|
||||
},
|
||||
{
|
||||
data: [120, 220, 214, 118, 235, 227, 110],
|
||||
type: 'line'
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
chart.setOption(option)
|
||||
},
|
||||
initChartwo() {
|
||||
const chart = echarts.init(document.getElementById('chartx'))
|
||||
|
||||
const option = {
|
||||
color: [
|
||||
'#77A8F9',
|
||||
'#86E1BB',
|
||||
'#8195F5',
|
||||
],
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
data: ['2023.1.1', '2023.2.1', '2023.3.1', '2023.4.1', '2023.5.1', '2023.6.1', '2023.7.1']
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
data: [250, 230, 224, 218, 135, 147, 140],
|
||||
type: 'line'
|
||||
},
|
||||
{
|
||||
data: [210, 230, 264, 318, 235, 247, 160],
|
||||
|
||||
|
||||
type: 'line'
|
||||
},
|
||||
{
|
||||
data: [120, 220, 214, 118, 235, 227, 110],
|
||||
type: 'line'
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
chart.setOption(option)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.center{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: 10px auto;
|
||||
}
|
||||
.left-box{
|
||||
width: 49%;
|
||||
background: #FFFFFF;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.right-box{
|
||||
width: 28%;
|
||||
background: #FFFFFF;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
border-radius: 8px;
|
||||
height: 455px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.but-box{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.hui{
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
color: #999999;
|
||||
}
|
||||
.title-hei{
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
color: #1a1a1a;
|
||||
}
|
||||
.title-lan{
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
color: #4F6EE3;
|
||||
}
|
||||
|
||||
</style>
|
||||
193
fuintAdmin/src/views/indexcomponents/centenrindex.vue
Normal file
193
fuintAdmin/src/views/indexcomponents/centenrindex.vue
Normal file
@ -0,0 +1,193 @@
|
||||
<template>
|
||||
<div class="center" >
|
||||
<div class="left-box">
|
||||
<div class="but-box">
|
||||
<div class="hui"><span class="title-hei">各油品销售额</span> <span>15天交易金额总计：</span><span class="title-lan">79701</span> <span>元</span> </div>
|
||||
<div >
|
||||
<el-radio-group v-model="radio" size="mini">
|
||||
<el-radio-button label="周"></el-radio-button>
|
||||
<el-radio-button label="月"></el-radio-button>
|
||||
<el-radio-button label="年"></el-radio-button>
|
||||
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</div>
|
||||
<div id="chart" style="width: 100%; height: 400px;"></div>
|
||||
</div>
|
||||
<div class="right-box">
|
||||
<div class="title-hei">员工销售排行</div>
|
||||
<div class="four-box">
|
||||
<div class="pm">排名</div>
|
||||
<div class="mc">员工名称</div>
|
||||
<div class="xs">销售笔数</div>
|
||||
<div class="xse">销售额(万)</div>
|
||||
</div>
|
||||
<div class="four-boxx" v-for="(item,index) in 10" key="index">
|
||||
<div class="pm">{{index+1}}</div>
|
||||
<div class="dis">
|
||||
<div class="touxiang">
|
||||
<img src="../../../src/assets/images/avatar.png" class="touxiang">
|
||||
</div>
|
||||
<div class="name">名字</div>
|
||||
</div>
|
||||
<div class="xs">9999</div>
|
||||
<div class="xse">18975</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from "echarts";
|
||||
|
||||
export default {
|
||||
name: "centenrindex",
|
||||
data(){
|
||||
return{
|
||||
radio:'周'
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initChart()
|
||||
},
|
||||
methods:{
|
||||
initChart() {
|
||||
const chart = echarts.init(document.getElementById('chart'))
|
||||
|
||||
const option = {
|
||||
color: [
|
||||
'#77A8F9',
|
||||
'#86E1BB',
|
||||
'#8195F5',
|
||||
'#d48265',
|
||||
'#91c7ae',
|
||||
'#749f83',
|
||||
'#ca8622',
|
||||
'#bda29a',
|
||||
'#6e7074',
|
||||
'#546570',
|
||||
'#c4ccd3'
|
||||
],
|
||||
legend: {},
|
||||
tooltip: {},
|
||||
dataset: {
|
||||
source: [
|
||||
['product', '#92', '#95', '#98'],
|
||||
['2023.1.1', 50, 85.8, 93.7],
|
||||
['2023.2.1', 83.1, 73.4, 55.1],
|
||||
['2023.3.1', 86.4, 65.2, 82.5],
|
||||
['2023.4.1', 72.4, 53.9, 39.1],
|
||||
['2023.5.1', 72.4, 53.9, 39.1],
|
||||
['2023.6.1', 72.4, 53.9, 39.1]
|
||||
]
|
||||
},
|
||||
xAxis: { type: 'category' },
|
||||
yAxis: {},
|
||||
// Declare several bar series, each will be mapped
|
||||
// to a column of dataset.source by default.
|
||||
series: [{ type: 'bar', barCategoryGap: '40%' }, { type: 'bar', barCategoryGap: '40%' }, { type: 'bar', barCategoryGap: '40%' }]
|
||||
};
|
||||
|
||||
chart.setOption(option)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.center{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: 10px auto;
|
||||
}
|
||||
.left-box{
|
||||
width: 70%;
|
||||
background: #FFFFFF;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.right-box{
|
||||
width: 28%;
|
||||
background: #FFFFFF;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
border-radius: 8px;
|
||||
height: 455px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.but-box{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.hui{
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
color: #999999;
|
||||
}
|
||||
.title-hei{
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
color: #1a1a1a;
|
||||
}
|
||||
.title-lan{
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
color: #4F6EE3;
|
||||
}
|
||||
.four-box{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 16px;
|
||||
font-weight: 400;
|
||||
color: #999999;
|
||||
}
|
||||
.four-boxx{
|
||||
margin: 10px auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-size: 16px;
|
||||
font-weight: 400;
|
||||
color: #333333;
|
||||
}
|
||||
.touxiang{
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
border-radius: 50%;
|
||||
background: #00acac;
|
||||
margin-right: 5px;
|
||||
overflow: hidden;
|
||||
}
|
||||
.dis{
|
||||
width: 30%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
||||
}
|
||||
.pm{
|
||||
width: 10%;
|
||||
text-align: center;
|
||||
}
|
||||
.mc{
|
||||
width: 30%;
|
||||
text-align: left;
|
||||
}
|
||||
.xs{
|
||||
width: 30%;
|
||||
text-align: left;
|
||||
}
|
||||
.xs{
|
||||
width: 30%;
|
||||
text-align: center;
|
||||
}
|
||||
.xse{
|
||||
width: 30%;
|
||||
text-align: right;
|
||||
}
|
||||
</style>
|
||||
66
fuintAdmin/src/views/indexcomponents/indexcomponents.vue
Normal file
66
fuintAdmin/src/views/indexcomponents/indexcomponents.vue
Normal file
@ -0,0 +1,66 @@
|
||||
<template>
|
||||
<div class="center" >
|
||||
<div class="left-box">
|
||||
<div id="chart" style="width: 600px; height: 400px;"></div>
|
||||
</div>
|
||||
<div class="right-box"></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from "echarts";
|
||||
|
||||
export default {
|
||||
name: "indexcomponents",
|
||||
data(){
|
||||
return{
|
||||
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.initChart()
|
||||
},
|
||||
methods:{
|
||||
initChart() {
|
||||
const chart = echarts.init(document.getElementById('chart'))
|
||||
|
||||
const option = {
|
||||
legend: {},
|
||||
tooltip: {},
|
||||
dataset: {
|
||||
source: [
|
||||
['product', '2015', '2016', '2017'],
|
||||
['Matcha Latte', 50, 85.8, 93.7],
|
||||
['Milk Tea', 83.1, 73.4, 55.1],
|
||||
['Cheese Cocoa', 86.4, 65.2, 82.5],
|
||||
['Walnut Brownie', 72.4, 53.9, 39.1],
|
||||
['Walnut Broswnie', 72.4, 53.9, 39.1]
|
||||
]
|
||||
},
|
||||
xAxis: { type: 'category' },
|
||||
yAxis: {},
|
||||
// Declare several bar series, each will be mapped
|
||||
// to a column of dataset.source by default.
|
||||
series: [{ type: 'bar' }, { type: 'bar' }, { type: 'bar' }]
|
||||
};
|
||||
|
||||
chart.setOption(option)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.center{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.left-box{
|
||||
width: 75%;
|
||||
}
|
||||
.right-box{
|
||||
width: 20%;
|
||||
}
|
||||
</style>
|
||||
226
fuintAdmin/src/views/indexcomponents/topindex.vue
Normal file
226
fuintAdmin/src/views/indexcomponents/topindex.vue
Normal file
@ -0,0 +1,226 @@
|
||||
<template>
|
||||
<div>
|
||||
<div class="top-box">
|
||||
<div class="top-sl" >
|
||||
<div class="box-title">
|
||||
<span style="margin-right: 5px">本日流水总额</span>
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
title="标题"
|
||||
width="200"
|
||||
trigger="hover"
|
||||
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
|
||||
|
||||
<i class="el-icon-warning-outline" slot="reference" ></i>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="box-size">
|
||||
4023
|
||||
</div>
|
||||
<div class="box-but">
|
||||
<div class="icon-lv">
|
||||
<i class="el-icon-bottom"></i>
|
||||
<span>20.5%</span>
|
||||
</div>
|
||||
<div>环比</div>
|
||||
<div> <i class="el-icon-arrow-right"></i> </div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="top-sl" >
|
||||
<div class="box-title">
|
||||
<span style="margin-right: 5px">本日流水总额</span>
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
title="标题"
|
||||
width="200"
|
||||
trigger="hover"
|
||||
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
|
||||
|
||||
<i class="el-icon-warning-outline" slot="reference" ></i>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="box-size">
|
||||
4023
|
||||
</div>
|
||||
<div class="box-but">
|
||||
<div class="icon-lv">
|
||||
<i class="el-icon-bottom"></i>
|
||||
<span>20.5%</span>
|
||||
</div>
|
||||
<div>环比</div>
|
||||
<div> <i class="el-icon-arrow-right"></i> </div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="top-sl" >
|
||||
<div class="box-title">
|
||||
<span style="margin-right: 5px">本日流水总额</span>
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
title="标题"
|
||||
width="200"
|
||||
trigger="hover"
|
||||
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
|
||||
|
||||
<i class="el-icon-warning-outline" slot="reference" ></i>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="box-size">
|
||||
4023
|
||||
</div>
|
||||
<div class="box-but">
|
||||
<div class="icon-lv">
|
||||
<i class="el-icon-bottom"></i>
|
||||
<span>20.5%</span>
|
||||
</div>
|
||||
<div>环比</div>
|
||||
<div> <i class="el-icon-arrow-right"></i> </div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="top-sl" >
|
||||
<div class="box-title">
|
||||
<span style="margin-right: 5px">本日流水总额</span>
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
title="标题"
|
||||
width="200"
|
||||
trigger="hover"
|
||||
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
|
||||
|
||||
<i class="el-icon-warning-outline" slot="reference" ></i>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="box-size">
|
||||
4023
|
||||
</div>
|
||||
<div class="box-but">
|
||||
<div class="icon-lv">
|
||||
<i class="el-icon-bottom"></i>
|
||||
<span>20.5%</span>
|
||||
</div>
|
||||
<div>环比</div>
|
||||
<div> <i class="el-icon-arrow-right"></i> </div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="top-sl" >
|
||||
<div class="box-title">
|
||||
<span style="margin-right: 5px">本日流水总额</span>
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
title="标题"
|
||||
width="200"
|
||||
trigger="hover"
|
||||
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
|
||||
|
||||
<i class="el-icon-warning-outline" slot="reference" ></i>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="box-size">
|
||||
4023
|
||||
</div>
|
||||
<div class="box-but">
|
||||
<div class="icon-lv">
|
||||
<i class="el-icon-bottom"></i>
|
||||
<span>20.5%</span>
|
||||
</div>
|
||||
<div>环比</div>
|
||||
<div> <i class="el-icon-arrow-right"></i> </div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="top-sl" >
|
||||
<div class="box-title">
|
||||
<span style="margin-right: 5px">本日流水总额</span>
|
||||
<el-popover
|
||||
placement="top-start"
|
||||
title="标题"
|
||||
width="200"
|
||||
trigger="hover"
|
||||
content="这是一段内容,这是一段内容,这是一段内容,这是一段内容。">
|
||||
|
||||
<i class="el-icon-warning-outline" slot="reference" ></i>
|
||||
</el-popover>
|
||||
</div>
|
||||
<div class="box-size">
|
||||
4023
|
||||
</div>
|
||||
<div class="box-but">
|
||||
<div class="icon-lv">
|
||||
<i class="el-icon-bottom"></i>
|
||||
<span>20.5%</span>
|
||||
</div>
|
||||
<div>环比</div>
|
||||
<div> <i class="el-icon-arrow-right"></i> </div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "topindex",
|
||||
data(){
|
||||
return{
|
||||
|
||||
}
|
||||
},
|
||||
methods:{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.top-box{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.top-sl{
|
||||
width: 16%;
|
||||
background: #FFFFFF;
|
||||
border-radius: 8px;
|
||||
background: #FFFFFF;
|
||||
box-sizing: border-box;
|
||||
padding: 15px;
|
||||
|
||||
}
|
||||
.box-title{
|
||||
font-size: 14px;
|
||||
font-weight: 400;
|
||||
color: rgba(0,0,0,0.6);
|
||||
}
|
||||
.box-size{
|
||||
font-size: 28px;
|
||||
font-weight: 400;
|
||||
color: rgba(0,0,0,0.9);
|
||||
margin-top: 5px;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.box-but{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
color: rgba(0,0,0,0.6);
|
||||
font-size: 14px;
|
||||
}
|
||||
.icon-lv{
|
||||
width: 71px;
|
||||
height: 24px;
|
||||
background: #E3F9E9;
|
||||
border-radius: 3px 3px 3px 3px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 14px;
|
||||
color: #2BA471;
|
||||
}
|
||||
</style>
|
||||
@ -78,11 +78,8 @@
|
||||
</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
|
||||
@ -227,6 +224,7 @@ export default {
|
||||
}
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
},
|
||||
getCodeimg() {
|
||||
const app = this
|
||||
|
||||
@ -123,10 +123,15 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="姓名" align="center" prop="name" />
|
||||
<el-table-column label="车牌号" align="center" prop="carNumber"/>
|
||||
<el-table-column label="车牌号" align="center" prop="carNumber">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.carNumber ? scope.row.carNumber:"--"}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="认证资料" align="center" prop="attestationData">
|
||||
<template slot-scope="scope">
|
||||
<!-- <p v-for="(item,index) in scope.row.imgUrlList" :key="index">{{item.imageUrl1}}</p>-->
|
||||
<span v-if="scope.row.imgUrlList==null || scope.row.imgUrlList==''">--</span>
|
||||
<span v-for="(item,index) in scope.row.imgUrlList" :key="index">
|
||||
<img v-if="item.imageUrl1" :src="'/dev-api'+item.imageUrl1" class="attImg">
|
||||
<img v-if="item.imageUrl2" :src="'/dev-api'+item.imageUrl2" class="attImg">
|
||||
@ -134,7 +139,11 @@
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="remark"/>
|
||||
<el-table-column label="备注" align="center" prop="remark">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.remark ? scope.row.remark:"--"}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.rzzt" :value="scope.row.status"/>
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
<el-card >
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="来源油站" prop="storeIds">
|
||||
<el-select v-model="storeIds" filterable clearable placeholder="来源油站" style="width: 100%;">
|
||||
<el-option v-for="item in storeList" :key="item.id+''" :label="item.name" :value="item.id+''"/>
|
||||
<el-select v-model="queryParams.storeId" filterable clearable placeholder="来源油站" style="width: 100%;">
|
||||
<el-option v-for="item in storeList" :key="item.id" :label="item.name" :value="item.id"/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="会员号" prop="userNo">
|
||||
@ -623,7 +623,9 @@ export default {
|
||||
resetQuery() {
|
||||
this.dateRange = [];
|
||||
this.resetForm("queryForm");
|
||||
this.queryParams.storeIds = '';
|
||||
this.queryParams.storeId = '';
|
||||
this.queryParams.official = "";
|
||||
this.ifBalance = ""
|
||||
this.storeIds = [];
|
||||
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
|
||||
this.handleQuery();
|
||||
|
||||
@ -320,7 +320,7 @@
|
||||
</el-col>
|
||||
|
||||
<el-col :span="22">
|
||||
|
||||
|
||||
<div v-if="cardValueList.length>0" style="display: flex;margin: 13px 5px;box-sizing: border-box;flex-wrap: wrap; ">
|
||||
<div class="mon"
|
||||
v-for="(item,index) in cardValueList" :key="index"
|
||||
@ -359,7 +359,7 @@
|
||||
<span class="bom">赠送金额 仅自定义金额模式下可手动输入赠送、活动充值赠送金额不可手动更改</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="jine">
|
||||
<div class="zeng">赠送积分</div>
|
||||
<div>
|
||||
@ -433,7 +433,7 @@
|
||||
<div style="display: flex">
|
||||
<div style="width: 7%;line-height: 40px">油品类型</div>
|
||||
<el-radio-group v-model="tabOilType" style="margin-bottom: 30px;">
|
||||
<el-radio-button v-for="item,index in oilTypeList" :label="item.oilType" @click.native="tabOilTypeClick(item.status)">{{ item.type }}</el-radio-button>
|
||||
<el-radio-button v-for="(item,index) in oilTypeList" :label="item.oilType" @click.native="tabOilTypeClick(item.status)">{{ item.type }}</el-radio-button>
|
||||
</el-radio-group>
|
||||
</div>
|
||||
</el-col>
|
||||
@ -467,14 +467,14 @@
|
||||
<span class="bom">升数卡充值不支持自定义积分,选择对应充值活动获得对应积分[需开启积分活动有效]</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div style="display:flex;margin-left: 20px">
|
||||
<div style="display:flex;margin-left: 20px">
|
||||
<div style="line-height: 40px;width: 20%">提成员工</div>
|
||||
<div>
|
||||
<el-input :readonly="true" placeholder="请选择提成员工" v-model="cardFuelDieselForm.realName">
|
||||
<el-button slot="append" @click="chooseStaff">选择员工</el-button>
|
||||
</el-input>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -519,9 +519,9 @@
|
||||
</el-dialog>
|
||||
<!-- 确认充值-->
|
||||
<el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openConfirm" width="500px" append-to-body>
|
||||
<div v-if="isPay == true"
|
||||
<div v-if="isPay"
|
||||
v-loading="loading">
|
||||
|
||||
|
||||
<div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
|
||||
<div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
|
||||
￥{{ realyPayBills }}
|
||||
@ -833,7 +833,7 @@ export default {
|
||||
cardValueList:[],
|
||||
cardValueForm: {
|
||||
cardValueId:'', // 储值卡id
|
||||
mtStaffId: '', //
|
||||
mtStaffId: '', //
|
||||
realName: '',
|
||||
staffMobile: '',
|
||||
amount:'', // 自定义充值字段
|
||||
@ -859,7 +859,7 @@ export default {
|
||||
staffMobile: '',
|
||||
points:'',
|
||||
remark:'',
|
||||
rechargeBalance:'', //实际支付
|
||||
rechargeBalance:'', //实际支付
|
||||
paymentType:'',
|
||||
oilType:'',
|
||||
type:'',
|
||||
@ -873,7 +873,7 @@ export default {
|
||||
|
||||
realyPayBills:0,
|
||||
|
||||
|
||||
|
||||
oilTypeList: {},
|
||||
|
||||
isPay:true,
|
||||
@ -1021,7 +1021,11 @@ export default {
|
||||
},
|
||||
|
||||
valueAmoutChange(data) {
|
||||
if(data == '' || data == null) {
|
||||
data = 0
|
||||
this.cardValueForm.amount = 0
|
||||
|
||||
}
|
||||
|
||||
this.cardValueForm.points = ''
|
||||
this.cardValueForm.bidBalance =''
|
||||
@ -1105,6 +1109,15 @@ export default {
|
||||
this.cardValueForm.staffMobile= data.staffMobile
|
||||
|
||||
},
|
||||
refStaff() {
|
||||
this.cardFuelDieselForm.mtStaffId= ''
|
||||
this.cardFuelDieselForm.realName= ''
|
||||
this.cardFuelDieselForm.staffMobile= ''
|
||||
|
||||
this.cardValueForm.mtStaffId= ''
|
||||
this.cardValueForm.realName= ''
|
||||
this.cardValueForm.staffMobile= ''
|
||||
},
|
||||
// 查询参加存油卡油品
|
||||
getCountOilType() {
|
||||
getCountOilTypeApi().then(res => {
|
||||
@ -1172,8 +1185,12 @@ export default {
|
||||
|
||||
this.realyPayBills = this.cardFuelDieselForm.rechargeBalance
|
||||
}
|
||||
this.isPay = true
|
||||
this.openConfirm = true;
|
||||
this.isPay = true
|
||||
|
||||
console.log("11111",this.isPay)
|
||||
// this.isPaySuccess=false
|
||||
|
||||
this.title = this.payment
|
||||
},
|
||||
// 支付方式
|
||||
@ -1230,8 +1247,9 @@ export default {
|
||||
this.cardValueForm.giftBalance = 0
|
||||
this.cardValueForm.growthValue = 0
|
||||
this.cardValueForm.bidBalance = 0
|
||||
|
||||
// this.cardValueForm.bidBalance = 1
|
||||
// this.cardValueForm.amount = 0
|
||||
this.cardValueForm.amount = 0
|
||||
|
||||
}else {
|
||||
let file={}
|
||||
@ -1283,7 +1301,7 @@ export default {
|
||||
},
|
||||
|
||||
async collection(){
|
||||
|
||||
|
||||
let userForm = this.form
|
||||
|
||||
if (this.flag === 1) {
|
||||
@ -1307,7 +1325,7 @@ export default {
|
||||
}
|
||||
});
|
||||
let this_ = this
|
||||
|
||||
//
|
||||
let timer = setInterval(async () => {
|
||||
getCheckTheStatusOfYourPaymentApi(id).then(response => {
|
||||
if (response.data!=null){
|
||||
@ -1331,10 +1349,12 @@ export default {
|
||||
this_.loading = false;
|
||||
this_.isPay = false;
|
||||
clearInterval(timer);
|
||||
clearTimeout(timer3);
|
||||
|
||||
}
|
||||
},500)
|
||||
|
||||
setTimeout(function (){
|
||||
var timer3 = setTimeout(function (){
|
||||
clearInterval(timer2);
|
||||
clearInterval(timer);
|
||||
this_.loading = false;
|
||||
@ -1411,17 +1431,19 @@ export default {
|
||||
|
||||
// 关闭支付窗口
|
||||
handClose(){
|
||||
this.isPay = true;
|
||||
this.isPay=true,
|
||||
this.isPaySuccess=false,
|
||||
this.isQuery=true,
|
||||
this.openConfirm = false
|
||||
this.openRecharge = false
|
||||
|
||||
this.isPaySuccess = false;
|
||||
|
||||
// this.isPaySuccess = false;
|
||||
this.authCode = null
|
||||
this.activeRecharge='balance',
|
||||
|
||||
this.cardValueForm = {}
|
||||
this.cardFuelDieselForm = {}
|
||||
},
|
||||
},
|
||||
|
||||
// 提交按钮
|
||||
submitForm: function() {
|
||||
@ -1456,7 +1478,7 @@ export default {
|
||||
this.isPay = true;
|
||||
this.openConfirm = false
|
||||
this.openRecharge = false
|
||||
|
||||
|
||||
this.isPaySuccess = false;
|
||||
this.authCode = null
|
||||
this.activeRecharge='balance',
|
||||
@ -1469,6 +1491,7 @@ export default {
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
// console.log(tab, event);
|
||||
this.refStaff()
|
||||
this.realyPayBills = 0
|
||||
},
|
||||
handleChange(value) {
|
||||
|
||||
@ -144,7 +144,7 @@ import {cleanTankApi} from "@/api/oilConfig/oilTank";
|
||||
},
|
||||
rules: {
|
||||
gunName: [
|
||||
{ required: true, message: '请输入油罐名称', trigger: 'blur' },
|
||||
{ required: true, message: '请输入油枪名称', trigger: 'blur' },
|
||||
],
|
||||
|
||||
tankId: [
|
||||
|
||||
@ -54,9 +54,9 @@
|
||||
|
||||
<div style="display: flex;align-items: center">
|
||||
<div class="mingc">规则周期</div>
|
||||
<el-radio-group v-model="labelPosition" size="small">
|
||||
<el-radio-button label="left">永久</el-radio-button>
|
||||
<el-radio-button label="right">单日</el-radio-button>
|
||||
<el-radio-group v-model="labelPosition" @input="ruleCycle == labelPosition" size="small">
|
||||
<el-radio-button label="permanent">永久</el-radio-button>
|
||||
<el-radio-button label="singleDay">单日</el-radio-button>
|
||||
</el-radio-group>
|
||||
<div class="mingc">功能状态</div>
|
||||
<el-switch
|
||||
@ -79,8 +79,8 @@
|
||||
<!-- <div> 交易满 </div>-->
|
||||
<div> 交易占比 </div>
|
||||
<div class="jiaong"> {{ item.proportion }} </div>
|
||||
<div> %更换支付通道 参与次数 </div>
|
||||
<div class="jiaong"> 不固定次数 </div>
|
||||
<div style="margin-right: 20px"> %更换支付通道 </div>
|
||||
<!-- <div class="jiaong"> 参与次数不固定次数 </div>-->
|
||||
|
||||
<el-button type="primary" icon="el-icon-edit" @click="editOilConfig(item.id)">编辑</el-button>
|
||||
<el-button type="danger" icon="el-icon-close" @click="deleteOilConfig(item.id)">删除</el-button>
|
||||
@ -101,7 +101,9 @@
|
||||
<!-- </div>-->
|
||||
<div class="hsize">注:规则按照顺序进行处理并自动更换支付通道，新增或变更规则后需要发布当前规则才生效,发布生效后的规则将从序号1的配置生效</div>
|
||||
|
||||
<el-dialog title="编辑通道规则" :visible.sync="dialogFormVisible">
|
||||
<!-- 编辑通道规则-->
|
||||
<el-dialog title="编辑通道规则" :visible.sync="dialogFormVisible"
|
||||
width="30%">
|
||||
<el-form :model="form" ref="form">
|
||||
|
||||
<el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
|
||||
@ -116,24 +118,24 @@
|
||||
<el-form-item label="商户号" :label-width="formLabelWidth">
|
||||
<el-input v-model="form.mchntCd" disabled autocomplete="off"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="消费满笔数" :label-width="formLabelWidth">
|
||||
<el-form-item label="交易占比" :label-width="formLabelWidth">
|
||||
<el-input v-model="form.proportion" autocomplete="off">
|
||||
<template slot="append">%</template>
|
||||
</el-input>
|
||||
<div>消费笔数满足后切换到下一个支付通道</div>
|
||||
</el-form-item>
|
||||
<el-form-item label="参与次数" :label-width="formLabelWidth">
|
||||
<el-radio-group v-model="form.resource" >
|
||||
<el-radio label="不固定次数"></el-radio>
|
||||
<el-radio label="固定次数"></el-radio>
|
||||
</el-radio-group>
|
||||
<div>是否限制当前配置在生效期间内的参与次数</div>
|
||||
<div>交易占比满足规则后切换到下一个支付通道</div>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="参与次数" :label-width="formLabelWidth">-->
|
||||
<!-- <el-radio-group v-model="form.resource" >-->
|
||||
<!-- <el-radio label="不固定次数"></el-radio>-->
|
||||
<!-- <el-radio label="固定次数"></el-radio>-->
|
||||
<!-- </el-radio-group>-->
|
||||
<!-- <div>是否限制当前配置在生效期间内的参与次数</div>-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
<el-form-item label="排序" :label-width="formLabelWidth">
|
||||
<el-input-number v-model="form.num" controls-position="right" :min="1" :max="100"></el-input-number>
|
||||
<div>数值越大顺序越在前</div>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="排序" :label-width="formLabelWidth">-->
|
||||
<!-- <el-input-number v-model="form.num" controls-position="right" :min="1" :max="100"></el-input-number>-->
|
||||
<!-- <div>数值越大顺序越在前</div>-->
|
||||
<!-- </el-form-item>-->
|
||||
|
||||
|
||||
</el-form>
|
||||
@ -168,6 +170,8 @@ export default {
|
||||
merchantList:[],
|
||||
// 商品规则配置信息
|
||||
oilConfigList:[],
|
||||
// 规则周期
|
||||
ruleCycle:"singleDay",
|
||||
form: {
|
||||
name: '',
|
||||
region: '',
|
||||
@ -179,11 +183,11 @@ export default {
|
||||
resource: '',
|
||||
desc: ''
|
||||
},
|
||||
formLabelWidth: '120px',
|
||||
formLabelWidth: '70px',
|
||||
dialogFormVisible:false,
|
||||
value:false,
|
||||
value1:true,
|
||||
labelPosition: 'right',
|
||||
labelPosition: 'singleDay',
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -197,12 +201,15 @@ export default {
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
delOilConfig(id).then( response => {})
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '规则数据删除成功'
|
||||
});
|
||||
this.getList();
|
||||
delOilConfig(id).then( response => {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '规则数据删除成功'
|
||||
});
|
||||
this.getList();
|
||||
this.value1 = true;
|
||||
this.changeStatus1();
|
||||
})
|
||||
}).catch(() => {});
|
||||
},
|
||||
// 添加商户信息
|
||||
@ -270,20 +277,50 @@ export default {
|
||||
// 修改启用状态
|
||||
changeStatus(){
|
||||
if (this.value){
|
||||
this.value1 = false;
|
||||
isOpenOilConfig(1).then( response => {})
|
||||
isOpenOilConfig({isOpen:1,ruleCycle:this.ruleCycle}).then( response => {
|
||||
if (response.data!=1){
|
||||
this.$message({
|
||||
type: 'error',
|
||||
message: '支付通道切换失败,请确保交易占比相加满足百分之百'
|
||||
});
|
||||
this.value = false;
|
||||
this.value1 = true;
|
||||
}else {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '发布成功!'
|
||||
});
|
||||
this.value1 = false;
|
||||
}
|
||||
})
|
||||
}else {
|
||||
this.value1 = true;
|
||||
isOpenOilConfig(0).then( response => {})
|
||||
isOpenOilConfig({isOpen:0,ruleCycle:this.ruleCycle}).then( response => {
|
||||
this.value1 = true;
|
||||
})
|
||||
}
|
||||
},
|
||||
changeStatus1(){
|
||||
if (this.value1){
|
||||
this.value = false;
|
||||
isOpenOilConfig(0).then( response => {})
|
||||
isOpenOilConfig({isOpen:0,ruleCycle:this.ruleCycle}).then( response => {
|
||||
this.value = false;
|
||||
})
|
||||
}else {
|
||||
this.value = true;
|
||||
isOpenOilConfig(1).then( response => {})
|
||||
isOpenOilConfig({isOpen:1,ruleCycle:this.ruleCycle}).then( response => {
|
||||
if (response.data!=1){
|
||||
this.$message({
|
||||
type: 'error',
|
||||
message: '支付通道切换失败,请确保交易占比相加满足百分之百'
|
||||
});
|
||||
this.value = false;
|
||||
this.value1 = true;
|
||||
}else {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '发布成功!'
|
||||
});
|
||||
this.value = true;
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
// 修改商户使用状态
|
||||
@ -294,12 +331,13 @@ export default {
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
data.isUse = isUse
|
||||
editMerchant(data).then( response => {})
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '支付通道切换成功,已实时切换为商户号('+data.mchntCd+')'
|
||||
});
|
||||
this.getList();
|
||||
editMerchant(data).then( response => {
|
||||
this.getList();
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '支付通道切换成功,已实时切换为商户号('+data.mchntCd+')'
|
||||
});
|
||||
})
|
||||
}).catch(() => {});
|
||||
},
|
||||
// 获取商户列表信息
|
||||
@ -323,10 +361,8 @@ export default {
|
||||
cancelButtonText: '取消',
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
this.$message({
|
||||
type: 'success',
|
||||
message: '发布成功!'
|
||||
});
|
||||
this.value1 = false;
|
||||
this.changeStatus1()
|
||||
}).catch(() => {
|
||||
this.$message({
|
||||
type: 'info',
|
||||
|
||||
@ -642,7 +642,7 @@ export default {
|
||||
],
|
||||
mobile: [
|
||||
{ required: true, message: "手机号不能为空", trigger: "blur" },
|
||||
{ min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur' },
|
||||
{ min: 6, max: 13, message: '手机号不正确', trigger: 'blur' }
|
||||
],
|
||||
roleId: [
|
||||
{ required: true, message: "请选择员工角色", trigger: "blur" }
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div class="app-container">
|
||||
<el-card class="card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>{{ store.oilStationName }}({{ store.description }})</span>
|
||||
<span>{{ store.name }}{{store.description? "("+store.description+")":"" }}</span>
|
||||
</div>
|
||||
|
||||
<map-componment :pform="form" ref="mapRef" @pform="getForm"></map-componment>
|
||||
@ -116,7 +116,9 @@ export default {
|
||||
this.form.lat = this.store.latitude;
|
||||
this.form.lng = this.store.longitude;
|
||||
this.form.address = this.store.address;
|
||||
this.welfare = this.store.welfare.split(",")
|
||||
if (this.store.welfare!=null){
|
||||
this.welfare = this.store.welfare.split(",")
|
||||
}
|
||||
this.$refs.mapRef.initAMap();
|
||||
})
|
||||
},
|
||||
@ -157,17 +159,19 @@ export default {
|
||||
light: "#fff"//背景色
|
||||
}
|
||||
};
|
||||
//this.QRlink 生成的二维码地址url
|
||||
QRCode.toDataURL(this.qrcode[0].collection, opts , (err, url) => {
|
||||
if (err) throw err
|
||||
//将生成的二维码路径复制给data的QRImgUrl
|
||||
this.collectionImg= url
|
||||
})
|
||||
QRCode.toDataURL(this.qrcode[0].payment, opts , (err, url) => {
|
||||
if (err) throw err
|
||||
//将生成的二维码路径复制给data的QRImgUrl
|
||||
this.paymentImg= url
|
||||
})
|
||||
if (this.qrcode.length > 0){
|
||||
//this.QRlink 生成的二维码地址url
|
||||
QRCode.toDataURL(this.qrcode[0].collection, opts , (err, url) => {
|
||||
if (err) throw err
|
||||
//将生成的二维码路径复制给data的QRImgUrl
|
||||
this.collectionImg= url
|
||||
})
|
||||
QRCode.toDataURL(this.qrcode[0].payment, opts , (err, url) => {
|
||||
if (err) throw err
|
||||
//将生成的二维码路径复制给data的QRImgUrl
|
||||
this.paymentImg= url
|
||||
})
|
||||
}
|
||||
},
|
||||
// 根据dom生成图片并下载到本地
|
||||
handleDownloadqrCode(id) {
|
||||
|
||||
@ -448,7 +448,7 @@ import {
|
||||
updateUserGrade
|
||||
} from "@/api/staff/user/usergrade";
|
||||
import {getChainStoreConfig, updateChainStoreConfig} from "@/api/staff/user/chainstoreconfig";
|
||||
import {getSysConfig} from "@/api/staff/user/sysconfig";
|
||||
import {editSysConfig, getSysConfig} from "@/api/staff/user/sysconfig";
|
||||
export default {
|
||||
name: "UserGradeIndex",
|
||||
dicts: ['yhlx','zhzt','yhhdz'],
|
||||
@ -456,6 +456,8 @@ export default {
|
||||
return {
|
||||
level1:true,
|
||||
level2:false,
|
||||
// 是否开启等级功能
|
||||
isEnableLevel:"",
|
||||
// 优惠值
|
||||
gasolinePreferential:[
|
||||
{
|
||||
@ -509,6 +511,11 @@ export default {
|
||||
catchTypeList: [],
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 等级开启信息
|
||||
map:{
|
||||
keyStr:"is_enable_level",
|
||||
valueStr:""
|
||||
},
|
||||
// 默认排序
|
||||
defaultSort: {prop: 'createTime', order: 'descending'},
|
||||
// 表单参数
|
||||
@ -564,26 +571,37 @@ export default {
|
||||
this.getList();
|
||||
this.getClearConfig();
|
||||
this.getRule();
|
||||
this.getISEnableLevel();
|
||||
},
|
||||
methods: {
|
||||
checkName(rule, value, callback){
|
||||
queryUserGrade({name:this.form.name}).then( response => {
|
||||
if(response.data!=null){
|
||||
callback(new Error("会员等级名称已存在"))
|
||||
// 是否开启等级功能
|
||||
getISEnableLevel(){
|
||||
getSysConfig('is_enable_level').then(response => {
|
||||
this.isEnableLevel = response.data
|
||||
if (response.data=="no"){
|
||||
this.level1 = true;
|
||||
this.level2 = false;
|
||||
}else {
|
||||
callback();
|
||||
this.level1 = false;
|
||||
this.level2 = true;
|
||||
}
|
||||
})
|
||||
});
|
||||
},
|
||||
editLevel1(){
|
||||
this.level1 = false;
|
||||
this.level2 = true;
|
||||
this.$modal.msgSuccess("等级状态更新成功");
|
||||
this.map.valueStr = "yes"
|
||||
editSysConfig(this.map).then(res => {
|
||||
this.level1 = false;
|
||||
this.level2 = true;
|
||||
this.$modal.msgSuccess("等级状态更新成功");
|
||||
})
|
||||
},
|
||||
editLevel2(){
|
||||
this.level1 = true;
|
||||
this.level2 = false;
|
||||
this.$modal.msgSuccess("等级状态更新成功");
|
||||
this.map.valueStr = "no"
|
||||
editSysConfig(this.map).then(res => {
|
||||
this.level1 = true;
|
||||
this.level2 = false;
|
||||
this.$modal.msgSuccess("等级状态更新成功");
|
||||
})
|
||||
},
|
||||
addGasOline(){
|
||||
let temp= {
|
||||
@ -744,7 +762,7 @@ export default {
|
||||
this.reset();
|
||||
},
|
||||
// 提交按钮
|
||||
submitForm: function() {
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.form.gasolineRule = JSON.stringify(this.gasolinePreferential)
|
||||
@ -761,19 +779,17 @@ export default {
|
||||
if(response.data!=null){
|
||||
this.$modal.msgError("会员等级名称已存在");
|
||||
}else {
|
||||
addUserGrade(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
addUserGrade(this.form).then(res => {
|
||||
if (res.data==1){
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}else {
|
||||
this.$modal.msgError("新增失败，最多支持20个等级");
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
// saveUserGrade(this.form).then(response => {
|
||||
// this.$modal.msgSuccess("新增成功");
|
||||
// this.open = false;
|
||||
// this.getList();
|
||||
// });
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 支付配置信息 controller层
|
||||
*/
|
||||
@ -32,17 +34,28 @@ public class OilConfigController extends BaseController {
|
||||
|
||||
/**
|
||||
* 查看支付配置规则是否开启
|
||||
* @param isOpen
|
||||
* @param map
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/{isOpen}")
|
||||
public ResponseObject isOpen(@PathVariable String isOpen){
|
||||
@PostMapping("/isOpen")
|
||||
public ResponseObject isOpen(@Validated @RequestBody Map<String,String> map){
|
||||
String isOpen = map.get("isOpen");
|
||||
String ruleCycle = map.get("ruleCycle");
|
||||
// 2 代表不启用规则
|
||||
int result = 2;
|
||||
// isOpen=1开启规则
|
||||
if (isOpen.equals("1")){
|
||||
oilConfigService.oilRule();
|
||||
result = oilConfigService.judgmentProportion();
|
||||
if (result==1){
|
||||
oilConfigService.oilRule();
|
||||
// 开启定时关闭规则
|
||||
oilConfigService.ruleCycle(ruleCycle);
|
||||
}
|
||||
}else {
|
||||
// 不开启规则
|
||||
merchantConfigService.updateMerchIsOpen("0");
|
||||
}
|
||||
return getSuccessResult(0);
|
||||
return getSuccessResult(result);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -38,6 +38,10 @@ public class OilConfig extends BaseEntity implements Serializable {
|
||||
* 交易占比
|
||||
*/
|
||||
private Integer proportion;
|
||||
/**
|
||||
* 规则周期
|
||||
*/
|
||||
private String ruleCycle;
|
||||
/**
|
||||
* key值
|
||||
*/
|
||||
|
||||
@ -15,6 +15,17 @@ public interface OilConfigService extends IService<OilConfig> {
|
||||
*/
|
||||
public void oilRule();
|
||||
|
||||
/**
|
||||
* 判断占比相加是否为100% 是返回1 不是返回0
|
||||
* @return
|
||||
*/
|
||||
public int judgmentProportion();
|
||||
|
||||
/**
|
||||
* 规则周期是否为当日
|
||||
*/
|
||||
public void ruleCycle(String ruleCycle);
|
||||
|
||||
/**
|
||||
* 查询油品配置信息
|
||||
* @return
|
||||
|
||||
@ -12,6 +12,7 @@ import com.fuint.api.fuyou.vo.OilConfigVo;
|
||||
import com.fuint.common.dto.AccountInfo;
|
||||
import com.fuint.common.util.TokenUtil;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@ -59,6 +60,35 @@ public class OilConfigServiceImpl extends ServiceImpl<OilConfigMapper, OilConfig
|
||||
merchantConfigService.updateMerch(merchantConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int judgmentProportion() {
|
||||
int result = 0;
|
||||
int percentage = 0;
|
||||
List<OilConfig> list = baseMapper.selectList(null);
|
||||
for (OilConfig config : list) {
|
||||
percentage += config.getProportion();
|
||||
}
|
||||
if (percentage==100){
|
||||
result = 1;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void ruleCycle(String ruleCycle) {
|
||||
// 如果是单日的话则开启定时任务
|
||||
if (ruleCycle.equals("singleDay")){
|
||||
try {
|
||||
// 86400000
|
||||
// Thread.sleep(20000);
|
||||
// System.out.println(1);
|
||||
merchantConfigService.updateMerchIsOpen("0");
|
||||
}catch (Exception e){
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<OilConfigVo> selectOilConfigList() {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
|
||||
@ -32,14 +32,16 @@ public class StaffCommissionServiceImpl extends ServiceImpl<StaffCommissionMappe
|
||||
commission.setStoreId(storeId);
|
||||
IPage<StaffCommission> staffCommissionIPage = baseMapper.selectCommissionList(page, commission);
|
||||
for (StaffCommission record : staffCommissionIPage.getRecords()) {
|
||||
String substring = record.getTakeEffect().substring(24, 43);
|
||||
Date date = new Date();
|
||||
SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
String now = dateFormat.format(date);
|
||||
int row = substring.compareTo(now);
|
||||
if (row == -1){
|
||||
record.setStatus("jy");
|
||||
baseMapper.updateById(record);
|
||||
if (record.getTakeEffect()!=null && record.getTakeEffect().equals("")){
|
||||
String substring = record.getTakeEffect().substring(24, 43);
|
||||
Date date = new Date();
|
||||
SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
String now = dateFormat.format(date);
|
||||
int row = substring.compareTo(now);
|
||||
if (row == -1){
|
||||
record.setStatus("jy");
|
||||
baseMapper.updateById(record);
|
||||
}
|
||||
}
|
||||
}
|
||||
IPage<StaffCommission> commissionIPage = baseMapper.selectCommissionList(page, commission);
|
||||
|
||||
@ -108,7 +108,7 @@ public class MtPurchaseController extends BaseController {
|
||||
|
||||
|
||||
/**
|
||||
* 盘点审核
|
||||
* 进货审核
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@ -117,11 +117,21 @@ public class MtPurchaseController extends BaseController {
|
||||
return getSuccessResult(this.mtPurchaseService.audit(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 进货废除
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("abolition")
|
||||
public ResponseObject abolition(Integer id) {
|
||||
return getSuccessResult(this.mtPurchaseService.abolition(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 进货入库
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("storage")
|
||||
public ResponseObject storage(Integer id) {
|
||||
return getSuccessResult(this.mtPurchaseService.storage(id));
|
||||
|
||||
@ -144,6 +144,7 @@
|
||||
left join mt_goods mg ON md.goods_id = mg.id
|
||||
where
|
||||
damage_id = #{mtDamageDetails.damageId}
|
||||
|
||||
</select>
|
||||
<select id="getListByExcel"
|
||||
resultType="com.fuint.business.convenienceSore.vo.excel.MtDamageDetailsExcel">
|
||||
|
||||
@ -151,15 +151,14 @@
|
||||
mg.supplier_id supplierId,
|
||||
mg.id goodsId,
|
||||
mg.stock stock,
|
||||
mg.store_id storeId,
|
||||
mp.order_number orderNumber
|
||||
from mt_purchase_details md
|
||||
left join mt_purchase mp ON md.purchase_id = mp.id
|
||||
left join mt_goods mg ON md.goods_id = mg.id
|
||||
<where>
|
||||
purchase_id = #{mtPurchaseDetails.purchaseId}
|
||||
<if test="mtPurchaseDetails.storeId != null">
|
||||
and md.store_id = #{mtPurchaseDetails.storeId}
|
||||
</if>
|
||||
and md.store_id = #{mtPurchaseDetails.storeId}
|
||||
</where>
|
||||
</select>
|
||||
<select id="getListByExcel"
|
||||
|
||||
@ -191,7 +191,7 @@ public class MtDamageServiceImpl implements MtDamageService {
|
||||
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
|
||||
StockTrack stockTrack = new StockTrack();
|
||||
stockTrack.setStockId(stockStatistic.getId());
|
||||
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
|
||||
stockTrack.setStoreId(nowAccountInfo.getStoreId());
|
||||
stockTrack.setDocument("商品报损");
|
||||
stockTrack.setChangeNumber(-mtReturnsDetailsVO.getDamageQuantity());
|
||||
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());
|
||||
|
||||
@ -169,7 +169,7 @@ public class MtInventoryServiceImpl implements MtInventoryService {
|
||||
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
|
||||
StockTrack stockTrack = new StockTrack();
|
||||
stockTrack.setStockId(stockStatistic.getId());
|
||||
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
|
||||
stockTrack.setStoreId(nowAccountInfo.getStoreId());
|
||||
stockTrack.setDocument("商品盘点");
|
||||
stockTrack.setChangeNumber(mtReturnsDetailsVO.getInventoryDiscrepancy().intValue());
|
||||
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());
|
||||
|
||||
@ -186,11 +186,13 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public boolean storage(Integer id) {
|
||||
String oilIntake = "进货入库";
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
int audit = iljStaffService.auditPrem(oilIntake);
|
||||
if (audit>0) {
|
||||
// 1.查询所有的数据
|
||||
MtPurchaseDetails mtPurchaseDetails = new MtPurchaseDetails();
|
||||
mtPurchaseDetails.setPurchaseId(id);
|
||||
mtPurchaseDetails.setStoreId(nowAccountInfo.getStoreId());
|
||||
List<MtPurchaseDetailsVO> allList2 = detailsMapper.getAllList2(mtPurchaseDetails);
|
||||
for (MtPurchaseDetailsVO mtPurchaseDetailsVO : allList2) {
|
||||
// 修改库存
|
||||
@ -200,7 +202,7 @@ public class MtPurchaseServiceImpl implements MtPurchaseService {
|
||||
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtPurchaseDetailsVO.getGoodsId());
|
||||
StockTrack stockTrack = new StockTrack();
|
||||
stockTrack.setStockId(stockStatistic.getId());
|
||||
stockTrack.setStoreId(mtPurchaseDetailsVO.getStoreId());
|
||||
stockTrack.setStoreId(nowAccountInfo.getStoreId());
|
||||
stockTrack.setDocument("商品进货");
|
||||
stockTrack.setChangeNumber(mtPurchaseDetailsVO.getQuantityPurchased());
|
||||
stockTrack.setOddNumber(mtPurchaseDetailsVO.getOrderNumber());
|
||||
|
||||
@ -192,7 +192,7 @@ public class MtReturnsServiceImpl implements MtReturnsService {
|
||||
StockStatistic stockStatistic = stockStatisticService.selectStockByGoodsId(mtReturnsDetailsVO.getGoodsId());
|
||||
StockTrack stockTrack = new StockTrack();
|
||||
stockTrack.setStockId(stockStatistic.getId());
|
||||
stockTrack.setStoreId(mtReturnsDetailsVO.getStoreId());
|
||||
stockTrack.setStoreId(nowAccountInfo.getStoreId());
|
||||
stockTrack.setDocument("商品退货");
|
||||
stockTrack.setChangeNumber(-mtReturnsDetailsVO.getReturnQuantity());
|
||||
stockTrack.setOddNumber(mtReturnsDetailsVO.getOrderNumber());
|
||||
|
||||
@ -160,6 +160,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
|
||||
Double theAmountToBePaid = 0.0;
|
||||
|
||||
boolean flag = false;
|
||||
System.out.println("cardFuelRecordDTO.getRechargeBalance():"+cardFuelRecordDTO.getRechargeBalance());
|
||||
|
||||
double epsilon = 1e-10; // 阈值
|
||||
if (!ObjectUtil.isEmpty(cardFuelRecordDTO.getRechargeBalance())
|
||||
|
||||
@ -106,6 +106,9 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
|
||||
double epsilon = 1e-10; // 阈值
|
||||
|
||||
Double theAmountToBePaid = 0.0;
|
||||
|
||||
System.out.println("cardFuelRecordDTO.getRechargeBalance():"+cardValueRecordDTO.getRealyPayBills());
|
||||
|
||||
boolean flag = false;
|
||||
// 先判断是否为自定义金额
|
||||
if (!ObjectUtil.isEmpty(cardValueRecordDTO.getRealyPayBills())
|
||||
|
||||
@ -9,6 +9,9 @@
|
||||
<include refid="selectOrders"></include>
|
||||
<where>
|
||||
store_id = #{order.storeId}
|
||||
<if test="order.userId != null and order.userId != ''">
|
||||
and user_id = #{order.userId}
|
||||
</if>
|
||||
<if test="order.staffId != null and order.staffId != ''">
|
||||
and staff_id = #{order.staffId}
|
||||
</if>
|
||||
|
||||
@ -147,7 +147,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
|
||||
|
||||
// 支付状态
|
||||
String payStatus = "unpaid";
|
||||
if (payType.equals("CASH")){
|
||||
if (payType.equals("CASH") && map.get("allAmount").equals("0")){
|
||||
payStatus = "paid";
|
||||
}else {
|
||||
payStatus = "unpaid";
|
||||
|
||||
@ -3,7 +3,9 @@ package com.fuint.business.petrolStationManagement.service.impl;
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.fuint.business.petrolStationManagement.entity.OilTank;
|
||||
import com.fuint.business.petrolStationManagement.entity.OilTracking;
|
||||
import com.fuint.business.petrolStationManagement.mapper.OilTankMapper;
|
||||
import com.fuint.business.petrolStationManagement.mapper.OilTrackingMapper;
|
||||
import com.fuint.business.petrolStationManagement.service.OilTankService;
|
||||
import com.fuint.business.petrolStationManagement.vo.OilTankExcel;
|
||||
import com.fuint.common.dto.AccountInfo;
|
||||
@ -27,7 +29,8 @@ import java.util.List;
|
||||
public class OilTankServiceImpl implements OilTankService {
|
||||
@Resource
|
||||
private OilTankMapper oilTankDao;
|
||||
|
||||
@Resource
|
||||
OilTrackingMapper oilTrackingMapper;
|
||||
/**
|
||||
* 通过ID查询单条数据
|
||||
*
|
||||
@ -80,6 +83,17 @@ public class OilTankServiceImpl implements OilTankService {
|
||||
oilTank.setStoreId(nowAccountInfo.getStoreId());
|
||||
oilTank.setCreateBy(nowAccountInfo.getStaffId().toString());
|
||||
this.oilTankDao.insert(oilTank);
|
||||
|
||||
// 添加到库存跟踪 （初始化时）
|
||||
OilTracking oilTracking = new OilTracking();
|
||||
oilTracking.setStoreId(nowAccountInfo.getStoreId());
|
||||
oilTracking.setCreateBy(nowAccountInfo.getStaffId().toString());
|
||||
oilTracking.setDocument("油罐库存初始化");
|
||||
oilTracking.setQuantityChange(oilTank.getStoredQuantity());
|
||||
oilTracking.setTankId(oilTank.getId());
|
||||
oilTracking.setOrderNumber("-");
|
||||
oilTrackingMapper.insert(oilTracking);
|
||||
|
||||
return oilTank;
|
||||
}
|
||||
|
||||
|
||||
@ -48,6 +48,17 @@ public class LJUserGradeController extends BaseController {
|
||||
return getSuccessResult(userGrade);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id查询会员等级信息
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/isUse/{id}")
|
||||
public ResponseObject userGrade(@PathVariable Integer id){
|
||||
LJUserGrade userGrade = userGradeService.selectUserGradeByIdIsUse(id);
|
||||
return getSuccessResult(userGrade);
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据id查询会员等级信息
|
||||
* @param map
|
||||
|
||||
@ -3,13 +3,15 @@
|
||||
<mapper namespace="com.fuint.business.userManager.mapper.LJUserMapper">
|
||||
<sql id="selectUser">
|
||||
select mu.*,mub.card_balance,mub.points,mub.growth_value,mub.refuel_money from mt_user mu
|
||||
inner join mt_user_balance mub on mu.id = mub.mt_user_id
|
||||
left join mt_user_balance mub on mu.id = mub.mt_user_id
|
||||
</sql>
|
||||
|
||||
<select id="selectUserList" resultType="com.fuint.business.userManager.vo.LJUserVo">
|
||||
<include refid="selectUser"></include>
|
||||
<where>
|
||||
mu.store_id = #{user.storeId}
|
||||
<if test="user.storeId != null and user.storeId != ''">
|
||||
and mu.store_id = #{user.storeId}
|
||||
</if>
|
||||
<if test="user.mobile != null and user.mobile != ''">
|
||||
and mu.mobile like concat('%', #{user.mobile}, '%')
|
||||
</if>
|
||||
@ -26,10 +28,10 @@
|
||||
and mu.official = #{user.official}
|
||||
</if>
|
||||
<if test="user.cardBalance != null and user.cardBalance != '' and user.cardBalance == 2">
|
||||
and mub.cardBalance = 0
|
||||
and mub.card_balance = 0
|
||||
</if>
|
||||
<if test="user.cardBalance != null and user.cardBalance != '' and user.cardBalance == 1">
|
||||
and mub.cardBalance != 0
|
||||
and mub.card_balance != 0
|
||||
</if>
|
||||
<if test="user.params.beginTime != null and user.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and date_format(mu.create_time,'%y%m%d') >= date_format(#{user.params.beginTime},'%y%m%d')
|
||||
|
||||
@ -23,6 +23,13 @@ public interface LJUserGradeService extends IService<LJUserGrade> {
|
||||
*/
|
||||
public LJUserGrade selectUserGradeById(int id);
|
||||
|
||||
/**
|
||||
* 根据id查询会员等级信息是否可使用
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
public LJUserGrade selectUserGradeByIdIsUse(int id);
|
||||
|
||||
/**
|
||||
* 根据会员等级名称查询会员等级信息
|
||||
* @param name
|
||||
|
||||
@ -12,6 +12,8 @@ import com.fuint.business.userManager.service.LJUserGradeService;
|
||||
import com.fuint.common.dto.AccountInfo;
|
||||
import com.fuint.common.util.StringUtils;
|
||||
import com.fuint.common.util.TokenUtil;
|
||||
import com.fuint.system.config.service.SysConfigService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Service
|
||||
@ -41,6 +43,18 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
|
||||
return baseMapper.selectById(id);
|
||||
}
|
||||
|
||||
@Autowired
|
||||
private SysConfigService sysConfigService;
|
||||
|
||||
@Override
|
||||
public LJUserGrade selectUserGradeByIdIsUse(int id) {
|
||||
String isEnableLevel = sysConfigService.getValueByKey("is_enable_level");
|
||||
if (isEnableLevel.equals("yes")){
|
||||
return baseMapper.selectById(id);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LJUserGrade selectUserGradeByName(String name) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
@ -59,7 +73,18 @@ public class LJUserGradeServiceImpl extends ServiceImpl<LJUserGradeMapper, LJUse
|
||||
|
||||
@Override
|
||||
public int insertUserGrade(LJUserGrade userGrade) {
|
||||
int row = baseMapper.insert(userGrade);
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
Integer storeId = nowAccountInfo.getStoreId();
|
||||
QueryWrapper queryWrapper = new QueryWrapper();
|
||||
queryWrapper.eq("store_id",storeId);
|
||||
Integer num = baseMapper.selectCount(queryWrapper);
|
||||
int row = 0;
|
||||
if (num<20){
|
||||
userGrade.setStoreId(storeId);
|
||||
row = baseMapper.insert(userGrade);
|
||||
}else {
|
||||
row = 0;
|
||||
}
|
||||
return row;
|
||||
}
|
||||
|
||||
|
||||
@ -37,9 +37,9 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
|
||||
*/
|
||||
@Override
|
||||
public IPage<LJUserVo> selectUserList(Page page, LJUserVo user) {
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
Integer storeId = nowAccountInfo.getStoreId();
|
||||
user.setStoreId(storeId);
|
||||
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
// Integer storeId = nowAccountInfo.getStoreId();
|
||||
// user.setStoreId(storeId);
|
||||
IPage<LJUserVo> ljUserIPage = baseMapper.selectUserList(page, user);
|
||||
return ljUserIPage;
|
||||
}
|
||||
|
||||
@ -90,6 +90,18 @@ public class SysConfigController extends BaseController {
|
||||
return getSuccessResult("成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 根据key修改value
|
||||
*
|
||||
* @param sysConfig 实体对象
|
||||
* @return 修改结果
|
||||
*/
|
||||
@PutMapping("/updateValue")
|
||||
public ResponseObject updateSysConfig(@RequestBody SysConfig sysConfig) {
|
||||
this.sysConfigService.updateSysConfig(sysConfig);
|
||||
return getSuccessResult("成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除数据
|
||||
*
|
||||
|
||||
@ -12,6 +12,12 @@ import com.fuint.system.config.entity.SysConfig;
|
||||
public interface SysConfigService extends IService<SysConfig> {
|
||||
void saveVo(SysConfig sysConfig);
|
||||
void updateByIdVo(SysConfig sysConfig);
|
||||
|
||||
/**
|
||||
* 根据key修改配置信息
|
||||
* @param sysConfig
|
||||
*/
|
||||
void updateSysConfig(SysConfig sysConfig);
|
||||
void removeByIdVo(Long id);
|
||||
String getValueByKey(String keyStr);
|
||||
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
package com.fuint.system.config.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.fuint.common.util.RedisUtil;
|
||||
import com.fuint.system.config.mapper.SysConfigMapper;
|
||||
@ -34,6 +35,17 @@ public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig
|
||||
this.updateById(sysConfig);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateSysConfig(SysConfig sysConfig) {
|
||||
QueryWrapper queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("key_str",sysConfig.getKeyStr());
|
||||
SysConfig sysConfig1 = baseMapper.selectOne(queryWrapper);
|
||||
if (ObjectUtils.isNotEmpty(sysConfig1)){
|
||||
sysConfig1.setValueStr(sysConfig.getValueStr());
|
||||
baseMapper.updateById(sysConfig1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeByIdVo(Long id) {
|
||||
SysConfig sysConfig = this.getById(id);
|
||||
|
||||
@ -17,6 +17,14 @@ export function getUserGrade(id) {
|
||||
})
|
||||
}
|
||||
|
||||
// 查询会员等级详细是否能使用
|
||||
export function userGradeInfo(id) {
|
||||
return request({
|
||||
url: '/business/userManager/userGrade/isUse/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 根据会员等级名称查询会员等级信息
|
||||
export function queryUserGrade(data) {
|
||||
return request({
|
||||
|
||||
@ -218,7 +218,7 @@
|
||||
<div class="bottom-price">￥{{ oilActualPay + goodsActualPay }}</div>
|
||||
<div class="price-red">优惠合计：{{ oilDiscount + goodsDiscount }}元/{{consumeRefuelMoney}}L</div>
|
||||
</div>
|
||||
<el-button class="center-left-lv" :disabled="(oilActualPay + goodsActualPay)==0" @click="settlement">立即结算</el-button>
|
||||
<el-button class="center-left-lv" :disabled="(oilAmount + goodsAmount)==0" @click="settlement">立即结算</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -782,13 +782,14 @@
|
||||
import {getUserVoMobile, getUserVoName} from "@/api/cashier/user";
|
||||
import {queryStaffs, staffInfo} from "@/api/cashier/staff";
|
||||
import {addLJGoods, goodsOrder, oilOrder} from "@/api/cashier/oilorder";
|
||||
import {getUserGrade, listUserGrade} from "@/api/cashier/usergrade";
|
||||
import {getUserGrade, listUserGrade, userGradeInfo} from "@/api/cashier/usergrade";
|
||||
import {getOilGun} from "@/api/cashier/oilGuns";
|
||||
import {listCardFavorableRecord} from "@/api/cashier/cardfavorablerecord";
|
||||
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";
|
||||
import {getSysConfig} from "@/api/staff/user/sysconfig";
|
||||
|
||||
const cityOptions = ['上海', '北京'];
|
||||
export default {
|
||||
@ -808,7 +809,7 @@
|
||||
cities2: cityOptions,
|
||||
gradeDiscount: [],
|
||||
// 囤油卡全选
|
||||
checkAll3: true,
|
||||
checkAll3: false,
|
||||
isIndeterminate3: true,
|
||||
checkedCities3: [],
|
||||
cities3: cityOptions,
|
||||
@ -863,8 +864,10 @@
|
||||
oilActualPay:0,
|
||||
// 油品优惠金额
|
||||
oilDiscount:0,
|
||||
// 囤油卡消费金额
|
||||
// 扣除升数后需要消费的金额
|
||||
hoardAmount:0,
|
||||
// 是否使用囤油卡
|
||||
isOilStorageCard:false,
|
||||
// 商品优惠金额
|
||||
goodsDiscount:0,
|
||||
// 商品实付金额
|
||||
@ -954,7 +957,7 @@
|
||||
// 优惠券id
|
||||
couponIds:[],
|
||||
// 使用的优惠券id
|
||||
useCouponIds:[],
|
||||
useCouponIds:"",
|
||||
map:{
|
||||
allAmount:0,
|
||||
// 用户支付条码信息
|
||||
@ -1194,7 +1197,7 @@
|
||||
if (val){
|
||||
this.fullReduction = 0;
|
||||
this.fullReduceDiscount.forEach(item => {
|
||||
this.fullReduction += item.reduce
|
||||
this.fullReduction += +item.reduce
|
||||
})
|
||||
this.isUseFull = false;
|
||||
}else {
|
||||
@ -1214,7 +1217,7 @@
|
||||
reduces = item.reduce
|
||||
}
|
||||
}
|
||||
this.fullReduction += reduces
|
||||
this.fullReduction += +reduces
|
||||
})
|
||||
let checkedCount = value.length;
|
||||
this.checkAll1 = checkedCount === this.fullReduceDiscount.length;
|
||||
@ -1256,8 +1259,10 @@
|
||||
handleCheckAllChange3(val) {
|
||||
if (val==false){
|
||||
this.consumeRefuelMoney = 0;
|
||||
this.hoardAmount = 0;
|
||||
// this.hoardAmount = 0;
|
||||
this.isOilStorageCard = false;
|
||||
}else {
|
||||
this.isOilStorageCard = true;
|
||||
this.changeRefuelMoney()
|
||||
}
|
||||
this.isExclusion();
|
||||
@ -1363,9 +1368,9 @@
|
||||
list.forEach(item => {
|
||||
num += item.num;
|
||||
if (_this.isMember){
|
||||
amount += item.memberPrice;
|
||||
amount += +item.memberPrice;
|
||||
}else {
|
||||
amount += item.retailPrice;
|
||||
amount += +item.retailPrice;
|
||||
}
|
||||
})
|
||||
this.goodsTotal = num;
|
||||
@ -1414,231 +1419,237 @@
|
||||
let _this = this;
|
||||
this.oilDiscount = 0;
|
||||
this.gradeDiscount = [];
|
||||
getUserGrade(id).then( response => {
|
||||
let gasolineDiscount = 0;
|
||||
let dieselDiscount = 0;
|
||||
let naturalGasDiscount = 0;
|
||||
_this.gradeDiscount = [];
|
||||
_this.oilOrder.forEach(item => {
|
||||
let discount = {type:"",full:0,reduce:0,liters:0}
|
||||
if (item.type == "汽油"){
|
||||
let gasolineRule = JSON.parse(response.data.gasolineRule);
|
||||
if (response.data.preferential == '自定义优惠' && response.data.status == 'qy'){
|
||||
if (response.data.gasolineDiscount=="满减优惠"){
|
||||
let oilDiscount = 0;
|
||||
discount.type = "满减优惠"
|
||||
for (let i = 1; i <= gasolineRule.length; i++){
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (gasolineRule.length>1){
|
||||
if (item.amount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
|
||||
discount.full = gasolineRule[gasolineRule.length-1].gasolineRule1
|
||||
oilDiscount = gasolineRule[gasolineRule.length-1].gasolineRule2
|
||||
discount.reduce = gasolineRule[gasolineRule.length-1].gasolineRule2
|
||||
break;
|
||||
}
|
||||
if (item.amount >= gasolineRule[i-1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1){
|
||||
discount.full = gasolineRule[i-1].gasolineRule1
|
||||
oilDiscount = gasolineRule[i-1].gasolineRule2
|
||||
discount.reduce = gasolineRule[i-1].gasolineRule2
|
||||
}
|
||||
}else {
|
||||
if (item.amount >= gasolineRule[i-1].gasolineRule1){
|
||||
discount.full = gasolineRule[i-1].gasolineRule1
|
||||
oilDiscount = gasolineRule[i-1].gasolineRule2
|
||||
discount.reduce = gasolineRule[i-1].gasolineRule2
|
||||
getSysConfig('is_enable_level').then(res => {
|
||||
if (res.data=="yes") {
|
||||
userGradeInfo(id).then(response => {
|
||||
let gasolineDiscount = 0;
|
||||
let dieselDiscount = 0;
|
||||
let naturalGasDiscount = 0;
|
||||
_this.gradeDiscount = [];
|
||||
if (response.data!=null) {
|
||||
_this.oilOrder.forEach(item => {
|
||||
let discount = {type: "", full: 0, reduce: 0, liters: 0}
|
||||
if (item.type == "汽油") {
|
||||
let gasolineRule = JSON.parse(response.data.gasolineRule);
|
||||
if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
|
||||
if (response.data.gasolineDiscount == "满减优惠") {
|
||||
let oilDiscount = 0;
|
||||
discount.type = "满减优惠"
|
||||
for (let i = 1; i <= gasolineRule.length; i++) {
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (gasolineRule.length > 1) {
|
||||
if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
|
||||
discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
|
||||
oilDiscount = gasolineRule[gasolineRule.length - 1].gasolineRule2
|
||||
discount.reduce = gasolineRule[gasolineRule.length - 1].gasolineRule2
|
||||
break;
|
||||
}
|
||||
if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
|
||||
discount.full = gasolineRule[i - 1].gasolineRule1
|
||||
oilDiscount = gasolineRule[i - 1].gasolineRule2
|
||||
discount.reduce = gasolineRule[i - 1].gasolineRule2
|
||||
}
|
||||
} else {
|
||||
if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
|
||||
discount.full = gasolineRule[i - 1].gasolineRule1
|
||||
oilDiscount = gasolineRule[i - 1].gasolineRule2
|
||||
discount.reduce = gasolineRule[i - 1].gasolineRule2
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce != 0) {
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('满减优惠')
|
||||
}
|
||||
gasolineDiscount += +oilDiscount
|
||||
} else if (response.data.gasolineDiscount == "每升优惠") {
|
||||
discount.type = "每升优惠"
|
||||
let oilDiscount = 0;
|
||||
for (let i = 1; i <= gasolineRule.length; i++) {
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (gasolineRule.length > 1) {
|
||||
if (item.amount >= gasolineRule[gasolineRule.length - 1].gasolineRule1) {
|
||||
discount.full = gasolineRule[gasolineRule.length - 1].gasolineRule1
|
||||
oilDiscount = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
|
||||
discount.reduce = (item.liters * gasolineRule[gasolineRule.length - 1].gasolineRule3).toFixed(2);
|
||||
discount.liters = gasolineRule[i - 1].gasolineRule3
|
||||
break;
|
||||
}
|
||||
if (item.amount >= gasolineRule[i - 1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1) {
|
||||
discount.full = gasolineRule[i - 1].gasolineRule1
|
||||
oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
|
||||
discount.liters = gasolineRule[i - 1].gasolineRule3
|
||||
}
|
||||
} else {
|
||||
if (item.amount >= gasolineRule[i - 1].gasolineRule1) {
|
||||
discount.full = gasolineRule[i - 1].gasolineRule1
|
||||
oilDiscount = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * gasolineRule[i - 1].gasolineRule3).toFixed(2)
|
||||
discount.liters = gasolineRule[i - 1].gasolineRule3
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce != 0) {
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('每升优惠')
|
||||
}
|
||||
gasolineDiscount += +oilDiscount
|
||||
} else {
|
||||
gasolineDiscount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('满减优惠')
|
||||
}
|
||||
gasolineDiscount += +oilDiscount
|
||||
}else if (response.data.gasolineDiscount=="每升优惠"){
|
||||
discount.type = "每升优惠"
|
||||
let oilDiscount = 0;
|
||||
for (let i = 1; i <= gasolineRule.length; i++){
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (gasolineRule.length>1){
|
||||
if (item.amount >= gasolineRule[gasolineRule.length-1].gasolineRule1){
|
||||
discount.full = gasolineRule[gasolineRule.length-1].gasolineRule1
|
||||
oilDiscount = (item.liters * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2);
|
||||
discount.reduce = (item.liters * gasolineRule[gasolineRule.length-1].gasolineRule3).toFixed(2);
|
||||
discount.liters = gasolineRule[i-1].gasolineRule3
|
||||
break;
|
||||
}
|
||||
if (item.amount >= gasolineRule[i-1].gasolineRule1 && item.amount < gasolineRule[i].gasolineRule1){
|
||||
discount.full = gasolineRule[i-1].gasolineRule1
|
||||
oilDiscount = (item.liters * gasolineRule[i-1].gasolineRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * gasolineRule[i-1].gasolineRule3).toFixed(2)
|
||||
discount.liters = gasolineRule[i-1].gasolineRule3
|
||||
}
|
||||
}else {
|
||||
if (item.amount >= gasolineRule[i-1].gasolineRule1){
|
||||
discount.full = gasolineRule[i-1].gasolineRule1
|
||||
oilDiscount = (item.liters * gasolineRule[i-1].gasolineRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * gasolineRule[i-1].gasolineRule3).toFixed(2)
|
||||
discount.liters = gasolineRule[i-1].gasolineRule3
|
||||
if (item.type == "柴油") {
|
||||
let dieselRule = JSON.parse(response.data.dieselRule);
|
||||
if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
|
||||
if (response.data.dieselDiscount == "满减优惠") {
|
||||
let oilDiscount = 0;
|
||||
discount.type = "满减优惠"
|
||||
for (let i = 1; i <= dieselRule.length; i++) {
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (dieselRule.length > 1) {
|
||||
if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
|
||||
discount.full = dieselRule[dieselRule.length - 1].dieselRule1
|
||||
oilDiscount = dieselRule[dieselRule.length - 1].dieselRule2
|
||||
discount.reduce = dieselRule[dieselRule.length - 1].dieselRule2
|
||||
break;
|
||||
}
|
||||
if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
|
||||
discount.full = dieselRule[i - 1].dieselRule1
|
||||
oilDiscount = dieselRule[i - 1].dieselRule2
|
||||
discount.reduce = dieselRule[i - 1].dieselRule2
|
||||
}
|
||||
} else {
|
||||
discount.full = dieselRule[i - 1].dieselRule1
|
||||
if (item.amount >= dieselRule[i - 1].dieselRule1) {
|
||||
oilDiscount = dieselRule[i - 1].dieselRule2
|
||||
discount.reduce = dieselRule[i - 1].dieselRule2
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce != 0) {
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('满减优惠')
|
||||
}
|
||||
dieselDiscount += +oilDiscount
|
||||
} else if (response.data.dieselDiscount == "每升优惠") {
|
||||
let oilDiscount = 0;
|
||||
for (let i = 1; i <= dieselRule.length; i++) {
|
||||
discount.type = "每升优惠"
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (dieselRule.length > 1) {
|
||||
if (item.amount >= dieselRule[dieselRule.length - 1].dieselRule1) {
|
||||
discount.full = dieselRule[dieselRule.length - 1].dieselRule1
|
||||
oilDiscount = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
|
||||
discount.reduce = (item.liters * dieselRule[dieselRule.length - 1].dieselRule3).toFixed(2);
|
||||
discount.liters = dieselRule[dieselRule.length - 1].dieselRule3
|
||||
break;
|
||||
}
|
||||
if (item.amount >= dieselRule[i - 1].dieselRule1 && item.amount < dieselRule[i].dieselRule1) {
|
||||
discount.full = dieselRule[i - 1].dieselRule1
|
||||
oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
|
||||
discount.liters = dieselRule[i - 1].dieselRule3
|
||||
}
|
||||
} else {
|
||||
discount.full = dieselRule[i - 1].dieselRule1
|
||||
if (item.amount >= dieselRule[i - 1].dieselRule1) {
|
||||
oilDiscount = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * dieselRule[i - 1].dieselRule3).toFixed(2)
|
||||
discount.liters = dieselRule[i - 1].dieselRule3
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce != 0) {
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('每升优惠')
|
||||
}
|
||||
dieselDiscount += +oilDiscount
|
||||
} else {
|
||||
dieselDiscount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('每升优惠')
|
||||
if (item.type == "天然气") {
|
||||
let naturalGasRule = JSON.parse(response.data.naturalGasRule);
|
||||
if (response.data.preferential == '自定义优惠' && response.data.status == 'qy') {
|
||||
if (response.data.naturalGasDiscount == "满减优惠") {
|
||||
let oilDiscount = 0;
|
||||
discount.type = "满减优惠"
|
||||
for (let i = 1; i <= naturalGasRule.length; i++) {
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (naturalGasRule.length > 1) {
|
||||
if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
|
||||
discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
|
||||
oilDiscount = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2;
|
||||
discount.reduce = naturalGasRule[naturalGasRule.length - 1].naturalGasRule2
|
||||
break;
|
||||
}
|
||||
if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
|
||||
discount.full = naturalGasRule[i - 1].naturalGasRule1
|
||||
oilDiscount = naturalGasRule[i - 1].naturalGasRule2
|
||||
discount.reduce = naturalGasRule[i - 1].naturalGasRule2
|
||||
}
|
||||
} else {
|
||||
if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
|
||||
discount.full = naturalGasRule[i - 1].naturalGasRule1
|
||||
oilDiscount = naturalGasRule[i - 1].naturalGasRule2
|
||||
discount.reduce = naturalGasRule[i - 1].naturalGasRule2
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce != 0) {
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('满减优惠')
|
||||
}
|
||||
naturalGasDiscount += +oilDiscount
|
||||
} else if (response.data.naturalGasDiscount == "每单位优惠") {
|
||||
let oilDiscount = 0;
|
||||
discount.type = "每单位优惠"
|
||||
for (let i = 1; i <= naturalGasRule.length; i++) {
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (naturalGasRule.length > 1) {
|
||||
if (item.amount >= naturalGasRule[naturalGasRule.length - 1].naturalGasRule1) {
|
||||
discount.full = naturalGasRule[naturalGasRule.length - 1].naturalGasRule1
|
||||
oilDiscount = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * naturalGasRule[gasolineRule.length - 1].naturalGasRule3).toFixed(2)
|
||||
discount.liters = naturalGasRule[naturalGasRule.length - 1].naturalGasRule3
|
||||
break;
|
||||
}
|
||||
if (item.amount >= naturalGasRule[i - 1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1) {
|
||||
discount.full = naturalGasRule[i - 1].naturalGasRule1
|
||||
oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
|
||||
discount.liters = naturalGasRule[i - 1].naturalGasRule3
|
||||
}
|
||||
} else {
|
||||
if (item.amount >= naturalGasRule[i - 1].naturalGasRule1) {
|
||||
discount.full = naturalGasRule[i - 1].naturalGasRule1
|
||||
oilDiscount = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * naturalGasRule[i - 1].naturalGasRule3).toFixed(2)
|
||||
discount.liters = naturalGasRule[i - 1].naturalGasRule3
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce != 0) {
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('每单位优惠')
|
||||
}
|
||||
naturalGasDiscount += +oilDiscount
|
||||
} else {
|
||||
naturalGasDiscount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
gasolineDiscount += +oilDiscount
|
||||
}else {
|
||||
gasolineDiscount = 0;
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
if (item.type == "柴油"){
|
||||
let dieselRule = JSON.parse(response.data.dieselRule);
|
||||
if (response.data.preferential == '自定义优惠' && response.data.status == 'qy'){
|
||||
if (response.data.dieselDiscount=="满减优惠"){
|
||||
let oilDiscount = 0;
|
||||
discount.type = "满减优惠"
|
||||
for (let i = 1; i <= dieselRule.length; i++){
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (dieselRule.length>1){
|
||||
if (item.amount >= dieselRule[dieselRule.length-1].dieselRule1){
|
||||
discount.full = dieselRule[dieselRule.length-1].dieselRule1
|
||||
oilDiscount = dieselRule[dieselRule.length-1].dieselRule2
|
||||
discount.reduce = dieselRule[dieselRule.length-1].dieselRule2
|
||||
break;
|
||||
}
|
||||
if (item.amount >= dieselRule[i-1].dieselRule1 && item.amount < dieselRule[i].dieselRule1){
|
||||
discount.full = dieselRule[i-1].dieselRule1
|
||||
oilDiscount = dieselRule[i-1].dieselRule2
|
||||
discount.reduce = dieselRule[i-1].dieselRule2
|
||||
}
|
||||
}else {
|
||||
discount.full = dieselRule[i-1].dieselRule1
|
||||
if (item.amount >= dieselRule[i-1].dieselRule1){
|
||||
oilDiscount = dieselRule[i-1].dieselRule2
|
||||
discount.reduce = dieselRule[i-1].dieselRule2
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('满减优惠')
|
||||
}
|
||||
dieselDiscount += +oilDiscount
|
||||
}else if (response.data.dieselDiscount=="每升优惠"){
|
||||
let oilDiscount = 0;
|
||||
for (let i = 1; i <= dieselRule.length; i++){
|
||||
discount.type = "每升优惠"
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (dieselRule.length>1){
|
||||
if (item.amount >= dieselRule[dieselRule.length-1].dieselRule1){
|
||||
discount.full = dieselRule[dieselRule.length-1].dieselRule1
|
||||
oilDiscount = (item.liters * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2);
|
||||
discount.reduce = (item.liters * dieselRule[dieselRule.length-1].dieselRule3).toFixed(2);
|
||||
discount.liters = dieselRule[dieselRule.length-1].dieselRule3
|
||||
break;
|
||||
}
|
||||
if (item.amount >= dieselRule[i-1].dieselRule1 && item.amount < dieselRule[i].dieselRule1){
|
||||
discount.full = dieselRule[i-1].dieselRule1
|
||||
oilDiscount = (item.liters * dieselRule[i-1].dieselRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * dieselRule[i-1].dieselRule3).toFixed(2)
|
||||
discount.liters = dieselRule[i-1].dieselRule3
|
||||
}
|
||||
}else {
|
||||
discount.full = dieselRule[i-1].dieselRule1
|
||||
if (item.amount >= dieselRule[i-1].dieselRule1){
|
||||
oilDiscount = (item.liters * dieselRule[i-1].dieselRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * dieselRule[i-1].dieselRule3).toFixed(2)
|
||||
discount.liters = dieselRule[i-1].dieselRule3
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('每升优惠')
|
||||
}
|
||||
dieselDiscount += +oilDiscount
|
||||
}else {
|
||||
dieselDiscount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (item.type == "天然气"){
|
||||
let naturalGasRule = JSON.parse(response.data.naturalGasRule);
|
||||
if (response.data.preferential == '自定义优惠' && response.data.status == 'qy'){
|
||||
if (response.data.naturalGasDiscount=="满减优惠"){
|
||||
let oilDiscount = 0;
|
||||
discount.type = "满减优惠"
|
||||
for (let i = 1; i <= naturalGasRule.length; i++){
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (naturalGasRule.length>1){
|
||||
if (item.amount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
|
||||
discount.full = naturalGasRule[naturalGasRule.length-1].naturalGasRule1
|
||||
oilDiscount = naturalGasRule[naturalGasRule.length-1].naturalGasRule2;
|
||||
discount.reduce = naturalGasRule[naturalGasRule.length-1].naturalGasRule2
|
||||
break;
|
||||
}
|
||||
if (item.amount >= naturalGasRule[i-1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1){
|
||||
discount.full = naturalGasRule[i-1].naturalGasRule1
|
||||
oilDiscount = naturalGasRule[i-1].naturalGasRule2
|
||||
discount.reduce = naturalGasRule[i-1].naturalGasRule2
|
||||
}
|
||||
}else {
|
||||
if (item.amount >= naturalGasRule[i-1].naturalGasRule1){
|
||||
discount.full = naturalGasRule[i-1].naturalGasRule1
|
||||
oilDiscount = naturalGasRule[i-1].naturalGasRule2
|
||||
discount.reduce = naturalGasRule[i-1].naturalGasRule2
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('满减优惠')
|
||||
}
|
||||
naturalGasDiscount += +oilDiscount
|
||||
}else if (response.data.naturalGasDiscount=="每单位优惠"){
|
||||
let oilDiscount = 0;
|
||||
discount.type = "每单位优惠"
|
||||
for (let i = 1; i <= naturalGasRule.length; i++){
|
||||
// 将满减条件加入等级优惠列表
|
||||
if (naturalGasRule.length>1){
|
||||
if (item.amount >= naturalGasRule[naturalGasRule.length-1].naturalGasRule1){
|
||||
discount.full = naturalGasRule[naturalGasRule.length-1].naturalGasRule1
|
||||
oilDiscount = (item.liters * naturalGasRule[gasolineRule.length-1].naturalGasRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * naturalGasRule[gasolineRule.length-1].naturalGasRule3).toFixed(2)
|
||||
discount.liters = naturalGasRule[naturalGasRule.length-1].naturalGasRule3
|
||||
break;
|
||||
}
|
||||
if (item.amount >= naturalGasRule[i-1].naturalGasRule1 && item.amount < naturalGasRule[i].naturalGasRule1){
|
||||
discount.full = naturalGasRule[i-1].naturalGasRule1
|
||||
oilDiscount = (item.liters * naturalGasRule[i-1].naturalGasRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * naturalGasRule[i-1].naturalGasRule3).toFixed(2)
|
||||
discount.liters = naturalGasRule[i-1].naturalGasRule3
|
||||
}
|
||||
}else {
|
||||
if (item.amount >= naturalGasRule[i-1].naturalGasRule1){
|
||||
discount.full = naturalGasRule[i-1].naturalGasRule1
|
||||
oilDiscount = (item.liters * naturalGasRule[i-1].naturalGasRule3).toFixed(2)
|
||||
discount.reduce = (item.liters * naturalGasRule[i-1].naturalGasRule3).toFixed(2)
|
||||
discount.liters = naturalGasRule[i-1].naturalGasRule3
|
||||
}
|
||||
}
|
||||
}
|
||||
if (discount.reduce!=0){
|
||||
_this.gradeDiscount.push(discount)
|
||||
_this.checkedCities2.push('每单位优惠')
|
||||
}
|
||||
naturalGasDiscount += +oilDiscount
|
||||
}else {
|
||||
naturalGasDiscount = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
_this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
|
||||
_this.checkAll2 = true;
|
||||
_this.isExclusion();
|
||||
console.log(response)
|
||||
_this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
|
||||
_this.checkAll2 = true;
|
||||
_this.isExclusion();
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
// 选择会员
|
||||
@ -1673,7 +1684,7 @@
|
||||
_this.couponIds = response.data
|
||||
if (response.data.length>0){
|
||||
response.data.forEach(item => {
|
||||
_this.useCouponIds.push(item.id)
|
||||
_this.useCouponIds = item.id
|
||||
let discount = {type:item.type,discountType:item.discountType,name:item.name,oilName:item1.oilName,full:0,reduce:0,discount:0}
|
||||
discount.full = item.satisfiedAmount
|
||||
if (item.type==0){
|
||||
@ -1748,15 +1759,29 @@
|
||||
})
|
||||
})
|
||||
},
|
||||
// 使用囤油卡 囤油卡不参与任何优惠
|
||||
countOilCard(){
|
||||
if (this.hoardAmount!=0){
|
||||
if (this.balance!=0 && this.balance >= (this.oilAmount - this.hoardAmount)){
|
||||
this.oilActualPay = 0
|
||||
this.consumeAmount = this.hoardAmount
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount - this.hoardAmount -this.balance
|
||||
}
|
||||
}else {
|
||||
this.oilActualPay = 0
|
||||
this.consumeAmount = 0
|
||||
}
|
||||
},
|
||||
// 使用优惠券不使用满减
|
||||
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
|
||||
this.consumeAmount = this.oilAmount - this.oilDiscount - this.couponAmount
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount -this.balance - this.oilDiscount - this.couponAmount - this.hoardAmount
|
||||
this.oilActualPay = this.oilAmount -this.balance - this.oilDiscount - this.couponAmount
|
||||
this.consumeAmount = this.balance
|
||||
}
|
||||
}else {
|
||||
@ -1766,7 +1791,7 @@
|
||||
// 使用优惠券和满减不使用储值卡
|
||||
countAmountUnBalance(){
|
||||
if (this.isMember){
|
||||
this.oilActualPay = this.oilAmount - this.fullReduction - this.oilDiscount - this.couponAmount - this.hoardAmount
|
||||
this.oilActualPay = this.oilAmount - this.fullReduction - this.oilDiscount - this.couponAmount
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount - this.oilDiscount
|
||||
}
|
||||
@ -1777,9 +1802,9 @@
|
||||
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
|
||||
this.consumeAmount = this.oilAmount - this.oilDiscount - this.fullReduction
|
||||
}else {
|
||||
this.oilActualPay = this.oilAmount -this.balance - this.oilDiscount - this.fullReduction - this.hoardAmount
|
||||
this.oilActualPay = this.oilAmount -this.balance - this.oilDiscount - this.fullReduction
|
||||
this.consumeAmount = this.balance
|
||||
}
|
||||
}else {
|
||||
@ -1828,6 +1853,18 @@
|
||||
this.countAmountFull()
|
||||
return;
|
||||
}
|
||||
// 使用囤油卡
|
||||
if (this.isOilStorageCard){
|
||||
this.checkAll1 = false;
|
||||
this.fullReduction = 0;
|
||||
this.checkAll2 = false;
|
||||
this.checkedCities2 = [],
|
||||
this.oilDiscount = 0;
|
||||
this.checkAll5 = false;
|
||||
this.couponAmount = 0;
|
||||
this.countOilCard();
|
||||
return;
|
||||
}
|
||||
this.countAmountBalance();
|
||||
}
|
||||
},
|
||||
@ -1845,7 +1882,7 @@
|
||||
if (response.data.length>0){
|
||||
_this.fullReduceDiscount = []
|
||||
response.data.forEach(item => {
|
||||
let discount = {type:item.name,full:0,reduce:0,discount:0}
|
||||
let discount = {type:item.name,full:0,reduce:0,discount:0,exclusion:item.participationCondition}
|
||||
let activeList = item.activeDiscountChildList;
|
||||
for (let i = 1;i<=activeList.length;i++){
|
||||
if (activeList.length>0){
|
||||
@ -1927,9 +1964,9 @@
|
||||
let amount = 0;
|
||||
for (let i = 0; i<goods.length; i++){
|
||||
if (_this.isMember){
|
||||
amount += (goods[i].memberPrice * goods[i].num).toFixed(2)
|
||||
amount += +(goods[i].memberPrice * goods[i].num).toFixed(2)
|
||||
}else {
|
||||
amount += (goods[i].retailPrice * goods[i].num).toFixed(2)
|
||||
amount += +(goods[i].retailPrice * goods[i].num).toFixed(2)
|
||||
}
|
||||
if (goods[i].id == val.id){
|
||||
goods[i].num = goods[i].num + 1;
|
||||
@ -1948,9 +1985,9 @@
|
||||
if (result){
|
||||
val.num = 1;
|
||||
if (_this.isMember){
|
||||
this.goodsAmount += val.memberPrice
|
||||
this.goodsAmount += +val.memberPrice
|
||||
}else {
|
||||
this.goodsAmount += val.retailPrice
|
||||
this.goodsAmount += +val.retailPrice
|
||||
}
|
||||
this.goodsActualPay = this.goodsAmount - this.goodsDiscount;
|
||||
this.goodsOrder.push(val);
|
||||
@ -2036,35 +2073,30 @@
|
||||
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++){
|
||||
// 囤油卡升数变化
|
||||
if (_this.refuelMoney[i].oilType==item.oilType){
|
||||
if ((_this.refuelMoney[i].refuelMoney-item.liters)>=0){
|
||||
conRefMon = item.liters
|
||||
oilActualPay = 0;
|
||||
}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 {
|
||||
if (result==false){
|
||||
oilActualPay = item.amount
|
||||
// 扣除升数后需要消费的金额
|
||||
hoardAmount = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_this.consumeRefuelMoney += +conRefMon
|
||||
oilActPay += +oilActualPay
|
||||
if (_this.consumeRefuelMoney!=0){
|
||||
_this.isOilStorageCard = true;
|
||||
_this.checkAll3 = true;
|
||||
_this.consumeAmount = 0;
|
||||
}
|
||||
_this.hoardAmount += +hoardAmount
|
||||
})
|
||||
_this.isExclusion();
|
||||
@ -2381,9 +2413,9 @@
|
||||
goods.forEach(item => {
|
||||
num += item.num
|
||||
if (_this.isMember){
|
||||
amount += (item.memberPrice*item.num).toFixed(2);
|
||||
amount += +(item.memberPrice*item.num).toFixed(2);
|
||||
}else {
|
||||
amount += (item.retailPrice*item.num).toFixed(2);
|
||||
amount += +(item.retailPrice*item.num).toFixed(2);
|
||||
}
|
||||
})
|
||||
this.goodsTotal = num;
|
||||
|
||||
@ -493,7 +493,7 @@
|
||||
</el-row>
|
||||
<div style="margin: 20px 0;text-align: center">
|
||||
<el-button type="primary" @click="confirm(1)">确认充值</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
<el-button @click="openRecharge = false">取 消</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
@ -537,14 +537,14 @@
|
||||
<span class="bom">升数卡充值不支持自定义积分,选择对应充值活动获得对应积分[需开启积分活动有效]</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div style="display:flex;margin-left: 20px">
|
||||
<div style="display:flex;margin-left: 20px">
|
||||
<div style="line-height: 40px;width: 20%">提成员工</div>
|
||||
<div>
|
||||
<el-input :readonly="true" placeholder="请选择提成员工" v-model="cardFuelDieselForm.realName">
|
||||
<el-button slot="append" @click="chooseStaff">选择员工</el-button>
|
||||
</el-input>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -575,12 +575,13 @@
|
||||
</el-row>
|
||||
<div style="margin: 20px 0;text-align: center">
|
||||
<el-button type="primary" @click="confirm(2)">确认充值</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
<el-button @click="openRecharge = false">取 消</el-button>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 选择员工-->
|
||||
<el-dialog :close-on-click-modal="false" width="50%" height="50%" title="选择员工" :visible.sync="openStaff" append-to-body>
|
||||
<select-staff @send-data="handleDataFromChild">
|
||||
@ -1217,6 +1218,15 @@ export default {
|
||||
this.cardValueForm.staffMobile= data.staffMobile
|
||||
|
||||
},
|
||||
refStaff() {
|
||||
this.cardFuelDieselForm.mtStaffId= ''
|
||||
this.cardFuelDieselForm.realName= ''
|
||||
this.cardFuelDieselForm.staffMobile= ''
|
||||
|
||||
this.cardValueForm.mtStaffId= ''
|
||||
this.cardValueForm.realName= ''
|
||||
this.cardValueForm.staffMobile= ''
|
||||
},
|
||||
// 查询参加存油卡油品
|
||||
getCountOilType() {
|
||||
getCountOilTypeApi().then(res => {
|
||||
@ -1448,11 +1458,13 @@ export default {
|
||||
|
||||
// 关闭支付窗口
|
||||
handClose(){
|
||||
this.isPay = true;
|
||||
this.isPay=true,
|
||||
this.isPaySuccess=false,
|
||||
this.isQuery=true,
|
||||
this.openConfirm = false
|
||||
this.openRecharge = false
|
||||
|
||||
this.isPaySuccess = false;
|
||||
// this.isPaySuccess = false;
|
||||
this.authCode = null
|
||||
this.activeRecharge='balance',
|
||||
|
||||
@ -1533,6 +1545,9 @@ export default {
|
||||
this.openConfirm = false;
|
||||
},
|
||||
handleClick(tab, event) {
|
||||
this.refStaff();
|
||||
this.realyPayBills = 0
|
||||
|
||||
// console.log(tab, event);
|
||||
},
|
||||
handleChange(value) {
|
||||
|
||||
@ -0,0 +1,59 @@
|
||||
<template>
|
||||
<div>
|
||||
<el-table ref="tables" v-loading="loading" :data="list">
|
||||
<el-table-column label="所属油站" prop="id" align="center"/>
|
||||
<el-table-column label="订单时间" align="center"/>
|
||||
<el-table-column label="交易终端" align="center" prop="userNo"/>
|
||||
<el-table-column label="油品/油枪" align="center" prop="name" />
|
||||
<el-table-column label="订单金额" align="center" prop="mobile"/>
|
||||
<el-table-column label="优惠金额" align="center" prop="gradeId"/>
|
||||
<el-table-column label="实付金额" align="center" prop="balance"/>
|
||||
<el-table-column label="付款类型" align="center" prop="balance"/>
|
||||
<el-table-column label="订单号" align="center" prop="balance"/>
|
||||
<el-table-column label="订单类型" align="center" prop="point"/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
:total="total"
|
||||
:page.sync="queryParams.page"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {listOilOrder} from "@/api/cashier/oilorder";
|
||||
|
||||
export default {
|
||||
props:["pid"],
|
||||
data(){
|
||||
return {
|
||||
loading:false,
|
||||
list:[],
|
||||
total:0,
|
||||
queryParams:{
|
||||
page:1,
|
||||
pageSize:10,
|
||||
userId:"",
|
||||
},
|
||||
// 会员id
|
||||
userId:"",
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
},
|
||||
methods:{
|
||||
getList(){
|
||||
listOilOrder(this.queryParams).then(res => {
|
||||
console.log(res)
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
||||
</style>
|
||||
Loading…
Reference in New Issue
Block a user