Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r38356 -r38428 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 38356) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 38428) @@ -1385,7 +1385,7 @@ Array.prototype.contains = function (value) { for (var i = 0; i < this.length; i++) { - if(this[i]){ + if (this[i]) { if (arguments.length == 1) { if (this[i].toString() == value) return true; } else { @@ -2763,13 +2763,17 @@ if (selectedUsersArray && selectedUsersArray.length > 0) { for (var i = 0; i < selectedUsersArray.length; i++) { var userStr = selectedUsersArray[i]; + var id = userStr.split(';')[0]; var name = userStr.split(';')[1]; var fullName = userStr.split(';')[2]; if (params.action == 'principal') { userNames.push(fullName); } else if (params.action == 'leader') { userIds.push("USERID_" + name); userNames.push(fullName); + } else if (params.action == 'examsUsers') { + userIds.push(id); + userNames.push(fullName); } else { userIds.push("USERID_" + name); userNames.push(fullName); @@ -2793,13 +2797,17 @@ if (returnValue && returnValue.length > 0) { for (var i = 0; i < returnValue.length; i++) { var userStr = returnValue[i]; + var id = userStr.split(';')[0]; var name = userStr.split(';')[1]; var fullName = userStr.split(';')[2]; if (params.action == 'principal') { userNames.push(fullName); } else if (params.action == 'leader') { userIds.push("USERID_" + name); userNames.push(fullName); + } else if (params.action == 'examsUsers') { + userIds.push(id); + userNames.push(fullName); } else { userIds.push("USERID_" + name); userNames.push(fullName); @@ -3771,13 +3779,13 @@ } hideMessageBox(false); } else { - if(pageSoure == 'toussePictures'){ + if (pageSoure == 'toussePictures') { for (var i = 0; i < tousses.length; i++) { var toussedef = tousses[i]; toussedef.currentDateTime = currentDateTime; printTousseDefinitionMaterialsInTousseView(toussedef, isPrint); } - }else { + } else { top.Ext.Msg.show({ title: '输入打印份数', msg: '打印份数：', @@ -5417,7 +5425,7 @@ } //获取供应室store -function getSupplyRoomStore(domID,defaultValue) { +function getSupplyRoomStore(domID, defaultValue) { var supplyRoomStore = new Ext.data.SimpleStore({ fields: ['departCode', 'name', 'orgUnitId'] }); @@ -5473,29 +5481,29 @@ if (supplyRoomStore.getCount() > 1) { supplyRoomStore.insert(0, new supplyRoomRecord({ 'departCode': ALL, 'name': ALL, 'orgUnitId': ALL })); } - if(defaultValue){ - if(defaultValue == 'all'){ - if(Ext.getCmp(domID)){ + if (defaultValue) { + if (defaultValue == 'all') { + if (Ext.getCmp(domID)) { Ext.getCmp(domID).setValue('全部'); } - if(top.Ext.getCmp(domID)){ + if (top.Ext.getCmp(domID)) { top.Ext.getCmp(domID).setValue('全部'); } - }else { - if(Ext.getCmp(domID)){ + } else { + if (Ext.getCmp(domID)) { Ext.getCmp(domID).setValue(defaultValue); } - if(top.Ext.getCmp(domID)){ + if (top.Ext.getCmp(domID)) { top.Ext.getCmp(domID).setValue(defaultValue); } } - }else { + } else { //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中) if (currentOrgUnitIsSupplyRoom) { - if(Ext.getCmp(domID)){ + if (Ext.getCmp(domID)) { Ext.getCmp(domID).setValue(currentOrgUnitCoding); } - if(top.Ext.getCmp(domID)){ + if (top.Ext.getCmp(domID)) { top.Ext.getCmp(domID).setValue(currentOrgUnitCoding); } } @@ -5547,71 +5555,71 @@ } //ZSRY-72：增加密码设置要求提示语 -function getModifyPwdMsg(){ +function getModifyPwdMsg() { var pwdConfig = sstsConfig.needBeStrongPwdWhenModifyPwd; - var msg = ''; + 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; + 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; + 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 += '，需要包含数字'; - } - } - } - } - } + 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; } //QYSRMYY-70：新增支持设置默认查询时间 -function getDefaultDate(newDate,queryPeriod){ +function getDefaultDate(newDate, queryPeriod) { var today = new Date(newDate); var targetday_milliseconds = today.getTime(); - if(queryPeriod && queryPeriod > 0 && queryPeriod <= 10000){ + if (queryPeriod && queryPeriod > 0 && queryPeriod <= 10000) { targetday_milliseconds = today.getTime() - 1000 * 60 * 60 * 24 * queryPeriod; } today.setTime(targetday_milliseconds); @@ -5624,5 +5632,5 @@ if (parseInt(tDate) < 10) { tDate = '0' + tDate; } - return tYear + "-" + tMonth + "-" + tDate +' '; + return tYear + "-" + tMonth + "-" + tDate + ' '; } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionForm.js =================================================================== diff -u -r38427 -r38428 --- ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionForm.js (.../examsDefinitionForm.js) (revision 38427) +++ ssts-web/src/main/webapp/disinfectsystem/onlineExams/examsDefinition/examsDefinitionForm.js (.../examsDefinitionForm.js) (revision 38428) @@ -19,7 +19,7 @@ var examDuration = top.Ext4.getCmp('examDuration').getValue(); var isCorrectObj = top.Ext4.getCmp('isCorrect').getValue(); var isCorrect = isCorrectObj.isCorrectValue; - var userIds = top.Ext4.getCmp('userIds').getRawValue(); + var userIds = top.Ext4.getCmp('userIds').getValue(); var examCount = top.Ext4.getCmp('examCount').getValue(); var remark = top.Ext4.getCmp('remark').getValue(); var questionSetId = top.Ext4.getCmp('questionSetId').getValue(); @@ -341,7 +341,7 @@ var params = { userIdsElement: top.Ext4.getCmp('userIds'), userNamesElement: top.Ext4.getCmp('userNames'), - action: 'includeUsers' + action: 'examsUsers' } openSelectUser(params); },