Merge remote-tracking branch 'origin/master'

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

@@ -120,19 +120,33 @@
                         <#if (order.salesCustomerId)??>
                             <div>
                                 <#if order.customerIsSolve == 1>
-                                    已解决
+                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                    <font color=#06c>已解决</font>
+                                </a>
                                 <#elseif order.customerIsSolve == 2>
-                                    未解决
+                                <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                    <font color=#06c>未解决</font>
+                                </a>
                                 <#elseif order.customerIsSolve == 3>
-                                    换
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>换</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 4>
-                                    修
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>修</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 5>
-                                    补
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>补</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 6>
-                                    退
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>退</font>
+                                    </a>
                                 <#elseif order.customerIsSolve == 7>
-                                    无理由退货
+                                    <a style="text-decoration:none" href="javascript:void(0);" title="详情" onclick="admin_details_customer(${order.salesCustomerId!''})">
+                                        <font color=#06c>无理由退货</font>
+                                    </a>
                                 </#if>
                             </div>
                         <#else>
@@ -191,9 +205,10 @@
                         </#if>
                     </td>
                     <td>
-                        <#list logisticsInfoList as logisticsInfo>
+                        <#--<#list logisticsInfoList as logisticsInfo>
                             <#if order.salesPostFirm??><#if order.salesPostFirm == logisticsInfo.logisticsRstCode>${logisticsInfo.logisticsName}</#if> </#if>
-                        </#list>
+                        </#list>-->
+                        ${order.salesPostFirm!''}
                     <br>
                     ${order.salesPostNum!''}
                     </td>
@@ -711,6 +726,14 @@
                 });
             });
         }
+
+        /**
+         *跳转到详情页面
+         * @param employee
+         */
+        function admin_details_customer(customerId) {
+            window.location.href= "${path}/admin/customer/_customer_info?customerId="+customerId;
+        }
     </script>
 </body>
 </html>