From d766d74d37d522bfb9c633e9afbe789ad0f1a6de Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 17 十二月 2025 15:10:26 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx |   85 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
index 9e0dd1d..db3a41e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -24,10 +24,38 @@
     <script type="text/javascript">
         window.printBeginCallBack = function () {
             document.getElementById('fram_operate').style.display = 'none';
+            document.getElementById('hetongchakan').style.display = 'none';
         };
         window.printOverCallBack = function () {
             document.getElementById('fram_operate').style.display = '';
+            document.getElementById('hetongchakan').style.display = '';
         };
+
+        //缁存姢
+        function onViewuplod(keyid) {
+            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');
+        }
+
+
+        //鏂板闂鍙嶉
+        function ToAddorder(orderid) {
+            var l = (screen.availWidth - 500) / 2;
+            var t = (screen.availHeight - 300) / 2;
+            window.open("/Pages/business/DeliverPlanWentiOrder.aspx?Orderid="+orderid, '_blank', 'height=750,width=900,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+        }
+        //鏌ョ湅璁捐璁㈠崟
+        function Toshejiorder(orderid) {
+            var l = (screen.availWidth - 500) / 2;
+            var t = (screen.availHeight - 300) / 2;
+            window.open("/Pages/business/ShejiOrderDeatil.aspx?orderId=" + orderid, '_blank', 'height=850,width=800,top=' + t + ',left=' + l + ',toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+           
+            
+        }
+
+
 
         $(function () {
             $("#btnPrint").click(function () {
@@ -48,6 +76,16 @@
 <body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
     <form id="form1" runat="server">
     <input type="hidden" runat="server" id="hideOrderId" />
+         <table border="1" cellpadding="0" cellspacing="0" style="border: 0;" id='hetongchakan' >
+              <tr>
+                        <td  >
+<%--                            <span onclick="onViewuplod('<%=BuyerId %>')"   <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>  >鏌ョ湅鍚堝悓 </span>--%>
+                            <input type="button"    <%=ContractCount.ToString() == "0" ? "style=\"display:none;\"" : ""%>   value="鏌ョ湅鍚堝悓" onclick="onViewuplod('<%=BuyerId %>')">&nbsp;&nbsp;&nbsp;
+                             <input type="button"     value="闂鍙嶉" onclick="ToAddorder('<%=OrderId %>')">
+                            <input type="button"  <%=(string.IsNullOrEmpty(shejidingdanid))?"style=\"display:none;\"":"" %>   value="璁捐璁㈠崟" onclick="Toshejiorder('<%=OrderId %>')">
+                        </td>
+                    </tr>
+             </table>
     <div class='dbody'>
         <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
             <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
@@ -165,13 +203,13 @@
                             鏁伴噺锛�
                         </td>
                         <td>
-                            <%#Eval("OrderExtend.PrintNum")%>&nbsp;
+                            <%#Eval("OrderExtend.PrintNum")%>&nbsp;<%#Eval("UnitName")%>
                         </td>
                         <td class='left'>
                             鍗曚环锛�
                         </td>
                         <td>
-                            <%#(Eval("UnitPrice")==null)||(string.IsNullOrEmpty(Eval("UnitPrice").ToString()))?"":"锟�"%><%#Eval("UnitPrice","{0:F2}")%>&nbsp;
+                            <%#(Eval("UnitPrice")==null)||(string.IsNullOrEmpty(Eval("UnitPrice").ToString()))?"":"锟�"%><%#Eval("UnitPrice","{0:F4}")%>&nbsp;
                         </td>
                         <td class='left'>
                             璁㈠崟鎬婚锛�
@@ -196,8 +234,16 @@
                         <td class='left'>
                             鎺ヤ欢鏃堕棿锛�
                         </td>
-                        <td colspan="3">
-                            &nbsp;
+                         <td colspan="3">
+                           
+                        </td>
+                         <tr>
+                         </tr>
+                         <td class='left'>
+                            瀵瑰簲鍚堝悓搴忓彿锛�
+                        </td>
+                        <td colspan="7">
+                           <%#Eval("Duiyinghetongbianhao")%>&nbsp; 
                         </td>
                     </tr>
                 </ItemTemplate>
@@ -222,14 +268,23 @@
                             <%#Eval("PrintModeName")%>&nbsp;
                         </td>
                     </tr>
-                    <tr>
-                        <td class='left'>
+                    <tr  <%#Eval("PrintTypeId").ToString()=="37"||Eval("PrintTypeId").ToString()=="38"?"style=\"display:none;\"":""%> >
+                        <td class='left'   >
                             鍗板埛瑕佹眰锛�
                         </td>
-                        <td colspan='7'>
-                            <asp:Label ID="lblPrintDemand" Text='<%#Eval("PrintDemand")%>' runat="server" Width="650px"></asp:Label>
+                        <td  colspan='7'    >
+                            <asp:Label ID="lblPrintDemand" Text='<%#Eval("PrintDemand")%>' runat="server" Width="650px"  ></asp:Label>
                         </td>
                     </tr>
+
+
+                    <tr  <%#Eval("PrintTypeId").ToString()=="37"||Eval("PrintTypeId").ToString()=="38"?"":"style=\"display:none;\""%>   >
+                         
+                        <td  colspan='8'   >
+                            <asp:Label ID="Label1" Text='<%#Eval("PrintDemand")%>' runat="server"  ></asp:Label>
+                        </td>
+                    </tr>
+
                     <tr>
                         <td class='left'>
                             鍚庨亾宸ュ簭锛�
@@ -333,6 +388,20 @@
                                 <%#Eval("FetchContacts")%>&nbsp;
                             </td>
                         </tr>
+                        <tr>
+                        <td class='left'>
+                           姣忓寘鏁伴噺锛�
+                        </td>
+                        <td>
+                            <%#Eval("NumPerBag")%>&nbsp;
+                        </td>
+                        <td class="left">
+                            鎬诲寘鏁帮細
+                        </td>
+                        <td colspan="5">
+                            <%#Eval("BagNum")%>&nbsp;
+                        </td>
+                    </tr>
                     </div>
                 </ItemTemplate>
             </asp:Repeater>

--
Gitblit v1.9.1