wuwen 4 years ago
parent
commit
2e46a45f9e

+ 9 - 1
src/main/resources/templates/sys/fx/merchantActiveCapList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 		<li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId" id="merchantId"   style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -122,6 +124,12 @@
 </script>
 
 <script type="text/javascript">
+
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantActiveCapList";
 	$("#seachform").submit();

+ 3 - 3
src/main/resources/templates/sys/fx/merchantAdd.html

@@ -149,16 +149,16 @@ dtext{
 				<input type="text" id="endSignTime" name="endSignTime"   onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',minDate:'#F{$dp.$D(\'signTime\')}'})"  autocomplete="off" th:value="${#dates.format(merchant.endSignTime, 'yyyy-MM-dd')}" class="scinput date_width" placeholder="合同结束日期">
 			</li>
 			
-			<li>
+			<li style="display: none">
 				<label>激活开始日期:<b >*</b></label>
 				<input type="text"  class="dfinput fl"  id="startActiveTime" name="startActiveTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" autocomplete="off" th:value="${#dates.format(merchant.startActiveTime, 'yyyy-MM-dd')}" placeholder="合同开始激活日期">
 			</li>
-			<li>
+			<li style="display: none">
 				<label>激活结束日期:<b >*</b></label>
 				<input type="text"  class="dfinput fl"  id="activeTime" name="activeTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" autocomplete="off" th:value="${#dates.format(merchant.activeTime, 'yyyy-MM-dd')}" placeholder="合同结束激活日期">
 			</li>
 			
-			<li th:style="${merchant.computeTime==null ? 'display: none' : ''}">
+			<li style="display: none">
 				<label>计费开始日期:<b >*</b></label>
 				<input type="text"  class="dfinput fl"  id="computeTime" name="computeTime"  onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',autoPickDate:true})" autocomplete="off" th:value="${#dates.format(merchant.computeTime, 'yyyy-MM-dd')}" placeholder="计费开始日期">
 			</li>

+ 10 - 2
src/main/resources/templates/sys/fx/merchantCapList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -29,8 +31,8 @@
 	<form id="seachform" th:action="@{/sys/fx/merchantCapList.html}" method="post">
 	<ul class="seachform">
 		<li>
-			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<label>所有商户:</label> 
+			<select class="scinput select_width"  name="merchantId"  id="merchantId"  style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -137,6 +139,12 @@
 </script>
 
 <script type="text/javascript">
+
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantCapList";
 	$("#seachform").submit();

+ 9 - 1
src/main/resources/templates/sys/fx/merchantCapOldList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 		<li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId"   id="merchantId" style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -135,6 +137,12 @@
 </script>
 
 <script type="text/javascript">
+
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantCapOldList";
 	$("#seachform").submit();

+ 10 - 3
src/main/resources/templates/sys/fx/merchantMealList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 		<li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId"  id="merchantId"  style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -112,10 +114,15 @@
 </script>
 
 <script type="text/javascript">
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
+
 $("#button").on('click',function(){
-	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantSignList";
+	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantMealList";
 	$("#seachform").submit();
-	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/merchantSignList.html";
+	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/merchantMealList.html";
 });
 </script>
 

+ 8 - 1
src/main/resources/templates/sys/fx/merchantMealOrderList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 	    <li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId"  id="merchantId"    style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -130,6 +132,11 @@
 </script>
 
 <script type="text/javascript">
+
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantMealOrderList";
 	$("#seachform").submit();

+ 7 - 1
src/main/resources/templates/sys/fx/merchantPlatOrderList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 	    <li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId"   id="merchantId"   style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -99,6 +101,10 @@
 </script>
 
 <script type="text/javascript">
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantPlatOrderList";
 	$("#seachform").submit();

+ 8 - 1
src/main/resources/templates/sys/fx/merchantSignList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 	    <li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId" id="merchantId"   style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -101,6 +103,11 @@
 </script>
 
 <script type="text/javascript">
+
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantSignList";
 	$("#seachform").submit();

+ 8 - 1
src/main/resources/templates/sys/fx/merchantSignOrderList.html

@@ -4,6 +4,8 @@
 <script th:include="sys/common/metaCSS" th:remove="tag"></script> 
 <script th:include="sys/common/metaJS" th:remove="tag"></script> 
 <script src="sys/js/My97DatePicker/WdatePicker.js" th:src="@{/static/sys/js/My97DatePicker/WdatePicker.js}"></script>
+<link href="sys/css/jquery.searchableSelect.css" th:href="@{/static/sys/css/jquery.searchableSelect.css}" rel="stylesheet"/>
+<script src="js/layer/layer.js" th:src="@{/static/sys/js/jquery.searchableSelect.js}"></script>
 </head>
 <style>
 	.tablelink{margin-right:10px;}
@@ -30,7 +32,7 @@
 	<ul class="seachform">
 	    <li>
 			<label>所有商户:</label>
-			<select class="scinput select_width"  name="merchantId"   style="width: 150px;" >
+			<select class="scinput select_width"  name="merchantId" id="merchantId"   style="width: 150px;" >
 				<option value="">全部</option>
 				<option th:each="item:${poslist}"  th:selected="${search.get('merchantId') eq item.id ? true : false}" th:value="${item.id}">[[${item.unitName}]]</option>
 			</select>
@@ -119,6 +121,11 @@
 </script>
 
 <script type="text/javascript">
+
+$(function(){
+	$('#merchantId').searchableSelect();
+});
+
 $("#button").on('click',function(){
 	document.getElementById("seachform").action = "[[${sysUrl}]]/sys/fx/exportMerchantSignOrderList";
 	$("#seachform").submit();