From e110200c2e32a0f82f474fa38b315ae6360f2dc4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 04 三月 2025 08:39:38 +0800
Subject: [PATCH] 在订单列表    送货安排     点击打印送货单  选择送货日期   默认最晚的送货日期,默认当天,可以修改  完成  司机查询  拥有司机小程序权限的人员  完成  新增送货     可以选择客户,也可以  填写临时客户  完成

---
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js |   17 ++++++++++-------
 1 files changed, 10 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..5cdb982 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -404,13 +404,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