From e7eea688585603c5a8f134d92762e8431d885d36 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 06 Oct 2021 19:59:11 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
index 787fd6f..5bc8e86 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html
@@ -40,6 +40,14 @@
<input autocomplete="off" name="endTimeVo" type="text" class="form-control datetimepicker" id="endTime">
</div>
+ <div class="form-group mr-20">
+ <label >所属门店</label>
+ <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
+ th:data-url="@{/admin/shopInfo/findAll}">
+ <option value=''>--请选择部所属门店--</option>
+ </select>
+ </div>
+
<input autocomplete="off" type="hidden" name="statu" value="待付款" id="statu"/>
<div class="form-group mr-20">
<button type="button" class="btn btn-my btn-sm" id="btn0" value="" >全部</button>
@@ -89,6 +97,7 @@
<th data-field="statu">订单状态</th>
<th data-field="remark">备注</th>
+ <th data-field="shopName">门店</th>
</tr>
</thead>
--
Gitblit v1.9.1