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

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -131,7 +131,13 @@ function setSelectCustomer(customerId){
                 $("#salesAddressName").val(customer.customerName);
                 $("#salesAddressTel").val(customer.customerTel);
                 /* 售后订单的支付时间、支付方式默认 */
-                $("#salesPayTime").val(customer.salesTime+" 08:00:00");
+                var newDate = new Date();
+                var salesTIme = customer.salesTime;
+                if(!isEmpty(customer.salesTime)){
+                    salesTIme = newDate.getFullYear()+"-"+ (newDate.getMonth()+1) + "-" + newDate.getDate();
+                }
+                var time = " "+newDate.getHours()+":"+ newDate.getMinutes()+":" + newDate.getSeconds();
+                $("#salesPayTime").val(salesTIme + time);
                 // sc.setUlcById(0,1,11);
                 // ulc.setUlcByName(0,"省","市","区");
             }else{