From 57f627c87934cf11e36bf5512516f888f90d28c7 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 16 Mar 2021 21:28:31 +0800
Subject: [PATCH] 修改redis配置
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 c0baf45..b9bf124 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
@@ -290,7 +290,7 @@
<el-table-column
label="小计">
<template slot-scope="scope">
- {{scope.row.zkPrice * scope.row.count }}
+ {{(scope.row.zkPrice * scope.row.count).toFixed(2) }}
</template>
</el-table-column>
@@ -354,7 +354,7 @@
<li>订单总金额：{{order.total}}</li>
- <li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{order.total - order.zkTotal}}</span></li>
+ <li>整单折扣：<span class="arrears" v-if="order.zkTotal != null">{{(order.total - order.zkTotal).toFixed(2)}}</span></li>
<!-- <li v-if="order.arrears>0">订单欠款：<span class="arrears">{{order.arrears}}</span></li>-->
<!-- <li v-if="order.arrears<0">找零：<span class="arrears">{{order.arrears}}</span></li>-->
</ul>
@@ -382,7 +382,7 @@
title="业绩设置"
:visible.sync="drawer"
:direction="direction"
- size="50%"
+ size="90%"
>
<el-row>
<el-col :span="24">
@@ -516,7 +516,7 @@
<el-row style="line-height: 50px;" v-for="(item, index) in payMoneys">
<el-col :span="6" style="text-align: right; padding-right: 10px; font-size: 12px;">{{item.value}}</el-col>
<el-col :span="8"><el-input v-model="item.money"></el-input></el-col>
- <el-col :span="6" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col>
+ <el-col :span="8" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col>
</el-row>
</el-col>
</el-row>
@@ -886,8 +886,8 @@
callback: function (data) {
let order = data.rows[0];
console.log("order", order);
- _this.order.zkTotal = order.zkTotal;
- _this.order.total = order.total;
+ _this.order.zkTotal = order.zkTotal.toFixed(2);
+ _this.order.total = order.total.toFixed(2);
//支付金额计算
_this.order.items.forEach(item => {
@@ -899,7 +899,14 @@
item.payMoney = zkPrice * count;
}
_this.order.payMoney += parseFloat(item.payMoney);
+
+ _this.achieveList.forEach(achieve=>{
+ if(achieve.orderItem==item){
+ achieve.achieveMoney=item.payMoney;
+ }
+ })
});
+ _this.order.payMoney = _this.order.payMoney.toFixed(2);
//计算欠款
// _this.order.arrears = _this.order.zkTotal - _this.order.payMoney;
// if (_this.order.arrears < 0) {
--
Gitblit v1.9.1