From eea9ea3094e223d531ec058a1ef6e1656b0a5216 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 10 三月 2025 09:05:22 +0800
Subject: [PATCH] 送货单逾期不要  就是要订单没有送货的逾期    完成    送货管理下   未送货订单        /Pages/business/OrderSonghuoanchiList.aspx    01

---
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js |   49 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index a04d821..1954352 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -276,6 +276,38 @@
     }
 }
 
+
+
+
+/*
+鎵归噺瀹屽伐
+*/
+function ToDeliverWork(operateFn, validateFn) {
+    var ids = '';
+    var cks = $("input[name='ckId']:checked");
+    if (cks.length == 0) { alertMsg('娌℃湁閫変腑浠讳綍椤癸紒'); return; } else { }
+    var isCan = true;
+    cks.each(function (ii, vv) {
+        var ckVal = $(this).val();
+        var ckValJson = eval('(' + ckVal + ')');
+        //        if (parseInt(ckValJson.orderType) < 1 && ckValJson.orderState == 1) {
+        //            isCan = false;
+        //            return false;
+        //        }
+        if (ckValJson.orderState == 1 || ckValJson.orderState <= 0) {
+            isCan = false;
+            return false;
+        }
+        ids = ids + ',' + $(vv).attr("value_keyid");
+    });
+    if (isCan) {
+        dialog.open({ URL: "/Pages/business/DeliverWork.aspx?ids=" + ids, Title: '瀹屽伐', Height: 600, Width: 680 });
+    }
+    else {
+        alertMsg("鎵�閫夎鍗曟湭鍙楃悊锛屾垨宸插喕缁擄紝鎴栬�呭凡缁堟锛屾垨宸插畬鎴愶紝涓嶈兘鎿嶄綔瀹屽伐锛�");
+    }
+}
+
 function SendToServer(sparam) {
 
     CallServer(sparam, function (data, textStatus) {
@@ -404,13 +436,16 @@
         }
         else {
             if (DeliveryOrderId == null || DeliveryOrderId == "" || DeliveryOrderId == "00000000-0000-0000-0000-000000000000") {
-                var r = confirm("鏄惁瀹夋帓閫佽揣?");
-                if (r == true) {
-                    OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=1' );
-                }
-                else {
-                    OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2'  );
-                }
+                var url = "/Pages/business/DeliverPlanShifou.aspx?ids=" + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId;
+                top.Dialog.open({ URL: url, Title: "閫佽揣鏃ユ湡", Height: 300, Width: 680 });
+
+                //var r = confirm("鏄惁瀹夋帓閫佽揣?");
+                //if (r == true) {
+                //    OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=1' );
+                //}
+                //else {
+                //    OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2'  );
+                //}
             } else {
                 OpenWindowByUrl('/Pages/business/PrintAwbOrder.aspx?ids=' + ids + '&buyerid=' + tobjs[0]['buyerId'] + '&orderId=' + orderId + '&shifouDelivery=2' );
             }

--
Gitblit v1.9.1