Merge branch 'feature/attendancece_js_0104' into 'wrdp'

考勤，修复前端切换考勤策略保存不成功的问题

See merge request o2oa/o2oa!2820

o2web/source/x_component_Attendance/Explorer.js

@@ -767,7 +767,6 @@ MWF.xApplication.Attendance.Explorer.PopupForm = new Class({
         this.cancelActionNode.addEvent("click", function(e){
             this.cancel(e);
         }.bind(this));
-
         if( this.isNew || this.isEdited){
 
             this.okActionNode = new Element("div", {
@@ -789,7 +788,8 @@ MWF.xApplication.Attendance.Explorer.PopupForm = new Class({
         delete this;
     },
     ok: function(e){
-        var data = this.form.getResult(true,",",true,false,true);
+        debugger
+        var data = this.form.getResult(false,",",true,false,true);
         if( data ){
             this._ok( data, function( json ){
                 if( json.type == "ERROR" ){

o2web/source/x_component_Attendance/ScheduleExplorer.js

@@ -85,7 +85,7 @@ MWF.xApplication.Attendance.ScheduleExplorer.Schedule = new Class({
     Extends: MWF.xApplication.Attendance.Explorer.PopupForm,
     options : {
         "width": 600,
-        "height": 500,
+        "height": 600,
         "hasTop" : true,
         "hasBottom" : true,
         "title" : "",
@@ -125,7 +125,7 @@ MWF.xApplication.Attendance.ScheduleExplorer.Schedule = new Class({
 
         this.formTableArea.set("html",html);
         MWF.xDesktop.requireApp("Template", "MForm", function(){
-
+            debugger
             var ob = Object;
             this.form = new MForm( this.formTableArea, this.data, {
                 onPostLoad: function(){
@@ -207,6 +207,7 @@ MWF.xApplication.Attendance.ScheduleExplorer.Schedule = new Class({
     },
     _ok: function( data, callback ){
         //checkDate
+        debugger
         var dateList = [];
         var signProxy = data.signProxy;
         if(signProxy!=1){