From 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 三月 2025 08:34:42 +0800
Subject: [PATCH] 送货管理 增加查询 业务经理 客户名称 完成 查询送货安排的历史 完成
---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index a89652b..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' );
}
@@ -546,7 +549,7 @@
document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
}
- $("#Duiyinghetongbianhao").hide();
+
}
else {
document.getElementById('tbFacing').style.display = '';
@@ -556,6 +559,12 @@
document.getElementById('selVerifyWay321').style.display = '';
document.getElementById('selVerifyWay1234').style.display = '';
document.getElementById('selVerifyWay4321').style.display = '';
+
+ }
+
+ if (sel.value == 37 || sel.value == 38) {
+ $("#Duiyinghetongbianhao").hide();
+ } else {
$("#Duiyinghetongbianhao").show();
}
}
@@ -592,6 +601,7 @@
document.getElementById('selBusinessManagers').value = jobj.BusinessManagerId;
document.getElementById('txtContact').value = jobj.BusinessManagers;
document.getElementById('txtPhone').value = jobj.CompanyPhone;
+ document.getElementById('txtPrintPackDeliveryRequir').value = jobj.Note;
var aaaaaaaaaselPrintTypes = document.getElementById('selPrintTypes').value;
if (aaaaaaaaaselPrintTypes == "37") {
document.getElementById('txtDocumentName').value = jobj.CompanyName + "浣滀笟鏈�";
--
Gitblit v1.9.1