Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r37461 -r37676
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 37461)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 37676)
@@ -5540,4 +5540,65 @@
             combo.setValue(combo.getCheckedValue());
         }
     }
+}
+
+//ZSRY-72：增加密码设置要求提示语
+function getModifyPwdMsg(){
+    var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd;
+
+	var msg = '';
+
+	if (!isUndefinedOrNullOrEmpty(pwdConfig)) {
+		var minPwdLength = pwdConfig.minPwdLength;
+		var containLetter = pwdConfig.containLetter;
+		var containUppercaseLetter = pwdConfig.containUppercaseLetter;
+		var containLowerCaseLetter = pwdConfig.containLowerCaseLetter;
+		var containSpecialChar = pwdConfig.containSpecialChar;
+		var containNumber = pwdConfig.containNumber;
+		var passwordNotContainLoginName = pwdConfig.passwordNotContainLoginName;
+		//密码复杂度要求1，该要求包含以下三类字符中的二类字符:(QYSRMYY-27)
+		var passwordComplexityReq1 = pwdConfig.passwordComplexityReq1;
+		//密码复杂度要求2，该要求包含以下四类字符中的三类字符:(QYSRMYY-27)
+		var windowsPasswordComplexityReq = pwdConfig.windowsPasswordComplexityReq;
+
+		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
+
+		msg = "密码至少需要"+ minPwdLength +"个字符";
+		if(windowsPasswordComplexityReq){
+			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
+		}else if(passwordComplexityReq1){
+			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
+		}else {
+			if(containUppercaseLetter && containLowerCaseLetter){
+				msg += '，需要包含大小写字母';
+			}else if(containUppercaseLetter){
+				msg += '，需要包含大写字母';
+			}else if(containLowerCaseLetter){
+				msg += '，需要包含小写字母';
+			}else if(containLetter){
+				msg += '，需要包含字母';
+			}
+			if(containUppercaseLetter || containLowerCaseLetter || containLetter){
+				if(containSpecialChar){
+					msg += '、特殊字符';
+				}
+				if(containNumber){
+					msg += '、数字';
+				}
+			}else {
+				if(containSpecialChar){
+					msg += '，需要包含特殊字符';
+					if(containNumber){
+						msg += '、数字';
+					}
+				}else {
+					if(containNumber){
+						msg += '，需要包含数字';
+					}
+				}
+			}
+		}
+	}
+
+    return msg;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js
===================================================================
diff -u -r37659 -r37676
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 37659)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByExt.js	(.../showModifyPWDWindowByExt.js)	(revision 37676)
@@ -2,62 +2,8 @@
 //	Ext.QuickTips.init();
 
 	//ZSRY-72：增加密码设置要求提示语
-	var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd;
+	var msg = getModifyPwdMsg();
 
-	var msg = '';
-
-	if (!isUndefinedOrNullOrEmpty(pwdConfig)) {
-		var minPwdLength = pwdConfig.minPwdLength;
-		var containLetter = pwdConfig.containLetter;
-		var containUppercaseLetter = pwdConfig.containUppercaseLetter;
-		var containLowerCaseLetter = pwdConfig.containLowerCaseLetter;
-		var containSpecialChar = pwdConfig.containSpecialChar;
-		var containNumber = pwdConfig.containNumber;
-		var passwordNotContainLoginName = pwdConfig.passwordNotContainLoginName;
-		//密码复杂度要求1，该要求包含以下三类字符中的二类字符:(QYSRMYY-27)
-		var passwordComplexityReq1 = pwdConfig.passwordComplexityReq1;
-		//密码复杂度要求2，该要求包含以下四类字符中的三类字符:(QYSRMYY-27)
-		var windowsPasswordComplexityReq = pwdConfig.windowsPasswordComplexityReq;
-
-		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
-
-		msg = "密码至少需要"+ minPwdLength +"个字符";
-		if(windowsPasswordComplexityReq){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
-		}else if(passwordComplexityReq1){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
-		}else {
-			if(containUppercaseLetter && containLowerCaseLetter){
-				msg += '，需要包含大小写字母';
-			}else if(containUppercaseLetter){
-				msg += '，需要包含大写字母';
-			}else if(containLowerCaseLetter){
-				msg += '，需要包含小写字母';
-			}else if(containLetter){
-				msg += '，需要包含字母';
-			}
-			if(containUppercaseLetter || containLowerCaseLetter || containLetter){
-				if(containSpecialChar){
-					msg += '、特殊字符';
-				}
-				if(containNumber){
-					msg += '、数字';
-				}
-			}else {
-				if(containSpecialChar){
-					msg += '，需要包含特殊字符';
-					if(containNumber){
-						msg += '、数字';
-					}
-				}else {
-					if(containNumber){
-						msg += '，需要包含数字';
-					}
-				}
-			}
-		}
-	}
-
 	var formObj = new Ext.FormPanel({
 		labelAlign : 'left',
 		frame : true,
Index: ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js
===================================================================
diff -u -r37659 -r37676
--- ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 37659)
+++ ssts-web/src/main/webapp/systemmanage/adminModifyPWDByExt.js	(.../adminModifyPWDByExt.js)	(revision 37676)
@@ -64,62 +64,8 @@
     Ext.QuickTips.init();
 
     //ZSRY-72：增加密码设置要求提示语
-	var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd;
+	var msg = getModifyPwdMsg();
 
-	var msg = '';
-
-	if (!isUndefinedOrNullOrEmpty(pwdConfig)) {
-		var minPwdLength = pwdConfig.minPwdLength;
-		var containLetter = pwdConfig.containLetter;
-		var containUppercaseLetter = pwdConfig.containUppercaseLetter;
-		var containLowerCaseLetter = pwdConfig.containLowerCaseLetter;
-		var containSpecialChar = pwdConfig.containSpecialChar;
-		var containNumber = pwdConfig.containNumber;
-		var passwordNotContainLoginName = pwdConfig.passwordNotContainLoginName;
-		//密码复杂度要求1，该要求包含以下三类字符中的二类字符:(QYSRMYY-27)
-		var passwordComplexityReq1 = pwdConfig.passwordComplexityReq1;
-		//密码复杂度要求2，该要求包含以下四类字符中的三类字符:(QYSRMYY-27)
-		var windowsPasswordComplexityReq = pwdConfig.windowsPasswordComplexityReq;
-
-		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
-
-		msg = "密码至少需要"+ minPwdLength +"个字符";
-		if(windowsPasswordComplexityReq){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
-		}else if(passwordComplexityReq1){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
-		}else {
-			if(containUppercaseLetter && containLowerCaseLetter){
-				msg += '，需要包含大小写字母';
-			}else if(containUppercaseLetter){
-				msg += '，需要包含大写字母';
-			}else if(containLowerCaseLetter){
-				msg += '，需要包含小写字母';
-			}else if(containLetter){
-				msg += '，需要包含字母';
-			}
-			if(containUppercaseLetter || containLowerCaseLetter || containLetter){
-				if(containSpecialChar){
-					msg += '、特殊字符';
-				}
-				if(containNumber){
-					msg += '、数字';
-				}
-			}else {
-				if(containSpecialChar){
-					msg += '，需要包含特殊字符';
-					if(containNumber){
-						msg += '、数字';
-					}
-				}else {
-					if(containNumber){
-						msg += '，需要包含数字';
-					}
-				}
-			}
-		}
-	}
-
     formObj = new Ext.FormPanel({
         frame:true,
         labelWidth:70,
Index: ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js
===================================================================
diff -u -r31392 -r37676
--- ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 31392)
+++ ssts-web/src/main/webapp/personalSetting/showModifyPWDWindowByUnmodified.js	(.../showModifyPWDWindowByUnmodified.js)	(revision 37676)
@@ -1,4 +1,7 @@
 function showModifyPWDWindowByUnmodified() {
+	//ZSRY-72：增加密码设置要求提示语
+	var msg = getModifyPwdMsg();
+
 	var formObj = new Ext.FormPanel({
 		labelAlign : 'left',
 		frame : true,
@@ -36,6 +39,33 @@
 			allowBlank : false,
 			blankText : '请输入确认新密码！',
 			msgTarget : 'side'
+		}, {
+			xtype : 'textfield',
+			fieldLabel : '确认新密码',
+			inputType : 'password',
+			name : 'confirmNewPassword',
+			id : 'confirmNewPassword',
+			width : 250,
+			allowBlank : false,
+			blankText : '请输入确认新密码！',
+			msgTarget : 'side'
+		}, {
+			items:[{
+				hidden:msg == ''?true:false,
+				layout:'column', 
+				items:[{
+					id:'showPwdMessage',
+					xtype:'textfield',
+					width : 390,
+					allowBlank : true,
+					labelSeparator:'',
+					labelWidth:0,
+					anchor: '99%',
+					readOnly : true,
+					cls : 'fieldReadOnlyNoRemove',
+					value: msg
+				}]
+			}]
 		}],
 
 		buttons : [{
@@ -111,7 +141,7 @@
 		layout : 'fit',
 		title : '修改密码',
 		width : 410,
-		height : 180,
+		height : 190,
 		modal : true,
 		border : false,
 		plain : true,
@@ -147,5 +177,7 @@
 	
 	window.show();
 	top.Ext.getCmp("oldPassword").focus(false, 100);
-
+	if(msg !== ''){
+		top.Ext.getCmp('showPwdMessage').el.dom.style.color = 'red';
+	}
 }
Index: ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js
===================================================================
diff -u -r37659 -r37676
--- ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 37659)
+++ ssts-web/src/main/webapp/personalSetting/modifyPWDByExt.js	(.../modifyPWDByExt.js)	(revision 37676)
@@ -3,61 +3,7 @@
     Ext.QuickTips.init();
 
     //ZSRY-72：增加密码设置要求提示语
-	var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd;
-
-	var msg = '';
-
-	if (!isUndefinedOrNullOrEmpty(pwdConfig)) {
-		var minPwdLength = pwdConfig.minPwdLength;
-		var containLetter = pwdConfig.containLetter;
-		var containUppercaseLetter = pwdConfig.containUppercaseLetter;
-		var containLowerCaseLetter = pwdConfig.containLowerCaseLetter;
-		var containSpecialChar = pwdConfig.containSpecialChar;
-		var containNumber = pwdConfig.containNumber;
-		var passwordNotContainLoginName = pwdConfig.passwordNotContainLoginName;
-		//密码复杂度要求1，该要求包含以下三类字符中的二类字符:(QYSRMYY-27)
-		var passwordComplexityReq1 = pwdConfig.passwordComplexityReq1;
-		//密码复杂度要求2，该要求包含以下四类字符中的三类字符:(QYSRMYY-27)
-		var windowsPasswordComplexityReq = pwdConfig.windowsPasswordComplexityReq;
-
-		minPwdLength = isUndefinedOrNullOrEmpty(minPwdLength) ? 6 : minPwdLength;
-
-		msg = "密码至少需要"+ minPwdLength +"个字符";
-		if(windowsPasswordComplexityReq){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的三项；";
-		}else if(passwordComplexityReq1){
-			msg = "密码至少需要"+ minPwdLength +"个字符，需要包含大小写字母、数字、特殊字符中的两项；";
-		}else {
-			if(containUppercaseLetter && containLowerCaseLetter){
-				msg += '，需要包含大小写字母';
-			}else if(containUppercaseLetter){
-				msg += '，需要包含大写字母';
-			}else if(containLowerCaseLetter){
-				msg += '，需要包含小写字母';
-			}else if(containLetter){
-				msg += '，需要包含字母';
-			}
-			if(containUppercaseLetter || containLowerCaseLetter || containLetter){
-				if(containSpecialChar){
-					msg += '、特殊字符';
-				}
-				if(containNumber){
-					msg += '、数字';
-				}
-			}else {
-				if(containSpecialChar){
-					msg += '，需要包含特殊字符';
-					if(containNumber){
-						msg += '、数字';
-					}
-				}else {
-					if(containNumber){
-						msg += '，需要包含数字';
-					}
-				}
-			}
-		}
-	}
+	var msg = getModifyPwdMsg();
     
     var formObj = new Ext.FormPanel({
         labelAlign: 'left',