username@email.com
2026-03-05 d1b1d6703fda926f5b80682d64c26833338a1082
20260305 施工单修改,报纸修改  20260305  送货管理默认显示逾期和明天
13个文件已修改
297 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx 239 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/business/Order.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -727,6 +727,10 @@
                {
                    Condition += " and (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
                }
                else if (DeliveryTime == "明天逾期")
                {
                    Condition += " and (  DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=1 or  DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=1 )";
                }
            }
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
@@ -239,7 +239,7 @@
                                        <span  style="<%#Eval("shifouxianshi")%>" >印色</span>   
                                    </td>
                                    <td rowspan="2" colspan="2">
                                       <span  style="<%#Eval("shifouxianshi")%>" >印刷方式</span>
                                       <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" >印刷方式</span>
                                    </td>
                                </tr>
                                <tr class=" price_tabbg" style="font-weight: bold; background-color: #E4E4E4;">
@@ -267,7 +267,7 @@
                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_PrintedColorRear")%></span>       
                                    </td>
                                    <td colspan="2">
                                     <span  style="<%#Eval("shifouxianshi")%>" ><%#Eval("PSF_Typesetting")%></span>
                                     <span  style="<%#Eval("shifouxianshi")%><%#Eval("shifouxianshilunzhuan")%>" ><%#Eval("PSF_Typesetting")%></span>
                                    </td>
                                    <%--<td>
                                        <%#Eval("PSF_SheetSource")%>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
@@ -182,7 +182,7 @@
                {
                    eC_SpecialForums.shifouxianshi = "display:none;";
                    eC_SpecialForums.shifouxianshiheban = "display:none;";
                    eC_SpecialForums.shifouqitadingdan = "display:;";
                    eC_SpecialForums.shifouqitadingdan = "";
                }
                else
                {
@@ -196,7 +196,7 @@
                }
                else
                {
                    eC_SpecialForums.shifouxianshilunzhuan = "display:;";
                    eC_SpecialForums.shifouxianshilunzhuan = "";
                }
            }
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -857,6 +857,109 @@
            $("select[name='PSF_PressesDesk']").live("change", function () {
                var value_SelWaerId = $(this).attr("value_selspec");
                if ($(this).val().indexOf('小森') >= 0) {
                    var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
                    // 清空现有的option
                    selectPSF_PrintedColorPositive.empty();
                    const newOptions1 = [
                        { value: '单色', text: '单色' },
                        { value: '双色', text: '双色' },
                        { value: '三色', text: '三色' },
                        { value: '四色', text: '四色' },
                    ];
                    // 3. 批量新增option到select中
                    let optionHtml1 = '';
                    newOptions1.forEach(item => {
                        // 拼接option标签,直接赋值即可
                        optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
                    });
                    selectPSF_PrintedColorPositive.html(optionHtml1); // 赋值到select,完成新增
                    var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
                    // 清空现有的option
                    selectPSF_PrintedColorRear.empty();
                    const newOptions2 = [
                        { value: '0色', text: '0色' },
                        { value: '单色', text: '单色' },
                        { value: '双色', text: '双色' },
                        { value: '三色', text: '三色' },
                        { value: '四色', text: '四色' },
                    ];
                    // 3. 批量新增option到select中
                    let optionHtml2 = '';
                    newOptions2.forEach(item => {
                        // 拼接option标签,直接赋值即可
                        optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
                    });
                    selectPSF_PrintedColorRear.html(optionHtml2); // 赋值到select,完成新增
                } else {
                    var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
                    // 清空现有的option
                    selectPSF_PrintedColorPositive.empty();
                    const newOptions1 = [
                        { value: '单色', text: '单色' },
                        { value: '双色', text: '双色' },
                        { value: '三色', text: '三色' },
                        { value: '四+专', text: '四+专' },
                    ];
                    // 3. 批量新增option到select中
                    let optionHtml1 = '';
                    newOptions1.forEach(item => {
                        // 拼接option标签,直接赋值即可
                        optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
                    });
                    selectPSF_PrintedColorPositive.html(optionHtml1); // 赋值到select,完成新增
                    var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
                    // 清空现有的option
                    selectPSF_PrintedColorRear.empty();
                    const newOptions2 = [
                        { value: '0色', text: '0色' },
                        { value: '单色', text: '单色' },
                        { value: '双色', text: '双色' },
                        { value: '三色', text: '三色' },
                        { value: '四色', text: '四色' },
                        { value: '四+专', text: '四+专' },
                    ];
                    // 3. 批量新增option到select中
                    let optionHtml2 = '';
                    newOptions2.forEach(item => {
                        // 拼接option标签,直接赋值即可
                        optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
                    });
                    selectPSF_PrintedColorRear.html(optionHtml2); // 赋值到select,完成新增
                }
                if ($(this).val().indexOf('六开') >= 0) {
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("单色");
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("单色");
@@ -1034,13 +1137,13 @@
                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
                    $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
                    $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
                    $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
                    $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
                    $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
                    $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
                    $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1052,6 +1155,12 @@
                    $(".PSF_Qitadingdanhao[value_ppwaerid='" + value_SelWaerId + "']").hide();
                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
                    $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("2");
                    if ($(this).val().indexOf('小森') >= 0) {
                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("四色");
                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("四色");
                        $("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("900*570");
                        $("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").val("8");
                    }
                }
                // else if () {
                //    //$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1243,7 +1352,6 @@
                        optionHtml += `<option value="${item.value}">${item.text}</option>`;
                    });
                    selectElement.html(optionHtml); // 赋值到select,完成新增
                    $("p[name='PSF_Zhizhangshuliang'][value_selspecspan='" + value_SelWaerId + "']").hide();
                    $("p[name='PSF_Kailiaoguige'][value_selspecspan='" + value_SelWaerId + "']").hide();
                    $("p[name='PSF_Zhizhangshulianga'][value_selspecspan='" + value_SelWaerId + "']").hide();
@@ -1305,7 +1413,11 @@
                }
              });
            
@@ -1318,6 +1430,10 @@
            $("input[name='PSF_Forumsid']").each(function (ii, vv) {
                var keyid = "<%=keyid %>";
                if ("<%=PrintTypeId %>" == "7") {
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PressesDesk']").val("小森商业轮转机");
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PressesDesk']").change();
                }
                if (keyid != "") {
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_Component']").val($(vv).attr("value_hide_psf_component"));
                    $(vv).parent().parent().parent().parent().parent().find("select[name='PSF_PressesDesk']").val($(vv).attr("value_hide_psf_pressesdesk"));
@@ -1507,13 +1623,13 @@
                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").show();
                        $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']").hide();
                        $("p[name='PSF_yinse'][value_openwidthspan='" + value_SelWaerId + "']").show();
                        $("p[name='PSF_yinsezheng'][value_openwidthspan='" + value_SelWaerId + "']").show();
                        $("p[name='PSF_yinsebei'][value_openwidthspan='" + value_SelWaerId + "']").show();
                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").show();
                        $("p[name='PSF_yinshufangshi'][value_openwidthspan='" + value_SelWaerId + "']").hide();
                        $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").show();
                        $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").show();
@@ -1594,7 +1710,7 @@
                    }
                    if ($(this).val().indexOf('轮转') >= 0) {
                    if ($(vv).val().indexOf('轮转') >= 0) {
                        var selectElement = $("select[name='PSF_Typesetting'][value_ppwaerid='" + value_SelWaerId + "']");
                        var sssssss = selectElement.val();
@@ -1682,6 +1798,110 @@
                    }
                    
                    if ($(vv).val().indexOf('小森') >= 0) {
                        var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
                        var sssssss = selectPSF_PrintedColorPositive.val();
                        // 清空现有的option
                        selectPSF_PrintedColorPositive.empty();
                        const newOptions1 = [
                            { value: '单色', text: '单色' },
                            { value: '双色', text: '双色' },
                            { value: '三色', text: '三色' },
                            { value: '四色', text: '四色' },
                        ];
                        // 3. 批量新增option到select中
                        let optionHtml1 = '';
                        newOptions1.forEach(item => {
                            // 拼接option标签,直接赋值即可
                            optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
                        });
                        selectPSF_PrintedColorPositive.html(optionHtml1); // 赋值到select,完成新增
                        selectPSF_PrintedColorPositive.val(sssssss);
                        var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
                        var ssssssss = selectPSF_PrintedColorRear.val();
                        // 清空现有的option
                        selectPSF_PrintedColorRear.empty();
                        const newOptions2 = [
                            { value: '0色', text: '0色' },
                            { value: '单色', text: '单色' },
                            { value: '双色', text: '双色' },
                            { value: '三色', text: '三色' },
                            { value: '四色', text: '四色' },
                        ];
                        // 3. 批量新增option到select中
                        let optionHtml2 = '';
                        newOptions2.forEach(item => {
                            // 拼接option标签,直接赋值即可
                            optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
                        });
                        selectPSF_PrintedColorRear.html(optionHtml2); // 赋值到select,完成新增
                        selectPSF_PrintedColorRear.val(ssssssss);
                    } else {
                        var selectPSF_PrintedColorPositive = $("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']");
                        var sssssss = selectPSF_PrintedColorPositive.val();
                        // 清空现有的option
                        selectPSF_PrintedColorPositive.empty();
                        const newOptions1 = [
                            { value: '单色', text: '单色' },
                            { value: '双色', text: '双色' },
                            { value: '三色', text: '三色' },
                            { value: '四+专', text: '四+专' },
                        ];
                        // 3. 批量新增option到select中
                        let optionHtml1 = '';
                        newOptions1.forEach(item => {
                            // 拼接option标签,直接赋值即可
                            optionHtml1 += `<option value="${item.value}">${item.text}</option>`;
                        });
                        selectPSF_PrintedColorPositive.html(optionHtml1); // 赋值到select,完成新增
                        selectPSF_PrintedColorPositive.val(sssssss);
                        var selectPSF_PrintedColorRear = $("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']");
                        var ssssssss = selectPSF_PrintedColorRear.val();
                        // 清空现有的option
                        selectPSF_PrintedColorRear.empty();
                        const newOptions2 = [
                            { value: '0色', text: '0色' },
                            { value: '单色', text: '单色' },
                            { value: '双色', text: '双色' },
                            { value: '三色', text: '三色' },
                            { value: '四色', text: '四色' },
                            { value: '四+专', text: '四+专' },
                        ];
                        // 3. 批量新增option到select中
                        let optionHtml2 = '';
                        newOptions2.forEach(item => {
                            // 拼接option标签,直接赋值即可
                            optionHtml2 += `<option value="${item.value}">${item.text}</option>`;
                        });
                        selectPSF_PrintedColorRear.html(optionHtml2); // 赋值到select,完成新增
                        selectPSF_PrintedColorRear.val(ssssssss);
                    }
                 } 
             });
@@ -1693,7 +1913,10 @@
                 if (keyid != "") {
                 } else {
                     $(vv).val("395*460");
                     if ("<%=PrintTypeId %>" != "7") {
                         $(vv).val("395*460");
                     }
                }
            });
           
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -45,6 +45,7 @@
        public string shukuanhuaceneiye3 = "";
        public string shukuanhuaceneiye4 = "";
        public string shukuanhuaceneiye5 = "";
        public string PrintTypeId = "";
        //初始化
        public AgSpecialOrderEdit()
@@ -189,6 +190,7 @@
            {
                _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
            }
            PrintTypeId = _eC_OrderBasic.PrintTypeId.ToString();
            #endregion
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,8 +9,8 @@
    <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=206" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=55" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=209" 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/OrderProdactionList.aspx.cs
@@ -211,7 +211,7 @@
        {
            if (this.txtDeliveryTime.Value == "")
            {
                this.txtDeliveryTime.Value = this.Button1.Text;
                this.txtDeliveryTime.Value = "明天逾期";
            }
            if (this.txtDeliveryTime.Value == this.Button1.Text)
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -9,8 +9,8 @@
    <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=206" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=55" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=209" 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
@@ -2258,6 +2258,11 @@
                    }
                    printDemand += "," + model.PageNum.ToString() + "版";
                    printDemand += "," + model.PrintColor;
                    if (request["printColor1"] != null)
                    {
                        model.printColor1 = request["printColor1"].ToString();
                        printDemand += "," + model.printColor1;
                    }
                }
                else if (model.PrintTypeId == 27) //收据联单
                {
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
@@ -26,7 +26,8 @@
                <th style="text-align: center;" class="gramWeight0">
                    克重
                </th>
                <th style="text-align: center;">印刷颜色</th>
                <th style="text-align: center;">印色正</th>
                <th style="text-align: center;">印色背</th>
                <th style="text-align: center;">
                    印刷数量
                </th>
@@ -97,14 +98,24 @@
                </td>
                 <td>
                <select name="printColor0">
                    <option value="四色">四色</option>
                    <option value="单色">单色</option>
                    <option value="双色">双色</option>
                     <option value="三色">三色</option>
                    <option value="四色">四色</option>
                </select>
                </td>
                <td>
                <select name="printColor1">
                     <option value="0色">0色</option>
                    <option value="单色">单色</option>
                    <option value="双色">双色</option>
                     <option value="三色">三色</option>
                    <option value="四色">四色</option>
                </select>
                </td>
                <td align="center">
                    <input type="text"  id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
                    <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
                    <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true' style="display:none;" ></select>
                </td>
            </tr>
        </tbody>
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
@@ -19,9 +19,10 @@
                PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
                Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//字典业务逻辑操作类对象
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位").Where(x => x.MeanValue == 2);
                this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("印刷单位").Where(x => x.MeanValue == 10000);
                this.ysUnit.DataBind();
                this.ysUnit.Value = "2";
                this.ysUnit.Items.Insert(0, new ListItem("无", "0"));
                //this.ysUnit.Value = "2";
            }
        }
    }
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -3104,7 +3104,10 @@
        }
    }
    //报纸
    if (printTypeId == 7) {
        $("[name='printColor1']").val(dataJson.printColor1);
    }
    //作业本
    if (printTypeId == 37) {
        var insideArry = dataJson.InquiryWorkBookList;
CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -599,7 +599,7 @@
       
    }
    if (sel.value == 37 || sel.value == 38) {
    if (sel.value == 37 || sel.value == 38 || sel.value == 7) {
        $("#Duiyinghetongbianhao").hide();
    } else {
        $("#Duiyinghetongbianhao").show();