订单列表优化

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

@@ -212,7 +212,7 @@
             <#if page.dataList?? &&  (page.dataList?size > 0) >
                 <#list page.dataList as order>
 
-                <tr class="text-c order_tr" status="${(order.salesShippingStatus)!"0"},${(order.salesDeliver)!"1"},${(order.salesStatus)!"0"}">
+                <tr class="text-c order_tr" status="${(order.salesShippingStatus)!"0"},${(order.salesDeliver)!"1"},${(order.salesStatus)!"0"}" sendType="${(order.salesSendType)!}">
                     <td width="16"><input type="checkbox" class="sales_id" value="${order.salesId!''}" ></td>
                     <td width="16">
                         <#if (order.salesCustomerId)??>
@@ -441,28 +441,28 @@
     var _editor;
 
     $(function() {
-       var trs = $(".order_tr");
+       let trs = $(".order_tr");
        if (trs != null && trs.length >= 1) {
-           for (var i = 0; i < trs.length; i++) {
-               var tr = $(trs[i]);
+           for (let i = 0; i < trs.length; i++) {
+               let tr = $(trs[i]);
                <#--<#if admin??  >
                   var adminDept = ${(admin.adminDept)!};
                   if(adminDept == 1){
                       tr.find(".edit_order_target").show();
                   }
                </#if>-->
-               var status = tr.attr("status").split(",");
+               let status = tr.attr("status").split(",");
                // 订单状态  0:未发货、1:已打单、3:备货中、4:收货、11:已通知配货
-               var orderStatus = status[0];
+               let orderStatus = status[0];
                // 出库状态  1:未出库、2:已出库
-               var deliverStatus = status[1];
+               let deliverStatus = status[1];
                // 确认状态  0:未确认、1:确认、2:挂起、3:作废 4:京东自发
-               var confimStatus = status[2];
-               if (confimStatus == "2" || confimStatus == "3" || confimStatus == "4") {
+               let confimStatus = status[2];
+               if (confimStatus === "2" || confimStatus === "3" || confimStatus === "4") {
                    // 挂起、作废
                    tr.find(".order_details_target").show();
                } else {
-                   if (confimStatus == "0") {
+                   if (confimStatus === "0") {
                        // 未确认
                        tr.find(".confirm_order_target").show();
                        tr.find(".edit_order_target").show();
@@ -473,9 +473,9 @@
                    } else {
                        // 已确认
 
-                       if (orderStatus == "11") {
+                       if (orderStatus === "11") {
                            // 已通知配货
-                           if (deliverStatus == "1") {
+                           if (deliverStatus === "1") {
                                // 未出库
                                tr.find(".order_details_target").show();
                                tr.find(".allocation_logistics_target").show();
@@ -488,7 +488,7 @@
                                tr.find(".order_details_target").show();
                                tr.find(".invalid_order_target").show();
                            }
-                       }else if (orderStatus == "0") {
+                       }else if (orderStatus === "0") {
                            // 未发货
                            tr.find(".order_details_target").show();
                            tr.find(".allocation_logistics_target").show();
@@ -504,6 +504,17 @@
                        }
                    }
                }
+               // 判断仓库
+               let sendType = tr.attr("sendType");
+               if (sendType === "3") {
+                   tr.find(".edit_order_target").hide();
+                   tr.find(".allocation_logistics_target").hide();
+                   tr.find(".split_order_target").hide();
+                   tr.find(".notice_distribution_target").hide();
+                   tr.find(".manual_ship_target").hide();
+                   tr.find(".del_order_target").hide();
+
+               }
            }
        }
     });