From a72aa4bb793ec765892406c842039a71b33215b1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 11 Mar 2021 18:12:22 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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..b39313f 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,
@@ -230,6 +226,9 @@
_this.closeFrame();
}
});
+ },
+ cancelSubmit() {
+ this.closeFrame();
},
print() {
let _this = this;
@@ -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