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

9.30

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-09-30 10:30:55 +08:00
parent 654545c8a7
commit 712310817a
6 changed files with 111 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/.env.development
View File

@ -11,7 +11,7 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
VUE_APP_SERVER_URL = 'http://127.0.0.1:8080/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8080/'
# http://192.168.0.121:8080/

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

@ -1,11 +1,11 @@
# \u57FA\u672C\u914D\u7F6E
server.port=8080
env.profile=dev
#env.properties.path=D:/my_project/oil-station/fuintBackend/configure/
env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure/
#env.properties.path=D:/workspaces/oil-stations/fuintBackend/configure/
#env.properties.path=F:/work/oilSystem/fuintBackend/configure/
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
#env.properties.path=D:/work/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/bulidmap/oil-station/fuintBackend/configure
#env.properties.path=D:/Code/yuzhan/oil-station/fuintBackend/configure
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E

41
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -121,16 +121,16 @@
<el-tab-pane label="全部" name='first'></el-tab-pane>
<el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name='item.id.toString()'></el-tab-pane>
</el-tabs>
<div style="width: 200px; ">
<el-input v-model="queryParams.giftName" @input="getGift()" placeholder="请输入内容"></el-input>
</div>
</div>
<div style="width: 200px;margin-left: 2%; ">
<el-input v-model="queryParams.giftName" @input="getGift()" placeholder="请输入内容"></el-input>
</div>
<div class="wrap-right">
<div class="ts-box">
<div class="wrap-right-box" v-for="(item,index) in giftList" :key="item.id" @click="addGift(item)">
<el-card shadow="hover" >
<div class="new_card" >
<el-badge :hidden="!item.markPurchases>0" :value="item.markPurchases" class="item">
<div class="box-six">
<img :src="imagePath+item.coverImage" >
@ -155,7 +155,7 @@
</div>
</div>
</el-badge>
</el-card>
</div>
</div>
</div>
</div>
@ -1383,6 +1383,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
overflow: hidden;
margin: 0px 10px;
height: 98vh;
background: #fff;
/*background: white;*/
}
.center-top{
@ -1685,7 +1686,7 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
}
.wrap-right{
width: 100%;
height: 78vh;
background: white;
overflow: auto;
}
@ -1695,16 +1696,20 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
}
.wrap-right-box{
width: 205px;
width: 20%;
height: 270px;
/*margin-right: 10px;*/
/*margin-bottom: 10px;*/
margin: 5px;
display: flex;
align-items: center;
justify-content: center;
}
.box-six{
width: 100%;
height: 160px;
width: 164px;
height: 150px;
img{
width: 100%;
height: 100%;
@ -1778,4 +1783,18 @@ import {getReturnCode, printIntegralReport, sendPrintIndex} from "@/api/print";
margin: 8px 10px;
cursor: pointer;
}
.new_card{
border: 1px solid #eceff1;
box-sizing: border-box;
padding: 10px;
border-radius: 8px;
}
//
.center-left{
width: 33%;
border-radius: 8px;
overflow: hidden;
height: 98vh;
position: relative;
}
</style>

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

@ -9,7 +9,7 @@
v-model="queryParams2.unitName"
placeholder="单位名称"
clearable
style="width: 240px;"
style="width: 200px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -18,7 +18,7 @@
v-model="queryParams2.personCredit"
placeholder="挂账人"
clearable
style="width: 240px;"
style="width: 200px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -27,7 +27,7 @@
v-model="queryParams2.contactMobile"
placeholder="联系电话"
clearable
style="width: 240px;"
style="width: 200px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@ -36,7 +36,7 @@
v-model="queryParams2.status"
placeholder="状态"
clearable
style="width: 240px"
style="width: 200px"
>
<el-option label="启用" value="qy"/>
<el-option label="禁用" value="jy"/>
@ -67,67 +67,43 @@
<!-- 统计-->
<div class="top_news">
<div class="box-gang">
<div class="box">
<div class="size-bole">{{ total3 }}</div>
<div class="size-hui">
<div class="nei">挂账单位总数</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
<div class="box2">
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
{{total3 || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #0DC291"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">挂账单位总数</div>
</div>
</div>
<div class="box">
<div class="size-hui"></div>
<div class="size-bole">{{ allCreditLimit || 0 }}</div>
<div class="size-hui">
<div class="nei">预设挂账总额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 4666@2x.png" alt="">
</div>
<div class="box2">
<div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
{{allCreditLimit || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #00CAFF"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">预设挂账总额</div>
</div>
</div>
<div class="box1">
<div class="size-bole">{{ allUsedCreditLimit || 0 }}</div>
<div class="size-hui">
<div class="nei">已使用挂账总额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 5017@2x.png" alt="">
</div>
<div class="box2">
<div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
{{allUsedCreditLimit || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #F44522"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">已使用挂账总额</div>
</div>
</div>
<div class="box1">
<div class="size-bole">{{ allResidueCreditLimit || 0 }}</div>
<div class="size-hui">
<div class="nei">剩余可挂账总额</div>
<div class="icon-img">
<img src="../../../assets/images/cut/组 5017@2x.png" alt="">
</div>
<div class="box2">
<div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
{{allResidueCreditLimit || 0 }}
</div>
<div class="size-hui">
<div style="width: 8px;height: 8px;border-radius: 4px;background: #FA6400"></div>
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">剩余可挂账总额</div>
</div>
</div>
</div>
<!-- <div class="box-gang">-->
<!-- <div class="box">-->
<!-- <div class="size-hui">挂账笔数</div>-->
<!-- <div class="size-bole">{{ total3 }}</div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <div class="size-hui">挂账总额</div>-->
<!-- <div class="size-bole">{{ allAmount }}</div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <div class="size-hui">归还笔数</div>-->
<!-- <div class="size-bole">{{ returnTotal }}</div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <div class="size-hui">归还总额</div>-->
<!-- <div class="size-bole">{{ returnAllAmount }}</div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <div class="size-hui">未还金额</div>-->
<!-- <div class="size-bole">{{ noReturnAllAmount }}</div>-->
<!-- </div>-->
<!-- </div>-->
<div class="table-box">
<el-table
:data="creditUnitList"
@ -1702,4 +1678,14 @@ import {getLodop} from "@/api/LodopFuncs";
padding: 15px;
margin-bottom: 10px;
}
.box2 {
padding: 5px;
margin-right: 20px;
margin-bottom: 20px;
padding-left: 20px;
width: 211px;
height: 70px;
border-radius: 6px 6px 6px 6px;
border: 1px solid #FF9655;
}
</style>

72
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -48,6 +48,7 @@
</div>
</div>
</div>
<!-- -->
<div class="center-left-hj">
<div class="hj-box" style="justify-content: left">油品:￥{{ oilAmount.toFixed(2) }}</div>
<div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥{{ goodsAmount.toFixed(2) }}</div>
@ -56,15 +57,10 @@
<div style="overflow-y: scroll;height: 42vh">
<div class="center-left-hj" v-show="isMember && refuelMoney && refuelMoney.length>0">
<div>
<!-- <el-checkbox-->
<!-- style="color: black;font-size: 16px"-->
<!-- v-model="checkAll3" @change="handleCheckAllChange3">-->
<!-- </el-checkbox>-->
囤油卡
<div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
（{{ item.type }}卡
锁价：{{ item.lockupPrice ? item.lockupPrice : 0.00 }}元/L）
<!-- 余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）-->
</div>
</div>
<div v-if="oilCardAmount>0">- ￥{{ oilCardAmount }}</div>
@ -118,8 +114,6 @@
<div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
<div style="color: red">-￥{{ item.discount }}</div>
<!-- <div v-if="item.type=='满减优惠'" style="color: grey">消费满{{ item.full }}元，立减{{ item.reduce }}元</div>-->
<!-- <div v-else style="color: grey">消费满{{ item.full }}元，每升优惠{{ item.liters }}元</div>-->
</div>
</div>
</el-checkbox>
@ -129,7 +123,7 @@
<el-checkbox
style="color: black;font-size: 16px"
v-model="checkAll2" @change="handleCheckAllChange2">
</el-checkbox><!-- :indeterminate="isIndeterminate2"-->
</el-checkbox>
等级优惠
</div>
</el-popover>
@ -152,20 +146,6 @@
placement="bottom-start"
width="400"
trigger="click">
<!-- <div>-->
<!-- <el-radio-group v-model="checkedCities5" @input="handleCheckedCitiesChange5">-->
<!-- <el-radio v-for="(item,index) in couponDiscount"-->
<!-- :label="item.gunName" :key="index" style="display: flex;">-->
<!-- <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
<!-- <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>-->
<!-- <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
<!-- <div style="color: red">-￥{{ item.discount }}</div>-->
<!--&lt;!&ndash; <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>&ndash;&gt;-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-radio>-->
<!-- </el-radio-group>-->
<!-- </div>-->
<div slot="reference">
<el-checkbox
style="color: black;font-size: 16px"
@ -195,10 +175,6 @@
</div>
<div class="bottom-posi">
<div class="center-left-wrap">
<!-- <div class="wrap-box" value="oilCard"
:class="{ 'wrap-box2': 'oilCard' == payType }" >
<span @click="payMethod('oilCard')">囤油卡</span>
</div>-->
<div class="wrap-box" value="balance" @click="payMethod('balance')"
:class="{ 'wrap-box2': 'balance' == payType }" >
<span>储值卡</span>
@ -4808,6 +4784,27 @@
border: 1px solid #30a1ff;
}
.center-left-bottom{
width: 100%;
background-color: white;
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
justify-content: space-between;
}
.center-left-lv{
width: 60%;
height: 80px;
background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%);
color: white;
border-radius: 10px;
display: flex;
align-items: center;
justify-content: center;
font-size: 22px;
}
.wrap-box2{
background: #30a1ff !important;
color: white;
@ -4844,16 +4841,7 @@
box-sizing: border-box;
overflow: auto;
}
.center-left-bottom{
width: 100%;
background-color: white;
border-radius: 8px;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
justify-content: space-between;
}
.bottom-qk{
border: 1px solid #99a9bf;
box-sizing: border-box;
@ -4904,17 +4892,7 @@
.price-red{
color: red;
}
.center-left-lv{
width: 60%;
height: 80px;
background: linear-gradient( 312deg, #FF945B 0%, #FEB37C 100%);
color: white;
border-radius: 10px;
display: flex;
align-items: center;
justify-content: center;
font-size: 22px;
}
.th-box{
width: 100%;
display: flex;

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

@ -17,7 +17,7 @@
placement="bottom"
trigger="click">
trigger="hover">
<div> 储值卡：￥1000.00 </div>
<div> 储值卡：￥1000.00 </div>
<div> 储值卡：￥1000.00 </div>
@ -214,7 +214,9 @@
<div class="orerate_name">操作</div>
</div>
<!-- 渲染商品列表 -->
<div class="taber-box" v-for="(item,index) in goodsList" :key="index">
<div class="goods_name">
<!-- <img src="../../../assets/images/goods.png" style="width: 30px;height: 30px">-->
{{ item.name }}
@ -222,7 +224,7 @@
<div class="stock_name">{{ item.stock }}</div>
<div class="u-price_name">{{ item.retailPrice }}</div>
<div class="u-price_name">{{ item.retailPrice }}</div>
<div class="num_name"> <el-input-number v-model="item.num" size="mini" :min="1" :max="999" label="描述文字"></el-input-number></div>
<div class="num_name"> <el-input-number v-model="goodsList[index].num" @change="handleCilone" :max="9999" size="mini" ></el-input-number></div>
<div class="orerate_name">
<span style="color: red;cursor: pointer" @click="deleteGoods(item.id)">删除</span>
</div>
@ -647,6 +649,7 @@ export default {
num: '0'
},
],
nums:0,
payList: [
],
//油枪数据 初始化容器
@ -808,6 +811,9 @@ export default {
},
methods: {
handleCilone(value){
console.log(value)
},
/**
* 获取优惠总金额
* */
@ -1165,6 +1171,7 @@ export default {
restVipUser(){
this.userInfo = false
this.chooseVipUser = {}
this.userMobile = ''
this.getActivity()
this.getCoupon()
},
@ -2121,7 +2128,7 @@ input {
}
.left_input {
width: 70%;
width: 80%;
overflow: hidden;
box-sizing: border-box;
display: flex;