From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单,你们给我做两种,做一张打印没得数量的,做一张打印有数量的。送货单格式就是32开,就哎就是A4排一半。你们打了测试,注意,美观。 把那个把它做出来,下一批就用这个自动打。 不是不是打印的要数量都是有数量,要没得数量都没得数量。就是点打印的时候就两个按钮嘛,一个是有数量打印,或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的,比如你那里再打你那个打印关闭的按钮,要把搞成两个打印嘛,就是打印空白送货单和打印送货单。 好点打印空白送货单的,就是现在这样子。点打印送货单,打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询,状态查询需要修改逻辑

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx |   72 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 6774756..2f3e5f2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,21 +9,22 @@
     <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
     <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
     <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
-    <script src="../../js/Inquiry/Inquiry.js?v=153" type="text/javascript"></script>
-    <script src="../../js/business/Order.js?v=43" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=205" type="text/javascript"></script>
+    <script src="../../js/business/Order.js?v=55" type="text/javascript"></script>
     <!--鍓嶅彴椤甸潰end-->
     <script type="text/javascript" language="javascript">
 
         function jsPrice(dj) {
             var num = $("#printCount").val();
 
-            $("#txtSumPrice").val(dj * num);            
+            $("#txtSumPrice").val((dj * num).toFixed(4));
         }
 
         function jsdjPrice(zj) {
             var num = $("#printCount").val();
-
-            $("#txtUnitPrice").val( (zj/num).toFixed(4) );
+            if (num > 0) {
+                $("#txtUnitPrice").val((zj / num).toFixed(4));
+            }
         }
 
         function ReBindClients() {
@@ -47,6 +48,12 @@
         }
 
         function Saveyaoqiu() {
+
+            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;
@@ -57,6 +64,11 @@
                 alertMsg("鐩墠鍙繚瀛樹功鍒婅姹�!");
                 return false;
             }
+
+            if (document.getElementById('selPrintTypes').value == "37") {
+                WorkBookCountNum();
+            }
+
             return ValidateForm();
         }
 
@@ -147,6 +159,21 @@
         }
 
 
+
+        //缁存姢
+        function onViewuplod() {
+
+            var keyid = $("#selCustormer").val();
+            if (keyid == "") {
+                alertMsg("璇烽�夋嫨瀹㈡埛!");
+                return;
+            }
+            var l = (screen.availWidth - 500) / 2;
+            var t = (screen.availHeight - 300) / 2;
+            // window.open({ URL: "/Pages/business/CorporateClientsUpLoadContract.aspx?Keyid=" + keyid, Title: "鏌ョ湅鍚堝悓", Width: 900, Height: 750 });
+            window.open('/Pages/business/CorporateClientsContractShow.aspx?Keyid=' + keyid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+        }
+
          
     </script>
     <style type="text/css">
@@ -169,7 +196,10 @@
     <table class="table2" id="tbBasic" align="left" style=" width:1000px;">
         <thead>
             <tr>
-                <th colspan="8">
+                <th colspan="1">
+                      <input type="button" id="btnPrint"    value="鏌ョ湅鍚堝悓" onclick="onViewuplod()">
+                </th>
+                <th colspan="7">
                     鍩烘湰淇℃伅
                 </th>
             </tr>
@@ -194,6 +224,15 @@
             </tr>
         <tr>
              <td align="right">
+                璁㈠崟绫诲瀷锛�
+            </td>
+            <td align="left">
+                <span id='spnPrintType'></span>
+                <input type="hidden" id='txtPrintTypes' runat="server" />
+                <select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
+                </select>
+            </td>   
+             <td align="right">
                 瀹㈡埛鍗曚綅锛�
             </td>
             <td colspan="3" align="left">
@@ -211,15 +250,7 @@
                 </select>
                 <!--datavaluefield="MeanValue"-->
             </td>
-            <td align="right">
-                璁㈠崟绫诲瀷锛�
-            </td>
-            <td align="left">
-                <span id='spnPrintType'></span>
-                <input type="hidden" id='txtPrintTypes' runat="server" />
-                <select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
-                </select>
-            </td>   
+           
            
         </tr>
         <tr>
@@ -349,7 +380,7 @@
                          瀵瑰簲鍚堝悓搴忓彿锛�
                 </td>
                      <td   style="text-align:left;"  >
-                             <input id='txtDuiyinghetongbianhao' runat="server" maxlength="100" style="width:300px;" />
+                             <input id='txtDuiyinghetongbianhao' runat="server" maxlength="100"   />
                 </td>
                    </tr>
               </table>
@@ -481,12 +512,11 @@
         var count = document.getElementById('printCount').value;
         var numPerBag = parseInt($("#txtNumberPerBag").val());
 
-        if (isNaN(count)) {
+        if (isNaN(count) || isNaN(numPerBag)) {
 
-            $("#txtBagNum").val(0);
+           /* $("#txtBagNum").val("");*/
         }
         else {
-
             var bagNum = parseInt(count / numPerBag);
             $("#txtBagNum").val(bagNum);
         }
@@ -496,9 +526,9 @@
         var count = document.getElementById('printCount').value;
         var bagNum = parseInt($("#txtBagNum").val());
 
-        if (isNaN(count)) {
+        if (isNaN(count) || isNaN(bagNum)) {
             
-            $("#txtNumberPerBag").val(0);
+          /*  $("#txtNumberPerBag").val("");*/
 
         }
         else {

--
Gitblit v1.9.1