From 989f588ea0c7bfb7604fa061c70cab4d5553df42 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 14 Jan 2021 10:21:54 +0800 Subject: [PATCH] modify --- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html | 9 ++++----- zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html | 4 ++-- 2 files changed, 6 insertions(+), 7 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..42a34a0 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) { 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 3eac151..1c01d27 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 @@ -104,7 +104,7 @@ <label style="font-size: 14px;">应收金额</label> <label>欠款</label> <label>已还</label> - <label>退款</label> + <label v-if="order.refund != 0">退款</label> </el-col> <el-col :span="14" style="text-align: right;"> <label>¥ {{order.total}}</label> @@ -112,7 +112,7 @@ <label>¥ {{order.zkTotal}}</label> <label>¥ {{order.arrears}}</label> <label>¥ {{order.repay}}</label> - <label>¥ {{order.refund}}</label> + <label v-if="order.refund != 0">¥ {{order.refund}}</label> </el-col> </el-row> </el-col> -- Gitblit v1.9.1