Merge branch 'master' of http://60.12.218.120:8083/wufan/ERP

TradeManageNew/DingDan/DT_OrderReturn.aspx

@@ -126,17 +126,10 @@
                 var model = datagrid1.Get_Model(RowIndex);
                    $("#img_1").attr("src", model.ImgUrl);
                    $("#div_img").empty();
-                       if(model.ImgUrl!=null)
-                        $("#div_img").append("<img src='../" + model.ImgUrl + "' width='100px' height='80px'  style='margin-right:5px'/>");
-                      if(model.ImgUrl2!=null)
-                        $("#div_img").append("<img src='../" + model.ImgUrl2 + "' width='100px' height='80px'  style='margin-right:5px'/>");
-                      if(model.ImgUrl3!=null)
-                        $("#div_img").append("<img src='../" + model.ImgUrl3 + "' width='100px' height='80px'  style='margin-right:5px'/>");
-                      if (model.ImgUrl4 != null)
-                        $("#div_img").append("<img src='../" + model.ImgUrl4 + "' width='100px' height='80px'  style='margin-right:5px'/>");
-                      if (model.ImgUrl5 != null)
-                        $("#div_img").append("<img src='../" + model.ImgUrl5 + "' width='100px' height='80px'  style='margin-right:5px'/>");
-                       
+                   let imgList = [model.ImgUrl, model.ImgUrl2, model.ImgUrl3, model.ImgUrl4, model.ImgUrl5].filter(it => it)
+                   imgList.forEach(it => {
+                       $("#div_img").append("<img src='../" + it + "' width='100px' height='80px'  style='margin-right:5px'/>");
+                   })
                 fopen3();
 
             });