From 50d433602441964d905abe6e516ad258ba66627d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 21 十一月 2025 12:06:16 +0800
Subject: [PATCH] 送货单修改这几个地方，第一个，那个表格最上面那根线条和左边那根线条看粗细不一致，太细了， 感觉像打出来像断笔画。这是一个。第二个， 中间空的太多。我刚才打印打了两张送货单，他都打印的是两页， 相当于说跳了一行一行空白的第二页，第二页是白字的嘛，中间空的太多，中间不空那么多。 好，第三，那个左右的页边距，你们可能只有。

---
 CY_ECommercePlatform/CY.WebForm/js/business/Order.js |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 13e4417..1e7ddd1 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -115,7 +115,7 @@
 //            html += '</p>';
 //            html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="鍙� 鐞�" onclick="DoAcceptAll(\'' + ids + '\')"/>&nbsp;&nbsp;<input type="button" class="button" value="鍙� 娑�" onclick="parent.dialog.close()"/></span></div>';
             //            dialog.open({ InnerHtml: html, Title: '鎵归噺纭鍙楃悊', Width: 400, Height: 100, Modal: false });
-            var msg = !needPrice ? ('纭鎵归噺鍙楃悊鎵�閫�' + orderShowIds + '璁㈠崟?') : ('鍙楃悊鎵�閫夌嚎涓婅鍗曢渶瑕佹敮浠橈骏' + Float2(price) + '鏈嶅姟璐�,鏄惁纭鎵归噺鍙楃悊' + orderShowIds + '璁㈠崟锛�');
+            var msg = !needPrice ? ('纭鎵归噺鍙楃悊鎵�閫夎鍗�?') : ('鍙楃悊鎵�閫夌嚎涓婅鍗曢渶瑕佹敮浠橈骏' + Float2(price) + '鏈嶅姟璐�,鏄惁纭鎵归噺鍙楃悊璁㈠崟锛�');
             top.Dialog.confirm(msg, function () {
                 DoAcceptAll(ids);
             });
@@ -335,11 +335,16 @@
     //姝ｆ暟姝ｅ垯琛ㄨ揪寮�
     var reg1 = /^\d+(?=\.{0,1}\d+$|$)/;
 
+    if (sparam.dtypeId == 4 && sparam.orderState != '1' && sparam.orderState != '2') {
+        alertMsg('宸茬粡瀹夋帓鐢熶骇鐨勮鍗曚笉鑳芥挙閿�锛�'); txtTargetValue.focus(); return;
+    }
+
     //鏈彈鐞�
     if (sparam.orderState == '1') {
         sparam.dtypeId = 4;
         sparam.title = "鎾ゅ崟绠＄悊";
     }
+   
 
     parent.parent.parent.parent.parent.parent['ToSubmit'] =
     function (domobj) {
@@ -1014,9 +1019,19 @@
     }
 }
 function Save() {
+
+    if (document.getElementById('printCount').value == "" || parseFloat(document.getElementById('printCount').value) <= 0) {
+        alert("璁㈠崟鏁伴噺涓�0,涓嶈兘淇濆瓨!");
+            return false;
+    }
+
     if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <= 0) {
         if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
             return false;
     }
+
+    if (document.getElementById('selPrintTypes').value == "37") {
+        WorkBookCountNum();
+    }
     return ValidateForm();
 }
\ No newline at end of file

--
Gitblit v1.9.1