From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx |  153 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 117 insertions(+), 36 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 3f2b5e4..40fa8cf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,15 +9,15 @@
     <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=18" type="text/javascript"></script>
-    <script src="../../js/business/Order.js?v=25" type="text/javascript"></script>
+    <script src="../../js/Inquiry/Inquiry.js?v=185" type="text/javascript"></script>
+    <script src="../../js/business/Order.js?v=47" 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) {
@@ -47,9 +47,15 @@
         }
 
         function Saveyaoqiu() {
+            if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <=0 ) {
+                if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
+                    return false;
+            }
+
+
             if (document.getElementById('selPrintTypes').value != "6") {
                 alertMsg("鐩墠鍙繚瀛樹功鍒婅姹�!");
-                return;
+                return false;
             }
             return ValidateForm();
         }
@@ -111,6 +117,8 @@
                 document.getElementById('spnCustormerControl').style.display = document.getElementById('txtCustormerName') ? 'none' : '';
                 if ('0' == document.getElementById('txtKeyid').value) {
                     document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 2 }).ToString('yyyy-MM-dd');
+                    document.getElementById('selPrintTypes').value = "29";
+                    printTypeChange(document.getElementById('selPrintTypes'));
                     ReceiptT('customer', '', 6, 120); return;
                 } else {
                     ReceiptT('order', '<%=Orderid %>', 6, 120);  
@@ -139,6 +147,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">
@@ -158,10 +181,13 @@
             </script>
         </ItemTemplate>
     </asp:Repeater>--%>
-    <table class="table2" id="tbBasic">
+    <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>
@@ -186,6 +212,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">
@@ -203,15 +238,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>
@@ -228,17 +255,17 @@
                 <select id='selExigencyDegree' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
                 </select>
             </td>
-            <td align="right">
+            <td align="right" id="selVerifyWay123">
                 浜よ揣鏃堕棿锛�
             </td>
-            <td align="left">
-                <input id='txtDeliveryTime' class='date req' runat="server" />
+            <td align="left" id="selVerifyWay321">
+                <input id='txtDeliveryTime' class='date' runat="server" />
             </td>
            <td align="right">
                 宸叉湁鍗颁欢锛�
             </td>
             <td align="left">
-                <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'    onchange='printTypeChange1(this)'  >
+                <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' style="width:150px;"   onchange='printTypeChange1(this)'  >
                     <option value="" >璇烽�夋嫨</option>
                 </select>
             </td>
@@ -250,23 +277,24 @@
             </td>
             <td align="left">
                 <input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
+                 <input type='hidden'   id='txtDocumentNameHide' />
             </td>
-            <td align="right">
+            <td align="right"  id="selVerifyWay1234">
                 璁㈠崟鍗曚环锛�
             </td>
-            <td align="left">
+            <td align="left"  id="selVerifyWay4321">
                 <input id='txtUnitPrice' runat="server" maxlength='9' class='float' onchange="jsPrice(this.value)" />
             </td>
             <td align="right">
                 璁㈠崟鎬讳环锛�
             </td>
             <td align="left">
-                <input id='txtSumPrice' runat="server" maxlength='9' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
+                <input id='txtSumPrice' runat="server" maxlength='16' value='0' class="req float" min="0" onchange="jsdjPrice(this.value)" />
             </td>
-            <td align="right">
+            <td align="right" id="selVerifyWay12">
                 鏍$鏂瑰紡锛�
             </td>
-            <td align="left">
+            <td align="left" id="selVerifyWay21">
                 <select id='selVerifyWay' class=' Sreq' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
                 </select>
             </td>
@@ -299,18 +327,53 @@
             <td align="left">
                 <input id='txtPhone' runat="server" class='' />
             </td>
-            <td align="right">
+           
+        </tr>
+
+        <tr>
+             <td align="right">
                 鑱旂郴Q Q锛�
             </td>
             <td align="left">
                 <input id='txtQQ' runat="server" maxlength="50" />
             </td>
-        </tr>
+             <td align="right">
+                
+            </td>
+            <td align="left">
+              
+            </td>
+            <td align="right">
+                
+            </td>
+            <td align="left">
+              
+            </td>
+            <td align="right">
+                
+            </td>
+            <td align="left">
+              
+            </td>
+            </tr>
     </table>
+  
     <div id='div_InquiryEdit' style='display: block;'>
-        <div id="divInquiry" style='display: block;'>
+        <div id="divInquiry"  style=' display: block;width:1010px;'  >
         </div>
-        <table class="table2 table2Left">
+         <br />
+          <table class="table2 table2Left" id="Duiyinghetongbianhao"  align="left" style=" width:1000px;">
+               <tr   style=" height:11px;">
+                     <td    style="width:100px;text-align:right;">
+                         瀵瑰簲鍚堝悓搴忓彿锛�
+                </td>
+                     <td   style="text-align:left;"  >
+                             <input id='txtDuiyinghetongbianhao' runat="server" maxlength="100"   />
+                </td>
+                   </tr>
+              </table>
+           <br />
+        <table class="table2 table2Left"  align="left" style=" width:1000px;">
             <thead>
                 <tr>
                     <th colspan="6">
@@ -334,7 +397,8 @@
             </tr>
         </table>
     </div>
-    <table class="table2" id="tbFacing">
+         <br />
+    <table class="table2" id="tbFacing"  align="left" style=" width:1000px;">
         <thead>
             <tr>
                 <th colspan="4">
@@ -374,7 +438,7 @@
                 <input id='txtBookPrice' runat="server" maxlength='9' class='float' />
             </td>
         </tr>
-        <tr>
+        <tr id="trPerBag">
            <td align="right">
                 姣忓寘鏁伴噺锛�
             </td>
@@ -389,7 +453,8 @@
             </td>
         </tr>
     </table>
-    <table class="table2">
+         <br />
+    <table class="table2"  align="left" style=" width:1000px;">
         <tbody>
             
              <tr>
@@ -435,12 +500,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);
         }
@@ -450,9 +514,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 {
@@ -497,6 +561,23 @@
         else {
             document.getElementById('trbook').style.display = 'none';
         }
+
+        if (ssselPrintTypes == 37) {
+            document.getElementById('tbFacing').style.display = 'none';
+            document.getElementById('selVerifyWay12').style.display = 'none';
+            document.getElementById('selVerifyWay21').style.display = 'none';
+            //document.getElementById('selVerifyWay123').style.display = 'none';
+            //document.getElementById('selVerifyWay321').style.display = 'none';
+
+            document.getElementById('txtDeliveryTime').value = "";
+            
+            
+        }
+        else {
+            document.getElementById('tbFacing').style.display = '';
+            document.getElementById('selVerifyWay12').style.display = '';
+            document.getElementById('selVerifyWay21').style.display = '';
+        }
     }
 
 

--
Gitblit v1.9.1