From ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 17 Jul 2021 15:59:10 +0800
Subject: [PATCH] 1. 新增套餐中有效和无效的操作 2. 会员修改门店功能 3. 套餐新增编辑次数功能 4. 计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0 5. 打印小票功能调整间距，和收银人 6. PC端服务单新增划扣金额展示
---
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html
index 2d7895b..4d6314b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html
@@ -175,9 +175,9 @@
</div>
<div class="form-group">
- <label class="col-sm-2 control-label">美疗师<span class="text-danger">*</span></label>
+ <label class="col-sm-2 control-label">美疗师</label>
<div class="col-sm-4">
- <select class="form-control autoFull select2" dataType="*" nullmsg="请选择美疗师"
+ <select class="form-control autoFull select2" dataType="*" nullmsg="请选择美疗师" ignore="ignore"
th:data-url="@{/admin/getShopStaffByRoleName?roleName=美疗师}"
data-value="suId"
data-filed="suName" th:data-def="${obj?.beatuyId}" name="beatuyId"
@@ -217,6 +217,32 @@
<div class="Validform_checktip"></div>
</div>
</div>
+
+ <div class="form-group">
+
+ <label class="col-sm-2 control-label">所属门店<span
+ class="text-danger">*</span></label>
+ <div class="col-sm-4">
+ <select class="form-control autoFull" dataType="*"
+ nullmsg="所属门店不能为空" th:data-url="@{/hiveErp/shopInfo/findShopByRole}"
+ data-value="id" data-filed="shopName"
+ th:data-def="${obj?.shopId}"
+ name="shopId">
+ <option value=''>--选择所属门店--</option>
+ </select>
+ <div class="Validform_checktip"></div>
+ </div>
+
+ <label class="col-sm-2 control-label">资金密码</label>
+ <div class="col-sm-4">
+ <input autocomplete="off" type="input" class="form-control" name="passWord"
+ th:value="${obj?.passWord}" datatype="*0-500" ignore="ignore">
+ <div class="Validform_checktip"></div>
+ </div>
+
+ </div>
+
+
</div>
</div>
</div>
--
Gitblit v1.9.1