9.6
This commit is contained in:
parent
a7dec0a733
commit
3a60ce4a65
@ -23,6 +23,7 @@ public interface LJOrderMapper extends BaseMapper<LJOrder> {
|
||||
* @return
|
||||
*/
|
||||
public IPage<LJOrder> selectOrderList(Page page, @Param("order") LJOrder order);
|
||||
public IPage<LJOrder> selectOrderList1(Page page, @Param("order") LJOrder order);
|
||||
public IPage<LJOrder> selectOrderListByZtDz(Page page, @Param("order") LJOrder order);
|
||||
|
||||
List<LJOrderExcel> selectOrderListExcel(@Param("order") LJOrder order);
|
||||
|
@ -38,6 +38,36 @@
|
||||
order by create_time desc
|
||||
</where>
|
||||
</select>
|
||||
<select id="selectOrderList1" resultType="com.fuint.business.order.entity.LJOrder">
|
||||
<include refid="selectOrders"></include>
|
||||
<where>
|
||||
<if test="order.storeId != null and order.storeId != ''">
|
||||
and store_id = #{order.storeId}
|
||||
</if>
|
||||
<if test="order.staffId != null and order.staffId != ''">
|
||||
and staff_id = #{order.staffId}
|
||||
</if>
|
||||
<if test="order.userId != null and order.userId != ''">
|
||||
and user_id = #{order.userId}
|
||||
</if>
|
||||
<if test="order.payType != null and order.payType != ''">
|
||||
and pay_type = #{order.payType}
|
||||
</if>
|
||||
<if test="order.orderNo != null and order.orderNo != ''">
|
||||
and order_no like concat('%', #{order.orderNo}, '%')
|
||||
</if>
|
||||
<if test="order.payUser != null and order.payUser != ''">
|
||||
and pay_user like concat('%', #{order.payUser}, '%')
|
||||
</if>
|
||||
<if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
|
||||
and date_format(create_time,'%y%m%d') >= date_format(#{order.params.beginTime},'%y%m%d')
|
||||
</if>
|
||||
<if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
|
||||
and date_format(create_time,'%y%m%d') <= date_format(#{order.params.endTime},'%y%m%d')
|
||||
</if>
|
||||
order by create_time desc
|
||||
</where>
|
||||
</select>
|
||||
<select id="getMtOrderList" resultType="com.fuint.business.order.vo.LJOrderVo">
|
||||
|
||||
select
|
||||
|
@ -35,10 +35,7 @@ import org.springframework.stereotype.Service;
|
||||
import javax.annotation.Resource;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.*;
|
||||
|
||||
@Service
|
||||
public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> implements LJOrderService {
|
||||
@ -53,8 +50,7 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
|
||||
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
|
||||
Integer storeId = nowAccountInfo.getStoreId();
|
||||
order.setStoreId(storeId);
|
||||
IPage<LJOrder> ljOrderIPage = baseMapper.selectOrderList(page, order);
|
||||
return ljOrderIPage;
|
||||
return baseMapper.selectOrderList1(page, order);
|
||||
}
|
||||
@Resource
|
||||
CvsGoodsMapper cvsGoodsMapper;
|
||||
|
@ -1,10 +1,10 @@
|
||||
# \u57FA\u672C\u914D\u7F6E
|
||||
server.port=8081
|
||||
server.port=8080
|
||||
env.profile=dev
|
||||
#env.properties.path=D:/workspaces/oilSystem/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:/Code/yuzhan/oil-station/fuintBackend/configure
|
||||
#env.properties.path=D:/work/oilSystem/fuintBackend/configure/
|
||||
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
|
||||
|
||||
# \u6570\u636E\u5E93\u914D\u7F6E
|
||||
|
@ -33,8 +33,8 @@
|
||||
<order_Vip v-if="tabindex == 3 "></order_Vip>
|
||||
<!-- 挂账订单-->
|
||||
<order_Added v-if="tabindex == 4 "></order_Added>
|
||||
<!-- 积分商城订单 暂未修改-->
|
||||
<order_Added v-if="tabindex == 5 "></order_Added>
|
||||
<!-- 积分商城订单 -->
|
||||
<pointsCashier v-if="tabindex == 5 "></pointsCashier>
|
||||
<!-- <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>-->
|
||||
<!-- <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>-->
|
||||
<!-- <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>-->
|
||||
@ -50,6 +50,7 @@ import order_Oil from "../orderComponents/order_Oil";
|
||||
import order_Ordinary from "../orderComponents/order_Ordinary";
|
||||
import order_Unpaid from "../orderComponents/order_Unpaid";
|
||||
import order_Vip from "../orderComponents/order_Vip";
|
||||
import pointsCashier from "./integralOrder/pointsCashier.vue"
|
||||
|
||||
export default {
|
||||
name: "Order",
|
||||
@ -80,7 +81,7 @@ export default {
|
||||
}
|
||||
},
|
||||
components: {
|
||||
order_Cashier, order_Added, order_Goods, order_Integral, order_Oil, order_Ordinary, order_Unpaid, order_Vip
|
||||
order_Cashier, order_Added, order_Goods, order_Integral, order_Oil, order_Ordinary, order_Unpaid, order_Vip,pointsCashier
|
||||
},
|
||||
methods: {
|
||||
getindex(index) {
|
||||
|
@ -60,102 +60,140 @@
|
||||
</div>
|
||||
<div>
|
||||
<div class="box-gang">
|
||||
<div class="box1">
|
||||
<div class="size-bole">
|
||||
{{ orderStatistics.theTotalAmountOfTheOrder ? orderStatistics.theTotalAmountOfTheOrder : 0 }}
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.theTotalAmountOfTheOrder ? orderStatistics.theTotalAmountOfTheOrder : 0 }}/
|
||||
{{ orderStatistics.numberOfStrokes ? orderStatistics.numberOfStrokes : 0 }}
|
||||
</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">订单总金额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
<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-bole">{{ orderStatistics.numberOfStrokes ? orderStatistics.numberOfStrokes : 0 }}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">笔数</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box1">
|
||||
<div class="size-bole">{{
|
||||
orderStatistics.theTotalAmountPaid ? orderStatistics.theTotalAmountPaid : 0
|
||||
}}
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #00CAFF;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.theTotalAmountPaid ? orderStatistics.theTotalAmountPaid : 0 }}
|
||||
</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">实付总金额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
<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">{{ orderStatistics.oilDiscounts ? orderStatistics.oilDiscounts : 0 }}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">油品优惠</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box1">
|
||||
<div class="size-bole">{{ seekZeroAmount }}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">找零总金额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box1">
|
||||
<div class="size-bole">{{
|
||||
orderStatistics.theTotalAmountOfOil ? orderStatistics.theTotalAmountOfOil : 0
|
||||
}}
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #F44522;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.oilDiscounts ? orderStatistics.oilDiscounts : 0 }}/
|
||||
{{ seekZeroAmount }}
|
||||
</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">油品总金额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
<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="box">
|
||||
<div class="size-bole">{{
|
||||
orderStatistics.numberOfStrokesByOil ? orderStatistics.numberOfStrokesByOil : 0
|
||||
}}
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #FA6400;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.numberOfStrokesByOil ? orderStatistics.numberOfStrokesByOil : 0 }}/
|
||||
{{ orderStatistics.theTotalAmountOfOil ? orderStatistics.theTotalAmountOfOil : 0 }}
|
||||
</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">油品笔数</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
<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 class="box">
|
||||
<div class="size-bole">
|
||||
{{ orderStatistics.numberOfStrokesByGoods ? orderStatistics.numberOfStrokesByGoods : 0 }}
|
||||
</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">商品笔数</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box1">
|
||||
<div class="size-bole">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #FE59E5;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.numberOfStrokesByGoods ? orderStatistics.numberOfStrokesByGoods : 0 }}/
|
||||
{{ orderStatistics.theTotalAmountOfTheItem ? orderStatistics.theTotalAmountOfTheItem : 0 }}
|
||||
</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">商品总金额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
<div style="width: 8px;height: 8px;border-radius: 4px;background: #FE59E5"></div>
|
||||
<div style="font-weight: bold;font-size: 13px;margin-left: 5px">商品订单/实付总金额(元)</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="box">-->
|
||||
<!-- <div class="size-bole">{{ orderStatistics.numberOfStrokes ? orderStatistics.numberOfStrokes : 0 }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">笔数</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{-->
|
||||
<!-- orderStatistics.theTotalAmountPaid ? orderStatistics.theTotalAmountPaid : 0-->
|
||||
<!-- }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">实付总金额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{ orderStatistics.oilDiscounts ? orderStatistics.oilDiscounts : 0 }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">油品优惠</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{ seekZeroAmount }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">找零总金额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{-->
|
||||
<!-- orderStatistics.theTotalAmountOfOil ? orderStatistics.theTotalAmountOfOil : 0-->
|
||||
<!-- }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">油品总金额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box">-->
|
||||
<!-- <div class="size-bole">{{-->
|
||||
<!-- orderStatistics.numberOfStrokesByOil ? orderStatistics.numberOfStrokesByOil : 0-->
|
||||
<!-- }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">油品笔数</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box">-->
|
||||
<!-- <div class="size-bole">-->
|
||||
<!-- {{ orderStatistics.numberOfStrokesByGoods ? orderStatistics.numberOfStrokesByGoods : 0 }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">商品笔数</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">-->
|
||||
<!-- {{ orderStatistics.theTotalAmountOfTheItem ? orderStatistics.theTotalAmountOfTheItem : 0 }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">商品总金额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@ -166,10 +204,12 @@
|
||||
style="width: 100%">
|
||||
<el-table-column type="index" width="50" align="center" label="序号"/>
|
||||
<el-table-column prop="orderNo" align="center" label="订单号" width="220"></el-table-column>
|
||||
<el-table-column prop="amount" align="center" label="订单金额"></el-table-column>
|
||||
<el-table-column prop="afterDiscountAmount" align="center" label="优惠后应付金额"></el-table-column>
|
||||
<el-table-column prop="payAmount" align="center" label="实付金额"></el-table-column>
|
||||
<el-table-column prop="seekZero" align="center" label="找零金额"></el-table-column>
|
||||
<el-table-column prop="amount" align="center" label="订单金额(元)"></el-table-column>
|
||||
<el-table-column prop="afterDiscountAmount" align="center" label="优惠金额(元)"></el-table-column>
|
||||
<el-table-column prop="afterDiscountAmount" align="center" label="应收金额(元)"></el-table-column>
|
||||
<el-table-column prop="payAmount" align="center" label="实付金额(元)"></el-table-column>
|
||||
<el-table-column prop="payAmount" align="center" label="已收金额(元)"></el-table-column>
|
||||
<el-table-column prop="seekZero" align="center" label="找零金额(元)"></el-table-column>
|
||||
<el-table-column align="center" label="订单金额组成">
|
||||
<el-table-column prop="oilOrderAmount" align="center" label="油品金额">
|
||||
<template slot-scope="scope">
|
||||
@ -196,7 +236,7 @@
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column prop="payUser" align="center" label="付款用户" width="110"></el-table-column>
|
||||
<el-table-column prop="status" align="center" label="状态">
|
||||
<el-table-column prop="status" align="center" label="支付方式">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
|
||||
<el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
|
||||
@ -204,30 +244,40 @@
|
||||
<el-tag type="danger" v-else>支付失败</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="交易时间" align="center" width="160" prop="payTime">
|
||||
<el-table-column prop="status" align="center" label="订单状态">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.payTime ? parseTime(scope.row.payTime) : "--" }}</span>
|
||||
<el-tag v-if="scope.row.status === 'unpaid'">未支付</el-tag>
|
||||
<el-tag type="success" v-else-if="scope.row.status === 'paid'">已支付</el-tag>
|
||||
<el-tag type="danger" v-else-if="scope.row.status === 'refund'">已退款</el-tag>
|
||||
<el-tag type="danger" v-else>支付失败</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="payUser" align="center" label="关联员工" width="110"></el-table-column>
|
||||
<el-table-column label="操作人" align="center" prop="staffId">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ getRealName(staffList, scope.row.staffId) || '--' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
|
||||
|
||||
<el-table-column label="订单完成时间" align="center" width="160" prop="payTime">
|
||||
<template slot-scope="scope">
|
||||
<el-button style="width: 60px" size="mini"
|
||||
<span>{{ scope.row.payTime ? parseTime(scope.row.payTime) : "--" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button style="color: #409EFF" size="mini"
|
||||
@click="getOrdersInfo(scope.row.id)"
|
||||
type="success" plain round>详情
|
||||
type="text" plain round>详情
|
||||
</el-button>
|
||||
<el-button style="width: 60px" size="mini"
|
||||
<el-button style="color: #409EFF" size="mini"
|
||||
@click="patchwork(scope.row)"
|
||||
type="primary" plain round>补打
|
||||
type="text" plain round>补打小票
|
||||
</el-button>
|
||||
<el-button style="width: 60px" size="mini"
|
||||
<el-button style="color: #409EFF" size="mini"
|
||||
v-if="scope.row.status === 'paid'"
|
||||
@click="refHandleRefund(scope.row.id)"
|
||||
type="danger" plain round>退款
|
||||
type="text" plain round>退款
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -1311,6 +1361,16 @@ export default {
|
||||
border-radius: 6px 6px 6px 6px;
|
||||
border: 1px solid #FF9655;
|
||||
}
|
||||
.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;
|
||||
}
|
||||
|
||||
.el-form--inline .el-form-item {
|
||||
margin-right: 44px;
|
||||
@ -1319,10 +1379,10 @@ export default {
|
||||
.size-hui {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
//justify-content: space-between;
|
||||
font-weight: 400;
|
||||
font-size: 13px;
|
||||
color: #888888;
|
||||
color: #333333;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
@ -1366,7 +1426,7 @@ export default {
|
||||
|
||||
.table-box {
|
||||
width: 100%;
|
||||
height: 50vh;
|
||||
height: 60vh;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,216 +1,275 @@
|
||||
<!--会员充值订单-->
|
||||
<template>
|
||||
<div>
|
||||
<!-- 条件查询-->
|
||||
<el-card class="box-card">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
||||
<el-form-item label="" prop="staffId">
|
||||
<el-select
|
||||
v-model="queryParams.mtStaffId"
|
||||
clearable
|
||||
placeholder="交易员工"
|
||||
>
|
||||
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
|
||||
<span style="float: left">{{ item.realName }}</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="paymentType">
|
||||
<el-select
|
||||
v-model="queryParams.paymentType"
|
||||
clearable
|
||||
placeholder="支付类型"
|
||||
>
|
||||
<el-option v-for="item in payList"
|
||||
:key="item.id"
|
||||
:label="item.dictLabel"
|
||||
:value="item.dictValue">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<el-input v-model="queryParams.mobile" placeholder="手机号"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<!-- <el-date-picker-->
|
||||
<!-- v-model="dateRange"-->
|
||||
<!-- style="width: 400px"-->
|
||||
<!-- size="medium"-->
|
||||
<!-- value-format="yyyy-MM-dd"-->
|
||||
<!-- type="datetimerange"-->
|
||||
<!-- range-separator="至"-->
|
||||
<!-- start-placeholder="开始日期"-->
|
||||
<!-- end-placeholder="结束日期"-->
|
||||
<!-- ></el-date-picker>-->
|
||||
<el-date-picker
|
||||
v-model="beginTime"
|
||||
style="width: 160px"
|
||||
type="date"
|
||||
placeholder="交易开始日期">
|
||||
</el-date-picker>
|
||||
至
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 160px"
|
||||
type="date"
|
||||
placeholder="交易结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item style="float: right">
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-card>
|
||||
<!-- 统计-->
|
||||
<el-card class="box-card">
|
||||
<div slot="header" class="clearfix">
|
||||
<span>会员充值统计</span>
|
||||
<div class="cot-box">
|
||||
<!-- 条件查询-->
|
||||
<div>
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
|
||||
<el-form-item label="" prop="staffId">
|
||||
<el-select
|
||||
v-model="queryParams.mtStaffId"
|
||||
clearable
|
||||
placeholder="请选择关联员工"
|
||||
>
|
||||
<el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
|
||||
<span style="float: left">{{ item.realName }}</span>
|
||||
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="paymentType">
|
||||
<el-select
|
||||
v-model="queryParams.paymentType"
|
||||
clearable
|
||||
placeholder="请选择订单类型"
|
||||
>
|
||||
<el-option v-for="item in payList"
|
||||
:key="item.id"
|
||||
:label="item.dictLabel"
|
||||
:value="item.dictValue">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="" prop="paymentType">
|
||||
<el-select
|
||||
v-model="queryParams.paymentType"
|
||||
clearable
|
||||
placeholder="请选择支付方式"
|
||||
>
|
||||
<el-option v-for="item in payList"
|
||||
:key="item.id"
|
||||
:label="item.dictLabel"
|
||||
:value="item.dictValue">
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<el-input v-model="queryParams.mobile" placeholder="请输入会员手机号"></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="">
|
||||
<el-date-picker
|
||||
v-model="beginTime"
|
||||
style="width: 160px"
|
||||
type="date"
|
||||
placeholder="交易开始日期">
|
||||
</el-date-picker>
|
||||
至
|
||||
<el-date-picker
|
||||
v-model="endTime"
|
||||
style="width: 160px"
|
||||
type="date"
|
||||
placeholder="交易结束日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item style="float: right">
|
||||
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||
<el-button type="primary" @click="exportExcelVip()">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="box-gang">
|
||||
|
||||
<div class="box">
|
||||
<div class="size-bole">{{orderStatistics.numberOfTopUps?orderStatistics.numberOfTopUps:0}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">充值笔数</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
<!-- 统计-->
|
||||
<div>
|
||||
<div class="box-gang">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.totalAmountReceived || 0 }}/
|
||||
{{ orderStatistics.numberOfTopUps || 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>
|
||||
<div class="box">
|
||||
<div class="size-bole">{{orderStatistics.theTotalAmountOfTopUp?orderStatistics.theTotalAmountOfTopUp:0}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">充值总金额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.theTotalAmountOfTopUp || 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>
|
||||
<div class="box">
|
||||
<div class="size-bole">{{orderStatistics.theTotalAmountOfTheCredit?orderStatistics.theTotalAmountOfTheCredit:0}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">赠送总额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.theTotalAmountOfTheCredit || 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>
|
||||
<div class="box">
|
||||
<div class="size-bole">{{orderStatistics.totalAmountReceived?orderStatistics.totalAmountReceived:0}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">实收总额</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.wechat || 0 }}/
|
||||
{{ orderStatistics.alipay || 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>
|
||||
<div class="box1">
|
||||
<div class="size-bole">{{orderStatistics.wechat?orderStatistics.wechat:0}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">微信</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.wechat || 0 }}/
|
||||
{{ orderStatistics.alipay || 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">云闪付/pos刷卡(元)</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box1">
|
||||
<div class="size-bole">{{orderStatistics.alipay?orderStatistics.alipay:0}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">支付宝</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box1">
|
||||
<div class="size-bole">{{orderStatistics.cash}}</div>
|
||||
<div class="size-hui">
|
||||
<div class="nei">现金</div>
|
||||
<div class="icon-img">
|
||||
<img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">
|
||||
<div class="box2">
|
||||
<div style="font-size: 26px;color: #0DC291;font-weight: bold;margin-top: 5px">
|
||||
{{ orderStatistics.cash || 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-bole">{{ orderStatistics.numberOfTopUps ? orderStatistics.numberOfTopUps : 0 }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">充值笔数</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box">-->
|
||||
<!-- <div class="size-bole">-->
|
||||
<!-- {{ orderStatistics.theTotalAmountOfTopUp ? orderStatistics.theTotalAmountOfTopUp : 0 }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">充值总金额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box">-->
|
||||
<!-- <div class="size-bole">-->
|
||||
<!-- {{ orderStatistics.theTotalAmountOfTheCredit ? orderStatistics.theTotalAmountOfTheCredit : 0 }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">赠送总额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box">-->
|
||||
<!-- <div class="size-bole">{{ orderStatistics.totalAmountReceived ? orderStatistics.totalAmountReceived : 0 }}-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">实收总额</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 4666@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{ orderStatistics.wechat ? orderStatistics.wechat : 0 }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">微信</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{ orderStatistics.alipay ? orderStatistics.alipay : 0 }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">支付宝</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="box1">-->
|
||||
<!-- <div class="size-bole">{{ orderStatistics.cash }}</div>-->
|
||||
<!-- <div class="size-hui">-->
|
||||
<!-- <div class="nei">现金</div>-->
|
||||
<!-- <div class="icon-img">-->
|
||||
<!-- <img src="../../../assets/images/cut/组 5017@2x.png" style="width: 20px;height: 20px">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
</div>
|
||||
</div>
|
||||
</el-card>
|
||||
<!-- 表格-->
|
||||
<el-card class="box-card">
|
||||
<div class="wgang">
|
||||
<div></div>
|
||||
<div style="display: flex ">
|
||||
<el-button type="primary" size="mini" icon="el-icon-plus" @click="exportExcelVip()">导出订单</el-button>
|
||||
<!-- 表格-->
|
||||
<div>
|
||||
<div class="table-box">
|
||||
<el-table
|
||||
:data="list"
|
||||
style="width: 100%">
|
||||
<el-table-column type="index" width="50" align="center" label="序号"/>
|
||||
<el-table-column prop="name" label="会员名称" align="center"></el-table-column>
|
||||
<el-table-column prop="mobile" label="会员手机号" align="center"></el-table-column>
|
||||
<el-table-column prop="bidBalance" label="到账金额" align="center"></el-table-column>
|
||||
<el-table-column prop="amount" label="自定义充值金额" align="center"></el-table-column>
|
||||
<el-table-column prop="rechargeBalance" label="电子储值卡实售金额" align="center"></el-table-column>
|
||||
<el-table-column prop="giftBalance" label="电子储值卡赠送金额" align="center"></el-table-column>
|
||||
<el-table-column prop="paymentType" label="支付方式" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ getType(payList, scope.row.paymentType) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="payStatus" label="支付状态" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
|
||||
<el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
|
||||
<el-tag type="danger" v-else>支付失败</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="realName" label="交易员工" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.realName || getStaffName(staffList, scope.row.mtStaffId) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="充值备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.remark ? scope.row.remark : "--" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="fringeBenefit" label="储值优惠" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>充值满{{ scope.row.rechargeBalance }}元赠送{{ scope.row.giftBalance }}元</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<!-- <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
|
||||
<el-button style="width: 60px" size="mini"
|
||||
@click="patchwork(scope.row)"
|
||||
type="primary" plain round>补打
|
||||
</el-button>
|
||||
<!-- <el-button style="width: 60px" size="mini"-->
|
||||
<!-- @click="handleRefund(scope.row.id)"-->
|
||||
<!-- type="danger" plain round>退款</el-button>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="pagination-box">
|
||||
<el-pagination
|
||||
background
|
||||
v-show="total>0"
|
||||
layout="prev, pager, next"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNo"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@current-change="getList">
|
||||
</el-pagination>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="table-box">
|
||||
<el-table
|
||||
:data="list"
|
||||
style="width: 100%">
|
||||
<el-table-column type="index" width="50" align="center" label="序号"/>
|
||||
<el-table-column prop="name" label="会员名称" align="center"> </el-table-column>
|
||||
<el-table-column prop="mobile" label="会员手机号" align="center"> </el-table-column>
|
||||
<el-table-column prop="bidBalance" label="到账金额" align="center"> </el-table-column>
|
||||
<el-table-column prop="amount" label="自定义充值金额" align="center"> </el-table-column>
|
||||
<el-table-column prop="rechargeBalance" label="电子储值卡实售金额" align="center"> </el-table-column>
|
||||
<el-table-column prop="giftBalance" label="电子储值卡赠送金额" align="center"></el-table-column>
|
||||
<el-table-column prop="paymentType" label="支付方式" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{getType(payList,scope.row.paymentType)}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="payStatus" label="支付状态" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
|
||||
<el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
|
||||
<el-tag type="danger" v-else>支付失败</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="realName" label="交易员工" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.realName || getStaffName(staffList,scope.row.mtStaffId)}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remark" label="充值备注" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.remark ? scope.row.remark:"--" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="fringeBenefit" label="储值优惠" align="center">
|
||||
<template slot-scope="scope">
|
||||
<span>充值满{{ scope.row.rechargeBalance }}元赠送{{ scope.row.giftBalance }}元</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<!-- <el-button size="mini" type="text" icon="el-icon-edit">更多操作</el-button>-->
|
||||
<el-button style="width: 60px" size="mini"
|
||||
@click="patchwork(scope.row)"
|
||||
type="primary" plain round>补打</el-button>
|
||||
<!-- <el-button style="width: 60px" size="mini"-->
|
||||
<!-- @click="handleRefund(scope.row.id)"-->
|
||||
<!-- type="danger" plain round>退款</el-button>-->
|
||||
</template>
|
||||
</el-table-column>
|
||||
</div>
|
||||
|
||||
</el-table>
|
||||
</div>
|
||||
<div class="pagination-box">
|
||||
<el-pagination
|
||||
background
|
||||
v-show="total>0"
|
||||
layout="prev, pager, next"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNo"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@current-change="getList">
|
||||
</el-pagination>
|
||||
</div>
|
||||
|
||||
|
||||
</el-card>
|
||||
|
||||
<!-- 订单退款-->
|
||||
<!-- 订单退款-->
|
||||
<el-dialog
|
||||
title="订单退款"
|
||||
width="25%"
|
||||
@ -231,7 +290,8 @@
|
||||
<div>
|
||||
<el-input placeholder="请输入密码" v-model="password" show-password></el-input>
|
||||
<br/>
|
||||
<span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、电子储值卡等原路退回处理</span>
|
||||
<span
|
||||
style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、电子储值卡等原路退回处理</span>
|
||||
</div>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="dialogRefund = false">取 消</el-button>
|
||||
@ -260,7 +320,10 @@
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>到账金额</div>
|
||||
<div>¥{{ oilOrder.amount ? oilOrder.giftBalance + oilOrder.amount : oilOrder.giftBalance + oilOrder.rechargeBalance }}</div>
|
||||
<div>¥{{
|
||||
oilOrder.amount ? oilOrder.giftBalance + oilOrder.amount : oilOrder.giftBalance + oilOrder.rechargeBalance
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="input-box">
|
||||
<div>实付款</div>
|
||||
@ -287,30 +350,30 @@ import {printCardValueReport} from "@/api/print";
|
||||
|
||||
export default {
|
||||
name: "order_Cashier",
|
||||
data(){
|
||||
return{
|
||||
data() {
|
||||
return {
|
||||
// 员工列表
|
||||
staffList:[],
|
||||
staffList: [],
|
||||
// 日期范围
|
||||
dateRange: [],
|
||||
beginTime:"",
|
||||
endTime:"",
|
||||
oilOrder:{},
|
||||
beginTime: "",
|
||||
endTime: "",
|
||||
oilOrder: {},
|
||||
// 退款密码
|
||||
password:"",
|
||||
radio1:"充值类型选错",
|
||||
dialogRefund:false,
|
||||
password: "",
|
||||
radio1: "充值类型选错",
|
||||
dialogRefund: false,
|
||||
// 支付方式列表
|
||||
payList:[],
|
||||
payList: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
},
|
||||
// 列表信息
|
||||
list:[],
|
||||
list: [],
|
||||
// 总条数
|
||||
total:0,
|
||||
total: 0,
|
||||
|
||||
labelPosition: 'right',
|
||||
formLabelAlign: {
|
||||
@ -318,16 +381,16 @@ export default {
|
||||
},
|
||||
|
||||
orderStatistics: {
|
||||
numberOfTopUps:'',
|
||||
theTotalAmountOfTopUp:'',
|
||||
theTotalAmountOfTheCredit:'',
|
||||
totalAmountReceived:'',
|
||||
wechat:'',
|
||||
alipay:'',
|
||||
cash:'',
|
||||
numberOfTopUps: '',
|
||||
theTotalAmountOfTopUp: '',
|
||||
theTotalAmountOfTheCredit: '',
|
||||
totalAmountReceived: '',
|
||||
wechat: '',
|
||||
alipay: '',
|
||||
cash: '',
|
||||
},
|
||||
// 是否为当天时间
|
||||
isSysDate:false,
|
||||
isSysDate: false,
|
||||
}
|
||||
},
|
||||
created() {
|
||||
@ -336,7 +399,7 @@ export default {
|
||||
start.setMinutes(0)
|
||||
start.setSeconds(0)
|
||||
start.setMilliseconds(0)
|
||||
this.dateRange = [start,new Date()];
|
||||
this.dateRange = [start, new Date()];
|
||||
this.beginTime = start
|
||||
this.endTime = new Date()
|
||||
this.isSysDate = true
|
||||
@ -344,13 +407,13 @@ export default {
|
||||
this.getPayList();
|
||||
this.getOrderStatistics()
|
||||
},
|
||||
methods:{
|
||||
methods: {
|
||||
// 获取员工名称
|
||||
getStaffName(list,id){
|
||||
getStaffName(list, id) {
|
||||
let name = "--"
|
||||
if (id){
|
||||
if (id) {
|
||||
list.forEach(item => {
|
||||
if (item.id == id){
|
||||
if (item.id == id) {
|
||||
name = item.realName
|
||||
}
|
||||
})
|
||||
@ -363,25 +426,25 @@ export default {
|
||||
dateRange.push(this.beginTime.toLocaleDateString())
|
||||
dateRange.push(this.endTime.toLocaleDateString())
|
||||
}
|
||||
exportExcelVipApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
|
||||
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
|
||||
this.$download.saveAs(blob,'会员充值订单统计.xLsx')
|
||||
exportExcelVipApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
|
||||
const blob = new Blob([res], {type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'});
|
||||
this.$download.saveAs(blob, '会员充值订单统计.xLsx')
|
||||
})
|
||||
},
|
||||
getOrderStatistics () {
|
||||
getOrderStatistics() {
|
||||
let dateRange = []
|
||||
if (this.beginTime && this.endTime) {
|
||||
dateRange.push(this.beginTime.toLocaleDateString())
|
||||
dateRange.push(this.endTime.toLocaleDateString())
|
||||
}
|
||||
orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
|
||||
orderStatisticsApi(this.addDateRange(this.queryParams, dateRange)).then(res => {
|
||||
this.orderStatistics = res.data
|
||||
})
|
||||
|
||||
},
|
||||
|
||||
async printLocally() {
|
||||
if (!connectFlag){
|
||||
if (!connectFlag) {
|
||||
return
|
||||
}
|
||||
//初始化打印函数
|
||||
@ -450,12 +513,12 @@ export default {
|
||||
}
|
||||
</style>
|
||||
`
|
||||
var fromHtml = bodyStyle+this.$refs.report.innerHTML
|
||||
var fromHtml = bodyStyle + this.$refs.report.innerHTML
|
||||
|
||||
|
||||
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
|
||||
|
||||
LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
|
||||
LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW", true);
|
||||
|
||||
// LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
|
||||
// let preview = LODOP.PREVIEW();
|
||||
@ -480,12 +543,12 @@ export default {
|
||||
|
||||
let a = {
|
||||
// 充值金额
|
||||
realyPayBills:this.oilOrder.amount ? this.oilOrder.amount : this.oilOrder.rechargeBalance,
|
||||
realyPayBills: this.oilOrder.amount ? this.oilOrder.amount : this.oilOrder.rechargeBalance,
|
||||
//赠送金额
|
||||
giftBalance:this.oilOrder.giftBalance,
|
||||
giftBalance: this.oilOrder.giftBalance,
|
||||
// 到账金额
|
||||
getAmount:this.oilOrder.amount ? this.oilOrder.giftBalance + this.oilOrder.amount : this.oilOrder.giftBalance + this.oilOrder.rechargeBalance,
|
||||
payType:payTypeText,
|
||||
getAmount: this.oilOrder.amount ? this.oilOrder.giftBalance + this.oilOrder.amount : this.oilOrder.giftBalance + this.oilOrder.rechargeBalance,
|
||||
payType: payTypeText,
|
||||
|
||||
// 实付款
|
||||
actualPay: this.oilOrder.amount ? this.oilOrder.amount : this.oilOrder.rechargeBalance,
|
||||
@ -493,29 +556,30 @@ export default {
|
||||
// seekZero:this.seekZero.toFixed(2),
|
||||
}
|
||||
|
||||
printCardValueReport(a).then(res=>{
|
||||
printCardValueReport(a).then(res => {
|
||||
|
||||
})
|
||||
|
||||
},
|
||||
// 补打
|
||||
patchwork(data){
|
||||
patchwork(data) {
|
||||
const orderNo = data.name
|
||||
this.$modal.confirm('确定您要补打当前订单吗?当前会员[' + orderNo + '],请确保云打印机正在运行中').then(function() {
|
||||
this.$modal.confirm('确定您要补打当前订单吗?当前会员[' + orderNo + '],请确保云打印机正在运行中').then(function () {
|
||||
// return delUser(row.id);
|
||||
}).then(async () => {
|
||||
await cardValueRecordInfo(data.id).then( response => {
|
||||
await cardValueRecordInfo(data.id).then(response => {
|
||||
this.oilOrder = response.data
|
||||
})
|
||||
// this.printLocally()
|
||||
this.cardValueReport()
|
||||
this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
|
||||
}).catch(() => {});
|
||||
}).catch(() => {
|
||||
});
|
||||
},
|
||||
// 退款
|
||||
handleRefund(id){
|
||||
handleRefund(id) {
|
||||
this.dialogRefund = true;
|
||||
cardValueRecordInfo(id).then( response => {
|
||||
cardValueRecordInfo(id).then(response => {
|
||||
this.oilOrder = response.data
|
||||
})
|
||||
},
|
||||
@ -524,32 +588,32 @@ export default {
|
||||
this.dialogRefund = false;
|
||||
// 退款确定
|
||||
// cashierOrder
|
||||
console.log("oilOrder",this.oilOrder)
|
||||
let map={
|
||||
console.log("oilOrder", this.oilOrder)
|
||||
let map = {
|
||||
orderNo: this.oilOrder.paymentNo,
|
||||
// refundAmt: this.oilOrder.paymentNo,
|
||||
storeId: this.oilOrder.storeId,
|
||||
type: "oilOrder"
|
||||
}
|
||||
refundApi(map).then(res=>{
|
||||
refundApi(map).then(res => {
|
||||
|
||||
})
|
||||
},
|
||||
getType(list,val){
|
||||
getType(list, val) {
|
||||
let name = "";
|
||||
list.forEach(item => {
|
||||
if (item.dictValue == val){
|
||||
if (item.dictValue == val) {
|
||||
name = item.dictLabel
|
||||
}
|
||||
})
|
||||
return name;
|
||||
},
|
||||
// 获取支付列表信息
|
||||
getPayList(){
|
||||
getDicts("payment_type").then( response => {
|
||||
getPayList() {
|
||||
getDicts("payment_type").then(response => {
|
||||
this.payList = response.data;
|
||||
})
|
||||
queryStaffs().then( response => {
|
||||
queryStaffs().then(response => {
|
||||
this.staffList = response.data;
|
||||
})
|
||||
},
|
||||
@ -572,8 +636,8 @@ export default {
|
||||
this.handleQuery();
|
||||
},
|
||||
// 获取列表信息
|
||||
getList(val){
|
||||
if (val!=undefined){
|
||||
getList(val) {
|
||||
if (val != undefined) {
|
||||
this.queryParams.pageNo = val
|
||||
}
|
||||
|
||||
@ -591,7 +655,7 @@ export default {
|
||||
dateRange.push(this.endTime.toLocaleDateString())
|
||||
}
|
||||
|
||||
listCardValueRecords(this.addDateRange(this.queryParams, dateRange)).then( response => {
|
||||
listCardValueRecords(this.addDateRange(this.queryParams, dateRange)).then(response => {
|
||||
this.list = response.data.records;
|
||||
this.total = response.data.total;
|
||||
this.isSysDate = false
|
||||
@ -602,112 +666,147 @@ export default {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.app-top{
|
||||
width: 100%;
|
||||
.app-top {
|
||||
width: 100%;
|
||||
|
||||
height: 60px;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
.clearfix{
|
||||
width: 100%;
|
||||
height: 60px;
|
||||
box-sizing: border-box;
|
||||
padding: 10px;
|
||||
}
|
||||
|
||||
.clearfix {
|
||||
width: 100%;
|
||||
|
||||
}
|
||||
|
||||
.box-card {
|
||||
width: 100%;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
.box-gang {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.box {
|
||||
padding: 5px;
|
||||
margin-bottom: 20px;
|
||||
margin-right: 20px;
|
||||
padding-left: 20px;
|
||||
width: 211px;
|
||||
height: 60px;
|
||||
background: rgba(64, 158, 255, 0.05);
|
||||
border-radius: 6px 6px 6px 6px;
|
||||
border: 1px solid #409EFF;
|
||||
}
|
||||
|
||||
.el-form--inline .el-form-item {
|
||||
margin-right: 44px;
|
||||
}
|
||||
|
||||
.size-hui {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
font-size: 13px;
|
||||
color: #888888;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
|
||||
.nei {
|
||||
width: 150px;
|
||||
}
|
||||
.box-card{
|
||||
width: 100%;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.box-gang{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.box{
|
||||
padding: 5px;
|
||||
margin-bottom: 20px;
|
||||
margin-right: 20px;
|
||||
padding-left: 20px;
|
||||
width: 211px;
|
||||
height: 60px;
|
||||
background: rgba(64,158,255,0.05);
|
||||
border-radius: 6px 6px 6px 6px;
|
||||
border: 1px solid #409EFF;
|
||||
}
|
||||
.el-form--inline .el-form-item {
|
||||
margin-right: 44px;
|
||||
}
|
||||
.size-hui{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
font-family: Source Han Sans CN, Source Han Sans CN;
|
||||
font-weight: 400;
|
||||
font-size: 13px;
|
||||
color: #888888;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
.nei {
|
||||
width: 150px;
|
||||
}
|
||||
}
|
||||
.size-bole{
|
||||
height: 31px;
|
||||
font-family: YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
font-size: 24px;
|
||||
color: #555555;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
.icon-img{
|
||||
width:20px;
|
||||
}
|
||||
|
||||
.size-bole {
|
||||
height: 31px;
|
||||
font-family: YouSheBiaoTiHei;
|
||||
font-weight: 400;
|
||||
font-size: 24px;
|
||||
color: #555555;
|
||||
text-align: left;
|
||||
font-style: normal;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.icon-img {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 5px;
|
||||
|
||||
img {
|
||||
float: right;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-right: 5px;
|
||||
img{
|
||||
float: right;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
}
|
||||
}
|
||||
.wgang{
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
}
|
||||
.table-box{
|
||||
width: 100%;
|
||||
}
|
||||
.pagination-box{
|
||||
width: 100%;
|
||||
margin: 10px auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.top-app-sou{
|
||||
width: 20%;
|
||||
}
|
||||
.tk{
|
||||
text-align: center;
|
||||
color: grey;
|
||||
margin: 10px 0;
|
||||
}
|
||||
.box1{
|
||||
padding: 5px;
|
||||
margin-right: 20px;
|
||||
margin-bottom: 20px;
|
||||
padding-left: 20px;
|
||||
.wgang {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 20px;
|
||||
|
||||
width: 211px;
|
||||
height: 60px;
|
||||
background: rgba(255,150,85,0.05);
|
||||
border-radius: 6px 6px 6px 6px;
|
||||
border: 1px solid #FF9655;
|
||||
}
|
||||
}
|
||||
|
||||
.table-box {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.pagination-box {
|
||||
width: 100%;
|
||||
margin: 10px auto;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
.top-app-sou {
|
||||
width: 20%;
|
||||
}
|
||||
|
||||
.tk {
|
||||
text-align: center;
|
||||
color: grey;
|
||||
margin: 10px 0;
|
||||
}
|
||||
|
||||
.box1 {
|
||||
padding: 5px;
|
||||
margin-right: 20px;
|
||||
margin-bottom: 20px;
|
||||
padding-left: 20px;
|
||||
|
||||
width: 211px;
|
||||
height: 60px;
|
||||
background: rgba(255, 150, 85, 0.05);
|
||||
border-radius: 6px 6px 6px 6px;
|
||||
border: 1px solid #FF9655;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
.cot-box {
|
||||
width: 98%;
|
||||
border-radius: 8px;
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 20px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
</style>
|
||||
|
Loading…
Reference in New Issue
Block a user