Index: ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js
===================================================================
diff -u -r28348 -r34760
--- ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 28348)
+++ ssts-web/src/main/webapp/disinfectsystem/schedule/scheduleDefinition.js	(.../scheduleDefinition.js)	(revision 34760)
@@ -3,6 +3,15 @@
     var handlerDepartmentStore;
     var handlerDepartment_select;
     var scheduleDefinitions;
+    $.fn.selectpicker.defaults = {
+      noneSelectedText: '没有选中任何项',
+      noneResultsText: '没有找到匹配项',
+      countSelectedText: '选中{1}中的{0}项',
+      maxOptionsText: ['超出限制 (最多选择{n}项)', '组选择超出限制(最多选择{n}组)'],
+      multipleSeparator: ',',
+      selectAllText: '全选', // 新增
+      deselectAllText: '全不选', // 新增
+    };
     
 //【列表--加载内容】
 loadTable();
@@ -30,6 +39,12 @@
       	 var startWorkingTime=$("#startWorkTime_input").val();
       	 var orgUnitCode=$("#select_department").val();
       	 var remark=$("#remarks").val();
+         var roleArray=$("#select_roleNames").val();
+         if(roleArray.length == 0){
+          roleIds = '';
+         }else {
+          roleIds = roleArray.join(',');
+         }
       	 if(isUndefinedOrNullOrEmpty(scheduleDefinitions)){
       		scheduleDefinitions=getAllScheduleDefinition();
       	 }
@@ -56,7 +71,7 @@
   	    	 $.ajax({
       			 url:WWWROOT + '/disinfectSystem/scheduleDefinitionController/saveOrUpdateScheduleDefinition.mhtml?time='+new Date().getTime(),
       			 contentType:"application/json;charset=utf-8",
-      			 data:JSON.stringify(new scheduleDefinition(id,sheduleName,endWorkingTime,startWorkingTime,orgUnitCode,remark)),
+      			 data:JSON.stringify(new scheduleDefinition(id,sheduleName,endWorkingTime,startWorkingTime,orgUnitCode,remark,roleIds)),
       			 type:'post',
       			 async:false,
       			 traditional: true,//这里设置为true
@@ -89,6 +104,7 @@
 //【新增】--begin
       $("#btn_add").click(function(){
     	  loadAndApendHandlerDepart(handlerDepartmentStore,handlerDepartment_select);
+        loadRoleNames();
     	  $("#myModalLabel").text("添加班次定义");
 	      $('#myModal').modal('show');
       });
@@ -98,6 +114,7 @@
       $("#btn_edit").click(function(){
     	 loadAndApendHandlerDepart(handlerDepartmentStore,handlerDepartment_select);
      	 var selected=$('#handoverTable').bootstrapTable('getSelections');
+       loadRoleNames(selected[0].roleIds);
      	 if(selected.length==0){
      		 alert("请选择要编辑的内容!");
      	 }else if(selected.length>1){
@@ -178,13 +195,14 @@
 
 
 
-function scheduleDefinition(id,sheduleName,endWorkingTime,startWorkingTime,orgUnitCode,remark){
+function scheduleDefinition(id,sheduleName,endWorkingTime,startWorkingTime,orgUnitCode,remark,roleIds){
 	 this.id=id;
 	 this.sheduleName=sheduleName;
 	 this.endWorkingTime=endWorkingTime;
 	 this.startWorkingTime=startWorkingTime;
 	 this.orgUnitCode=orgUnitCode;
 	 this.remark=remark;
+   this.roleIds = roleIds;
 }
 
 
@@ -205,6 +223,21 @@
  	return handlerDpertmentStore;
 }
 
+//获取角色列表
+function getRoleStore(){
+   var roleStore=[];
+  $.ajax({      
+    url:WWWROOT + '/systemmanage/role/findAllRoles.do',//OrgUnitAction!getCurrentOrgUnit
+    type:'get',
+    dataType:'json',
+    async:false,
+    success:function(msg){
+      roleStore=msg.data;
+    }
+  });
+  return roleStore;
+}
+
 //验证内容是否为null、undefined、''
 function isUndefinedOrNullOrEmpty(value){
 	if(typeof(value) == 'undefined'){
@@ -244,6 +277,29 @@
 	}
 }
 
+//加载添加表单"拥有角色"下拉内容
+function loadRoleNames(ids){
+  $("#select_roleNames").html('');
+  var roleStore = getRoleStore();
+  var idsArr = [];
+  if(ids){
+    var arr = ids.split(',');
+    for (var i = arr.length - 1; i >= 0; i--) {
+      idsArr.push(parseInt(arr[i]))
+    }
+  }
+  for (var i = roleStore.length - 1; i >= 0; i--) {
+    var selectOption = null;
+    if(idsArr.indexOf(roleStore[i].id) == -1){
+      selectOption ="<option value='"+roleStore[i].id+"'>"+roleStore[i].name+"</option>";
+    }else {
+      selectOption ="<option value='"+roleStore[i].id+"' selected>"+roleStore[i].name+"</option>";
+    }
+    $("#select_roleNames").append(selectOption);
+  }
+  $("#select_roleNames").selectpicker('refresh');
+}
+
 //加载班次定义信息
 function getAllScheduleDefinition(){
 	 var scheduleDefinitions=[];
@@ -348,6 +404,11 @@
                                  align : 'center'
                             },
                             {
+                               title : '拥有角色',
+                                 field : 'roleNames',
+                                 align : 'center'
+                            },
+                            {
                                 title : '备注',
                                 field : 'remark',
                                 align : 'left'