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 |   42 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
index 1107822..db3a41e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -46,6 +46,16 @@
             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 () {
@@ -72,6 +82,7 @@
 <%--                            <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>
@@ -198,7 +209,7 @@
                             鍗曚环锛�
                         </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'>
                             璁㈠崟鎬婚锛�
@@ -223,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>
@@ -249,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'>
                             鍚庨亾宸ュ簭锛�

--
Gitblit v1.9.1