From e52888ec01a11ad8423e30b9505fee9624e88422 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 24 九月 2024 09:01:08 +0800
Subject: [PATCH] 查询，批量操作优化，排版等修改
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 4 +
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx.designer.cs | 18 +++--
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 68 ++++++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx.designer.cs | 14 ++--
CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx | 4
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 16 +++++
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx | 2
CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs | 3 +
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx | 5 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 2
23 files changed, 130 insertions(+), 34 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 44bc467..9b35b71 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -37,6 +37,8 @@
using CY.Model;
using CY.Infrastructure.Query;
using System.Transactions;
+using CY.Model.Inquiry;
+using CY.Infrastructure.Common;
namespace CY.SQLDAL
{
@@ -728,12 +730,26 @@
}
if (result != null && result.Count > 0)
{
+ _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase);
foreach (EC_OrderBasic ob in result)
{
if (IsComplainant(ob.Keyid.Value))
{
ob.IsComplainant = true;
}
+
+ EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterDAL.GetModel(ob.Keyid.Value);
+ InquiryCommonModel _inquiryCommonModel = null;
+ if (null == _eC_OrderPrintParameter)
+ {
+ _inquiryCommonModel = new InquiryCommonModel();
+ }
+ else
+ {
+ _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+ }
+
+ ob.PrintSizeName = _inquiryCommonModel.PrintSizeName;
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
index 78ab2f0..858eb8b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx
@@ -7,7 +7,7 @@
<title>鍥炶</title>
<uc:CMSHead ID="CMSHead1" runat="server" />
<script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
- <script src="../../js/business/BackVisitNote.js" type="text/javascript"></script>
+ <script src="../../js/business/BackVisitNote.js?v=1" type="text/javascript"></script>
<script type="text/javascript">
$(function () {
document.getElementById('spnOperator').innerHTML = '<%=Request.RequestContext.RouteData.DataTokens["currentUserName"] %>';
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx.designer.cs
index 2b5b181..5d4fc94 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/BackVisitNoteEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class BackVisitNoteEdit {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class BackVisitNoteEdit
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 8a8a491..c26c512 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -122,7 +122,7 @@
<td class="ali03 ">瀹㈡埛淇¤獕锛�</td>
<td><select id="selCreditId" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
</tr>
- <tr>
<td class="ali03 ">涓爣鍗曚綅锛�</td>
<td ><select id="selBiddingcompany" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
<td ><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" /> </td>
<td class="ali03 "><asp:Button ID="Button3" Text="鏂板涓爣鍗曚綅" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /></td>
<td colspan="2" ></td>
</tr>
+ <tr>
<td class="ali03 ">涓爣鍗曚綅锛�</td>
<td ><select id="selBiddingcompany" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w200px"></select></td>
<td class="ali03 "><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" /> </td>
<td ><asp:Button ID="Button3" Text="鏂板涓爣鍗曚綅" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /></td>
<td colspan="2" ></td>
</tr>
<tr>
<td class="ali03 ">鍚堝悓閲戦锛�</td>
<td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
<td ><input id="txtContractmoney" type="text" runat="server" maxlength="50" class="float w70px" value="0" min="0" />鍏�</td>
<td class="ali03 ">鍒版湡鏃堕棿锛�</td>
<td ><select id="selExpiretype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
<td ><input id="txtExpireTime" type="text" runat="server" maxlength="50" class="date w90px" datefmt="yyyy-MM-dd" /></td>
</tr>
<tr id="ReceiptT_Html">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index 41575e2..ef803a0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -464,12 +464,15 @@
this.selSourcesInfoId.DataValueField = "Keyid";
this.selSourcesInfoId.DataTextField = "Name";
this.selSourcesInfoId.DataBind();
+ this.selSourcesInfoId.Value = "452";
this.selCustomerIndustriesId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("瀹㈡埛鎵�灞炶涓�");
this.selCustomerIndustriesId.DataValueField = "Keyid";
this.selCustomerIndustriesId.DataTextField = "Name";
this.selCustomerIndustriesId.DataBind();
+ this.selCustomerIndustriesId.Value = "454";
+
this.selCustomerTypeId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("瀹㈡埛绫诲瀷");
this.selCustomerTypeId.DataValueField = "Keyid";
this.selCustomerTypeId.DataTextField = "Name";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 4edaf6a..3675713 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -440,7 +440,7 @@
- <%--<input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />--%>
+ <input type="button" value="杩斿洖鍒楄〃" id='btnBackList' onclick="window.location='OrderList.aspx';" />
</td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 1f690b4..776cee6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -389,7 +389,7 @@
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
_inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ _inquiryCommonModel.PrintDemand = /*Request["printSizeName"].ToString() + "锛�" +*/ Request["txtPrintDemand"].ToString();
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
@@ -569,7 +569,7 @@
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
_inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ _inquiryCommonModel.PrintDemand = /*Request["printSizeName"].ToString() + "锛�" +*/ Request["txtPrintDemand"].ToString();
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 72a858e..e07dec3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -396,7 +396,9 @@
deliverPrice:<%#Eval("SumPrice")%>,
UnitPrice:'<%#Eval("UnitPrice") %>',
sumPrice:<%#Eval("SumPrice")%>,
- DeliveryOrderId:'<%#Eval("DeliveryOrderId")%>',
+ DeliveryOrderId:'<%#Eval("DeliveryOrderId")%>',
+ yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>',
+ PrintSizeName:'<%#Eval("PrintSizeName")%>'
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index 831f812..f53930f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -530,7 +530,75 @@
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
+ if (!IsPostBack && !IsCallback)
+ {
+ if (Session["OrderList"] != null)
+ {
+ //鍏堣繕鍘熻〃鍗�
+ searchParam = Session["OrderList"] as Dictionary<int, object>;
+ if (searchParam.Keys.Count(x => x == 4)<=0)
+ {
+ this.txtBeginData.Value = "";
+ }
+ if (searchParam.Keys.Count(x => x == 5) <= 0)
+ {
+ this.txtEndDate.Value = "";
+ }
+ foreach (int index in searchParam.Keys)
+ {
+ if (index == 2)
+ this.txtOrderId.Value = searchParam[index].ToString();
+ if (index == 3)
+ this.txtCustormerName.Value = searchParam[index].ToString();
+ if (index == 4)
+ this.txtBeginData.Value = searchParam[index].ToString();
+ if (index == 5)
+ this.txtEndDate.Value = searchParam[index].ToString();
+ if (index == 6)
+ this.selPrintTypes.Value = searchParam[index].ToString();
+ if (index == 7)
+ this.selOrderTypes.Value = searchParam[index].ToString();
+ if (index == 8)
+ this.selOrderStates.Value = searchParam[index].ToString();
+ if (index == 9)
+ this.selPayStates.Value = searchParam[index].ToString();
+ if (index == 10)
+ this.txtCreaterName.Value = searchParam[index].ToString();
+ if (index == 11)
+ this.selCustormerLevels.Value = searchParam[index].ToString();
+ if (index == 12)
+ this.selCustormerManager.Value = searchParam[index].ToString();
+ if (index == 13)
+ this.selBusinessManager.Value = searchParam[index].ToString();
+ if (index == 14)
+ this.selPayType.SelectedValue = searchParam[index].ToString();
+ if (index == 15)
+ this.selReturnvisit.SelectedValue = searchParam[index].ToString();
+ if (index == 16)
+ this.selAppraise.SelectedValue = searchParam[index].ToString();
+ if (index == 28)
+ this.txtSearchyjname.Value = searchParam[index].ToString();
+
+ }
+
+
+
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
+ SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
+ SetParamValue(searchParam, 20, CurrentUser.StaffId);
+ SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
+ }
+ }
+ else
+ {
+ Session["OrderList"] = searchParam;
+ }
SearchParam = searchParam;
+
+
UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
//鍐嶆鏌ヨ
AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
index b688c6d..0510744 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx
@@ -429,8 +429,11 @@
printNum:<%#Eval("OrderExtend.PrintNum")%>,
deliverPrice:<%#Eval("SumPrice")%>,
sumPrice:<%#Eval("SumPrice")%>,
+ UnitPrice:'<%#Eval("UnitPrice") %>',
Kaipiaoshenqing:'<%#Eval("Kaipiaoshenqing")%>',
- PayState:<%#Eval("PayState")%>
+ PayState:<%#Eval("PayState")%>,
+ yssldw: '<%#Eval("OrderExtend.PrintNum")%><%#Eval("yssldw")%>',
+ PrintSizeName:'<%#Eval("PrintSizeName")%>'
}" id='ckBox<%#Container.ItemIndex%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td class="ItemIndex">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
index 9e6164f..10e8db4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/PrintAwbOrder.aspx
@@ -37,7 +37,7 @@
var fillOrder = function (orderObj) {
var i = -1;
var newtr = document.createElement('tr');
- var fillTarget = ['ordershowId', 'pdName', 'printName', 'printNum', 'UnitPrice', 'sumPrice'];
+ var fillTarget = ['ordershowId', 'pdName', 'PrintSizeName', 'yssldw', 'UnitPrice', 'sumPrice'];
while (++i < fillTarget.length) {
setOrderAttr(newtr, orderObj, fillTarget[i]);
}
@@ -145,7 +145,7 @@
鍗板埛鍝佸悕绉�
</th>
<th scope="col">
- 涓氬姟绫诲埆
+ 瑙勬牸
</th>
<th scope="col" style='width: 100px;'>
鏁伴噺
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
index a7fd99e..22cf155 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index e805502..f050cb5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
index 604f8af..3d9869e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" id="hebanyinshua" /><label for="hebanyinshua">鍚堢増鍗板埛</label>  <input type="radio" name="printMode" value='0' id="zhuanbanyinshua"/><label for="zhuanbanyinshua">涓撶増鍗板埛</label></th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1'id="hebanyinshua" /><label for="hebanyinshua">鍚堢増鍗板埛</label>  <input type="radio" name="printMode" value='0' checked="true" id="zhuanbanyinshua"/><label for="zhuanbanyinshua">涓撶増鍗板埛</label></th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
index 3b7ba89..b765db4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
index c23cf1f..d2fa6d8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true"/>涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
index ebc7ab3..41e770b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx
index 8bd6d4d..32e9d08 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡: <input type="radio" name="printMode" value='1' checked="true" />鍚堢増  <input type="radio" name="printMode" value='0'/>涓撶増</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡: <input type="radio" name="printMode" value='1' />鍚堢増  <input type="radio" name="printMode" value='0' checked="true" />涓撶増</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx.designer.cs
index 7c7fad5..a87a1c5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbum.aspx.designer.cs
@@ -2,14 +2,16 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class PictureAlbum {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class PictureAlbum
+ {
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
index 8799e6b..51b1299 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
index e0d981a..eed77f6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡: <input type="radio" name="printMode" value='1' checked="true" />鍚堢増  <input type="radio" name="printMode" value='0'/>涓撶増</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡: <input type="radio" name="printMode" value='1' />鍚堢増  <input type="radio" name="printMode" value='0' checked="true" />涓撶増</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
index 6f7618e..923f62a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
@@ -10,7 +10,7 @@
<table class="table2">
<tbody>
<tr>
- <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' checked="true" />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0'/>涓撶増鍗板埛</th>
+ <th>璇烽�夋嫨鍗板埛鏂瑰紡锛� <input type="radio" name="printMode" value='1' />鍚堢増鍗板埛  <input type="radio" name="printMode" value='0' checked="true" />涓撶増鍗板埛</th>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js b/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
index 64cbade..f7b86f4 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/BackVisitNote.js
@@ -34,7 +34,7 @@
// var scores = data.Scores;
// data.Scores = '';
// var dataString =
- alert(data);
+ //alert(data);
return data;
// window.NoneData.Scores = scores;
// return dataString;
--
Gitblit v1.9.1