1.维修上报功能添加提示确认信息

王通
1 parent 1deb3207
Showing 6 changed files with 125 additions and 27 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/fcxxwt.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sftz.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/wxsb.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
@@ -134,7 +134,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	 * @throws
 	 */
 	@RequestMapping(value = "/realOutAdjust", method = RequestMethod.POST)
-	public Map<String, Object> realOutAdjust(Map<String, String> map) {
+	public Map<String, Object> realOutAdjust(@RequestParam Map<String, String> map) {
 		return scheduleRealInfoService.realOutAdjust(map);
 	}
@@ -238,6 +238,18 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     	report2repair.put("9103", "9103");
     	report2repair.put("9104", "9104");
     	report2repair.put("9109", "9109");
+    	report2repair.put("9201", "9201");
+    	report2repair.put("9202", "9202");
+    	report2repair.put("9203", "9203");
+    	report2repair.put("9204", "9204");
+    	report2repair.put("9209", "9209");
+    	report2repair.put("9301", "9301");
+    	report2repair.put("9302", "9302");
+    	report2repair.put("9303", "9303");
+    	report2repair.put("9304", "9304");
+    	report2repair.put("9305", "9305");
+    	report2repair.put("9306", "9306");
+    	report2repair.put("9309", "9309");
     }
@@ -182,8 +182,7 @@
         (function() {
             var adjustExps = ['配车', '保养', '故障', '肇事', '路阻', '纠纷', '缺人', '客稀', '缺车', '气候', '援外', '吊慢', '抽减', '其他'];
             var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}];
-            var modal = '#schedule-fcxxwt-modal'
-              ,sch;
+            var modal = '#schedule-fcxxwt-modal', sch, isReport = false;
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 sch=data.sch;
@@ -216,6 +215,7 @@
                			for (var j = 0;j < reportTypes.length;j++) {
                				if (items[i] == reportTypes[j].name) {
                					$('input:checkbox[value=' + reportTypes[j].code + ']').prop('checked', true);
+                				isReport = true;
                				}
                			}
                 	}
@@ -226,7 +226,7 @@
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
                     e.preventDefault();
-                    var data = $(this).serializeJSON();
+                    var data = $(this).serializeJSON(), reportText = new Array();
                     //校验实发实达时间
                     if(!validation_s_e_Time(data)){
@@ -239,11 +239,40 @@
                     //修改里程
                     var editJhlc = data.jhlc != sch.jhlc && data.jhlc != 0;
                     // 修改报修类型为字符串
-                    if (data.reportTypes) data.reportTypes = data.reportTypes.join(";");
                     if(!data.adjustExps && (data.status==-1 || normalDestory || editJhlc)){
                         notify_err("当前操作需要选择调整原因！");
                         return;
                     }
+                    if (data.reportTypes) {
+                    	for (var i = 0;i < data.reportTypes.length;i++) {
+                    		for (var j = 0;j < reportTypes.length;j++) {
+                    			if (data.reportTypes[i] == reportTypes[j].code) {
+		                    		reportText.push(reportTypes[j].name);
+		                    		break;
+                    			}
+                    		}
+                    	}
+                    	if (!isReport) {
+	                   		layer.confirm('确定上报类型[' + reportText.join(';') + ']?', {
+	                   			btn : [ '确定', '取消' ],
+	                   			icon : 3,
+	                   			skin : 'layui-layer-cfm-add'
+	                   		}, function() {
+	                   			layer.closeAll();
+	                   			// 修改报修类型为字符串
+	                   			data.reportTypes = data.reportTypes.join(";");
+	                   			postData(data);
+	                   		}, function() {
+	                   			$('.uk-button-primary').attr('disabled', false);
+	                   		});
+	                   		return;
+                    	}
+                    	
+                    	data.reportTypes = data.reportTypes.join(";");
+               			postData(data);
+               			return;
+                    }
+                    
                     postData(data);
                 });
@@ -14,7 +14,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >车辆</label>
                     <div class="uk-form-controls">
-                        <input type="text" value="{{sch.clZbh}}" disabled>
+                        <input type="text" name="clZbh" value="{{sch.clZbh}}" readonly>
                     </div>
                 </div>
             </div>
@@ -83,24 +83,65 @@
     <script>
         (function() {
-            var modal = '#schedule-sftz-modal',
-                sch;
+            var modal = '#schedule-sftz-modal', sch, isReport = false;
             var reportTypes = [{name:"无到", code:"9101"}, {name:"无出", code:"9109"}, {name:"掉线", code:"9102"}, {name:"指令故障", code:"9103"}, {name:"车辆漂移", code:"9104"}];
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
                 sch = data.sch;
+                debugger;
                 var formHtml = template('schedule-sftz-form-temp', {sch: sch, reportTypes:reportTypes});
                 $('form', modal).html(formHtml);
+                $('input:checkbox').click(function(){
+	                var remark = $('[name=remarks]').val(), title = $(this).prop("title");
+                	if ($(this).prop('checked')) {
+                		if (remark.indexOf(title) > -1) return;
+	                	$('[name=remarks]').val((remark ? remark + ";" : "") + title);
+                	} else {
+                		$('[name=remarks]').val(remark.replace(";" + title, "").replace(title + ";", "").replace(title, ""));
+                	}
+                });
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
                     e.preventDefault();
-                    var data = $(this).serializeJSON();
+                    var data = $(this).serializeJSON(), reportText = new Array();
-                 	// 修改报修类型为字符串
-                    if (data.reportTypes) data.reportTypes = data.reportTypes.join(";");
-                    gb_common.$post('/realSchedule/realOutAdjust', data, function(rs) {
+                    if (data.reportTypes) {
+                    	for (var i = 0;i < data.reportTypes.length;i++) {
+                    		for (var j = 0;j < reportTypes.length;j++) {
+                    			if (data.reportTypes[i] == reportTypes[j].code) {
+		                    		reportText.push(reportTypes[j].name);
+		                    		break;
+                    			}
+                    		}
+                    	}
+                    	if (!isReport) {
+	                   		layer.confirm('确定上报类型[' + reportText.join(';') + ']?', {
+	                   			btn : [ '确定', '取消' ],
+	                   			icon : 3,
+	                   			skin : 'layui-layer-cfm-add'
+	                   		}, function() {
+	                   			layer.closeAll();
+                 				// 修改报修类型为字符串
+	                   			data.reportTypes = data.reportTypes.join(";");
+	                   			postData(data);
+	                   		}, function() {
+	                   			$('.uk-button-primary').attr('disabled', false);
+	                   		});
+	                   		return;
+                    	}
+                    	
+                    	data.reportTypes = data.reportTypes.join(";");
+               			postData(data);
+               			return;
+                    }
+                    
+                    postData(data);
+                });
+                
+                var postData = function (data) {
+                	gb_common.$post('/realSchedule/realOutAdjust', data, function(rs) {
                         if (rs.ts) {
                             //更新前端数据
                             gb_schedule_table.updateSchedule(rs.ts);
@@ -111,7 +152,7 @@
                               gb_schedule_table.calc_yfwf_num(sch.xlBm);
                         }
                     });
-                });
+                }
              	// 维修类型选中
                 var initReport = function() {
@@ -22,7 +22,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label" >故障类型</label>
                     <div class="uk-form-controls">
-                        <select name="repairTypes"></select>
+                        <select name="reportTypes"></select>
                     </div>
                 </div>
             </div>
@@ -35,8 +35,7 @@
     <script>
         (function() {
-            var modal = '#schedule-wxsb-modal'
-                    ,sch;
+            var modal = '#schedule-wxsb-modal', sch;
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
@@ -46,23 +45,40 @@
                 //报修类型字典
                 var opts = new Array();
-                var repairTypes=[{name:"录像不连续", code:"9201"}, {name:"无录像", code:"9202"}, {name:"录像缺通告", code:"9203"}, {name:"无法调取录像", code:"9204"}, {name:"其它录像报修", code:"9209"}, {name:"黑屏", code:"9301"}, {name:"间歇性黑屏", code:"9302"}, {name:"中门视屏无", code:"9303"}, {name:"卡在启动界面", code:"9304"}, {name:"倒车视频无", code:"9305"}, {name:"启动后显示倒车", code:"9306"}, {name:"其它屏幕报修", code:"9309"}];
-                for(var i = 0;i < repairTypes.length;i++){
-                    opts.push('<option value="'+repairTypes[i].code+'">'+repairTypes[i].name+'</option>');
+                var reportTypes = [{name:"录像不连续", code:"9201"}, {name:"无录像", code:"9202"}, {name:"录像缺通告", code:"9203"}, {name:"无法调取录像", code:"9204"}, {name:"其它录像报修", code:"9209"}, {name:"黑屏", code:"9301"}, {name:"间歇性黑屏", code:"9302"}, {name:"中门视屏无", code:"9303"}, {name:"卡在启动界面", code:"9304"}, {name:"倒车视频无", code:"9305"}, {name:"启动后显示倒车", code:"9306"}, {name:"其它屏幕报修", code:"9309"}];
+                for(var i = 0;i < reportTypes.length;i++){
+                    opts.push('<option value="'+reportTypes[i].code+'">'+reportTypes[i].name+'</option>');
                 }
-                $('[name=repairTypes]', modal).html(opts.join(""));
+                $('[name=reportTypes]', modal).html(opts.join(""));
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
                 f.on('success.form.fv', function(e) {
                     e.preventDefault();
                     $('[type=submit]', f).attr('disabled', 'disabled');
-                    var data = $(this).serializeJSON();
-                    gb_common.$post('/realSchedule/wxsb', data, function(rs){
-                        //更新班次信息
-                        notify_succ('操作成功!');
-                        UIkit.modal(modal).hide();
-                    });
+                    var data = $(this).serializeJSON(), reportText = new Array();
+                    
+               		for (var j = 0;j < reportTypes.length;j++) {
+               			if (data.reportTypes == reportTypes[j].code) {
+                    		reportText.push(reportTypes[j].name);
+                    		break;
+               			}
+               		}
+                    
+                    layer.confirm('确定上报类型[' + reportText.join(';') + ']?', {
+               			btn : [ '确定', '取消' ],
+               			icon : 3,
+               			skin : 'layui-layer-cfm-add'
+               		}, function() {
+               			layer.closeAll();
+	                    gb_common.$post('/realSchedule/wxsb', data, function(rs){
+	                        //更新班次信息
+	                        notify_succ('操作成功!');
+	                        UIkit.modal(modal).hide();
+	                    });
+               		}, function() {
+               			$('.uk-button-primary').attr('disabled', false);
+               		});
                 });
             });
         })();
@@ -289,7 +289,7 @@ var gb_schedule_context_menu = (function () {
         wxsb: function (sch) {
         	open_modal(folder + '/wxsb.html', {
                 sch: sch
-            }, modal_opts);
+            }, {center: true, bgclose: false, modal: true});
         }
     };