From 9c791d431038fe79a111805762ee2f42c96b51c5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Nov 2021 17:03:15 +0800
Subject: [PATCH] fix

---
 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
index 42a34a0..8265278 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html
@@ -238,7 +238,7 @@
 						title: "打印订单",
 						area: ['250px', '550px'],
 						maxmin: true,
-						content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + this.order.id],
+						content: [basePath + '/admin/order/printOrder?id=' + this.order.id],
 						cancel: function (index, layero) {
 							_this.closeFram();
 						}
@@ -303,6 +303,13 @@
 							}
 						} else {
 							Vue.set(item,'isActive',true);
+							var hasAmount = 0;
+							for(var i = 0; i < payMoneys.length; i++) {
+								hasAmount += parseFloat(payMoneys[i].money);
+							}
+							if (_this.order.arrears - hasAmount > 0) {
+								Vue.set(item, 'money', _this.order.arrears - hasAmount);
+							}
 							_this.payMoneys.push(item);
 						}
 					});

--
Gitblit v1.9.1