Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -178,7 +178,10 @@
                                 <#elseif customer.customerSourceType == 3>
 
                                 </#if>
-                                 - ${customer.customerSource!''}
+                                <#if customer.customerSource??>
+                                    -${customer.customerSource }
+                                </#if>
+
                             </td>
                             <td>${customer.typeName!''}</td>
                             <#--<td>${customer.complaintClassName!''}</td>-->

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -385,11 +385,15 @@
                         }
                         <#--1：正常 2：换货 3：退货  4:维修  5：补发-->
 
+                        var disHtml =  "";
+                        if(salesOrder.salesOrderId == null || salesOrder.salesOrderId == "" || typeof (salesOrder.salesOrderId) == 'undefined'){
+                            disHtml = 'disabled="disabled"';
+                        }
                         html += '<tr class="text-c">' +
-                                ' <td><input type="checkbox" class="sales_order_id" id="" value="'+ salesOrder.salesId +'" ></td>' +
+                                ' <td><input type="checkbox" class="sales_order_id" id="" value="'+ salesOrder.salesId +'" '+ disHtml +'></td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.companyName) +'</td>' +
                                 ' <td>'+ convertUndefinedToEmpty(salesOrder.storeName) +'</td>' +
-                                ' <td>'+ salesOrder.salesOrderId +'</td>' +
+                                ' <td>'+ convertUndefinedToEmpty(salesOrder.salesOrderId) +'</td>' +
                                 ' <td>'+ salesOrder.salesDealCode +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressName +'</td>' +
                                 ' <td>'+ salesOrder.salesAddressTel +'</td>' +