From ec0c71cc88407098e0c088dbf1e44cddf856b8f8 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 26 Jan 2021 16:30:55 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html |    4 ++--
 1 files changed, 2 insertions(+), 2 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 039e6be..5d91b37 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
@@ -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>
@@ -906,7 +906,7 @@
                                     }
                                 })
                             });
-
+                            _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