From 34f6bcd014c684e6fe609016d618726961b7d582 Mon Sep 17 00:00:00 2001 From: seaon Date: Wed, 27 Nov 2024 17:26:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8BJS?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmattendance/HrmjucailAskForLeave_e9.jsp | 375 ++++++++++++++++-- 1 file changed, 351 insertions(+), 24 deletions(-) diff --git a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp index a2fcc64..d17fc31 100644 --- a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp +++ b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp @@ -31,6 +31,7 @@ detailTableData:JSON.stringify(detailTableData), } console.log(param); + WfForm.delDetailRow("detail_3", "all"); $.ajax({ url:'/api/attendance/askforleave/generateLeaveInfoList', data:param, @@ -41,7 +42,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 = {} @@ -57,23 +57,6 @@ addObj[WfForm.convertFieldNameToId("jqye", "detail_1")]={value:item.jqye==undefined?'':item.jqye} 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); }) }else{ WfForm.showMessage(res.data.errorInfo, 2, 5); @@ -82,20 +65,322 @@ } }) + 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}; + 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}; + 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); + } + } + //ChangeDetailAtt(); + // 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} }) + // function ChangeDetailAtt(){ + // var rowArr = WfForm.getDetailAllRowIndexStr("detail_3").split(","); + // for(var i=0; i 0){ - callback(); - }else{ - WfForm.showMessage("明细表1没有数据,请点击生成请假按钮", 2, 10); - } + //清空明细1,重新根据明细3生成明细1及明细2 + WfForm.delDetailRow("detail_1", "all"); + // let detailNum = WfForm.getDetailRowCount("detail_1") + // if(detailNum > 0){ + // callback(); + // }else{ + // WfForm.showMessage("明细表1没有数据,请点击生成请假按钮", 2, 10); + // } }); resetAttr(WfForm.getFieldValue(WfForm.convertFieldNameToId("cxjqj"))) @@ -134,6 +419,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; + } From cb9d650ed882b04627f346000417b506e9be4c48 Mon Sep 17 00:00:00 2001 From: seaon Date: Wed, 27 Nov 2024 17:47:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8BJS?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmattendance/HrmjucailAskForLeave_e9.jsp | 102 ++++++------------ 1 file changed, 33 insertions(+), 69 deletions(-) diff --git a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp index d17fc31..099ac6e 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")), @@ -64,14 +65,13 @@ } } }) - 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}; + 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:''}; @@ -152,7 +152,7 @@ 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}; + 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) { @@ -220,76 +220,39 @@ v_tmpedate = new Date(v_tmpedate); } } - //ChangeDetailAtt(); - // 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} }) - - // function ChangeDetailAtt(){ - // var rowArr = WfForm.getDetailAllRowIndexStr("detail_3").split(","); - // for(var i=0; i Date: Wed, 27 Nov 2024 17:54:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8BJS?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp index 099ac6e..954624c 100644 --- a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp +++ b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp @@ -339,6 +339,7 @@ WfForm.registerCheckEvent(WfForm.OPER_SAVE+","+WfForm.OPER_SUBMIT,function(callback){ //清空明细1,重新根据明细3生成明细1及明细2 WfForm.delDetailRow("detail_1", "all"); + callback(); // let detailNum = WfForm.getDetailRowCount("detail_1") // if(detailNum > 0){ // callback(); From bfac08c292f9ebe9a03f9c920ecb7c45733c6c5d Mon Sep 17 00:00:00 2001 From: seaon Date: Thu, 28 Nov 2024 10:01:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=B5=81=E7=A8=8BJS?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmattendance/HrmjucailAskForLeave_e9.jsp | 311 +++++++++--------- 1 file changed, 156 insertions(+), 155 deletions(-) diff --git a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp index 954624c..9b1a160 100644 --- a/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp +++ b/workflow/request/hrmattendance/HrmjucailAskForLeave_e9.jsp @@ -58,6 +58,162 @@ addObj[WfForm.convertFieldNameToId("jqye", "detail_1")]={value:item.jqye==undefined?'':item.jqye} WfForm.addDetailRow("detail_1", 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); @@ -65,161 +221,6 @@ } } }) - 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); - } - } }) //绑定全天假栏位值变更事件 jQuery(document).ready(function(){