From d6748f01a7263d5f447325ef9c178b0475c4a62f Mon Sep 17 00:00:00 2001
From: leslie52 <zenghao2010@sina.com>
Date: Mon, 15 Aug 2016 15:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9D=83=E9=99=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/webapp/jsp/pms/PmsOperatorResetPwd.jsp    |  8 ++++----
 .../src/main/webapp/jsp/pms/PmsRoleEdit.jsp            | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsOperatorResetPwd.jsp b/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsOperatorResetPwd.jsp
index 93cda6e4..c9a00dab 100644
--- a/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsOperatorResetPwd.jsp
+++ b/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsOperatorResetPwd.jsp
@@ -1,17 +1,17 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@include file="../../common/taglib/taglib.jsp"%>
 <div class="pageContent">
-	<form id="form" method="post" action="pms_resetOperatorPwd.action" class="pageForm required-validate" onsubmit="return validateCallback(this, dialogAjaxDone);">
+	<form id="form" method="post" action="${baseURL}/pms/operator/resetPwd" class="pageForm required-validate" onsubmit="return validateCallback(this, dialogAjaxDone);">
 		<div class="pageFormContent" layoutH="60">
-			<input type="hidden" name="navTabId" value="listPmsOperator">
+			<input type="hidden" name="navTabId" value="czygl">
 			<input type="hidden" name="callbackType" value="closeCurrent">
 			<input type="hidden" name="forwardUrl" value="">
 			
-				<input type="hidden" name="operatorId" value="${operatorId}" />
+				<input type="hidden" name="id" value="${operator.id}" />
 				
 				<div class="unit">
 					<label>操作员登录名：</label>
-					<input type="text" value="${loginName }" readonly="readonly" size="30" />
+					<input type="text" value="${operator.loginName }" readonly="readonly" size="30" />
 				</div>
 				<div class="unit">
 					<label>新密码：</label>
diff --git a/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsRoleEdit.jsp b/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsRoleEdit.jsp
index 5f5b299a..eea166eb 100644
--- a/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsRoleEdit.jsp
+++ b/roncoo-pay-web-boss/src/main/webapp/jsp/pms/PmsRoleEdit.jsp
@@ -3,25 +3,25 @@
 <div class="pageContent">
 	<form id="form" method="post" action="${baseURL}/pms/role/edit" class="pageForm required-validate" onsubmit="return validateCallback(this, dialogAjaxDone);">
 		<div class="pageFormContent" layoutH="60">
-			<input type="hidden" name="navTabId" value="listPmsRole">
+			<input type="hidden" name="navTabId" value="jsgl">
 			<input type="hidden" name="callbackType" value="closeCurrent">
 			<input type="hidden" name="forwardUrl" value="">
 
-			<input type="hidden" name="id" value="${id}">
+			<input type="hidden" name="id" value="${pmsRole.id }">
 
 			<p>
 				<label>角色名称：</label>
-				<input type="text" name="roleName" size="8" cssClass="required" minlength="3" maxlength="90" size="30">
+				<input type="text" name="roleName" cssClass="required" minlength="3" maxlength="90" size="30" value="${pmsRole.roleName }">
 			</p>
 
 			<p>
 				<label>角色编码：</label>
-				<input type="text" name="roleCode" size="8" cssClass="required" minlength="3" maxlength="90" size="30">
+				<input type="text" name="roleCode" cssClass="required" minlength="3" maxlength="90" size="30" value="${pmsRole.roleCode }">
 			</p>
 
 			<p style="height: 50px;">
 				<label>角色描述：</label>
-				<input type="text" name="remark" size="8" cssClass="required" minlength="3" maxlength="90" size="30">
+				<textarea rows="5" cols="27" name="remark" class="required" minlength="3" maxlength="300">${pmsRole.remark }</textarea>
 			</p>
 
 		</div>