From 24df3ed89ac1934bf0a0b9f74c4e5f227f0f82cf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 17 Mar 2021 09:45:49 +0800
Subject: [PATCH] Merge branch 'hive2.0' of http://120.27.238.55:7000/r/beauty-erp into hive2.0
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
index c6975a2..bd63766 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -108,7 +108,7 @@
</el-col>
<el-col :span="14" style="text-align: right;">
<label>¥ {{order.total}}</label>
- <label>¥ {{order.zkTotal - order.total}}</label>
+ <label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label>
<label>¥ {{order.zkTotal}}</label>
<label>¥ {{order.arrears}}</label>
<label>¥ {{order.repay}}</label>
@@ -133,7 +133,7 @@
</el-col>
</el-row>
<el-row type="flex" justify="center" style="margin: 20px;">
- <el-button size="medium" type="primary">打印</el-button>
+ <el-button size="medium" type="primary" @click="printf">打印</el-button>
</el-row>
</el-aside>
<el-main style="background-color: white; margin-right: 15px; margin-left: 15px; padding: 20px 30px;">
@@ -902,7 +902,7 @@
var id = this.order.id;
layer.open({
type: 2,
- title: "打印服务单",
+ title: "打印订单",
area: ['250px', '550px'],
maxmin: true,
content: [basePath + '/admin/redirect/hive/beautySalon/print-order?id=' + id]
--
Gitblit v1.9.1