bug
This commit is contained in:
parent
9d869e404f
commit
2552723bfd
@ -100,6 +100,7 @@
|
|||||||
type="primary"
|
type="primary"
|
||||||
@click="batchGrounding('jy')"
|
@click="batchGrounding('jy')"
|
||||||
>商品下架</el-button>
|
>商品下架</el-button>
|
||||||
|
<div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<el-table ref="tables" v-loading="loading" :data="list"
|
<el-table ref="tables" v-loading="loading" :data="list"
|
||||||
|
|||||||
@ -217,7 +217,8 @@ public class LJGoodsServiceImpl extends ServiceImpl<LJGoodsMapper, LJGoods> impl
|
|||||||
for (String s : split) {
|
for (String s : split) {
|
||||||
LJGoods ljGoods = this.selectLJGoodsById(Integer.parseInt(s));
|
LJGoods ljGoods = this.selectLJGoodsById(Integer.parseInt(s));
|
||||||
if (ObjectUtil.isNotEmpty(ljGoods)){
|
if (ObjectUtil.isNotEmpty(ljGoods)){
|
||||||
if (status.equals("qy") && ljGoods.getStock()==0){
|
if (status.equals("qy") && ljGoods.getStock()==0 ||
|
||||||
|
status.equals("qy") && ljGoods.getRetailPrice()==0 && ljGoods.getMemberPrice()==0){
|
||||||
ljGoods.setStatus("jy");
|
ljGoods.setStatus("jy");
|
||||||
}else {
|
}else {
|
||||||
ljGoods.setStatus(status);
|
ljGoods.setStatus(status);
|
||||||
|
|||||||
@ -53,130 +53,131 @@
|
|||||||
<div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥{{ goodsAmount.toFixed(2) }}</div>
|
<div class="hj-box" style="border-left: 1px solid #d1d1d4; border-right: 1px solid #d1d1d4;">商品:￥{{ goodsAmount.toFixed(2) }}</div>
|
||||||
<div class="hj-box" style="justify-content: flex-end">合计: ￥{{ (oilAmount + goodsAmount).toFixed(2) }}</div>
|
<div class="hj-box" style="justify-content: flex-end">合计: ￥{{ (oilAmount + goodsAmount).toFixed(2) }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="center-left-hj">
|
<div style="overflow-y: scroll;height: 42vh">
|
||||||
<div>
|
<div class="center-left-hj">
|
||||||
<el-popover
|
<div>
|
||||||
placement="bottom-start"
|
<el-popover
|
||||||
width="400"
|
placement="bottom-start"
|
||||||
trigger="click">
|
width="400"
|
||||||
<div>
|
trigger="click">
|
||||||
<div v-if="fullReduceDiscount.length>0">
|
<div>
|
||||||
<el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
|
<div v-if="fullReduceDiscount.length>0">
|
||||||
<el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.gunName" :key="index">
|
<el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
|
||||||
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
<el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.gunName" :key="index">
|
||||||
<div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
|
<div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
|
||||||
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
<div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
|
||||||
<div style="color: red">-￥{{ item.discount }}</div>
|
<div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
|
||||||
<div style="color: grey" v-if="item.type!=1">满减优惠</div>
|
<div style="color: red">-￥{{ item.discount }}</div>
|
||||||
<div style="color: grey" v-if="item.type!=2">折扣优惠</div>
|
<div style="color: grey" v-if="item.type!=1">满减优惠</div>
|
||||||
|
<div style="color: grey" v-if="item.type!=2">折扣优惠</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</el-checkbox>
|
||||||
|
</el-checkbox-group>
|
||||||
|
</div>
|
||||||
|
<div v-else>
|
||||||
|
暂无满减油品信息
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div slot="reference">
|
||||||
|
<el-checkbox :disabled="fullReduceDiscount.length==0"
|
||||||
|
style="color: black;font-size: 16px"
|
||||||
|
v-model="checkAll1" @change="handleCheckAllChange1">
|
||||||
|
</el-checkbox><!--:indeterminate="isIndeterminate1"-->
|
||||||
|
活动优惠
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
|
</div>
|
||||||
|
<div>-￥{{ fullReduction.toFixed(2) }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="center-left-hj" v-show="isMember">
|
||||||
|
<div>
|
||||||
|
<el-popover
|
||||||
|
placement="bottom-start"
|
||||||
|
width="400"
|
||||||
|
trigger="click">
|
||||||
|
<div>
|
||||||
|
<el-checkbox-group v-model="checkedCities2" @change="handleCheckedCitiesChange2">
|
||||||
|
<el-checkbox v-for="(item,index) in gradeDiscount" :label="item.gunName" :key="index">
|
||||||
|
<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>
|
||||||
|
<!-- <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>
|
||||||
|
</div>
|
||||||
</el-checkbox>
|
</el-checkbox>
|
||||||
</el-checkbox-group>
|
</el-checkbox-group>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div slot="reference">
|
||||||
暂无满减油品信息
|
<el-checkbox
|
||||||
|
style="color: black;font-size: 16px"
|
||||||
|
v-model="checkAll2" @change="handleCheckAllChange2">
|
||||||
|
</el-checkbox><!-- :indeterminate="isIndeterminate2"-->
|
||||||
|
等级优惠
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</el-popover>
|
||||||
<div slot="reference">
|
|
||||||
<el-checkbox :disabled="fullReduceDiscount.length==0"
|
|
||||||
style="color: black;font-size: 16px"
|
|
||||||
v-model="checkAll1" @change="handleCheckAllChange1">
|
|
||||||
</el-checkbox><!--:indeterminate="isIndeterminate1"-->
|
|
||||||
活动优惠
|
|
||||||
</div>
|
|
||||||
</el-popover>
|
|
||||||
</div>
|
|
||||||
<div>-￥{{ fullReduction.toFixed(2) }}</div>
|
|
||||||
</div>
|
|
||||||
<div class="center-left-hj" v-show="isMember">
|
|
||||||
<div>
|
|
||||||
<el-popover
|
|
||||||
placement="bottom-start"
|
|
||||||
width="400"
|
|
||||||
trigger="click">
|
|
||||||
<div>
|
|
||||||
<el-checkbox-group v-model="checkedCities2" @change="handleCheckedCitiesChange2">
|
|
||||||
<el-checkbox v-for="(item,index) in gradeDiscount" :label="item.gunName" :key="index">
|
|
||||||
<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>
|
|
||||||
<!-- <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>
|
|
||||||
</el-checkbox-group>
|
|
||||||
</div>
|
|
||||||
<div slot="reference">
|
|
||||||
<el-checkbox
|
|
||||||
style="color: black;font-size: 16px"
|
|
||||||
v-model="checkAll2" @change="handleCheckAllChange2">
|
|
||||||
</el-checkbox><!-- :indeterminate="isIndeterminate2"-->
|
|
||||||
等级优惠
|
|
||||||
</div>
|
|
||||||
</el-popover>
|
|
||||||
</div>
|
|
||||||
<div>-￥{{ oilDiscount.toFixed(2) }}</div>
|
|
||||||
</div>
|
|
||||||
<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><!--:indeterminate="isIndeterminate3"-->
|
|
||||||
囤油卡
|
|
||||||
<div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
|
|
||||||
（{{ item.type }}卡
|
|
||||||
<!-- <span style="color: #00afff">{{ item.oilType }}</span>-->
|
|
||||||
余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）
|
|
||||||
</div>
|
</div>
|
||||||
|
<div>-￥{{ oilDiscount.toFixed(2) }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div>- {{ consumeRefuelMoney.toFixed(2) }}L</div>
|
<div class="center-left-hj" v-show="isMember && refuelMoney && refuelMoney.length>0">
|
||||||
</div>
|
<div>
|
||||||
<div class="center-left-hj" v-show="isMember">
|
<el-checkbox
|
||||||
<div>
|
style="color: black;font-size: 16px"
|
||||||
<el-checkbox style="color: black;font-size: 16px" :disabled="balance==0"
|
v-model="checkAll3" @change="handleCheckAllChange3">
|
||||||
v-model="checkAll4" @change="handleCheckAllChange4">
|
</el-checkbox><!--:indeterminate="isIndeterminate3"-->
|
||||||
</el-checkbox>
|
囤油卡
|
||||||
储值卡
|
<div style="margin: 5px 0" v-for="(item,index) in refuelMoney" :key="index">
|
||||||
<span>（账户余额：{{ balance }}元）</span>
|
（{{ item.type }}卡
|
||||||
</div>
|
<!-- <span style="color: #00afff">{{ item.oilType }}</span>-->
|
||||||
<div>-￥{{ consumeAmount.toFixed(2) }}</div>
|
余额：{{ item.refuelMoney ? item.refuelMoney : 0.00 }}L）
|
||||||
</div>
|
|
||||||
<div class="center-left-hj" v-show="isMember && couponDiscount.length>0">
|
|
||||||
<div>
|
|
||||||
<el-popover
|
|
||||||
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>-->
|
|
||||||
<!--<!– <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>–>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<!-- </el-radio>-->
|
|
||||||
<!-- </el-radio-group>-->
|
|
||||||
<!-- </div>-->
|
|
||||||
<div slot="reference">
|
|
||||||
<el-checkbox
|
|
||||||
style="color: black;font-size: 16px"
|
|
||||||
v-model="checkAll5" @change="handleCheckAllChange5">
|
|
||||||
</el-checkbox><!-- :indeterminate="isIndeterminate5"-->
|
|
||||||
优惠券
|
|
||||||
</div>
|
</div>
|
||||||
</el-popover>
|
</div>
|
||||||
|
<div>- {{ consumeRefuelMoney.toFixed(2) }}L</div>
|
||||||
</div>
|
</div>
|
||||||
<div>-￥{{ couponAmount.toFixed(2) }}</div>
|
<div class="center-left-hj" v-show="isMember">
|
||||||
</div>
|
<div>
|
||||||
<div class="center-left-th">
|
<el-checkbox style="color: black;font-size: 16px" :disabled="balance==0"
|
||||||
|
v-model="checkAll4" @change="handleCheckAllChange4">
|
||||||
|
</el-checkbox>
|
||||||
|
储值卡
|
||||||
|
<span>（账户余额：{{ balance }}元）</span>
|
||||||
|
</div>
|
||||||
|
<div>-￥{{ consumeAmount.toFixed(2) }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="center-left-hj" v-show="isMember && couponDiscount.length>0">
|
||||||
|
<div>
|
||||||
|
<el-popover
|
||||||
|
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>-->
|
||||||
|
<!--<!– <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>–>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
<!-- </el-radio>-->
|
||||||
|
<!-- </el-radio-group>-->
|
||||||
|
<!-- </div>-->
|
||||||
|
<div slot="reference">
|
||||||
|
<el-checkbox
|
||||||
|
style="color: black;font-size: 16px"
|
||||||
|
v-model="checkAll5" @change="handleCheckAllChange5">
|
||||||
|
</el-checkbox><!-- :indeterminate="isIndeterminate5"-->
|
||||||
|
优惠券
|
||||||
|
</div>
|
||||||
|
</el-popover>
|
||||||
|
</div>
|
||||||
|
<div>-￥{{ couponAmount.toFixed(2) }}</div>
|
||||||
|
</div>
|
||||||
|
<div class="center-left-th">
|
||||||
<div class="th-box">
|
<div class="th-box">
|
||||||
<div>扫码支付</div>
|
<div>扫码支付</div>
|
||||||
<div class="bule">{{ ((+oilActualPay) + (+goodsActualPay)).toFixed(2) }}</div>
|
<div class="bule">{{ ((+oilActualPay) + (+goodsActualPay)).toFixed(2) }}</div>
|
||||||
@ -190,6 +191,7 @@
|
|||||||
<div style="cursor: pointer;color: crimson" @click="getStaffList" >{{ staff.realName }}</div>
|
<div style="cursor: pointer;color: crimson" @click="getStaffList" >{{ staff.realName }}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="bottom-posi">
|
<div class="bottom-posi">
|
||||||
<div class="center-left-wrap">
|
<div class="center-left-wrap">
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user