From a8b2da07ad54ee6d8e6a692f989627cdba756ae0 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Tue, 20 Jul 2021 15:35:37 +0800
Subject: [PATCH] 1、服务单打印格式调整
---
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java | 5 +----
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html | 4 ++++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
index c19da86..a65e987 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java
@@ -5,7 +5,6 @@
import com.matrix.core.exception.GlobleException;
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.core.tools.DateUtil;
import com.matrix.core.tools.WebUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.constance.Dictionary;
@@ -299,9 +298,7 @@
break;
//如果是冻结状态则要算出冻结的天数，延长有效期
case Dictionary.TAOCAN_STATUS_DJ:
- MoneyCardUseFreeze freeze = new MoneyCardUseFreeze();
- freeze = moneyCardUseFreezeService.findByMoneyCardUseId(cardUse.getId());
- cardUse.setFailTime(DateUtil.nextNDate(failTime, freeze.getGapDays()));
+
break;
default:
return new AjaxResult(AjaxResult.STATUS_FAIL, "请选择无效或者冻结的充值卡");
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
index ab2f950..a01f2d8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html
@@ -117,6 +117,7 @@
<th width="100px">服务时长(分钟)</th>
<th>服务时间</th>
<th width="300px">美疗师</th>
+ <th style="width: 100px;">提成</th>
<th>操作</th>
</tr>
@@ -161,6 +162,9 @@
</el-select>
</td>
<td>
+ <el-input v-model="item.extract"></el-input>
+ </td>
+ <td>
<el-button size="mini" type="danger"
@click="handleDelete(index)">删除</el-button>
</td>
--
Gitblit v1.9.1