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(",+-+,", ",")%>
@@ -287,6 +287,7 @@
                </tr>
            </tbody>
        </table>
         <asp:Repeater ID="Repeater1" runat="server">
                        <ItemTemplate>
                            <table cellpadding="0" cellspacing="0" style="text-align: center;">
@@ -299,35 +300,48 @@
                                    <td rowspan="2">
                                         构件 
                                    </td>
                                    <td rowspan="2" colspan="2">
                                        P数
                                    <td rowspan="2" >
                                        页数
                                    </td>
                                    <td rowspan="2" colspan="2">
                                    <td rowspan="2" >
                                        印刷机台
                                    </td>
                                    <td colspan="2">
                                        <span  style="<%#Eval("shifouxianshi")%>" >印色</span>
                                    <td colspan="3">
                                        <span  style="<%#Eval("shifouxianshi")%>" >印刷要求</span>
                                    </td>
                                    <td rowspan="2" colspan="2">
                                   <%-- <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>
                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >背</span>
                                        <span  style="<%#Eval("shifouxianshi")%>" >正面色数</span>
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >背面色数</span>
                                    </td>
                                </tr>
                                <tr style="background-color: #FFFFFF;">
                                    <td>
                                        <%#Eval("PSF_Component")%>
                                    </td>
                                    <td colspan="2">
                                    <td >
                                        <%#0.Equals(Eval("PSF_PNum")) ? "" : Eval("PSF_PNum")%>
                                    </td>
                                    <td colspan="2">
                                    <td >
                                        <%#Eval("PSF_PressesDesk")%>
                                    </td>
                                    <td>
@@ -336,7 +350,7 @@
                                    <td>
                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>       
                                    </td>
                                    <td colspan="2">
                                    <td >
                                     <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>       
                                    </td>
                                    <%--<td>
@@ -348,6 +362,15 @@
                                    <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">
@@ -363,7 +386,7 @@
                                      <span  style="<%#Eval("shifouxianshilunzhuan")%>" >纸张数量(张)</span>       
                                    </td>
                                    <td colspan="4">
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开料规格</span>
                                       <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开料规格(mm)</span>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
@@ -380,10 +403,10 @@
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >开数</span>      
                                    </td>
                                    <td>
                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >宽度(mm)</span>
                                        <span  style="<%#Eval("shifouxianshilunzhuan")%>" >宽度</span>
                                    </td>
                                    <td>
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >长度(mm)</span>
                                         <span  style="<%#Eval("shifouxianshilunzhuan")%>" >长度</span>
                                    </td>
                                </tr>
                                <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
@@ -418,7 +441,7 @@
                                        <%#0.Equals(Eval("PSF_OpenLength")) ? "" : Eval("PSF_OpenLength")%>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                              <%--  <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;<%#Eval("shifouxianshiheban")%>">
                                    <td>
                                        <span  style="<%#Eval("shifouxianshi")%>" >版材类型</span>
                                    </td>
@@ -436,7 +459,7 @@
                                    </td>
                                    <td colspan="6">
                                    </td>
                                    <tr>
                                    </tr>
                                        <tr style="background-color: #FFFFFF;<%#Eval("shifouxianshiheban")%>">
                                            <td>
                                               <span  style="<%#Eval("shifouxianshi")%>" > <%#Eval("PSF_PlateSource")%> </span>
@@ -455,7 +478,7 @@
                                            </td>
                                            <td colspan="6">
                                            </td>
                                        </tr>
                                        </tr>--%>
                                        <tr style="<%#Eval("shifouqitadingdan")%>">
                                            <td style="font-weight: bold; background-color: #E6E6E6;">
                                                其它订单的订单号:
@@ -464,9 +487,9 @@
                                                <%#Eval("PSF_PaperName")%>
                                            </td>
                                        </tr>
                                        <tr style=" display:<%#string.IsNullOrEmpty(Eval("PSF_Note").ToString())?"none":""%>">
                                        <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")%>
@@ -475,6 +498,71 @@
                            </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>