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 | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 7dd8f24..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
@@ -111,6 +111,7 @@
<el-row style="text-align: center; margin: 10px 0 0 0">
<el-button type="primary" @click="submitBj">确认收款</el-button>
+ <el-button type="danger" @click="cancelSubmit">取消</el-button>
</el-row>
</el-dialog>
</div>
@@ -157,11 +158,6 @@
img: '/images/pay/card.png',
isActive: false,
type: '储值卡'
- },{
- value: '欠款',
- img: '/images/pay/qian.png',
- isActive: false,
- type: '欠款'
},],
moneyCards : [],
dialogSettleVisible : true,
@@ -231,6 +227,9 @@
}
});
},
+ cancelSubmit() {
+ this.closeFrame();
+ },
print() {
let _this = this;
if (_this.order.id) {
@@ -239,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();
}
@@ -304,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