减号要选择性的删除。每行都要有减号  完成
现在的“印刷数量”就是新版格式的“生产数量”,放在“生产要求”前面,跟生产要求一行 完成
消耗格子的宽度适当缩小点 完成
9个文件已修改
154 ■■■■ 已修改文件
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs
@@ -227,7 +227,7 @@
                    condition += " and a.CateId = '" + _CateId + "'";
                if (!string.IsNullOrEmpty(_Name))
                    condition += " and a.Name = '" + _Name + "'";
                    condition += " and a.Name like '%" + _Name + "%'";
                if (!string.IsNullOrEmpty(Anzhuangdidian))
                    condition += " and a.Anzhuangdidian = '" + Anzhuangdidian + "'";
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
@@ -304,7 +304,7 @@
                    condition += " and a.CateId = '" + _CateId + "'";
                if (!string.IsNullOrEmpty(_Name))
                    condition += " and a.Name = '" + _Name + "'";
                    condition += " and a.Name like '%" + _Name + "%'";
                if (!string.IsNullOrEmpty(Anzhuangdidian))
                    condition += " and a.Anzhuangdidian = '" + Anzhuangdidian + "'";
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx
@@ -323,16 +323,16 @@
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
                                      <td>
                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>
                                    </td>
                                    <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>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -210,15 +210,16 @@
                                    </td>
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"   >
                                  <td>
                                        <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>
                                    </td>
                                <td>
                                  <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">正面色数</p>      
                                </td>
                                <td>
                                 <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">背面色数</p>       
                                </td>
                                  <td>
                                        <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>
                                    </td>
                            </tr>
                            <tr>
                                <td>
@@ -364,7 +365,7 @@
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_PrintedPositive" value="<%#Eval("PSF_PrintedPositive")%>" value_positiveid="<%#Container.ItemIndex + 1%>" />
                                </td>
                                <td colspan="1">
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
                                    <input type="text" class="  w60px  int " msg="请填写数字" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
                                </td>
                                <td colspan="1">
                                    <select keepdefaultstyle="true" class="  w80px" name="PSF_OpenSpecifications" value_selspec="<%#Container.ItemIndex + 1%>">
@@ -513,15 +514,16 @@
                       要求: <input type="text" name="txtYaoqiu" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PSF_Yaoqiu")%>" />
                         
                    </td>
                                             <td class="w70px " >
                                 <a class="Btn AddHoudaos" value_id="<%#Container.ItemIndex + 1%>"  style="font-size:20px;" >+</a>&nbsp;&nbsp;  <a class="Btn CutHoudaos" value_id="<%#Container.ItemIndex + 1%>"  style="font-size:20px;" >-</a>
                 </td>
                                              </tr>
                          </ItemTemplate>
                </asp:Repeater>
                                         </tbody>
                                     </table>
                            </td>
                             <td class="w70px " >
                                 <a class="Btn AddHoudaos"  style="font-size:20px;" >+</a>&nbsp;&nbsp;  <a class="Btn CutHoudaos" style="font-size:20px;" >-</a>
                 </td>
                        </tr>
                    </tbody>
                </table>
@@ -532,7 +534,7 @@
                生产要求:
                 </td>
                <td colspan="9">
                    <textarea style="width: 940px; height: 62px;" name="PMS_Remarks" runat = "server" id="PMS_Remarks"></textarea>
                    <textarea style="width: 940px; height: 12px;" name="PMS_Remarks" runat = "server" id="PMS_Remarks"></textarea>
                </td>
            </tr>
            <tr>
@@ -736,16 +738,18 @@
                 var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                 $(".AddHoudao").last().after($(".AddHoudao").last().clone(true));
                 $(".AddHoudao").last().attr("value_id", value_id + 1);
                 $(".AddHoudaos").last().attr("value_id", value_id + 1);
                 $(".CutHoudaos").last().attr("value_id", value_id + 1);
             });
             $(".CutHoudaos").click(function () {
                 var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                 if (value_id == 1) {
                 var value_id = parseInt($(this).attr("value_id"));
                 var count = $('.AddHoudao').length;
                 if (count == 1) {
                 } else {
                     $(".AddHoudao").last().remove();
                     $(".AddHoudao[value_id='" + value_id + "']").remove();
                 }
             });
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -207,14 +207,7 @@
                                    <span id="spanOrderBillModeName" runat="server"></span>
                                </td>
                            </tr>
                            <tr>
                                <td class="ali03">
                                    印刷数量:
                                </td>
                                <td colspan="5">
                                    <span id="spanPrintNum" runat="server"></span>
                                </td>
                            </tr>
                            <tr>
                                <td class="ali03">
                                    备注:
@@ -260,14 +253,15 @@
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
                                     <td>
                                        <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>
                                    </td>
                                    <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;">
@@ -514,12 +508,18 @@
                            </th>
                        </tr>--%>
                        <tbody>
                            <tr>
                                  <td style="font-weight: bold; background-color: #E6E6E6;width:10%;">
                             <tr>
                                <td  style="font-weight: bold; background-color: #E6E6E6;width:10%;">
                                    印刷数量:
                                </td>
                                <td  style="width:10%;">
                                    <span id="spanPrintNum" runat="server"></span>
                                </td>
                                  <td   style="font-weight: bold; background-color: #E6E6E6;width:10%;">
                                                生产要求:
                                            </td>
                                <td>
                                <td style="width:70%;">
                                    <span runat="server" id="txtPSO_Remarks_o"></span>
                                </td>
                            </tr>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -125,7 +125,7 @@
            this.txtPSO_Work_o_TR.Visible = false;
            if (string.IsNullOrEmpty(m_EC_SpecialOrders.PSO_Remarks))
            {
                this.txtPSO_Remarks_o_TR.Visible = false;
               // this.txtPSO_Remarks_o_TR.Visible = false;
            }
            else
            {
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.designer.cs
@@ -213,15 +213,6 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
        /// <summary>
        /// spanPrintNum 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPrintNum;
        /// <summary>
        /// spanOrderRemarks 控件。
        /// </summary>
        /// <remarks>
@@ -285,6 +276,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlTableRow txtPSO_Remarks_o_TR;
        /// <summary>
        /// spanPrintNum 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPrintNum;
        /// <summary>
        /// txtPSO_Remarks_o 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -173,14 +173,7 @@
                                <span id="spanOrderBillModeName" runat="server"></span>
                            </td>
                        </tr>
                        <tr>
                            <td class="ali03">
                                印刷数量:
                            </td>
                            <td colspan="5">
                                 <input type="text" id="txtOrderNum" class=" w120px int" min="0"  runat="server" />
                            </td>
                        </tr>
                        <tr>
                            <td class="ali03">
                                备注:
@@ -229,15 +222,16 @@
                                 
                            </tr>
                            <tr class=" price_tabbg" style="font-weight: bold; background-color: #E6E6E6;"   >
                                 <td>
                                        <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>
                                    </td>
                                <td>
                                  <p name="PSF_yinsezheng" value_openwidthspan="<%#Container.ItemIndex + 1%>">正面色数</p>      
                                </td>
                                <td>
                                 <p name="PSF_yinsebei" value_openwidthspan="<%#Container.ItemIndex + 1%>">背面色数</p>       
                                </td>
                                <td>
                                        <p name="PSF_yinshufangshi" value_openwidthspan="<%#Container.ItemIndex + 1%>">印刷方式</p>
                                    </td>
                            </tr>
                            <tr>
                                <td>
@@ -384,7 +378,7 @@
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_PrintedPositive" value="<%#Eval("PSF_PrintedPositive")%>" value_positiveid="<%#Container.ItemIndex + 1%>" />
                                </td>
                                <td colspan="1">
                                    <input type="text" class="  w80px  int " msg="请填写数字" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
                                    <input type="text" class="  w60px  int " msg="请填写数字" name="PSF_LastNum" value="<%#Eval("PSF_LastNum")%>" value_lastnumid="<%#Container.ItemIndex + 1%>" />
                                </td>
                                <td colspan="1">
                                    <select keepdefaultstyle="true" class="  w80px" name="PSF_OpenSpecifications" value_selspec="<%#Container.ItemIndex + 1%>">
@@ -533,15 +527,16 @@
                       要求: <input type="text" name="txtYaoqiu" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PSF_Yaoqiu")%>" />
                         
                    </td>
                                               <td class="w70px " >
                                 <a class="Btn AddHoudaos" value_id="<%#Container.ItemIndex + 1%>"  style="font-size:20px;" >+</a>&nbsp;&nbsp;  <a class="Btn CutHoudaos" value_id="<%#Container.ItemIndex + 1%>"  style="font-size:20px;" >-</a>
                 </td>
                                              </tr>
                          </ItemTemplate>
                </asp:Repeater>
                                         </tbody>
                                     </table>
                            </td>
                             <td class="w70px " >
                                 <a class="Btn AddHoudaos"  style="font-size:20px;" >+</a>&nbsp;&nbsp;  <a class="Btn CutHoudaos" style="font-size:20px;" >-</a>
                 </td>
                        </tr>
                    </tbody>
                </table>
@@ -582,12 +577,19 @@
                        </tr>
                    </thead>--%>
                    <tbody>
                        <tr>
                         <tr>
                            <td class="ali03 w70px">
                                印刷数量:
                            </td>
                            <td  class=" w120px">
                                 <input type="text" id="txtOrderNum" class=" w120px int" min="0"  runat="server" />
                            </td>
                            <td class="ali03 w70px " >
                生产要求:
                 </td>
                            <td>
                                <textarea style="width: 96%; height: 40px;" name="PSO_Remarks" runat="server" id="txtPSO_Remarks"></textarea>
                                <textarea style="width: 96%; height: 12px;" name="PSO_Remarks" runat="server" id="txtPSO_Remarks"></textarea>
                            </td>
                        </tr>
                    </tbody>
@@ -808,16 +810,18 @@
                var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                $(".AddHoudao").last().after($(".AddHoudao").last().clone(true));
                $(".AddHoudao").last().attr("value_id", value_id + 1);
                $(".AddHoudaos").last().attr("value_id", value_id + 1);
                $(".CutHoudaos").last().attr("value_id", value_id + 1);
                
            });
            $(".CutHoudaos").click(function () {
                var value_id = parseInt($(".AddHoudao").last().attr("value_id"));
                if (value_id == 1) {
                var value_id = parseInt($(this).attr("value_id"));
                var count = $('.AddHoudao').length;
                if (count == 1) {
                } else {
                    $(".AddHoudao").last().remove();
                    $(".AddHoudao[value_id='" + value_id + "']").remove();
                }
            });
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.designer.cs
@@ -213,15 +213,6 @@
        protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanOrderBillModeName;
        /// <summary>
        /// txtOrderNum 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderNum;
        /// <summary>
        /// spanOrderRemarks 控件。
        /// </summary>
        /// <remarks>
@@ -258,6 +249,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPSO_Work;
        /// <summary>
        /// txtOrderNum 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderNum;
        /// <summary>
        /// txtPSO_Remarks 控件。
        /// </summary>
        /// <remarks>