Merge branch 'bo_household' into 'dev'
[BO] 테이블 내용 칼럼 class 추가 + 건의사항 상세 null 처리 추가 See merge request korea-research/korea-research!83
This commit is contained in:
@@ -27,23 +27,23 @@
|
||||
</td>
|
||||
<th>휴대폰 번호</th>
|
||||
<td>
|
||||
<span th:text="${item.ownerPhone}">010-0000-0000</span>
|
||||
<span th:text="${item.ownerPhone != null && item.ownerPhone != '' ? item.ownerPhone : '-'}">010-0000-0000</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>실사</th>
|
||||
<td>
|
||||
<span th:text="${item.regionMainName}">서울</span>
|
||||
<span th:text="${item.regionMainName != null && item.regionMainName != '' ? item.regionMainName : '-'}">서울</span>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>조사원</th>
|
||||
<td>
|
||||
<span th:text="${item.researcherName}">김조사</span>
|
||||
<span th:text="${item.researcherName != null && item.researcherName != '' ? item.researcherName : '-'}">김조사</span>
|
||||
</td>
|
||||
<th>조사원 연락처</th>
|
||||
<td>
|
||||
<span th:text="${item.researcherPhone}">010-0000-0000</span>
|
||||
<span th:text="${item.researcherPhone != null && item.researcherPhone != '' ? item.researcherPhone : '-'}">010-0000-0000</span>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
</td>
|
||||
<td>${ifNullHyphen(item.visitDate)}</td> <!-- 방문일 -->
|
||||
<td>${ifNullHyphen(managementType[item.managementType])}</td> <!-- 관리분야 -->
|
||||
<td class="underline"><a href="javascript:void(0);" onclick="showVisitInfoModal(${item.id});">${ifNullHyphen(item.content)}</a></td> <!-- 내용 -->
|
||||
<td class="underline"><a class="ellipsis" href="javascript:void(0);" onclick="showVisitInfoModal(${item.id});">${ifNullHyphen(item.content)}</a></td> <!-- 내용 -->
|
||||
<td>
|
||||
${item.updatedBy}<br>
|
||||
(${item.updatedAt})
|
||||
|
||||
@@ -329,7 +329,7 @@
|
||||
<td>${ct.ownerName}</td>
|
||||
<td>${ct.visitDate}</td>
|
||||
<td>${ct.managementType}</td>
|
||||
<td>${ct.content}</td>
|
||||
<td><a href="javascript:void(0);" class="ellipsis" style="text-decoration: none;">${ct.content}</a></td>
|
||||
<td>${ct.updatedAt}</td>
|
||||
<td>${ct.isGiftSentFlag}</td>
|
||||
</tr>
|
||||
|
||||
Reference in New Issue
Block a user