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 | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index f7a528f..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' );
}
@@ -536,6 +571,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 = "";
}
@@ -544,6 +581,7 @@
document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
}
+
}
else {
document.getElementById('tbFacing').style.display = '';
@@ -551,6 +589,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();
}
}
@@ -586,6 +633,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 + "浣滀笟鏈�";
@@ -653,4 +701,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