|
|
@@ -21,7 +21,7 @@ $(document).ready(function() {
|
|
|
if ($("#qzd").val() != "") {
|
|
|
dd = $("#qzd").val();
|
|
|
}
|
|
|
- inittAreaable($("#month_date").val(), $("#qzd").val(),$("#qzdpeople").val());
|
|
|
+ inittAreaable($("#month_date").val(), $("#qzd").val());
|
|
|
|
|
|
initselecttable();
|
|
|
|
|
|
@@ -52,7 +52,6 @@ function initselecttable() {
|
|
|
}
|
|
|
|
|
|
function reloadtable() {
|
|
|
-
|
|
|
$('#selected_table').datagrid({
|
|
|
dataSource: selectedData,
|
|
|
states: { fixedTopUntil: 0 },
|
|
|
@@ -64,22 +63,21 @@ function reloadtable() {
|
|
|
var layindex = null;
|
|
|
var taskMap = new HashMap();
|
|
|
|
|
|
-function inittAreaable(time, dept, people) {
|
|
|
+function inittAreaable(time, dept) {
|
|
|
layindex = layer.load(0, { shade: false });
|
|
|
var t = time.replace("/", "-") + "";
|
|
|
var endtime = moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss");
|
|
|
var starttime = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
|
|
|
|
|
|
-
|
|
|
- var param1 = { "startTime":new Date(starttime), "endTime": new Date(endtime), "dept": dept }
|
|
|
+ var param1 = { "startTime": new Date(starttime), "endTime": new Date(endtime), "dept": dept }
|
|
|
post_common_service("/q/record/getall/0/0", param1, function(taskdata) {
|
|
|
taskMap = new HashMap();
|
|
|
recordlist = taskdata;
|
|
|
taskdata.forEach(t => {
|
|
|
var user = t.users.split(",");
|
|
|
- for(var i=0;i<user.length;i++){
|
|
|
- var key = user[i]+"_"+moment(t.received_time).format("YYYY-MM-DD");
|
|
|
- if (taskMap.get(key) != null) {
|
|
|
+ for (var i = 0; i < user.length; i++) {
|
|
|
+ var key = user[i] + "_" + moment(t.received_time).format("YYYY-MM-DD");
|
|
|
+ if (taskMap.get(key) != null) {
|
|
|
var list = taskMap.get(key);
|
|
|
list.push(t);
|
|
|
taskMap.set(key, list);
|
|
|
@@ -88,168 +86,35 @@ function inittAreaable(time, dept, people) {
|
|
|
list.push(t);
|
|
|
taskMap.set(key, list);
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
});
|
|
|
-
|
|
|
var userData = {
|
|
|
"organid": dept
|
|
|
- }
|
|
|
- UserGetList(userData, function(redata) {
|
|
|
- layer.close(layer.index);
|
|
|
- var data ;
|
|
|
- var people = $("#qzdpeople").val();
|
|
|
- if( people != "全部"){
|
|
|
- for(var i in redata){
|
|
|
- if(people == redata[i].id){
|
|
|
- data = new Array();
|
|
|
- data[0]=redata[i];
|
|
|
- }
|
|
|
- }
|
|
|
- }else{
|
|
|
- data = redata;
|
|
|
- rowsDate = redata;
|
|
|
- }
|
|
|
- // checkuserlist = redata.checkusers;
|
|
|
- var datac = { cols: [], array: [] };
|
|
|
-
|
|
|
- var days = endtime.diff(starttime, 'days');
|
|
|
-
|
|
|
- datac.cols.push({ width: 120, name: 'type', label: "", });
|
|
|
-
|
|
|
- for (var i = 1; i <= days; i++) {
|
|
|
- var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
|
|
|
- var currentday = temp.add(i, "day");
|
|
|
- var day = currentday.date();
|
|
|
- datac.cols.push({ width: 80, name: "day_" + i, label: currentday.format("MM-DD"), html: true, className: "table_content" });
|
|
|
- }
|
|
|
- // arealist = data;
|
|
|
- stimemonth = time;
|
|
|
- var timedate = [
|
|
|
- {},
|
|
|
- ]
|
|
|
- var dataconfigs = {
|
|
|
- C1: { className: "datagrid-cell-index", style: { 'text-align': 'center', } },
|
|
|
- R0: { style: { 'text-align': 'center', 'line-height': '36px' } }
|
|
|
- }
|
|
|
- var row = 1;
|
|
|
- for (var index in rowsDate) {
|
|
|
- var people = rowsDate[index];
|
|
|
- var data_table = {};
|
|
|
- data_table.type = people.truename;
|
|
|
- var maxsize = 0;
|
|
|
- for (var i = 1; i <= days; i++) {
|
|
|
- //内容
|
|
|
- var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
|
|
|
- var currentday = temp.add(i, "day");
|
|
|
- var key = people.id + "_" + currentday.format("YYYY-MM-DD");
|
|
|
- var temphtml = "";
|
|
|
- if(taskMap.get(key) != null){
|
|
|
- if(taskMap.get(key).length > maxsize){
|
|
|
- maxsize = taskMap.get(key).length;
|
|
|
- }
|
|
|
- for(var k in taskMap.get(key)){
|
|
|
- var record = taskMap.get(key)[k];
|
|
|
- var stime = moment(record.received_time).format("HH:mm");
|
|
|
- var etime = moment(record.back_time).format("HH:mm");
|
|
|
- if(record.check_status == 2){
|
|
|
- temphtml = temphtml+'<div class="" data-toggle="buttons" id="div_' + people.id+ '_' + i + '" >' +
|
|
|
- '<label class="btn btn-info3" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
|
|
|
- '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + people.id+'_' + i +'_'+k+'">'+stime+'-'+etime+
|
|
|
- '</label>'+
|
|
|
- "</div>";
|
|
|
- }else{
|
|
|
- temphtml = temphtml+'<div class="" data-toggle="buttons" id="div_' + people.id+ '_' + i + '" >' +
|
|
|
- '<label class="btn btn-info2" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
|
|
|
- '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + people.id+'_' + i +'_'+k+'">'+stime+'-'+etime+
|
|
|
- '</label>'+
|
|
|
- "</div>";
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //eval("dataconfigs."+dkey+"="+cssValue);
|
|
|
- // if(i == 4 ){
|
|
|
- // temphtml = '<div class="" data-toggle="buttons" id="div_' + people.id + '_' + i + '" >' +
|
|
|
- // '<label class="btn btn-info2" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
|
|
|
- // "10:00-12:00"+
|
|
|
- // '</label>'+
|
|
|
- // "</div>";
|
|
|
- // temphtml = temphtml+'<div class="" data-toggle="buttons" id="div_' + people.id + '_' + i + '" >' +
|
|
|
- // '<label class="btn btn-info2" style="font-size:10px;padding:5%;width:90%;margin:5%">' +
|
|
|
- // '<input type="checkbox" name="options" onchange="selectedTask(this)" id="' + people.id + '_' + i + '"> 10:00-12:00'+
|
|
|
- // '</label>'+
|
|
|
- // "</div>";
|
|
|
- // }else{
|
|
|
- // //不存在稽查
|
|
|
- // temphtml = '<div class="" data-toggle="buttons" id="div_' + people.id + '_' + i + '" >' +
|
|
|
- // // '<label class="btn btn-info2" style="font-size:10px">' +
|
|
|
- // // "10:00-12:00"+
|
|
|
- // // '</label>';
|
|
|
- // "</div>";
|
|
|
- // }
|
|
|
- data_table["day_" + i] = temphtml;
|
|
|
- }
|
|
|
- if(maxsize > 1){
|
|
|
- var dkey = "R"+maxsize;
|
|
|
- var cssValue = {'rowspan': maxsize};
|
|
|
- eval("dataconfigs.R"+row+"="+"{'rowspan': "+maxsize+"}");
|
|
|
- rowsDate.splice(row,0,"无效");
|
|
|
- row = row+1;
|
|
|
- }else{
|
|
|
- row = row+1;
|
|
|
- }
|
|
|
- datac.array.push(data_table);
|
|
|
- }
|
|
|
- if (tabledatagride != null) {
|
|
|
- tabledatagride.dataSource.data = null;
|
|
|
- tabledatagride.setDataSource(datac);
|
|
|
- tabledatagride.setPager(1, datac.array.length, datac.array.length);
|
|
|
- tabledatagride.setConfigs(dataconfigs);
|
|
|
- tabledatagride.render();
|
|
|
- } else {
|
|
|
- $('#table_s').datagrid({
|
|
|
- dataSource: datac,
|
|
|
- states: { fixedLeftUntil: 1, fixedTopUntil: 0 },
|
|
|
- showRowIndex: false,
|
|
|
-
|
|
|
- onRender: function() {
|
|
|
- },
|
|
|
- configs: dataconfigs
|
|
|
- });
|
|
|
- tabledatagride = $('#table_s').data('zui.datagrid');
|
|
|
- }
|
|
|
-
|
|
|
- var jcb = {
|
|
|
- "organid":"29"
|
|
|
- }
|
|
|
- UserGetList(jcb, function(jcbdata) {
|
|
|
- console.log(jcbdata);
|
|
|
- // checkuserlist = jcbdata;
|
|
|
- for (var index in jcbdata) {
|
|
|
- var p = jcbdata[index];
|
|
|
- if(p.roles[0].id == 5){
|
|
|
- p.title = p.truename;
|
|
|
- checkuserlist.push(p);
|
|
|
- }
|
|
|
- }
|
|
|
- console.log(checkuserlist);
|
|
|
-
|
|
|
- if (checkusersselect != null) {
|
|
|
- reset();
|
|
|
- } else {
|
|
|
- checkusersselect = $('#check_users').comboTree({
|
|
|
- source: checkuserlist,
|
|
|
- isMultiple: true
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- });
|
|
|
+ };
|
|
|
+ UserGetList(userData, function(redata) {
|
|
|
+ layer.close(layer.index);
|
|
|
+ var data = redata;
|
|
|
+ rowsDate = redata;
|
|
|
+
|
|
|
+ // checkuserlist = redata.checkusers;
|
|
|
+ var datac = { cols: [], array: [] };
|
|
|
+
|
|
|
+ var days = endtime.diff(starttime, 'days');
|
|
|
+
|
|
|
+ datac.cols.push({ width: 120, name: 'type', label: "", });
|
|
|
+
|
|
|
+ for (var i = 1; i <= days; i++) {
|
|
|
+ var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
|
|
|
+ var currentday = temp.add(i, "day");
|
|
|
+ var day = currentday.date();
|
|
|
+ datac.cols.push({ width: 80, name: "day_" + i, label: currentday.format("MM-DD"), html: true, className: "table_content" });
|
|
|
+ }
|
|
|
});
|
|
|
});
|
|
|
}
|
|
|
|
|
|
-function setdatagrid(){
|
|
|
-
|
|
|
+function setdatagrid() {
|
|
|
+
|
|
|
}
|
|
|
|
|
|
function reset() {
|
|
|
@@ -279,7 +144,7 @@ function reset() {
|
|
|
|
|
|
function selectedTask(obj) {
|
|
|
changeListItem(obj.id);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
|
|
|
function removeListItem(obj) {
|
|
|
@@ -294,43 +159,43 @@ function changeListItem(id) {
|
|
|
var cobj;
|
|
|
var tempids = id.split("_");
|
|
|
var t = stimemonth.replace("/", "-") + "";
|
|
|
- var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
|
|
|
- var currentday = temp.add(tempids[1], "day");
|
|
|
- var taskMapid = tempids[0]+"_"+currentday.format("YYYY-MM-DD");
|
|
|
+ var temp = moment(moment(t + "-25T23:00:00", "YYYY-MM-DD HH:mm:ss").subtract(1, 'month'));
|
|
|
+ var currentday = temp.add(tempids[1], "day");
|
|
|
+ var taskMapid = tempids[0] + "_" + currentday.format("YYYY-MM-DD");
|
|
|
var cpeople;
|
|
|
- for(var index in rowsDate){
|
|
|
- var obj = rowsDate[index];
|
|
|
- if(obj.id == tempids[0]){
|
|
|
- cpeople = obj;
|
|
|
- // truename = obj.truename;
|
|
|
- }
|
|
|
+ for (var index in rowsDate) {
|
|
|
+ var obj = rowsDate[index];
|
|
|
+ if (obj.id == tempids[0]) {
|
|
|
+ cpeople = obj;
|
|
|
+ // truename = obj.truename;
|
|
|
+ }
|
|
|
}
|
|
|
- for(var i in recordlist){
|
|
|
- if(taskMap.get(taskMapid)[id.split("_")[2]].id == recordlist[i].id){
|
|
|
- cobj = recordlist[i];
|
|
|
+ for (var i in recordlist) {
|
|
|
+ if (taskMap.get(taskMapid)[id.split("_")[2]].id == recordlist[i].id) {
|
|
|
+ cobj = recordlist[i];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
if ($("#" + id).prop('checked')) {
|
|
|
- activteChange(cobj,tempids);
|
|
|
- addlisttable(cobj, taskMapid,id);
|
|
|
+ activteChange(cobj, tempids);
|
|
|
+ addlisttable(cobj, taskMapid, id);
|
|
|
} else {
|
|
|
- activteRemove(cobj,tempids);
|
|
|
+ activteRemove(cobj, tempids);
|
|
|
removelisttable(cobj, currentday.format("YYYY-MM-DD"));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
-function addlisttable(people, id,arryid) {
|
|
|
+function addlisttable(people, id, arryid) {
|
|
|
var dept_info = null;
|
|
|
id = trim(id);
|
|
|
var time = id.split("_")[1];
|
|
|
- var record = taskMap.get(id)[arryid.split("_")[2]];
|
|
|
+ var record = taskMap.get(id)[arryid.split("_")[2]];
|
|
|
var date = moment(record.received_time).format("MM/DD");
|
|
|
var stime = moment(record.received_time).format("HH:mm");
|
|
|
- var etime = moment(record.back_time).format("HH:mm");
|
|
|
+ var etime = moment(record.back_time).format("HH:mm");
|
|
|
var btn = '<button class="btn btn-primary" type="button" onclick="removeListItem(this)" id="delete_' + arryid + '">删除</button>';
|
|
|
- selectedData.array.push({"name": people.userNames, "car": date+' '+stime+"-"+etime+record.car_info+"清障任务", "option": btn, peopleinfo:people,time:time});
|
|
|
+ selectedData.array.push({ "name": people.userNames, "car": date + ' ' + stime + "-" + etime + record.car_info + "清障任务", "option": btn, peopleinfo: people, time: time });
|
|
|
|
|
|
var myDataGrid = $('#selected_table').data('zui.datagrid');
|
|
|
myDataGrid.dataSource.data = null;
|
|
|
@@ -342,14 +207,14 @@ function addlisttable(people, id,arryid) {
|
|
|
// $('#selected_table').data('zui.datagrid').renderData();
|
|
|
}
|
|
|
|
|
|
-function removelisttable(people,time) {
|
|
|
- for (var index in selectedData.array) {
|
|
|
- var o = selectedData.array[index];
|
|
|
- if (o != null && o.peopleinfo.id == people.id && time.format("YYYY-MM-DD") == o.time) {
|
|
|
- selectedData.array.splice(index, 1);
|
|
|
- }
|
|
|
- }
|
|
|
- var myDataGrid = $('#selected_table').data('zui.datagrid');
|
|
|
+function removelisttable(people, time) {
|
|
|
+ for (var index in selectedData.array) {
|
|
|
+ var o = selectedData.array[index];
|
|
|
+ if (o != null && o.peopleinfo.id == people.id && time.format("YYYY-MM-DD") == o.time) {
|
|
|
+ selectedData.array.splice(index, 1);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ var myDataGrid = $('#selected_table').data('zui.datagrid');
|
|
|
myDataGrid.dataSource.data = null;
|
|
|
myDataGrid.setDataSource(selectedData);
|
|
|
myDataGrid.setPager(1, selectedData.array.length, selectedData.array.length);
|
|
|
@@ -361,7 +226,7 @@ function removelisttable(people,time) {
|
|
|
|
|
|
|
|
|
function search() {
|
|
|
- inittAreaable($("#month_date").val(), $("#qzd").val(),$("#qzdpeople").val());
|
|
|
+ inittAreaable($("#month_date").val(), $("#qzd").val());
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -380,7 +245,7 @@ function addTask() {
|
|
|
var count = tasklist.length / check_user_list.length;
|
|
|
var u_index = 0;
|
|
|
var index = 0;
|
|
|
- for(var i in tasklist){
|
|
|
+ for (var i in tasklist) {
|
|
|
var obj = tasklist[i];
|
|
|
if (index++ == count) {
|
|
|
u_index++;
|
|
|
@@ -388,22 +253,22 @@ function addTask() {
|
|
|
u_index--;
|
|
|
}
|
|
|
}
|
|
|
- var param = {
|
|
|
- "name": obj.car,
|
|
|
- "check_status": 2,
|
|
|
- "start_time" :moment(obj.peopleinfo.received_time).format("YYYY-MM-DD HH:mm:ss"),
|
|
|
- "end_time" : moment(obj.peopleinfo.back_time).format("YYYY-MM-DD HH:mm:ss"),
|
|
|
- "checked_dept": obj.peopleinfo.dept,
|
|
|
- "checkman" : parseInt(check_user_list[u_index]),
|
|
|
- "record_id" : parseInt(obj.peopleinfo.id),
|
|
|
- "checked_users" : obj.peopleinfo.users,
|
|
|
- "rule_id" : 6
|
|
|
- }
|
|
|
- console.log(param);
|
|
|
- post_common_service('/q/task/add', param, function(redata) {
|
|
|
- layer.msg('已添加', { icon: 1 });
|
|
|
- //inittAreaable($("#month_date").val(), $("#qzd").val());
|
|
|
- });
|
|
|
+ var param = {
|
|
|
+ "name": obj.car,
|
|
|
+ "check_status": 2,
|
|
|
+ "start_time": moment(obj.peopleinfo.received_time).format("YYYY-MM-DD HH:mm:ss"),
|
|
|
+ "end_time": moment(obj.peopleinfo.back_time).format("YYYY-MM-DD HH:mm:ss"),
|
|
|
+ "checked_dept": obj.peopleinfo.dept,
|
|
|
+ "checkman": parseInt(check_user_list[u_index]),
|
|
|
+ "record_id": parseInt(obj.peopleinfo.id),
|
|
|
+ "checked_users": obj.peopleinfo.users,
|
|
|
+ "rule_id": 6
|
|
|
+ }
|
|
|
+ console.log(param);
|
|
|
+ post_common_service('/q/task/add', param, function(redata) {
|
|
|
+ layer.msg('已添加', { icon: 1 });
|
|
|
+ //inittAreaable($("#month_date").val(), $("#qzd").val());
|
|
|
+ });
|
|
|
}
|
|
|
// post_common_service('/f/task/add', param, function(redata) {
|
|
|
// // layer.msg('已添加', { icon: 1 });
|
|
|
@@ -413,43 +278,35 @@ function addTask() {
|
|
|
|
|
|
}
|
|
|
|
|
|
-function getpeople(){
|
|
|
+function getpeople() {
|
|
|
var orginid = $("#qzd").val();
|
|
|
var userData = {
|
|
|
"organid": orginid
|
|
|
}
|
|
|
- UserGetList(userData, function(data) {
|
|
|
- var opstr ='<option>全部</option>';
|
|
|
- for(var i in data){
|
|
|
- opstr += "<option value='"+data[i].id+"'>"+data[i].truename+"</option>";
|
|
|
- }
|
|
|
- $(qzdpeople).html('');
|
|
|
- $(qzdpeople).html(opstr);
|
|
|
- });
|
|
|
}
|
|
|
|
|
|
-function activteChange(cobj,tempids){
|
|
|
+function activteChange(cobj, tempids) {
|
|
|
var usersids = cobj.users.split(",");
|
|
|
- if(usersids.length >1){
|
|
|
- for(var j in usersids){
|
|
|
- var objid = usersids[j]+"_"+tempids[1]+"_"+tempids[2];
|
|
|
- if($("#" + objid).prop('checked') == false){
|
|
|
- $("#" + objid).parent().addClass("active");
|
|
|
- $("#" + objid).prop("checked", true);
|
|
|
- }
|
|
|
- }
|
|
|
+ if (usersids.length > 1) {
|
|
|
+ for (var j in usersids) {
|
|
|
+ var objid = usersids[j] + "_" + tempids[1] + "_" + tempids[2];
|
|
|
+ if ($("#" + objid).prop('checked') == false) {
|
|
|
+ $("#" + objid).parent().addClass("active");
|
|
|
+ $("#" + objid).prop("checked", true);
|
|
|
+ }
|
|
|
}
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
-function activteRemove(cobj,tempids){
|
|
|
+function activteRemove(cobj, tempids) {
|
|
|
var usersids = cobj.users.split(",");
|
|
|
- if(usersids.length >1){
|
|
|
- for(var j in usersids){
|
|
|
- var objid = usersids[j]+"_"+tempids[1]+"_"+tempids[2];
|
|
|
- if($("#" + objid).prop('checked')){
|
|
|
- $("#" + objid).parent().removeClass("active");
|
|
|
- $("#" + objid).prop("checked", false);
|
|
|
- }
|
|
|
- }
|
|
|
+ if (usersids.length > 1) {
|
|
|
+ for (var j in usersids) {
|
|
|
+ var objid = usersids[j] + "_" + tempids[1] + "_" + tempids[2];
|
|
|
+ if ($("#" + objid).prop('checked')) {
|
|
|
+ $("#" + objid).parent().removeClass("active");
|
|
|
+ $("#" + objid).prop("checked", false);
|
|
|
+ }
|
|
|
}
|
|
|
-}
|
|
|
+ }
|
|
|
+}
|