Commit e234d476 by Ratchanok

[9293] PI พนง.เข้าใหม่, ข้อมูลการทำงาน - desc jobcode level

parent 2831942c
......@@ -89,4 +89,13 @@
<FIELD>COMPANYID</FIELD>
</ORDER>
</TABLE>
<TABLE name="mjobcode_level" status="" central="false" out="inquiry">
<FIELD>levelid</FIELD>
<FIELD>companyid</FIELD>
<FIELD>tdesc</FIELD>
<FIELD>edesc</FIELD>
<ORDER>
<FIELD>levelid</FIELD>
</ORDER>
</TABLE>
</DBXML>
......@@ -131,6 +131,15 @@ FIELD>emp_every</FIELD
<FIELD>jobcodeid</FIELD>
</ORDER>
</TABLE>
<TABLE name="mjobcode_level" status="" central="mjobcode" out="inquiry">
<FIELD>levelid</FIELD>
<FIELD>companyid</FIELD>
<FIELD>tdesc</FIELD>
<FIELD>edesc</FIELD>
<ORDER>
<FIELD>levelid</FIELD>
</ORDER>
</TABLE>
<TABLE name="mcostcenter0" status="" central="false" out="inquiry">
<FIELD>costcenterid</FIELD>
<FIELD>companyid</FIELD>
......
......@@ -95,11 +95,21 @@
<FIELD>companyid</FIELD>
<FIELD>tdesc</FIELD>
<FIELD>edesc</FIELD>
<FIELD>jobcode_level</FIELD>
<FIELD>runno</FIELD>
<ORDER>
<FIELD>jobcodeid</FIELD>
</ORDER>
</TABLE>
<TABLE name="mjobcode_level" status="" central="mjobcode" out="inquiry">
<FIELD>levelid</FIELD>
<FIELD>companyid</FIELD>
<FIELD>tdesc</FIELD>
<FIELD>edesc</FIELD>
<ORDER>
<FIELD>levelid</FIELD>
</ORDER>
</TABLE>
<TABLE name="tadjposition" status="center" central="false" out="inquiry">
<FIELD>employeeid</FIELD>
<FIELD>adj_date</FIELD>
......
......@@ -111,7 +111,7 @@
function goHelp(helpName,inputName){
var helpReturn;
if(inputName=="__job" )
helpReturn="__job:jobcodeid,__bu1:bu1,__bu2:bu2,__bu3:bu3,__bu4:bu4,__bu5:bu5,__emp_position:jobcode_position,__branch:branchid,MBRANCH@TDESC,MJOBCODE@TDESC,MJOBCODE@JOBCODE_LEVEL,MBU1@TDESC,MBU2@TDESC,MBU3@TDESC,MBU4@TDESC,MBU5@TDESC,MPOSITION@TDESC";
helpReturn="__job:jobcodeid,__bu1:bu1,__bu2:bu2,__bu3:bu3,__bu4:bu4,__bu5:bu5,__emp_position:jobcode_position,__branch:branchid,MBRANCH@TDESC,MJOBCODE@TDESC,MJOBCODE@JOBCODE_LEVEL,MBU1@TDESC,MBU2@TDESC,MBU3@TDESC,MBU4@TDESC,MBU5@TDESC,MPOSITION@TDESC,MJOBCODE_LEVEL@TDESC";
else if(inputName=="__emp_position" ){
var cf_position = '<%=cf_position%>';
if(cf_position === "1"){
......@@ -673,8 +673,12 @@ $(document).ready(function(){
<tr>
<td class="columnlabel"><%=screen.getLabel("MJOBCODE","JOBCODE_LEVEL")%>&nbsp;</td>
<td colspan="4" nowrap><input name="MJOBCODE@JOBCODE_LEVEL" type="text" disabled="true" size="45" value="<%=screen.getDataLabel("MJOBCODE","JOBCODE_LEVEL")%>"></td>
<td colspan="4" nowrap>
<input name="MJOBCODE@JOBCODE_LEVEL" type="text" disabled="true" size="10" value="<%=screen.getDataLabel("MJOBCODE","JOBCODE_LEVEL")%>">&nbsp;
<input name="MJOBCODE_LEVEL@TDESC" type="text" disabled="true" size="48" value="<%=screen.getDataLabel("MJOBCODE_LEVEL","TDESC")%>">
</td>
</tr>
<tr>
<td class="columnlabel"><%=screen.getLabel("pl")%>&nbsp;</td>
<td colspan="2" nowrap><%=screen.getInput("pl")%>
......@@ -685,7 +689,7 @@ $(document).ready(function(){
</tr>
<tr>
<td class="columnlabel"><%=screen.getLabel("bossid")%>&nbsp;</td>
<td colspan="2"><%=screen.getInput("bossid")%><input name="MEMPLOYEE@FULLNAME" type="text" disabled="true" size="40" value="<%=screen.getDataLabel("v1memployee","fullname")%>"></td>
<td colspan="2"><%=screen.getInput("bossid")%><input name="MEMPLOYEE@FULLNAME" type="text" disabled="true" size="45" value="<%=screen.getDataLabel("v1memployee","fullname")%>"></td>
<td align="right" nowrap></td>
<td nowrap></td>
</tr>
......@@ -732,7 +736,7 @@ $(document).ready(function(){
<tr>
<td class="columnlabel"><%=screen.getLabel("branch")%>&nbsp;</td>
<td colspan="2"><%=screen.getInput("branch")%> <input name="MBRANCH@TDESC" type="text" disabled="true" size="50" value="<%=screen.getDataLabel("MBRANCH","TDESC")%>"></td>
<td colspan="2"><%=screen.getInput("branch")%> <input name="MBRANCH@TDESC" type="text" disabled="true" size="45" value="<%=screen.getDataLabel("MBRANCH","TDESC")%>"></td>
<td nowrap> <div align="right"><%=screen.getLabel("eff_branch")%>&nbsp;</div></td>
<td nowrap><%=screen.getInput("eff_branch")%> <a href="#" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('Image13','','../IMAGES/BUTTON/SWAP/CALENDAR_SWAP20.gif',1)" onClick="viewCal('__eff_branch')"><img src="../IMAGES/BUTTON/MAIN/CALENDAR20.gif" alt="Calendar" name="Image13" width="20" height="20" border="0" align="absmiddle" id="Image13"></a> </td>
</tr>
......
......@@ -35,6 +35,7 @@ String memployement_typetdesc = chk.chkNullString(request.getParameter("MEMPLOYM
String madjreasontdesc = chk.chkNullString(request.getParameter("MADJREASON@TDESC"),screen.getDataLabel("MADJREASON","TDESC"));
String mpersonalleveldesc = chk.chkNullString(request.getParameter("MPERSONALLEVEL@TDESC"),screen.getDataLabel("MPERSONALLEVEL","TDESC"));
String meventgrpbranchtdesc = chk.chkNullString(request.getParameter("MEVENTGRPBRANCH@TDESC"),screen.getDataLabel("MEVENTGRPBRANCH","TDESC"));
String mjobcode_level_tdesc = chk.chkNullString(request.getParameter("MJOBCODE_LEVEL@TDESC"),screen.getDataLabel("MJOBCODE_LEVEL","TDESC"));
DbInquiry assignEmp = new InitialInquiry(screen.getUProfile()).getDbInquiry();
assignEmp.initMyTable("mempl_setup_employeeid","","");
......@@ -544,7 +545,7 @@ function updateRecord(){
var fixCon = "";
if(inputName=="__job" )
//helpReturn="__job:jobcodeid,__bu1:bu1,__bu2:bu2,__bu3:bu3,__bu4:bu4,__bu5:bu5,__emp_position:jobcode_position,__branch:branchid,MBRANCH@TDESC,MJOBCODE@TDESC,MJOBCODE@JOBCODE_LEVEL,MBU1@TDESC,MBU2@TDESC,MBU3@TDESC,MBU4@TDESC,MBU5@TDESC,MPOSITION@TDESC";
helpReturn="__job:jobcodeid,__emp_position:jobcode_position,__branch:branchid,MBRANCH@TDESC,MJOBCODE@TDESC,MJOBCODE@JOBCODE_LEVEL,MPOSITION@TDESC";
helpReturn="__job:jobcodeid,__emp_position:jobcode_position,__branch:branchid,MBRANCH@TDESC,MJOBCODE@TDESC,MJOBCODE@JOBCODE_LEVEL,MPOSITION@TDESC,MJOBCODE_LEVEL@TDESC";
else if(inputName=="__emp_position" ){
var cf_position = '<%=cf_position%>';
if(cf_position === "1"){
......@@ -1293,7 +1294,8 @@ function updateRecord(){
</tr>
<tr>
<td class="columnlabel"><%=screen.getLabel("MJOBCODE","JOBCODE_LEVEL")%>&nbsp;</td>
<td colspan="3"><input name="MJOBCODE@JOBCODE_LEVEL" type="text" readonly size="10" value="<%=mjobcode_level%>"></td>
<td colspan="3"><input name="MJOBCODE@JOBCODE_LEVEL" type="text" readonly size="10" value="<%=mjobcode_level%>">
&nbsp;<input name="MJOBCODE_LEVEL@TDESC" type="text" readonly size="33" value="<%=mjobcode_level_tdesc%>"></td>
</tr>
<tr>
<td class="columnlabel"><%=screen.getLabel("pl")%>&nbsp;</td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment