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