wuwen 3 anni fa
parent
commit
ee03b6aa57

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

@@ -163,7 +163,7 @@ dtext{
 				<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>
 			
-			<li th:style="${ #httpSession.getAttribute('admin') !=null && #lists.contains(#httpSession.getAttribute('admin').authorities,'超级管理员角色')  ? ''   : 'display: none' }">
+			<li >
 				<label>上级渠道:<b >*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="parentposcode" id="parentposcode" class="select1" th:disabled="${merchant.id!=null || curMerchant.orgCode ne 'SSJ-FX' ? 'true' : 'false'}" > 

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

@@ -138,7 +138,7 @@ dtext{
 			</li>
 			
 			
-			<li style="display: none">
+			<li>
 				<label>上级渠道:<b >*</b></label>
 				<div class="vocation" style="margin-right: 5px; width: 345px">
 					<select name="parentposcode" id="parentposcode" class="select1" th:disabled="${merchant.id!=null || curMerchant.orgCode ne 'SSJ-FX' ? 'true' : 'false'}" >