用户详情页调整

happy-job-base-system/src/main/webapp/webpage/modules/jfmanager/mpPointsDetailOwnerList.js

@@ -92,10 +92,7 @@ $(document).ready(function() {
 		        field: 'pointType',
 		        title: '变动原因',
 		        sortable: false,
-		        sortName: 'pointType',
-		        formatter:function(value, row , index){
-		        	return jp.getDictLabel(${fns:toJson(fns:getDictList('point_type'))}, value, "-");
-		        }
+		        sortName: 'adjustReason'
 		       
 		    }
             ,{

happy-job-base-system/src/main/webapp/webpage/modules/sys/hpuser/hpUserForm.jsp

@@ -42,7 +42,7 @@
 		});
 		//积分明细
 		function jifenDetail(id) {
-            jp.openViewDialog('积分明细', "${ctx}/jfmanager/mpPointsDetail/pointDetail?hpMember.id=" + id , '800px', '620px');
+            jp.openViewDialog('积分明细', "${ctx}/jfmanager/mpPointsDetail/pointDetail?hpMember.id=" + id , '800px', '600px');
         }
         //积分调整
         function jifenAdjust(id) {
@@ -97,14 +97,21 @@
 								<label class="col-sm-3 control-label">当前积分：</label>
 								<div class="col-sm-7">
 										${hpMember.mpMemberAccountF.pointsBalance!= null?hpMember.mpMemberAccountF.pointsBalance:0}&nbsp;&nbsp;&nbsp;&nbsp;
-										<a onclick="jifenDetail(${hpMember.id})">积分明细</a>&nbsp;&nbsp;|&nbsp;&nbsp;<a onclick="jifenAdjust(${hpMember.id})">积分调整</a>
+										<shiro:hasPermission name="pointmanager:mpPointDetail:detail">
+											<a onclick="jifenDetail(${hpMember.id})">积分明细</a>
+										</shiro:hasPermission>
+										<shiro:hasPermission name="pointmanager:mpPointDetail:adjust">
+										&nbsp;&nbsp;|&nbsp;&nbsp;<a onclick="jifenAdjust(${hpMember.id})">积分调整</a>
+										</shiro:hasPermission>
 								</div>
 							</div>
 							<div class="form-group col-sm-4">
 								<label class="col-sm-3 control-label">钱包余额：</label>
 								<div class="col-sm-7">
 										${hpMember.mpMemberAccountF.moneyBalance!= null?hpMember.mpMemberAccountF.moneyBalance:0}&nbsp;&nbsp;&nbsp;&nbsp;
+										<shiro:hasPermission name="moneymanager:mpMoneyDetail:detail">
 										<a onclick="moneyDetail(${hpMember.id})">余额明细</a>
+										</shiro:hasPermission>
 								</div>
 							</div>
 						</div>