From d1b1d6703fda926f5b80682d64c26833338a1082 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 05 三月 2026 15:11:42 +0800
Subject: [PATCH] 20260305 施工单修改,报纸修改 20260305 送货管理默认显示逾期和明天
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 5
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 2
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx | 17 ++
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 5 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 239 ++++++++++++++++++++++++++++++++++++++++++++++-
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs | 5
13 files changed, 273 insertions(+), 24 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index bfa8fd8..d29b394 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/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 )";
+ }
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
index 5bceca6..35739c7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx
+++ b/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")%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
index 83d83ab..c4e340e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderDetail.aspx.cs
+++ b/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 = "";
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index 474a4f6..6c9dcb5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/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 + "']");
+
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorPositive.empty();
+
+ const newOptions1 = [
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥涜壊', text: '鍥涜壊' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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 + "']");
+
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorRear.empty();
+
+ const newOptions2 = [
+ { value: '0鑹�', text: '0鑹�' },
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥涜壊', text: '鍥涜壊' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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 + "']");
+
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorPositive.empty();
+
+ const newOptions1 = [
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥�+涓�', text: '鍥�+涓�' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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 + "']");
+
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorRear.empty();
+
+ const newOptions2 = [
+ { value: '0鑹�', text: '0鑹�' },
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥涜壊', text: '鍥涜壊' },
+ { value: '鍥�+涓�', text: '鍥�+涓�' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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();
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorPositive.empty();
+
+ const newOptions1 = [
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥涜壊', text: '鍥涜壊' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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();
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorRear.empty();
+
+ const newOptions2 = [
+ { value: '0鑹�', text: '0鑹�' },
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥涜壊', text: '鍥涜壊' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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();
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorPositive.empty();
+
+ const newOptions1 = [
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥�+涓�', text: '鍥�+涓�' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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();
+
+ // 娓呯┖鐜版湁鐨刼ption
+ selectPSF_PrintedColorRear.empty();
+
+ const newOptions2 = [
+ { value: '0鑹�', text: '0鑹�' },
+ { value: '鍗曡壊', text: '鍗曡壊' },
+ { value: '鍙岃壊', text: '鍙岃壊' },
+ { value: '涓夎壊', text: '涓夎壊' },
+ { value: '鍥涜壊', text: '鍥涜壊' },
+ { value: '鍥�+涓�', text: '鍥�+涓�' },
+ ];
+
+
+
+ // 3. 鎵归噺鏂板option鍒皊elect涓�
+ 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");
+ }
+
}
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index 9edfceb..2db5bab 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/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
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 530cd66..87dd293 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/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">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
index 000af42..18ffee0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderProdactionList.aspx.cs
+++ b/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)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
index f29e79a..1839959 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
+++ b/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">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index e8b8920..a89a7ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/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) //鏀舵嵁鑱斿崟
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
index 5ae82dc..8604e64 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
+++ b/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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
index 51caf20..49edfea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
+++ b/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";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index dc6b1a9..4cbe7ae 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/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;
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 1e7ddd1..1cdb233 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/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();
--
Gitblit v1.9.1