From f6cb981322bc4c2a27921ad0480dce7fb483a4d8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 10 四月 2026 13:23:54 +0800
Subject: [PATCH] 先提交一部分
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 281 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
index ec0de5f..a3ada61 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -121,9 +121,9 @@
<th style="text-align: center; width: 56px;">
淇垏瑕佹眰
</th>
- <th style="text-align: center; width: 56px;">
+ <%--<th style="text-align: center; width: 56px;">
鍖呰瑕佹眰
- </th>
+ </th>--%>
<th style="text-align: center;">
鍚庨亾鍙婂伐鑹鸿姹�
</th>
@@ -148,9 +148,9 @@
<td style="text-align: center;">
<%#Eval("PO_TrimRequire")%>
</td>
- <td style="text-align: center;">
+ <%-- <td style="text-align: center;">
<%#Eval("PO_PackagRequire")%>
- </td>
+ </td>--%>
<td>
<div style="width: 254px; overflow: visible; word-break: break-all; word-wrap: normal; text-align: left;">
<%#Eval("PO_RequirementWork").ToString().Replace("锛�+-+锛�", ",")%>
@@ -160,7 +160,7 @@
</ItemTemplate>
</asp:Repeater>
</table>
- <table border="1" cellpadding="0" cellspacing="0" style="border-right: 0; border-bottom: 0; text-align: left;">
+ <table border="1" cellpadding="0" cellspacing="0" style="border-right: 0; border-bottom: 0; text-align: left;" id="yuanshi" runat="server" >
<tr style="border: none; background-color: #E4E4E4;">
<th colspan="10" style="text-align: left; text-indent: 5px;">
<b>鍗板埛淇℃伅</b>
@@ -287,6 +287,282 @@
</tr>
</tbody>
</table>
+
+ <asp:Repeater ID="Repeater1" runat="server">
+ <ItemTemplate>
+ <table cellpadding="0" cellspacing="0" style="text-align: center;">
+ <tr style="border: none; background-color: #E4E4E4;">
+ <th colspan="12" style="text-align: left; text-indent: 5px;">
+ <b>绗�<span class=" AddCount red"><%#Container.ItemIndex + 1%></span>鐗�</b>
+ </th>
+ </tr>
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
+ <td rowspan="2">
+ 鏋勪欢
+ </td>
+ <td rowspan="2" >
+ 椤垫暟
+ </td>
+ <td rowspan="2" >
+ 鍗板埛鏈哄彴
+ </td>
+ <td colspan="3">
+ <span style="<%#Eval("shifouxianshi")%>" >鍗板埛瑕佹眰</span>
+ </td>
+ <%-- <td rowspan="2" colspan="2">
+ <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>
+ </td>--%>
+ <td rowspan="2" >
+ <span style="<%#Eval("shifouxianshi")%>" > 鏉挎潗瑙勬牸</span>
+ </td>
+ <td rowspan="2" >
+ <span style="<%#Eval("shifouxianshi")%>" > 鏁伴噺锛堝紶锛� </span>
+ </td>
+ <td rowspan="2" >
+ 鍙戠増濂楁暟
+ </td>
+ </tr>
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
+
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" >姝ｉ潰鑹叉暟</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" >鑳岄潰鑹叉暟</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >鍗板埛鏂瑰紡</span>
+ </td>
+ </tr>
+ <tr style="background-color: #FFFFFF;">
+ <td>
+ <%#Eval("PSF_Component")%>
+ </td>
+ <td >
+ <%#0.Equals(Eval("PSF_PNum")) ? "" : Eval("PSF_PNum")%>
+ </td>
+ <td >
+ <%#Eval("PSF_PressesDesk")%>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorPositive")%></span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>
+ </td>
+ <td >
+ <span style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>
+ </td>
+ <%--<td>
+ <%#Eval("PSF_SheetSource")%>
+ </td>
+ <td>
+ <%#Eval("PSF_SpecificationsSheet")%>
+ </td>
+ <td>
+ <%#Eval("PSF_EditionCount")%>
+ </td>--%>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" > <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
+ </td>
+ <td>
+ <%#Eval("PSF_Fabantaoshu")%>
+ </td>
+ </tr>
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>" >
+ <td rowspan="2">
+ 绾稿紶鏉ユ簮
+ </td>
+ <td rowspan="2" colspan="1">
+ 绾稿紶鍚嶇О
+ </td>
+ <td rowspan="2" colspan="1">
+ 绾稿紶瑙勬牸
+ </td>
+ <td colspan="3">
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >绾稿紶鏁伴噺锛堝紶锛�</span>
+ </td>
+ <td colspan="4">
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏂欒鏍硷紙mm锛�</span>
+ </td>
+ </tr>
+ <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
+ <td>
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >绾稿紶鏁伴噺</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >鍗板埛姝ｆ暟</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >娑堣��</span>
+ </td>
+ <td colspan="1">
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >寮�鏁�</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >瀹藉害</span>
+ </td>
+ <td>
+ <span style="<%#Eval("shifouxianshilunzhuan")%>" >闀垮害</span>
+ </td>
+ </tr>
+ <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
+ <td>
+ <%#Eval("PSF_PaperSource")%>
+ </td>
+ <td colspan="1">
+ <%#Eval("PSF_PaperName")%>
+ </td>
+ <td colspan="1">
+ <%#Eval("PSF_MaterialSpecifications")%>
+ </td>
+ <%--<td colspan="1">
+ <%#0.Equals(Eval("PSF_BigPaperCount")) ? "" : Eval("PSF_BigPaperCount")%>
+ </td>--%>
+ <td>
+ <%#0.Equals(Eval("PSF_PrintedCount")) ? "" : Eval("PSF_PrintedCount")%>
+ </td>
+ <td>
+ <%#0.Equals(Eval("PSF_PrintedPositive")) ? "" : Eval("PSF_PrintedPositive")%>
+ </td>
+ <td>
+ <%#0.Equals(Eval("PSF_LastNum")) ? "" : Eval("PSF_LastNum")%>
+ </td>
+ <td colspan="1">
+ <%#Eval("PSF_OpenSpecifications")%>
+ </td>
+ <td>
+ <%#0.Equals(Eval("PSF_OpenWidth")) ? "" : Eval("PSF_OpenWidth")%>
+ </td>
+ <td>
+ <%#0.Equals(Eval("PSF_OpenLength")) ? "" : Eval("PSF_OpenLength")%>
+ </td>
+ </tr>
+ <%-- <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" >鐗堟潗绫诲瀷</span>
+ </td>
+ <td colspan="2">
+ <span style="<%#Eval("shifouxianshi")%>" > 瑙勬牸</span>
+ </td>
+ <td id="lbCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>>
+ <span style="<%#Eval("shifouxianshi")%>" > CTP鏁伴噺锛堝紶锛� </span>
+ </td>
+ <td id="lbPSSpec" <%#show("PSSpec",Eval("PSF_PlateSource").ToString())%>>
+ PS鐗堣鏍�
+ </td>
+ <td id="lbPSCount" <%#show("PSCount",Eval("PSF_PlateSource").ToString())%>>
+ PS鐗堟暟閲�
+ </td>
+ <td colspan="6">
+ </td>
+ </tr>
+ <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
+ <td>
+ <span style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span>
+ </td>
+ <td colspan="2">
+ <span style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_CTPSpecType")%> </span>
+ </td>
+ <td id="tdCTPCount" <%#show("CTPCount",Eval("PSF_PlateSource").ToString())%>>
+ <span style="<%#Eval("shifouxianshi")%>" > <%#0.Equals(Eval("PSF_CTPCount")) ? "" : Eval("PSF_CTPCount")%> </span>
+ </td>
+ <td id="tdPSSpec" <%#show("PSSpec",Eval("PSF_PlateSource").ToString())%>>
+ <%#Eval("PSF_PSSpec")%>
+ </td>
+ <td id="tdPsCount" <%#show("PSCount",Eval("PSF_PlateSource").ToString())%>>
+ <%#0.Equals(Eval("PSF_PSCount")) ? "" : Eval("PSF_PSCount")%>
+ </td>
+ <td colspan="6">
+ </td>
+ </tr>--%>
+ <tr style="<%#Eval("shifouqitadingdan")%>">
+ <td style="font-weight: bold; background-color: #E6E6E6;">
+ 鍏跺畠璁㈠崟鐨勮鍗曞彿锛�
+ </td>
+ <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
+ <%#Eval("PSF_PaperName")%>
+ </td>
+ </tr>
+ <tr style=" display:none;">
+ <td style="font-weight: bold; background-color: #E6E6E6;">
+ 鐢熶骇瑕佹眰锛�
+ </td>
+ <td colspan="12" style="text-align: left; background-color: #FFFFFF;">
+ <%#Eval("PSF_Note")%>
+ </td>
+ </tr>
+ </table>
+ </ItemTemplate>
+ </asp:Repeater>
+
+
+ <table cellpadding="0" cellspacing="0" style="text-align: left;width: 100%;<%=tablesee%>">
+
+ <tbody>
+
+ <tr>
+ <td style="font-weight: bold; background-color: #E6E6E6;width:10%;" rowspan="<%=therowspan %>">
+ 鍚庨亾宸ュ簭锛�
+ </td>
+
+
+ <asp:Repeater ID="RepeaterHoudaoList" runat="server">
+ <ItemTemplate>
+
+ <td>
+
+ <%#Eval("PSF_Houdaogongxu")%>
+
+ </td>
+
+ <td>
+ 鏁伴噺: <%#Eval("PSF_Shuliang")%>
+ </td>
+ <td>
+ 鍊嶆暟: <%#Eval("PSF_Beishu")%>
+ </td>
+ <td>
+ 鏈洪暱:<%#Eval("PSF_Jichang")%>
+ </td>
+ <td>
+
+ 瑕佹眰: <%#Eval("PSF_Yaoqiu")%>
+
+ </td>
+ </tr>
+ </ItemTemplate>
+ </asp:Repeater>
+
+
+
+ </tbody>
+ </table>
+
+
+
+
+ <table cellpadding="0" cellspacing="0" style="text-align: left;" id="txtPSO_Remarks_o_TR1" runat="server" >
+ <%-- <tr style="border: none; background-color: #E4E4E4;">
+ <th colspan="1" style="text-align: left; text-indent: 5px;">
+ <b>澶囨敞</b>
+ </th>
+ </tr>--%>
+ <tbody>
+ <tr>
+ <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
+ 鐢熶骇瑕佹眰锛�
+ </td>
+ <td>
+ <span runat="server" id="txtPSO_Remarks_o"></span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+
</div>
</form>
</body>
--
Gitblit v1.9.1