From 8d824926bbb3346eb1046b9f1ab8d95b6a60ba17 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期五, 17 九月 2021 10:48:31 +0800
Subject: [PATCH] 订单单位 sql更新
---
CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs | 8
.gitignore | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx | 30 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs | 12 +
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx | 32 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx | 34 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs | 8
/dev/null | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx | 28 +
开票修改.sql | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx | 30 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx | 30 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx | 38 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs | 23 +
CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx | 32 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs | 23 +
34 files changed, 419 insertions(+), 164 deletions(-)
diff --git a/.gitignore b/.gitignore
index d4b0241..308b771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,4 @@
CY_ECommercePlatform/UploadFiles/UpLoads/
CY_ECommercePlatform/CY.Config/obj/
/CY_ECommercePlatform/.vs
+/CY_ECommercePlatform/CY.WebForm/CacheFiles
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
deleted file mode 100644
index 05a7d4a..0000000
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
+++ /dev/null
@@ -1 +0,0 @@
-2021-09-16 11:19:55
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
deleted file mode 100644
index 05a7d4a..0000000
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
+++ /dev/null
@@ -1 +0,0 @@
-2021-09-16 11:19:55
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
deleted file mode 100644
index 05a7d4a..0000000
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
+++ /dev/null
@@ -1 +0,0 @@
-2021-09-16 11:19:55
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index e956066..72a858e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -409,7 +409,7 @@
<%#Eval("SellerOrderId")%></a>--%>
</td>
<td style="text-align: center;">
- <div style="width: 140px; word-wrap: break-word; text-align:justify;">
+ <div style="word-wrap: break-word; text-align:justify;">
<a href='javascript:void(0)' title='<%#Eval("BuyerName").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("BuyerName").ToString().Length > 15 ? (Eval("BuyerName").ToString().Substring(0, 15) + "..") : Eval("BuyerName").ToString()%></a>
</div>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx
index a959ea1..18e6b08 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx
@@ -55,18 +55,28 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" defaultValue="1000" value="1000" class="validateIntSpc"/>
- <div class="xialapb">
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">30000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" style="height:15px; line-height: 15px; width:80px;" defaultValue="1000" value="1000" class="validateIntSpc"/>
+ <div class="xialapb">
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">30000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select name="printColor0" chg="1" remark="#value#">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
index 8c67c79..f317f39 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -15,7 +16,12 @@
if (!IsPostBack)
{
if (Request["PrintTypeId"] != null)
- PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs
index 5cb5395..29384b1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingCup.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class AdvertisingCup {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class AdvertisingCup
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx
index 73ea80c..f741c24 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx
@@ -34,16 +34,26 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" style="height: 15px; line-height: 15px; width:80px;" class="validateIntSpc" defaultValue="5000" value="5000"/>
- <div class="xialapb">
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">30000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" style="height: 15px; line-height: 15px; width:80px;" class="validateIntSpc" defaultValue="5000" value="5000"/>
+ <div class="xialapb">
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">30000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs
index 99bd73a..3e1bd85 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -11,7 +12,13 @@
{
protected void Page_Load(object sender, EventArgs e)
{
-
+ if (!IsPostBack)
+ {
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
+ }
}
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs
index 95211a7..bac1fc8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/AdvertisingPoker.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class AdvertisingPoker {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class AdvertisingPoker
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index 67460fc..e805502 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -88,20 +88,30 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">50000</div>
- <div class="xialapr">100000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ <div class="xialapr">100000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select class="selectLaber" name="singleOrdouble0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs
index d1f5a37..2d2abda 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -15,7 +16,12 @@
if (!IsPostBack)
{
if (Request["PrintTypeId"] != null)
- PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs
index b556f37..b6d2e9e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class BlackAndWhite {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class BlackAndWhite
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
index fd0cc1f..b4786e2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx
@@ -74,6 +74,7 @@
</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>
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
index db9148e..35c519d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs
index 1151abf..e1e18e9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Calendary.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Calendary {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Calendary
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
index 673c968..211497e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx
@@ -75,6 +75,7 @@
</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>
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
index 748a3f4..36a1661 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs
index 9030c8d..b15dfa2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DeskCalendar.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class DeskCalendar {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class DeskCalendar
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
index a3713fe..3b7ba89 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx
@@ -77,17 +77,27 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select class="selectLaber" name="printColor0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
index c3c526b..0644c9b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs
index d46065c..f46b55a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Envelop.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Envelop {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Envelop
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
index 22d1433..c23cf1f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx
@@ -69,16 +69,26 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">100</div>
- <div class="xialapr">200</div>
- <div class="xialapr">300</div>
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">100</div>
+ <div class="xialapr">200</div>
+ <div class="xialapr">300</div>
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
index 1f9d6a7..5cef432 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs
index 48d5be0..be4fac2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Note.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Note {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Note
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
index c97c95c..ebc7ab3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx
@@ -71,17 +71,27 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- <div class="xialapr">2000</div>
- <div class="xialapr">3000</div>
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ <div class="xialapr">2000</div>
+ <div class="xialapr">3000</div>
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
</tr>
</tbody>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
index 65d7c2e..ec5420c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs
index 5ee45e9..acba297 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Packet.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Packet {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Packet
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
index af712ac..e0d981a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -89,16 +89,26 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
- <div class="xialapb">
- <div class="xialapr">100</div>
- <div class="xialapr">200</div>
- <div class="xialapr">300</div>
- <div class="xialapr">500</div>
- <div class="xialapr">1000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="500" value="500"/>
+ <div class="xialapb">
+ <div class="xialapr">100</div>
+ <div class="xialapr">200</div>
+ <div class="xialapr">300</div>
+ <div class="xialapr">500</div>
+ <div class="xialapr">1000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td align="center" class="fsByre">
<div class="xialap">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
index 5a537b4..86e5085 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -10,11 +11,18 @@
public partial class ReceiptDocument : System.Web.UI.Page
{
public int PrintTypeId { get; set; }
+
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
- PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+ if (Request["PrintTypeId"] != null)
+ PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs
index bf12e34..6800ed1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class ReceiptDocument {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class ReceiptDocument
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
index 9b177a7..3314bc6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx
@@ -31,15 +31,25 @@
</select>
</td>
<td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
- <div class="xialapb">
- <div class="xialapr">5000</div>
- <div class="xialapr">10000</div>
- <div class="xialapr">20000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="height: 15px; line-height: 15px; width:80px;" class="validateInt" defaultValue="5000" value="5000"/>
+ <div class="xialapb">
+ <div class="xialapr">5000</div>
+ <div class="xialapr">10000</div>
+ <div class="xialapr">20000</div>
+ <div class="xialapr">50000</div>
+ </div>
+ </div>
+ </td>
+ <td>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ </td>
+ </tr>
+ </table>
+
</td>
<td>
<select class="selectLaber" id="pRoomCard" name="paper0">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs
index caae056..73a787c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘縰sing CY.BLL.Sys;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
@@ -16,6 +17,11 @@
{
if (Request["PrintTypeId"] != null)
PrintTypeId = int.Parse(Request["PrintTypeId"].ToString());
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.ysUnit.DataSource = _sys_DictionaryBLL.GetDataByType("鍗板埛鍗曚綅");
+ this.ysUnit.DataBind();
+ this.ysUnit.Value = "1";
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs
index 85d26c0..44b3cf1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/RoomCard.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class RoomCard {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class RoomCard
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git "a/\345\274\200\347\245\250\344\277\256\346\224\271.sql" "b/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
index 49f76b4..eb54f96 100644
--- "a/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
+++ "b/\345\274\200\347\245\250\344\277\256\346\224\271.sql"
@@ -27,4 +27,4 @@
ALTER TABLE [dbo].[EC_OrderExtend] ADD CONSTRAINT [DF_EC_OrderExtend_printunit] DEFAULT ((1)) FOR [printunit]
--更新存储过程[sp_EC_OrderBasic_Search_Seller] ，订单查询sql
---更新存储过程sp_EC_OrderExtend_Insert，订单扩展sql
\ No newline at end of file
+--更新存储过程sp_EC_OrderExtend_Insert，sp_EC_OrderExtend_Update， 订单扩展sql
\ No newline at end of file
--
Gitblit v1.9.1