|
|
@@ -114,7 +114,11 @@
|
|
|
// $(".thread_charge").append("<th>进口车道"+(i+1)+"</th>");
|
|
|
// }
|
|
|
for (var i = 0; i < entrance_number; i++) {
|
|
|
- $(".thread_charge").append("<th>入口" + (i + 1) + "</th>");
|
|
|
+ if (i == 1 && user_dept_id == 34) {
|
|
|
+ $(".thread_charge").append("<th>入口" + 9 + "</th>");
|
|
|
+ } else {
|
|
|
+ $(".thread_charge").append("<th>入口" + (i + 1) + "</th>");
|
|
|
+ }
|
|
|
}
|
|
|
for (var i = 0; i < exit_number; i++) {
|
|
|
$(".thread_charge").append("<th>出口" + (i + 1) + "</th>");
|
|
|
@@ -238,25 +242,25 @@
|
|
|
date_time();
|
|
|
$("#save_user_class").click(function() {
|
|
|
|
|
|
- getCodeByFlagAndValue("record_class_days",1,function(data){
|
|
|
+ getCodeByFlagAndValue("record_class_days", 1, function(data) {
|
|
|
var days = 1;
|
|
|
- if(data && data.code_name){
|
|
|
+ if (data && data.code_name) {
|
|
|
days = data.code_name;
|
|
|
}
|
|
|
var now_date = moment(nowStr).toDate(); //new Date();
|
|
|
now_date.setDate(now_date.getDate() - days);
|
|
|
- if(now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim()){
|
|
|
+ if (now_date.Format('yyyy-MM-dd') >= $("#save_user_class").data("work_date").trim()) {
|
|
|
tip("不能生成过期的排班");
|
|
|
- return ;
|
|
|
+ return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
var dutyList = [];
|
|
|
var work_date = $("#save_user_class").data("work_date") + "00:00:00";
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
for (var j = 1; j < 4; j++) {
|
|
|
var cache = $(".tr-" + j).data("cache");
|
|
|
-
|
|
|
+
|
|
|
var zhiji_m_id = $(".c-" + j + "_0 select").val();
|
|
|
var station_m_id = $(".c-" + j + "_1 select").val();
|
|
|
var station_m_id1 = null;
|
|
|
@@ -266,21 +270,21 @@
|
|
|
station_m_id1 = 0;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (zhiji_m_id == "" || zhiji_m_id == null || typeof(zhiji_m_id) == "undefined") {
|
|
|
zhiji_m_id = 0;
|
|
|
}
|
|
|
if (station_m_id == "" || station_m_id == null || typeof(station_m_id) == "undefined") {
|
|
|
station_m_id = 0;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
if (user_dept_id == 35) {
|
|
|
station_m_id1 = parseInt(station_m_id1)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
zhiji_m_id = parseInt(zhiji_m_id)
|
|
|
station_m_id = parseInt(station_m_id)
|
|
|
-
|
|
|
+
|
|
|
if (cache) {
|
|
|
var n_c = 2;
|
|
|
if (user_dept_id == 35) {
|
|
|
@@ -295,7 +299,7 @@
|
|
|
start_time = date.Format("yyyy-MM-dd") + " " + classCode[j].start_time + ":00";
|
|
|
}
|
|
|
var end_time = $("#save_user_class").data("work_date") + classCode[j].end_time + ":00";
|
|
|
-
|
|
|
+
|
|
|
var lane_id = $(".tr-" + j + " td select").eq(i).parent().attr('tag');
|
|
|
if (lane_id == null || typeof(lane_id) == "undefined") {
|
|
|
continue;
|
|
|
@@ -312,22 +316,22 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
var list = $(".tr-" + j + " td select").eq(i).data("data");
|
|
|
var obj = { "list": list, "work_date": work_date, "dept_id": cache.dept_id, "user_id": $(".tr-" + j + " td select").eq(i).val(), "class_type": j, "team_id": cache.team_id, "start_time": start_time, "end_time": end_time, "lane": lane_id, "monitor_user_id": m_id };
|
|
|
console.log(obj)
|
|
|
-
|
|
|
+
|
|
|
dutyList.push(obj);
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$("#save_user_class").attr("disabled", "disabled");
|
|
|
-
|
|
|
+
|
|
|
if ($("#save_user_class").data("modify_flag")) {
|
|
|
$("#save_user_class").data("modify_flag", false);
|
|
|
post_common_service("userClass/updateList", dutyList, function(data) {
|
|
|
@@ -339,7 +343,7 @@
|
|
|
})
|
|
|
return;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
post_common_service("userClass/addList", dutyList, function(data) {
|
|
|
tip("添加成功");
|
|
|
$('#add_fee_station').modal('hide');
|
|
|
@@ -727,74 +731,74 @@
|
|
|
});
|
|
|
|
|
|
$("#save_term_class").click(function() {
|
|
|
- getCodeByFlagAndValue("record_class_days",1,function(data){
|
|
|
- var days = 1;
|
|
|
- if(data && data.code_name){
|
|
|
- days = data.code_name;
|
|
|
- }
|
|
|
- var now_date = moment(nowStr).toDate(); //new Date();
|
|
|
- now_date.setDate(now_date.getDate() - days);
|
|
|
- // 判断当前时间和待添加班组时间判断
|
|
|
- // now_date.setDate(now_date.getDate() - 1);
|
|
|
- if(now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim()){
|
|
|
- tip("不能生成过期的排班");
|
|
|
- return ;
|
|
|
- }
|
|
|
+ getCodeByFlagAndValue("record_class_days", 1, function(data) {
|
|
|
+ var days = 1;
|
|
|
+ if (data && data.code_name) {
|
|
|
+ days = data.code_name;
|
|
|
+ }
|
|
|
+ var now_date = moment(nowStr).toDate(); //new Date();
|
|
|
+ now_date.setDate(now_date.getDate() - days);
|
|
|
+ // 判断当前时间和待添加班组时间判断
|
|
|
+ // now_date.setDate(now_date.getDate() - 1);
|
|
|
+ if (now_date.Format('yyyy-MM-dd') >= $("#save_term_class").data("date").trim()) {
|
|
|
+ tip("不能生成过期的排班");
|
|
|
+ return;
|
|
|
+ }
|
|
|
|
|
|
- var data = [];
|
|
|
- for (var i = 0; i < $("select[id*='_term']").length; i++) {
|
|
|
- if ($("select[id*='_term']").eq(i).val() != "") {
|
|
|
+ var data = [];
|
|
|
+ for (var i = 0; i < $("select[id*='_term']").length; i++) {
|
|
|
+ if ($("select[id*='_term']").eq(i).val() != "") {
|
|
|
+
|
|
|
+ // 这边需要转换一下,关于值
|
|
|
+ var team_type_value = 1;
|
|
|
+ if (i == 0) {
|
|
|
+ team_type_value = 3;
|
|
|
+ } else if (i == 1) {
|
|
|
+ team_type_value = 1;
|
|
|
+ } else {
|
|
|
+ team_type_value = 2;
|
|
|
+ }
|
|
|
|
|
|
- // 这边需要转换一下,关于值
|
|
|
- var team_type_value = 1;
|
|
|
- if (i == 0) {
|
|
|
- team_type_value = 3;
|
|
|
- } else if (i == 1) {
|
|
|
- team_type_value = 1;
|
|
|
- } else {
|
|
|
- team_type_value = 2;
|
|
|
- }
|
|
|
+ var start_time = $("#save_term_class").data("date") + " " + classCode[team_type_value].start_time + ":00";
|
|
|
+ if (i == 0) {
|
|
|
+ var date = new Date($("#save_term_class").data("date").replace(/-/, "/"));
|
|
|
+ date.setDate(date.getDate() - 1);
|
|
|
+ start_time = date.Format("yyyy-MM-dd") + " " + classCode[team_type_value].start_time + ":00";
|
|
|
+ }
|
|
|
|
|
|
- var start_time = $("#save_term_class").data("date") + " " + classCode[team_type_value].start_time + ":00";
|
|
|
- if (i == 0) {
|
|
|
- var date = new Date($("#save_term_class").data("date").replace(/-/, "/"));
|
|
|
- date.setDate(date.getDate() - 1);
|
|
|
- start_time = date.Format("yyyy-MM-dd") + " " + classCode[team_type_value].start_time + ":00";
|
|
|
+ var obj = {
|
|
|
+ "class_type": team_type_value,
|
|
|
+ "team_id": $("select[id*='_term']").eq(i).val(),
|
|
|
+ "work_date": $("#save_term_class").data("date") + " 00:00:00",
|
|
|
+ "start_time": start_time,
|
|
|
+ "end_time": $("#save_term_class").data("date") + " " + classCode[team_type_value].end_time + ":00",
|
|
|
+ "dept_id": user_dept_id,
|
|
|
+ "user_type": 1 //表示收费站
|
|
|
+ };
|
|
|
+
|
|
|
+ data.push(obj);
|
|
|
}
|
|
|
-
|
|
|
- var obj = {
|
|
|
- "class_type": team_type_value,
|
|
|
- "team_id": $("select[id*='_term']").eq(i).val(),
|
|
|
- "work_date": $("#save_term_class").data("date") + " 00:00:00",
|
|
|
- "start_time": start_time,
|
|
|
- "end_time": $("#save_term_class").data("date") + " " + classCode[team_type_value].end_time + ":00",
|
|
|
- "dept_id": user_dept_id,
|
|
|
- "user_type": 1 //表示收费站
|
|
|
- };
|
|
|
-
|
|
|
- data.push(obj);
|
|
|
}
|
|
|
- }
|
|
|
- if (data.length == 0) {
|
|
|
- tip("请增加排班!");
|
|
|
- return;
|
|
|
- }
|
|
|
- if ($("#save_term_class").data("modify_flag") != 1) {
|
|
|
- post_common_service("teamClass/add/list", data, function(data) {
|
|
|
- updateCalendar();
|
|
|
- $('#myModal').modal('hide');
|
|
|
- }, function(error) {
|
|
|
- $('#myModal').modal('hide');
|
|
|
- })
|
|
|
- } else {
|
|
|
- post_common_service("teamClass/update/list", data, function(data) {
|
|
|
- updateCalendar();
|
|
|
- $('#myModal').modal('hide');
|
|
|
- }, function(error) {
|
|
|
- $('#myModal').modal('hide');
|
|
|
- })
|
|
|
- }
|
|
|
- })
|
|
|
+ if (data.length == 0) {
|
|
|
+ tip("请增加排班!");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if ($("#save_term_class").data("modify_flag") != 1) {
|
|
|
+ post_common_service("teamClass/add/list", data, function(data) {
|
|
|
+ updateCalendar();
|
|
|
+ $('#myModal').modal('hide');
|
|
|
+ }, function(error) {
|
|
|
+ $('#myModal').modal('hide');
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ post_common_service("teamClass/update/list", data, function(data) {
|
|
|
+ updateCalendar();
|
|
|
+ $('#myModal').modal('hide');
|
|
|
+ }, function(error) {
|
|
|
+ $('#myModal').modal('hide');
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
})
|
|
|
|
|
|
$(".close_btn").click(function() {
|