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 | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index e1241fc..5cdb982 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -50,6 +50,28 @@
});
}
+
+
+/*
+纭鍙楃悊
+*/
+function ToSuodan(orderId, orderShowId) {
+
+
+ var msg ='纭閿佸崟璁㈠崟:' + orderShowId + '?';
+ top.Dialog.confirm(msg, function () {
+ CallServer({ Target: "SuodanOrder", id: orderId }, function (data, textStatus) {
+ if ('1' == data) {
+ alertMsg('鎿嶄綔鎴愬姛锛�');
+ RefreshDIVOpener(); //鍏抽棴椤甸潰
+ } else {
+ alertMsg('-1' == data ? '閿佸崟杩囩▼涓彂鐢熷紓甯革紝璇烽噸鏂板彈鐞嗭紒' : '閿佸崟澶辫触锛�');
+ //dialog.close();
+ }
+ });
+ });
+}
+
///鎵归噺鍙楃悊
function ToAllAccept() {
var commission = parseFloat(document.getElementById('txtCommission').value);
@@ -382,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' );
}
@@ -514,6 +539,8 @@
document.getElementById('tbFacing').style.display = 'none';
document.getElementById('selVerifyWay12').style.display = 'none';
document.getElementById('selVerifyWay21').style.display = 'none';
+ document.getElementById('selVerifyWay1234').style.display = 'none';
+ document.getElementById('selVerifyWay4321').style.display = 'none';
if (OldOrderId == "" || OldOrderId == "0") {
document.getElementById('txtDeliveryTime').value = "";
}
@@ -522,6 +549,7 @@
document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
}
+
}
else {
document.getElementById('tbFacing').style.display = '';
@@ -529,6 +557,15 @@
document.getElementById('selVerifyWay21').style.display = '';
document.getElementById('selVerifyWay123').style.display = '';
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();
}
}
@@ -564,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 + "浣滀笟鏈�";
@@ -631,4 +669,10 @@
return verfy_form(document.forms[0]);
}
}
-function Save() { return ValidateForm(); }
\ No newline at end of file
+function Save() {
+ if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <= 0) {
+ if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
+ return false;
+ }
+ return ValidateForm();
+}
\ No newline at end of file
--
Gitblit v1.9.1