From fa791f7796c1546b1329b52a3de8d753915cb4d5 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:24:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 84 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 26 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 63aaa8b..63f1f78 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 style="overflow: hidden">
+<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>
@@ -287,22 +299,7 @@
<el-input @change="calculationTotal" v-model="scope.row.zkPrice"></el-input>
</template>
</el-table-column>
- <el-table-column
- label="支付方式"
- width="130">
- <template slot-scope="scope">
- <el-select v-model="scope.row.payMethod"
- placeholder="请选择支付方式">
- <el-option
- v-for="item in itemSimplePayMethods"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- :disabled="item.disabled">
- </el-option>
- </el-select>
- </template>
- </el-table-column>
+
<el-table-column
label="小计">
<template slot-scope="scope">
@@ -362,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>
@@ -431,6 +428,22 @@
label="收款">
</el-table-column>
<el-table-column
+ label="支付方式"
+ width="130">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.payMethod"
+ placeholder="请选择支付方式">
+ <el-option
+ v-for="item in itemSimplePayMethods"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ :disabled="item.disabled">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
label="业绩类型" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.achieveType" @change="calculationAchieve" placeholder="请选择业绩类型">
@@ -443,6 +456,7 @@
</el-select>
</template>
</el-table-column>
+
<el-table-column
label="业绩" >
<template slot-scope="scope">
@@ -646,7 +660,7 @@
shopInfo: {},
- tableHeight: 500,
+ tableHeight: 'calc(100vh - 300px)',
/*****搜索表格数据*********/
//搜索关键词
@@ -657,6 +671,11 @@
searchTableData: [],
//表格加载效果
loading: false,
+ page : {
+ currentPage : 1,
+ pageSize : 10,
+ total : 0
+ },
/******搜索表格数据END********/
dialogSettleVisible : false,
@@ -748,6 +767,7 @@
commission : 0,
achieveType : _this.achieveTypeList[0].value,
isShare: false,
+ payMethod:item.payMethod,
});
});
_this.order.payMoney = orderPayMoney;
@@ -852,7 +872,6 @@
item.price = goods.sealPice;
item.goodsId = goods.id;
item.isFree = '否';
- item.payMethod = '现金';
if (type == BUY_TYPE_NOT_FREE) {
//购买
item.zkPrice = goods.sealPice;
@@ -875,6 +894,7 @@
achieveType : _this.achieveTypeList[0].value,
commission: 0,
isShare: false,
+ payMethod:'现金',
});
} else {
//加入业绩
@@ -886,6 +906,7 @@
achieveType : _this.achieveTypeList[0].value,
commission: 0,
isShare: false,
+ payMethod:'现金',
});
}
this.order.items.push(item);
@@ -924,10 +945,10 @@
let count = parseFloat(item.count);
let zkPrice = parseFloat(item.zkPrice);
- if (optionType != 1) {
+ // if (optionType != 1) {
//直接修改支付金额不重置支付金额
item.payMoney = zkPrice * count;
- }
+ // }
_this.order.payMoney += parseFloat(item.payMoney);
//重新计算业绩金额
@@ -1027,6 +1048,7 @@
projPercentage: achieve.commission,
achieveType: achieve.achieveType,
goodsCash: achieve.goodsCash,
+ payMethod: achieve.payMethod,
};
item.achieveList.push(achieveNew);
break;
@@ -1169,6 +1191,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;
@@ -1176,10 +1201,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;
}
});
@@ -1187,8 +1213,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