feat: 건설현장 관리에서 건설현장 조회 시 입력 상태 필터링 동작 안 하는 버그 수정
parent
98a6deb9e3
commit
769e3633b5
|
|
@ -79,7 +79,7 @@
|
|||
#{constComCodes, jdbcType=VARCHAR},
|
||||
#{constCompanyAdmin, jdbcType=VARCHAR},
|
||||
#{constCompanyTel, jdbcType=VARCHAR},
|
||||
NULL
|
||||
#{projectStateCode, jdbcType=VARCHAR}
|
||||
) FROM DUAL
|
||||
</select>
|
||||
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
#{constComCodes, jdbcType=VARCHAR},
|
||||
#{constCompanyAdmin, jdbcType=VARCHAR},
|
||||
#{constCompanyTel, jdbcType=VARCHAR},
|
||||
NULL,
|
||||
#{projectStateCode, jdbcType=VARCHAR},
|
||||
#{sortfield},
|
||||
#{sorttype},
|
||||
#{nCount},
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
|
||||
const constStateCode = trim( document.getElementById('const-state-code').value );
|
||||
const projectStateCode = trim( document.getElementById('project-state-code').value );
|
||||
const constCompanyName = trim( document.getElementById('company-dept').value );
|
||||
const constCompanyAdmin = trim( document.getElementById('company-admin').value );
|
||||
const constCompanyTel = trim( document.getElementById('company-tel').value );
|
||||
|
|
@ -44,6 +45,7 @@
|
|||
'&' +'constStartDate='+ constStartDate +
|
||||
'&' +'constEndDate='+ constEndDate +
|
||||
'&' +'constStateCode='+ constStateCode +
|
||||
'&' +'projectStateCode='+ projectStateCode +
|
||||
'&' +'constCompanyName='+ constCompanyName +
|
||||
'&' +'constCompanyAdmin='+ constCompanyAdmin +
|
||||
'&' +'constCompanyTel='+ constCompanyTel +
|
||||
|
|
@ -396,8 +398,15 @@ li {
|
|||
}
|
||||
|
||||
#const-state-code {
|
||||
width: 160px;
|
||||
width: 180px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
#project-state-code {
|
||||
width: 160px;
|
||||
height: 24px;
|
||||
}
|
||||
|
||||
.drilling .page-content-inner{
|
||||
padding: 0;
|
||||
}
|
||||
|
|
@ -428,15 +437,25 @@ li {
|
|||
<input type="date" id="const-start-date" name="const-start-date" >
|
||||
<span>~</span>
|
||||
<input type="date" id="const-end-date" name="const-end-date" >
|
||||
<input type="hidden" >
|
||||
<input type="hidden" >
|
||||
<select id="const-state-code" name="const-state-code">
|
||||
<option value="" selected="selected">전체</option>
|
||||
<option value="1">미입력</option>
|
||||
<option value="2">입력 중</option>
|
||||
<option value="3">검수 준비 대기중</option>
|
||||
<option value="4">검수 중</option>
|
||||
<option value="6">수정 요청</option>
|
||||
<option value="7">등록 완료</option>
|
||||
<option value="1">타당성조사 및 계획검토</option>
|
||||
<option value="2">기본설계</option>
|
||||
<option value="3">실시설계</option>
|
||||
<option value="4">시공 중</option>
|
||||
<option value="5">준공</option>
|
||||
<option value="6">유지보수</option>
|
||||
</select>
|
||||
<select id="project-state-code" name="project-state-code">
|
||||
<option value="" selected="selected">전체</option>
|
||||
<option value="0">미입력</option>
|
||||
<option value="1">입력 중</option>
|
||||
<option value="2">검수 준비 대기중</option>
|
||||
<option value="3">검수 중</option>
|
||||
<option value="4">수정 요청</option>
|
||||
<option value="5">검수 완료</option>
|
||||
<option value="6">등록 완료</option>
|
||||
</select>
|
||||
</form>
|
||||
<form class="form-inline-row">
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@
|
|||
|
||||
|
||||
const constStateCode = trim( document.getElementById('const-state-code').value );
|
||||
const projectStateCode = trim( document.getElementById('project-state-code').value );
|
||||
const constCompanyName = trim( document.getElementById('company-dept').value );
|
||||
const constCompanyAdmin = trim( document.getElementById('company-admin').value );
|
||||
const constCompanyTel = trim( document.getElementById('company-tel').value );
|
||||
|
|
@ -44,6 +45,7 @@
|
|||
'&' +'constStartDate='+ constStartDate +
|
||||
'&' +'constEndDate='+ constEndDate +
|
||||
'&' +'constStateCode='+ constStateCode +
|
||||
'&' +'projectStateCode='+ projectStateCode +
|
||||
'&' +'constCompanyName='+ constCompanyName +
|
||||
'&' +'constCompanyAdmin='+ constCompanyAdmin +
|
||||
'&' +'constCompanyTel='+ constCompanyTel +
|
||||
|
|
@ -504,15 +506,25 @@ li {
|
|||
<input type="date" id="const-start-date" name="const-start-date" >
|
||||
<span>~</span>
|
||||
<input type="date" id="const-end-date" name="const-end-date" >
|
||||
<input type="hidden" >
|
||||
<input type="hidden" >
|
||||
<select id="const-state-code" name="const-state-code">
|
||||
<option value="" selected="selected">전체</option>
|
||||
<option value="1">미입력</option>
|
||||
<option value="2">입력 중</option>
|
||||
<option value="3">검수 준비 대기중</option>
|
||||
<option value="4">검수 중</option>
|
||||
<option value="6">수정 요청</option>
|
||||
<option value="7">등록 완료</option>
|
||||
<option value="1">타당성조사 및 계획검토</option>
|
||||
<option value="2">기본설계</option>
|
||||
<option value="3">실시설계</option>
|
||||
<option value="4">시공 중</option>
|
||||
<option value="5">준공</option>
|
||||
<option value="6">유지보수</option>
|
||||
</select>
|
||||
<select id="project-state-code" name="project-state-code">
|
||||
<option value="" selected="selected">전체</option>
|
||||
<option value="0">미입력</option>
|
||||
<option value="1">입력 중</option>
|
||||
<option value="2">검수 준비 대기중</option>
|
||||
<option value="3">검수 중</option>
|
||||
<option value="4">수정 요청</option>
|
||||
<option value="5">검수 완료</option>
|
||||
<option value="6">등록 완료</option>
|
||||
</select>
|
||||
</form>
|
||||
<form class="form-inline-row">
|
||||
|
|
|
|||
Loading…
Reference in New Issue