From 93b130b87d2302f216c8bdc77e95e47eae0ba331 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 30 九月 2024 09:39:54 +0800
Subject: [PATCH] 订单默认送货
---
CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx | 2
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx.designer.cs | 14 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx.designer.cs | 16 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx | 2
CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx.designer.cs | 14 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 18 ++++++---
CY_ECommercePlatform/CY.WebForm/js/common/ReceiptTool.js | 8 +++-
10 files changed, 48 insertions(+), 32 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 8428ea1..4d5d048 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -171,17 +171,17 @@
<td class="ali03 ">涓氬姟鑱旂郴浜猴細</td>
<td><input id="txtBusinessManagers" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">鎵嬫満锛�</td>
- <td><input id="txtManagersMobile" type="text" runat="server" class="phone" maxlength="20" /></td>
+ <td><input id="txtManagersMobile" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">寰俊锛�</td>
- <td ><input id="txtManagersQQ" type="text" runat="server" class="int" maxlength="20" /></td>
+ <td ><input id="txtManagersQQ" type="text" runat="server" maxlength="20" /></td>
</tr>
<tr>
<td class="ali03 ">璐㈠姟璐熻矗浜猴細</td>
<td><input id="txtFinancialOfficers" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">鎵嬫満锛�</td>
- <td><input id="txtOfficersMobile" type="text" runat="server" class="phone" maxlength="20"/></td>
+ <td><input id="txtOfficersMobile" type="text" runat="server" maxlength="20"/></td>
<td class="ali03 ">寰俊锛�</td>
- <td><input id="txtOfficersQQ" type="text" runat="server" class="int" maxlength="20" /></td>
+ <td><input id="txtOfficersQQ" type="text" runat="server" maxlength="20" /></td>
</tr>
<tr>
<td class="ali03 ">娉ㄦ剰浜嬮」锛�</td>
@@ -198,7 +198,7 @@
<td class="ali02" colspan="6">
<asp:Button ID="btn_Submit" Text="淇濆瓨" runat="server" OnClick="btn_Submit_Config" />
<% if (Shifouwanjie != "1") {%>
- <asp:Button ID="btn_wanjie" Text="瀹岀粨" runat="server" OnClick="btn_Submit_Wanjie" />
+ <asp:Button ID="btn_wanjie" Text="瀹岀粨" runat="server" OnClientClick="if(removeOnSubmit())return true;else return false;" OnClick="btn_Submit_Wanjie" />
<% } %>
<input type="hidden" id="HideKeyid" value="<%=Request["Keyid"]%>" />
<input type="hidden" id="saveKey" runat="server" />
@@ -508,7 +508,13 @@
});
-
+ function removeOnSubmit() {
+
+ document.getElementById('txtCompanyName').value = "232323";
+ document.getElementById('txtDetailedAddress').value = "232323";
+ document.getElementById('txtCompanyPhone').value = "232323";
+ return true;
+ }
</script>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 6622011..149afe6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/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=20" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=35" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=25" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx b/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx
index 3698d92..32bb9cd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx
@@ -119,7 +119,7 @@
<script src="../../js/common/CityTool_o.js" type="text/javascript"></script>
<!--鍩庡競鍖哄煙end-->
<!--鏀惰揣鏂瑰紡start-->
-<script src="../../js/common/ReceiptTool.js" type="text/javascript"></script>
+<script src="../../js/common/ReceiptTool.js?v=2" type="text/javascript"></script>
<!--鏀惰揣鏂瑰紡end-->
<!--鍥剧墖娴忚鍣╞egin-->
<link href="../../js/ColorBox/colorbox.css" rel="stylesheet" type="text/css" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx.designer.cs
index 58c36a4..1904336 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CMSHead.ascx.designer.cs
@@ -2,14 +2,16 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.common {
-
-
- public partial class CMSHead {
+namespace CY.WebForm.Pages.common
+{
+
+
+ public partial class CMSHead
+ {
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx b/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx
index 12d79b6..873b050 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx
@@ -114,7 +114,7 @@
<script src="../../js/common/CityTool_o.js" type="text/javascript"></script>
<!--鍩庡競鍖哄煙end-->
<!--鏀惰揣鏂瑰紡start-->
-<script src="../../js/common/ReceiptTool.js" type="text/javascript"></script>
+<script src="../../js/common/ReceiptTool.js?v=2" type="text/javascript"></script>
<!--鏀惰揣鏂瑰紡end-->
<!--鍓嶅彴椤甸潰start-->
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx.designer.cs
index 993632f..1300902 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/FrontQuote.ascx.designer.cs
@@ -2,14 +2,16 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.common {
-
-
- public partial class FrontQuote {
+namespace CY.WebForm.Pages.common
+{
+
+
+ public partial class FrontQuote
+ {
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx
index 0bfae80..32ae93e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx
@@ -6,7 +6,7 @@
<head id="Head1" runat="server">
<title></title>
<script src="../../js/utils/jquery-1.5.1.js" type="text/javascript"></script>
- <script src="../../js/common/ReceiptToolTest.js" type="text/javascript"></script>
+ <script src="../../js/common/ReceiptToolTest.js?v=2" type="text/javascript"></script>
</head>
<body>
<form id="form1" name="form1">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx.designer.cs
index fb80a1a..cad2ae1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/production/TestRecipet.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.production {
-
-
- public partial class TestRecipet {
-
+namespace CY.WebForm.Pages.production
+{
+
+
+ public partial class TestRecipet
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index c620c37..86264a2 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -1226,7 +1226,7 @@
$("[name='pNameMP']").val(dataJson.PaperMP);
$("[name='paper0']").val(dataJson.PaperId);
if (dataJson.PrintMode == 0) {
- if (dataJson.PaperMP && dataJson.PaperMP != "") {
+ if (dataJson.PaperMP && dataJson.PaperMP != "" && $("#hidPrintTypeId").val() !="29") {
PaperSelect($("[name='pNameMP']").val(), $("#hidPrintTypeId").val(), 0);
}
else {
diff --git a/CY_ECommercePlatform/CY.WebForm/js/common/ReceiptTool.js b/CY_ECommercePlatform/CY.WebForm/js/common/ReceiptTool.js
index 996e32d..63239c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/common/ReceiptTool.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/common/ReceiptTool.js
@@ -20,9 +20,13 @@
$("#ReceiptT_Html").after(ReceiptTHtml);
}
- $("#AcceptTypeId").html('<option value="104">鑷彁</option><option value="105">浠ｅ彂璐ц繍</option><option value="106">閫佽揣涓婇棬</option><option value="107">鎸囧畾璐ц繍鍏徃</option>');
- $("#InvoiceId").html('<option value="涓嶅惈绋庝环" value_keyid="108">涓嶅惈绋庝环</option><option value="鏅�氬彂绁�" value_keyid="109">鏅�氬彂绁�</option><option value="澧炲�肩◣绁�" value_keyid="110">澧炲�肩◣绁�</option>');
+ $("#AcceptTypeId").html('<option value="104">鑷彁</option><option value="105">浠ｅ彂璐ц繍</option><option value="106" selected >閫佽揣涓婇棬</option><option value="107">鎸囧畾璐ц繍鍏徃</option>');
+ $("#InvoiceId").html('<option value="鏅�氬彂绁�" value_keyid="109">鏅�氬彂绁�</option><option value="涓嶅惈绋庝环" value_keyid="108">涓嶅惈绋庝环</option><option value="澧炲�肩◣绁�" value_keyid="110">澧炲�肩◣绁�</option>');
+ $(".rt_OnBehalfOfCargo").css("display", "none");
+ $(".rt_OfficialFreightForwarder").css("display", "none");
+ $(".rt_HomeDelivery").css("display", "");
+ $(".rt_HomeDelivery").removeClass("hide");
// //鍔犺浇鏀惰揣鏂瑰紡閫夐」
// $.ajax({
// url: "/Pages/common/CommonAjax.aspx",
--
Gitblit v1.9.1