[추가] 4. 시판이유식 & 간식 검색하면, 식품명 + 제조사 까지 나오기

src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml

@@ -93,6 +93,7 @@
 		 	 x.db_dn_no
 			,dn.prd_nm 
 			,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %H:%i') reg_dt
+			,dn.company
 		FROM tbl_bf_daily_nutrition_3 x
 		INNER JOIN tbl_db_nutrient dn ON dn.dn_no = x.db_dn_no 
 		WHERE  x.smc_no = #smc_no#  
@@ -289,6 +290,7 @@
 			  end  )  prd_nm 
 			,x.db_dbc_tp
 			,DATE_FORMAT(x.reg_dt, '%Y.%m.%d %H:%i') reg_dt
+			,dn.company
 		from 	tbl_bf_daily_nutrition_10 x
 		left join tbl_db_bf_commerce dn 
 			on dn.dbc_no = x.db_dbc_no

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_ajax_data.ftl

@@ -74,7 +74,7 @@ function ajax_data(keyword){
 	                                var company = result.list[i].company;                                    
 	                                var barcode = result.list[i].barcode;
 	                                var imgurl1 = result.list[i].imgurl1;
-	                                html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '\' ,\'bf\' );"><img src="' + imgurl1 + '" alt="섭취량 이미지" width="200px" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '</a></li>';
+	                                html +='<li><a href="javascript:save_set(\'db_dn_no\', \'' + dn_no + '\', \'' + prd_nm + '(' + company + ')' + '\' ,\'bf\' );"><img src="' + imgurl1 + '" alt="섭취량 이미지" width="200px" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
 	                            }
 	                            
 	                            var ul_board = $('#ul_board');

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/include_bf_nutrition.ftl

@@ -1,3 +1,7 @@
+    <style>
+        .swal2-container{z-index: 9999999}
+    </style>
+
     <!-- modal-wrapper -->
     <div id="popup_self" class="modal-wrapper">
         <div class="modal_content" style="width: 400px;">

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl

@@ -60,7 +60,7 @@
                 
                 <#if model['lm_lastest_lac']? has_content>
 				    <#list model['lm_lastest_lac'] as item>
-				    	<div class="milk_sel"><a onclick="javascript:save_set('db_dbc_no', '${item['db_dbc_no']!}', '${item['prd_nm']!}')">  ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
+				    	<div class="milk_sel"><a onclick="javascript:save_set('db_dbc_no', '${item['db_dbc_no']!}', '${item['prd_nm']!}(${item['company']!})')">  ${item['prd_nm']!} (${item['company']!}) [${item['reg_dt']!}]</a></div>
                 	</#list>
 				</#if>
 
@@ -227,7 +227,7 @@
 	                                var company = result.list[i].company;                                    
 	                                var barcode = result.list[i].barcode;                               
 	                                var imgurl1 = result.list[i].imgurl1;
-	                                html +='<li><a href="javascript:save_set(\'db_dbc_no\', \'' + dbc_no + '\', \'' + prd_nm + '\', \'bf\');"><img src="' + imgurl1 + '" alt="섭취량 이미지" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '</a></li>';
+	                                html +='<li><a href="javascript:save_set(\'db_dbc_no\', \'' + dbc_no + '\', \'' + prd_nm + '(' + company + ')' + '\', \'bf\');"><img src="' + imgurl1 + '" alt="섭취량 이미지" onerror="this.onerror=null;this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\'" />' + prd_nm + '(' + company + ')' + '</a></li>';
 	                            }
 	                            
 	                            var ul_board = $('#ul_board');

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl

@@ -57,7 +57,7 @@
 
                     <#if model['lm_lastest_lac']? has_content>
 					    <#list model['lm_lastest_lac'] as item>
-					    	<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}')" >  ${item['prd_nm']!}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[${item['reg_dt']!}]</a></div>
+					    	<div class="milk_sel"><a onclick="javascript:save_set('db_dn_no', '${item['db_dn_no']!}', '${item['prd_nm']!}(${item['company']!})')" >  ${item['prd_nm']!} (${item['company']!}) [${item['reg_dt']!}]</a></div>
                     	</#list>
 					</#if>
 

src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl

@@ -105,10 +105,6 @@
         </div>
         <!-- //홈메이드이유식-->
     </div>
-
-	<style>
-		.swal2-container{z-index: 9999999}
-	</style>
           
    <!-- modal-wrapper -->
     <div id="popup" class="modal-wrapper">