Merge branch 'qyn' of yinet2020/jeesite into master

web/src/main/resources/views/modules/sys/schedule/schedule.html

@@ -40,11 +40,8 @@
 				var _date = $.fullCalendar.formatDate(date, 'yyyy-MM-dd');
 				var _time = $.fullCalendar.formatDate(date, 'HHmm');
 				var myDate=new Date()
-				// alert(js.formatDate(date, 'yyyyMMdd'));
-				// alert(js.formatDate(myDate,'yyyyMMdd'));
-				// alert(js.formatDate(date, 'yyyyMMdd')>=js.formatDate(myDate,'yyyyMMdd'));
 				if(js.formatDate(date, 'yyyyMMdd')>=js.formatDate(myDate,'yyyyMMdd')){
-					btn_add(_date, _time);
+					btn_add();
 				}
 			},
 			editable: true,
@@ -98,8 +95,7 @@
 	});
 
 	//添加日程
-	function btn_add(date) {
-		debugger;
+	function btn_add() {
 		js.addTabPage(null, "新增日程", "${ctx}/sys/schedule/schedule/form")
 	};
 
@@ -110,8 +106,11 @@
 			dataType: "json",
 			async: false,
 			success: function (data) {
-				if (data.code == 200) {
-					alert("删除成功");
+				if (data.result == "true") {
+					js.alert('删除成功');
+					js.getCurrentTabPage(function(contentWindow){
+						contentWindow.location.reload(true);
+					});
 				}
 			}
 		});

web/src/main/resources/views/modules/sys/schedule/scheduleForm.html

@@ -122,7 +122,7 @@ $("#inputForm").validate({
 			js.showMessage(data.message);
 			if(data.result == Global.TRUE){
 				js.closeCurrentTabPage(function(contentWindow){
-					contentWindow.page();
+					contentWindow.location.reload();
 				});
 			}
 		}, "json");