From 0de4720110cc7ce35d1565bdd5706d6b9a0b3982 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 18 Jun 2021 22:10:24 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
index 6bdb364..16d0557 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -118,8 +118,8 @@
}
</style>
</head>
-<body>
-<div class="ibox-content" id="app" v-cloak>
+<body >
+<div id="app" v-cloak>
<el-row>
@@ -237,6 +237,18 @@
</template>
</el-table-column>
</el-table>
+
+ <el-row style="text-align: center; margin-top: 10px;">
+ <el-pagination
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
+ :current-page="page.currentPage"
+ :page-sizes="[10, 20, 30, 50]"
+ :page-size="page.pageSize"
+ layout="total, prev, pager, next, jumper"
+ :total="page.total">
+ </el-pagination>
+ </el-row>
<el-row class="btn-box">
<el-button size="mini" type="danger" @click="closeXm()">关闭</el-button>
<el-button size="mini" type="primary" @click="chouseGoods()">确认</el-button>
@@ -347,7 +359,7 @@
</el-table>
</el-row>
- <el-row class="mt-20 vertical">
+ <el-row class=" vertical">
<el-col :span="10" class="money-box">
<div>
<ul>
@@ -648,7 +660,7 @@
shopInfo: {},
- tableHeight: 500,
+ tableHeight: 'calc(100vh - 300px)',
/*****搜索表格数据*********/
//搜索关键词
@@ -659,6 +671,11 @@
searchTableData: [],
//表格加载效果
loading: false,
+ page : {
+ currentPage : 1,
+ pageSize : 10,
+ total : 0
+ },
/******搜索表格数据END********/
dialogSettleVisible : false,
@@ -928,10 +945,10 @@
let count = parseFloat(item.count);
let zkPrice = parseFloat(item.zkPrice);
- if (optionType != 1) {
+ // if (optionType != 1) {
//直接修改支付金额不重置支付金额
- item.payMoney = zkPrice * count;
- }
+ item.payMoney = (zkPrice * count).toFixed(2);
+ // }
_this.order.payMoney += parseFloat(item.payMoney);
//重新计算业绩金额
@@ -982,9 +999,14 @@
if (this.checkSubmitOrder()) {
let _this = this;
+ //是否全部为储值卡支付
+ let isCardPay=true;
if(submitType == 1) {
//校验支付方式
+
+
+
if (_this.payMoneys.length > 0) {
let flows = []
var total = 0;
@@ -1002,6 +1024,8 @@
if (item.type == '储值卡'){
flow.isGift = item.isGift;
flow.cardId = item.id;
+ }else{
+ isCardPay=false;
}
total += parseFloat(item.money);
flows.push(flow)
@@ -1011,6 +1035,10 @@
return false;
}
_this.order.flows = flows;
+
+
+
+
} else {
this.$message.warning("请选择支付方式");
return false;
@@ -1025,6 +1053,12 @@
item.achieveList = [];
}
if (item.uuid == achieve.orderItem.uuid) {
+
+ if(isCardPay){
+ //如果是储值卡支付，则业绩自动切换到划扣金额
+ achieve.payMethod="划扣";
+ }
+
let achieveNew = {
uuid:item.uuid,
beaultId: achieve.saleId,
@@ -1174,6 +1208,9 @@
*/
searchGoods() {
let _this = this;
+ var currentPage = this.page.currentPage;
+ var pageSize = this.page.pageSize;
+ var offset = (currentPage - 1) * pageSize;
if (this.queryKey && this.queryKey.trim().length > 0) {
this.showSearchTable = true;
this.loading = true;
@@ -1181,10 +1218,11 @@
app: _this,
contentType: 'application/x-www-form-urlencoded',
//TODO 优化下拉加载
- data: {name: _this.queryKey, limit: 10000},
+ data: {name: _this.queryKey, limit: pageSize, offset : offset},
url: basePath + "/admin/shoppinggoods/showList",
callback: function (data) {
_this.searchTableData = data.rows;
+ _this.page.total = data.total;
_this.loading = false;
}
});
@@ -1192,8 +1230,14 @@
this.showSearchTable = false;
}
},
-
-
+ handleSizeChange(val) {
+ this.page.pageSize = val;
+ this.searchGoods();
+ },
+ handleCurrentChange(val) {
+ this.page.currentPage = val;
+ this.searchGoods();
+ },
remoteMethod(query) {
if (query !== '') {
this.vipLoading = true;
--
Gitblit v1.9.1