20260312  所有要品牌选择界面的订单类型的“品牌”都删除 20260312 合版工单删除包装要求,后道及工艺要求不要尺寸
7个文件已修改
65 ■■■■ 已修改文件
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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(",+-+,", ",")%>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -78,9 +78,9 @@
            <th style="text-align: center;">
                修切要求
            </th>
            <th style="text-align: center;">
           <%-- <th style="text-align: center;">
                包装要求
            </th>
            </th>--%>
            <th style="text-align: center;">
                后道及工艺要求
            </th>
@@ -111,14 +111,14 @@
                            <option value="不修切">不修切</option>
                        </select>
                    </td>
                    <td>
                   <%-- <td>
                        <select keepDefaultStyle="true" class=" w70px" name="PO_PackagRequire">
                            <option value="打包">打包</option>
                            <option value="打捆">打捆</option>
                            <option value="装纸箱">装纸箱</option>
                            <option value="不打包">不打包</option>
                        </select>
                    </td>
                    </td>--%>
                    <td>
                        <%--<input type="text" name="PO_Requirement" class=" noJ" style="width: 300px;" value="<%#Eval("PrintDemandAfterWorksDemand") %>" />--%>
                        <input type="text" name="PO_Requirement" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PrintDemandAfterWorksDemand")%>" />
@@ -152,14 +152,14 @@
                            <option value="不修切" <%#Eval("PO_TrimRequire").ToString()=="不修切"?"selected":""%>>不修切</option>
                        </select>
                    </td>
                    <td>
                  <%--  <td>
                         <select keepDefaultStyle="true" class=" w70px" name="PO_PackagRequire" value="<%#Eval("PO_PackagRequire")%>">
                            <option value="打包" <%#Eval("PO_PackagRequire").ToString()=="打包"?"selected":""%>>打包</option>
                            <option value="打捆" <%#Eval("PO_PackagRequire").ToString()=="打捆"?"selected":""%>>打捆</option>
                            <option value="装纸箱" <%#Eval("PO_PackagRequire").ToString()=="装纸箱"?"selected":""%>>装纸箱</option>
                            <option value="不打包" <%#Eval("PO_PackagRequire").ToString()=="不打包"?"selected":""%>>不打包</option>                     
                        </select>
                    </td>
                    </td>--%>
                    <td>
                        <input type="text" name="PO_Requirement" class=" noJ" style="width: 405px;" value="<%#Eval("PO_RequirementWork").ToString().Replace(",+-+,", ",")%>" />
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -222,7 +222,7 @@
                    }
                    if(_eC_OrderBasic.PrintTypeId == -1)
                    {
                        ssss = _inquiryCommonModel.PrintDemand;
                        ssss = _inquiryCommonModel.PrintDemand.Replace(_inquiryCommonModel.PrintSizeName+ ";", "");
                    }
                    if (!string.IsNullOrEmpty(ssss) && ssss.Length > 500)
                    {
@@ -485,7 +485,7 @@
                string[] PO_Count = Request["PO_Count"].ToString2().Split(',');
                string[] PO_TrimRequire = Request["PO_TrimRequire"].ToString2().Split(',');
                string[] PO_PackagRequire = Request["PO_PackagRequire"].ToString2().Split(',');
                //string[] PO_PackagRequire = Request["PO_PackagRequire"].ToString2().Split(',');
                string[] PO_Requirement = Request["PO_Requirement"].ToString2().Split(',');
                string[] PO_OrderNum = Request["txtOrderNum"].ToString2().Split(',');
                string[] PO_Title = Request["txtDocumentName"].ToString2().Split(',');
@@ -493,7 +493,7 @@
              
                if (orderId.Length != PO_Count.Length || orderId.Length != PO_TrimRequire.Length || orderId.Length != PO_PackagRequire.Length || orderId.Length != PO_Requirement.Length)
                if (orderId.Length != PO_Count.Length || orderId.Length != PO_TrimRequire.Length  || orderId.Length != PO_Requirement.Length)
                {
                    JavaScript.MessageBox("提交失败", this);
                    return;
@@ -524,7 +524,7 @@
                    m_EC_MergerOrders.PO_Count = PO_Count[i].ToInt32();
                    m_EC_MergerOrders.PO_Orderid = orderId[i].ToInt32();
                    m_EC_MergerOrders.PO_OrderNum = PO_OrderNum[i].ToString2();
                    m_EC_MergerOrders.PO_PackagRequire = PO_PackagRequire[i].ToString2();
                    m_EC_MergerOrders.PO_PackagRequire = "";// PO_PackagRequire[i].ToString2();
                    m_EC_MergerOrders.PO_TrimRequire = PO_TrimRequire[i].ToString2();
                    m_EC_MergerOrders.PO_RequirementWork = PO_Requirement[i].ToString2().Replace(",+-+,", ",");
                    m_EC_MergerOrders.PO_Size = PO_Size[i].ToString2();
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <script src="../../js/Inquiry/Inquiry.js?v=209" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=210" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <script src="../../js/Inquiry/Inquiry.js?v=209" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=210" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=56" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -347,7 +347,7 @@
                        if (model.PrintMode == 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                            //printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -477,7 +477,7 @@
                        if (model.PaperId > 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                            printDemand += "," + model.GramWeight + "克";
                        }
                        printDemand += "," + model.SingleOrdouble + "," + model.PrintColor + ",4页";
@@ -498,7 +498,7 @@
                            if (insideModelObj.PaperId > 0)
                            {
                                SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
                                printDemand += "(" + brandInfo.BrandName + ")";
                                //printDemand += "(" + brandInfo.BrandName + ")";
                                printDemand += "," + insideModelObj.GramWeight + "克";
                            }
                            printDemand += "," + insideModelObj.PrintColor + "," + insideModelObj.PageNum.ToString();
@@ -621,7 +621,7 @@
                    if (model.PaperId > 0)
                    {
                        SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                        printDemand += "(" + brandInfo.BrandName + ")";
                        //printDemand += "(" + brandInfo.BrandName + ")";
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += "," + model.SingleOrdouble + "," + model.PrintColor + ",4页";
@@ -642,7 +642,7 @@
                        if (insideModelObj.PaperId > 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(insideModelObj.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                            printDemand += "," + insideModelObj.GramWeight + "克";
                        }
                        printDemand += "," + insideModelObj.PrintColor + "," + insideModelObj.PageNum.ToString();
@@ -2021,13 +2021,13 @@
                        printDemand = paperSize.Name + ",";
                        model.PrintSizeName = paperSize.Name;
                    }
                    printDemand += paperInfo.PaperName + ",";
                    printDemand += paperInfo.PaperName /*+ ","*/;
                    if (model.PaperId != 0)
                    {
                        if (model.PrintMode == 0)
                        {
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                            //printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -2086,7 +2086,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                    }
                    if (pId != 0)
@@ -2122,7 +2122,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                    }
                    if (pId != 0)
@@ -2166,7 +2166,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -2199,7 +2199,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                    }
                    if (pId != 0)
@@ -2252,7 +2252,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                        }
                        printDemand += "," + model.GramWeight + "克";
                    }
@@ -2307,7 +2307,7 @@
                        {
                            BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                            SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                            printDemand += "(" + brandInfo.BrandName + ")";
                           // printDemand += "(" + brandInfo.BrandName + ")";
                            printDemand += "," + model.GramWeight + "克";
                        }
                        printDemand += ",每本" + model.PageNum + "份,";
@@ -2394,7 +2394,7 @@
                    {
                        BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                        SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                        printDemand += "(" + brandInfo.BrandName + ")";
                       // printDemand += "(" + brandInfo.BrandName + ")";
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += ",每本" + model.PageNum.ToString() + "张";
@@ -2498,7 +2498,7 @@
                    {
                        BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
                        SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
                        printDemand += "(" + brandInfo.BrandName + ")";
                        //printDemand += "(" + brandInfo.BrandName + ")";
                        printDemand += "," + model.GramWeight + "克";
                    }
                    printDemand += ",每本" + model.PageNum.ToString() + "张";
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -2604,6 +2604,7 @@
        }
    }
    else {
        $(".Brand" + index).hide();
        if (paperId == "0") {
            $(".Brand" + index).hide();
            $(".gramWeight" + index).hide();
@@ -2614,7 +2615,7 @@
            $(".Qitazhi" + index).show();
        }
        else {
            $(".Brand" + index).show();
            //$(".Brand" + index).show();
            $(".gramWeight" + index).show();
            $(".Qitazhi" + index).hide();
            if (printTypeId == 27) {