diff --git a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp
index a2fcc64..9b1a160 100644
--- a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp
+++ b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp
@@ -12,6 +12,7 @@
             szjg: WfForm.getFieldValue(WfForm.convertFieldNameToId("szjg")),
             qjr: WfForm.getFieldValue(WfForm.convertFieldNameToId("qjry")),
             jqlx: WfForm.getFieldValue(WfForm.convertFieldNameToId("jqlx")),
+            jqlx_vals: mobx.toJS(wfform.getFieldValueObj(WfForm.convertFieldNameToId("jqlx")).specialobj),
             mtcfsdjq: WfForm.getFieldValue(WfForm.convertFieldNameToId("mtcfsdjq")),
             ksrq: WfForm.getFieldValue(WfForm.convertFieldNameToId("ksrq")),
             jsrq: WfForm.getFieldValue(WfForm.convertFieldNameToId("jsrq")),
@@ -31,6 +32,7 @@
             detailTableData:JSON.stringify(detailTableData),
         }
         console.log(param);
+        WfForm.delDetailRow("detail_3", "all");
         $.ajax({
             url:'/api/attendance/askforleave/generateLeaveInfoList',
             data:param,
@@ -41,7 +43,6 @@
                 if(res.api_status){
                     if(res.data.status){
                         WfForm.delDetailRow("detail_1", "all");
-                        WfForm.delDetailRow("detail_3", "all");
                         let resultData = res.data.data;
                         resultData.filter(item => {
                             let addObj = {}
@@ -58,22 +59,161 @@
 
                             WfForm.addDetailRow("detail_1", addObj);
 
-                            addObj = {}
-                            addObj[WfForm.convertFieldNameToId("qjr", "detail_3")] = {value:item.qjr,specialobj:[{id:item.qjr,name:item.qjrName}]};
-                            addObj[WfForm.convertFieldNameToId("qjlx", "detail_3")] = {value:item.qjlx,specialobj:[{id:item.qjlx,name:item.qjlxName}]};
-                            addObj[WfForm.convertFieldNameToId("ksrq", "detail_3")]={value:item.ksrq}
-                            addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:item.kssj}
-                            addObj[WfForm.convertFieldNameToId("jsrq", "detail_3")]={value:item.jsrq}
-                            addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:item.jssj}
-                            addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:item.qjsc}
-                            addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:item.qtj}
-                            addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:item.btj}
-                            addObj[WfForm.convertFieldNameToId("jqye", "detail_3")]={value:item.jqye==undefined?'':item.jqye}
-                            addObj[WfForm.convertFieldNameToId("yesygz", "detail_3")]={value:mainTableData.yesygz}
-                            addObj[WfForm.convertFieldNameToId("sxwxz", "detail_3")]={value:mainTableData.sxwxz}
-                            addObj[WfForm.convertFieldNameToId("qjfs", "detail_3")]={value:mainTableData.cxjqj}
-
-                            WfForm.addDetailRow("detail_3", addObj);
+                            if (mainTableData.mtcfsdjq == "0"){
+                                addObj = {};
+                                addObj[WfForm.convertFieldNameToId("yesygz", "detail_3")]={value:mainTableData.yesygz};
+                                addObj[WfForm.convertFieldNameToId("sxwxz", "detail_3")]={value:mainTableData.sxwxz};
+                                addObj[WfForm.convertFieldNameToId("qjfs", "detail_3")]={value:mainTableData.cxjqj};
+                                addObj[WfForm.convertFieldNameToId("qjr", "detail_3")]={value:mainTableData.qjr};
+                                addObj[WfForm.convertFieldNameToId("qjlx", "detail_3")]={value:mainTableData.jqlx,specialobj:mainTableData.jqlx_vals};
+                                addObj[WfForm.convertFieldNameToId("ksrq", "detail_3")]={value:mainTableData.ksrq};
+                                addObj[WfForm.convertFieldNameToId("jsrq", "detail_3")]={value:mainTableData.jsrq}
+                                addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                switch(mainTableData.cxjqj) {
+                                    case '0'://全天请假
+                                        addObj[WfForm.convertFieldNameToId("qtj", "detail_3")] = {value: '1'};//设置全天假为勾选
+
+                                        addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+
+                                        break;
+                                    case '1'://按时间区间请假，需要单独设置开始结束时间或者开始结束时段
+                                        //按时间区间请假，需要单独设置开始结束时间或者开始结束时段
+                                        if (mainTableData.sxwxz == '0') {
+                                            addObj[WfForm.convertFieldNameToId("kssj", "detail_3")] = {value: mainTableData.kssj};
+                                            addObj[WfForm.convertFieldNameToId("jssj", "detail_3")] = {value: mainTableData.jssj};
+
+                                            addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                            addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                        } else {
+                                            addObj[WfForm.convertFieldNameToId("kssd", "detail_3")] = {value: mainTableData.kssd};
+                                            addObj[WfForm.convertFieldNameToId("jssd", "detail_3")] = {value: mainTableData.jssd};
+
+                                            addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                            addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                        }
+                                        break;
+                                    case '2'://半天请假
+                                        addObj[WfForm.convertFieldNameToId("btj", "detail_3")] = {value: '1'};//设置半天假为勾选
+
+                                        addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                        break;
+                                    case '3'://按时间长度请假
+                                        addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")] = {value: mainTableData.qjsc};
+
+                                        addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                        addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                        addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                        break;
+                                    default://其他全天或者半天出差
+                                        break;
+                                }
+                                WfForm.addDetailRow("detail_3", addObj);
+                            }else{
+                                var v_tmpbdate = new Date(mainTableData.ksrq);
+                                var v_tmpedate = new Date(v_tmpbdate);
+                                if (!DateCheck(mainTableData.ksrq,mainTableData.kssj,mainTableData.jsrq,mainTableData.jssj)) {
+                                    v_tmpedate = v_tmpedate.setDate(v_tmpedate.getDate() + 1);
+                                    v_tmpedate = new Date(v_tmpedate);
+                                }
+                                while (v_tmpbdate<=new Date(mainTableData.jsrq)){
+                                    addObj = {};
+                                    addObj[WfForm.convertFieldNameToId("yesygz", "detail_3")]={value:mainTableData.yesygz};
+                                    addObj[WfForm.convertFieldNameToId("sxwxz", "detail_3")]={value:mainTableData.sxwxz};
+                                    addObj[WfForm.convertFieldNameToId("qjfs", "detail_3")]={value:mainTableData.cxjqj};
+                                    addObj[WfForm.convertFieldNameToId("qjr", "detail_3")]={value:mainTableData.qjr};
+                                    addObj[WfForm.convertFieldNameToId("qjlx", "detail_3")]={value:mainTableData.jqlx,specialobj:mainTableData.jqlx_vals};
+                                    addObj[WfForm.convertFieldNameToId("ksrq", "detail_3")]={value:v_tmpbdate};
+                                    addObj[WfForm.convertFieldNameToId("jsrq", "detail_3")]={value:v_tmpedate};
+                                    switch(mainTableData.cxjqj) {
+                                        case '0'://全天请假
+                                            addObj[WfForm.convertFieldNameToId("qtj", "detail_3")] = {value: '1'};//设置全天假为勾选
+
+                                            addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+
+                                            break;
+                                        case '1'://按时间区间请假，需要单独设置开始结束时间或者开始结束时段
+                                            //按时间区间请假，需要单独设置开始结束时间或者开始结束时段
+                                            if (mainTableData.sxwxz == '0') {
+                                                addObj[WfForm.convertFieldNameToId("kssj", "detail_3")] = {value: mainTableData.kssj};
+                                                addObj[WfForm.convertFieldNameToId("jssj", "detail_3")] = {value: mainTableData.jssj};
+
+                                                addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                                addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                                addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                                addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                                addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                            } else {
+                                                addObj[WfForm.convertFieldNameToId("kssd", "detail_3")] = {value: mainTableData.kssd};
+                                                addObj[WfForm.convertFieldNameToId("jssd", "detail_3")] = {value: mainTableData.jssd};
+
+                                                addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                                addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                                addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                                addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                                addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                            }
+                                            break;
+                                        case '2'://半天请假
+                                            addObj[WfForm.convertFieldNameToId("btj", "detail_3")] = {value: '1'};//设置半天假为勾选
+
+                                            addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                            break;
+                                        case '3'://按时间长度请假
+                                            addObj[WfForm.convertFieldNameToId("qjsc", "detail_3")] = {value: mainTableData.qjsc};
+
+                                            addObj[WfForm.convertFieldNameToId("kssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssj", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("kssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("jssd", "detail_3")]={value:''};
+                                            addObj[WfForm.convertFieldNameToId("qtj", "detail_3")]={value:''};//设置全天假为不勾选
+                                            addObj[WfForm.convertFieldNameToId("btj", "detail_3")]={value:''};//设置半天假为不勾选
+                                            break;
+                                        default://其他全天或者半天出差
+                                            break;
+                                    }
+                                    WfForm.addDetailRow("detail_3", addObj);
+                                    v_tmpbdate = v_tmpbdate.setDate(v_tmpbdate.getDate() + 1);
+                                    v_tmpbdate = new Date(v_tmpbdate);
+                                    //明细结束日期加一天
+                                    v_tmpedate = v_tmpedate.setDate(v_tmpedate.getDate() + 1);
+                                    v_tmpedate = new Date(v_tmpedate);
+                                }
+                            }
                         })
                     }else{
                         WfForm.showMessage(res.data.errorInfo, 2, 5);
@@ -81,8 +221,116 @@
                 }
             }
         })
-
     })
+    //绑定全天假栏位值变更事件
+    jQuery(document).ready(function(){
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("ksrq", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("jsrq", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("kssj", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("jssj", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("kssd", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("jssd", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("qjsc", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+        });
+
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("qtj", "detail_3"),function(id,rowIndex,value){
+            if (null2String(WfForm.getFieldValue(WfForm.convertFieldNameToId("btj", "detail_3")+"_"+rowIndex))=="1" && null2String(value) == "1") {
+                WfForm.changeFieldValue(WfForm.convertFieldNameToId("btj","detail_3")+"_"+rowIndex,{ value: '0' });//重置开始时间
+            }
+        });
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("btj", "detail_3"),function(id,rowIndex,value){
+            if (null2String(WfForm.getFieldValue(WfForm.convertFieldNameToId("qtj", "detail_3")+"_"+rowIndex))=="1" && null2String(value) == "1") {
+                WfForm.changeFieldValue(WfForm.convertFieldNameToId("qtj","detail_3")+"_"+rowIndex,{ value: '0' });//重置开始时间
+            }
+        });
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("sxwxz", "detail_3"),function(id,rowIndex,value){
+            if (null2String(value)=="1"){
+                //按上下午进行请假
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssj","detail_3")+"_"+rowIndex, 1);//结束时间
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssj","detail_3")+"_"+rowIndex, 1);//开始时间
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssd","detail_3")+"_"+rowIndex, 3);//开始时段
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssd","detail_3")+"_"+rowIndex, 3);//结束时段
+            }else{
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssj","detail_3")+"_"+rowIndex, 3);//结束时间
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssj","detail_3")+"_"+rowIndex, 3);//开始时间
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssd","detail_3")+"_"+rowIndex, 1);//开始时段
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssd","detail_3")+"_"+rowIndex, 1);//结束时段
+            }
+        });
+        WfForm.bindDetailFieldChangeEvent(WfForm.convertFieldNameToId("qjfs", "detail_3"),function(id,rowIndex,value){
+            WfForm.delDetailRow("detail_1", "all");
+            if(rowIndex !== ""){
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("sxwxz","detail_3")+"_"+rowIndex, 1);//按上下午请假功能不开放
+                WfForm.changeFieldValue(WfForm.convertFieldNameToId("kssj","detail_3")+"_"+rowIndex,{ value: '' });//重置开始时间
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssj","detail_3")+"_"+rowIndex, 1);//开始时间
+                WfForm.changeFieldValue(WfForm.convertFieldNameToId("jssj","detail_3")+"_"+rowIndex,{ value: '' });//重置结束时间
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssj","detail_3")+"_"+rowIndex, 1);//结束时间
+
+                WfForm.changeFieldValue(WfForm.convertFieldNameToId("kssd","detail_3")+"_"+rowIndex,{ value: '' });//清空开始时段内容
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssd","detail_3")+"_"+rowIndex, 1);//开始时段
+                WfForm.changeFieldValue(WfForm.convertFieldNameToId("jssd","detail_3")+"_"+rowIndex,{ value: '' });//清空结束时段内容
+                WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssd","detail_3")+"_"+rowIndex, 1);//结束时段
+
+                switch(value){
+                    case '0'://全天请假
+                        WfForm.changeFieldAttr(WfForm.convertFieldNameToId("qjsc","detail_3")+"_"+rowIndex, 1);//请假时长
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("qtj","detail_3")+"_"+rowIndex, {value:"1"});//全天假勾选
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("btj","detail_3")+"_"+rowIndex, {value:"0"});//半天假取消勾选
+                        break;
+                    case '1'://指定时间区间请假
+                        WfForm.changeFieldAttr(WfForm.convertFieldNameToId("qjsc","detail_3")+"_"+rowIndex, 1);//请假时长
+                        WfForm.changeFieldAttr(WfForm.convertFieldNameToId("sxwxz","detail_3")+"_"+rowIndex, 2);//按上下午请假功能开放
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("qtj","detail_3")+"_"+rowIndex, {value:"0"});//全天假取消勾选
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("btj","detail_3")+"_"+rowIndex, {value:"0"});//半天假取消勾选
+                        if (null2String(WfForm.getFieldValue(WfForm.convertFieldNameToId("sxwxz", "detail_3")+"_"+rowIndex))=="1"){
+                            //按上下午进行请假
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssj","detail_3")+"_"+rowIndex, 1);//结束时间
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssj","detail_3")+"_"+rowIndex, 1);//开始时间
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssd","detail_3")+"_"+rowIndex, 3);//开始时段
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssd","detail_3")+"_"+rowIndex, 3);//结束时段
+                        }else{
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssj","detail_3")+"_"+rowIndex, 3);//结束时间
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssj","detail_3")+"_"+rowIndex, 3);//开始时间
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("kssd","detail_3")+"_"+rowIndex, 1);//开始时段
+                            WfForm.changeFieldAttr(WfForm.convertFieldNameToId("jssd","detail_3")+"_"+rowIndex, 1);//结束时段
+                        }
+                        break;
+                    case '2'://半天请假
+                        WfForm.changeFieldAttr(WfForm.convertFieldNameToId("qjsc","detail_3")+"_"+rowIndex, 1);//请假时长
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("qtj","detail_3")+"_"+rowIndex, {value:"0"});//全天假勾选
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("btj","detail_3")+"_"+rowIndex, {value:"1"});//半天假取消勾选
+                        break;
+                    case '3'://按时间长度请假
+                        WfForm.changeFieldAttr(WfForm.convertFieldNameToId("qjsc","detail_3")+"_"+rowIndex, 3);//请假时长
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("qtj","detail_3")+"_"+rowIndex, {value:"0"});//全天假取消勾选
+                        WfForm.changeFieldValue(WfForm.convertFieldNameToId("btj","detail_3")+"_"+rowIndex, {value:"0"});//半天假取消勾选
+                        break;
+                }
+            }
+        });
+    });
 
     //请假方式变更时，同样进行页面显示属性的调整
     WfForm.bindFieldChangeEvent(WfForm.convertFieldNameToId("cxjqj"),function(obj,id,value){
@@ -90,12 +338,15 @@
     });
 
     WfForm.registerCheckEvent(WfForm.OPER_SAVE+","+WfForm.OPER_SUBMIT,function(callback){
-        let detailNum = WfForm.getDetailRowCount("detail_1")
-        if(detailNum > 0){
-            callback();
-        }else{
-            WfForm.showMessage("明细表1没有数据，请点击生成请假按钮", 2, 10);
-        }
+        //清空明细1，重新根据明细3生成明细1及明细2
+        WfForm.delDetailRow("detail_1", "all");
+        callback();
+        // let detailNum = WfForm.getDetailRowCount("detail_1")
+        // if(detailNum > 0){
+        //     callback();
+        // }else{
+        //     WfForm.showMessage("明细表1没有数据，请点击生成请假按钮", 2, 10);
+        // }
     });
 
     resetAttr(WfForm.getFieldValue(WfForm.convertFieldNameToId("cxjqj")))
@@ -134,6 +385,48 @@
         }
     }
 
+    function null2String(s){
+        if(!s){
+            return "";
+        }
+        return s;
+    }
+
+
+    function DateCheck(fromDate,fromTime,toDate,toTime,msg){
+
+        var begin = new Date(fromDate.replace(/\-/g, "\/"));
+        var end = new Date(toDate.replace(/\-/g, "\/"));
+        if(fromTime != "" && toTime != ""){
+            begin = new Date(fromDate.replace(/\-/g, "\/")+" "+fromTime+":00");
+            end = new Date(toDate.replace(/\-/g, "\/")+" "+toTime+":00");
+            if(fromDate!=""&&toDate!=""&&begin >end)
+            {
+                if(isMobile){
+                    alert(msg);
+                }else{
+
+                    WfForm.showMessage(msg);
+
+                }
+                return false;
+            }
+        }else{
+            if(fromDate!=""&&toDate!=""&&begin >end)
+            {
+                if(isMobile){
+                    alert(msg);
+
+                }else{
+
+                    WfForm.showMessage(msg);
+
+                }
+                return false;
+            }
+        }
+        return true;
+    }
 </script>