From 4b93e2f25069b1b8a210719b1983eeba8a736017 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期四, 16 九月 2021 11:56:02 +0800
Subject: [PATCH] 增加印件名称模糊查询 电话号码验证修改 订单新增根据单价算总价，根据总价算单价 订单增加单位(其他类型)
---
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs | 23 ++
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs | 7
CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt | 2
.gitignore | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 19 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx | 1
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user | 2
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs | 23 ++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs | 9 +
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs | 23 ++
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx | 40 +++-
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs | 6
订单扩展sql.sql | 0
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt | 2
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 11 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 27 +++
CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs | 23 ++
CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx | 32 ++-
CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx | 33 ++-
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx | 39 ++--
CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs | 23 ++
订单查询存储过程参数测试.sql | 0
开票修改.sql | 21 ++
订单查询sql.sql | 0
CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs | 8
38 files changed, 329 insertions(+), 101 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4fa5e9f..d4b0241 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,3 +32,4 @@
CY_ECommercePlatform/UploadFiles/obj/
CY_ECommercePlatform/UploadFiles/UpLoads/
CY_ECommercePlatform/CY.Config/obj/
+/CY_ECommercePlatform/.vs
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index 5e17b8e..798b6e9 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -510,6 +510,11 @@
get;
set;
}
+
+ /// <summary>
+ /// 鍗板埛鏁伴噺鍗曚綅
+ /// </summary>
+ public string yssldw { get; set; }
#endregion
#region Visiter
@@ -905,7 +910,11 @@
this.shifouDelivery = isChange ? MyConvert.ConvertToInt32(value) : this.shifouDelivery;
theValue = this.shifouDelivery;
}
-
+ else if ("yssldw".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 96)
+ {
+ this.yssldw = isChange ? MyConvert.ConvertToString(value) : this.yssldw;
+ theValue = this.yssldw;
+ }
#endregion
return theValue;
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
index 301369e..31a79eb 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtend.cs
@@ -219,6 +219,12 @@
#endregion Model
public string PrintPackDeliveryRequir { get; set; }
+
+ /// <summary>
+ /// 鍗板埛鏁伴噺鍗曚綅
+ /// </summary>
+ public int printunit { get; set; }
+
}
}
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index 42c5a73..ba4fece 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -50,6 +50,11 @@
public int PrintCount { get; set; }
/// <summary>
+ /// 鍗曚綅浠ｇ爜
+ /// </summary>
+ public int Unit { get; set; }
+
+ /// <summary>
/// 鍗曞弻闈�
/// </summary>
public string SingleOrdouble { get; set; }
@@ -394,10 +399,12 @@
#endregion
#region 璇环浠锋牸璁板綍
+
/// <summary>
/// 璇环浠锋牸鏄庣粏
/// </summary>
public InquiryDetail InquiryDetailObj { get; set; }
+
#endregion
}
}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 38a6be8..ea01a4f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -535,6 +535,8 @@
new SqlParameter("@Kehuqianshou",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@KaipiaoshenqingId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
+ new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
+
};
/*
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
index 0759fca..6df952b 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -97,6 +97,7 @@
delayTime,
new SqlParameter("@Productionprogress",trueModel.Productionprogress),
new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
+ new SqlParameter("@printunit",trueModel.printunit)
};
int i = -1;
@@ -158,6 +159,7 @@
new SqlParameter("@NumPerBag",trueModel.NumPerBag),
new SqlParameter("@BagNum",trueModel.BagNum),
new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
+ new SqlParameter("@printunit",trueModel.printunit)
};
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
index 2015451..d0c714a 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj.user
@@ -21,7 +21,7 @@
<StartAction>CurrentPage</StartAction>
<AspNetDebugging>True</AspNetDebugging>
<SilverlightDebugging>False</SilverlightDebugging>
- <NativeDebugging>False</NativeDebugging>
+ <NativeDebugging>True</NativeDebugging>
<SQLDebugging>False</SQLDebugging>
<ExternalProgram>
</ExternalProgram>
diff --git a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
index 977c3a2..05a7d4a 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/Orders.txt
@@ -1 +1 @@
-2021-09-14 09:59:56
\ No newline at end of file
+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
index 977c3a2..05a7d4a 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/QuoteDemand.txt
@@ -1 +1 @@
-2021-09-14 09:59:56
\ No newline at end of file
+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
index 977c3a2..05a7d4a 100644
--- a/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
+++ b/CY_ECommercePlatform/CY.WebForm/CacheFiles/SeckillBusiness.txt
@@ -1 +1 @@
-2021-09-14 09:59:56
\ No newline at end of file
+2021-09-16 11:19:55
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index f84291c..875669e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -435,7 +435,8 @@
<td class="contentLeft" colspan="2" style=" padding-left:300px;">
<input type="hidden" id='txtKeyid' runat="server" value='0' /><input type="hidden" value='0' id='txtBillMode' runat="server" />
<input type="hidden" name='Target' value='default' />
- <input name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" /><input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" /> <input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" /> <input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
+ <input name='hidPrintTypeId' id='hidPrintTypeId' type="hidden" />
+ <input type="button" id="btnSaveask" runat="server" value="淇濆瓨璁㈠崟鍜岃姹�" onclick="if(!Saveyaoqiu())return false;" /> <input type="button" id="btnSave" runat="server" value="淇濆瓨璁㈠崟" onclick="if(!Save())return false;" /> <input type="button" value="閲� 缃�" id='btnReset' onclick="ReLoad()" />
@@ -490,18 +491,23 @@
showWait();
var OldOrderId = document.getElementById('txtKeyid').value;
var ssselPrintTypes = document.getElementById('selPrintTypes').value;
+ alert(7);
if (ssselPrintTypes == -1 || ssselPrintTypes == "-1") {//鍏朵粬绫诲瀷
$("#hidOrderId").val(OldOrderId);
$("#divInquiry").load("/Pages/front/OtherType.aspx", { "PrintTypeId": "-1" });
setTimeout(function () {
+ alert(8);
if (sel.value != "" || sel.value == "0") {
BindControl1(sel.value);
}
}, 1000);
window.hideWaitDiv = window.parent.parent.parent.parent.parent.parent.hideWaitDiv;
- if (window.hideWaitDiv) window.hideWaitDiv();
- } else {
+ if (window.hideWaitDiv)
+ window.hideWaitDiv();
+ }
+ else
+ {
DelayLoadPrintType1(ssselPrintTypes, '1', OldOrderId, 'order');
}
document.getElementById('hidPrintTypeId').value = ssselPrintTypes;
@@ -520,18 +526,22 @@
//淇敼鍙嶇粦鏁版嵁
function BindControl1(orderId) {
+ alert(1);
if (parseInt(orderId) > 0) {
$.ajax({
url: '/Pages/front/InquiryOnLine.aspx?tmp' + (new Date()).valueOf(),
type: "POST",
data: "BindControl1=true&OrderId=" + orderId,
success: function (dataJsonStr) {
+ alert(2);
if (dataJsonStr == null || dataJsonStr == "")
return;
var dataJson = eval('(' + dataJsonStr + ')');
+ alert(dataJson.PrintTypeId);
if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
$("[name='printSizeName']").val(dataJson.PrintSizeName);
$("[name='printCount']").val(dataJson.PrintCount);
+ $("#ysUnit").attr("value", dataJson.Unit);
$("[name='txtPrintDemand']").val(dataJson.PrintDemand);
} else {
BindControlByPrintType(dataJson);
@@ -579,6 +589,7 @@
function LoadPrintType1(printTypeId, pvcTypePar, OrderId) {
+ alert(4);
$("#hidOrderId").val(OrderId);
switch (printTypeId) {
//鍚嶇墖
@@ -690,6 +701,7 @@
//鍔ㄦ�佸姞杞介〉闈㈠悗鎵ц鐨勮鍙�
function ExcuteCallBack1() {
+ alert(5);
var printTypeId = $("#hidPrintTypeId").val();
$("#selDigitalPrintType").live("change",
@@ -739,6 +751,7 @@
var ssselprintask = $("#selprintask").val();
//淇敼鍙嶇粦鏁版嵁
+ alert(3);
if (ssselprintask != "" || ssselprintask == "0") {
BindControl1(ssselprintask);
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index ff9a6b9..1f690b4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -371,6 +371,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+ eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -387,6 +388,7 @@
_inquiryCommonModel = new InquiryCommonModel();
_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.PrintSizeName = Request["printSizeName"].ToString();
}
@@ -549,6 +551,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
+ eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -565,6 +568,7 @@
_inquiryCommonModel = new InquiryCommonModel();
_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.PrintSizeName = Request["printSizeName"].ToString();
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 169db99..e956066 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -214,6 +214,12 @@
</select>
</td>
<td class="ali03">
+ 鍗颁欢鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtSearchyjname' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
浠樻鏂瑰紡锛�
</td>
<td>
@@ -241,9 +247,20 @@
<asp:listitem value="0">涓瘎</asp:listitem>
<asp:listitem value="-1">宸瘎</asp:listitem>
</asp:dropdownlist>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
</td>
- <td>
+ <td>
</td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td class="ali03"> </td>
+ <td> </td>
+ <td> </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
<input type="hidden" id='txtCommission' runat="server" />
@@ -304,6 +321,9 @@
</th>
<th width="36">
鏁伴噺
+ </th>
+ <th width="36">
+ 鍗曚綅
</th>
<th style="text-align: center;" width="50">
璁㈠崟鐘舵��
@@ -390,7 +410,7 @@
</td>
<td style="text-align: center;">
<div style="width: 140px; 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 > 10 ? (Eval("BuyerName").ToString().Substring(0, 10) + "..") : Eval("BuyerName").ToString()%></a>
+ <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>
<td>
@@ -406,6 +426,9 @@
<%#Eval("OrderExtend.PrintNum")%>
</td>
<td>
+ <%#Eval("yssldw")%>
+ </td>
+ <td>
<%#Eval("OrderStateObj.Name")%>
</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 242c3ec..831f812 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -529,6 +529,7 @@
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
SearchParam = searchParam;
UCPager1.AspNetPager.CurrentPageIndex = 1;//閲嶇疆椤垫暟
//鍐嶆鏌ヨ
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
index 8d76b73..9f67cc7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
@@ -150,6 +150,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
/// <summary>
+ /// txtSearchyjname 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSearchyjname;
+
+ /// <summary>
/// selPayType 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
index e36d08e..a7fd99e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx
@@ -38,21 +38,31 @@
<option value="寮傚瀷">寮傚瀷</option>
</select>
</td>
- <td align="center">
- <div class="xialap">
- <input type="text" id="printCount" name="printCount" readonly="readonly" style="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">30000</div>
- <div class="xialapr">50000</div>
- </div>
- </div>
+ <td align="center">
+ <table>
+ <tr>
+ <td>
+ <div class="xialap">
+ <input type="text" id="printCount" name="printCount" readonly="readonly" style="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">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/Adhesive.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
index 787e85b..beb743e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.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/Adhesive.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
index f7bf1f2..8211eb6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Adhesive.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Adhesive {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Adhesive
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
index 42ac7ee..1df31d2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
@@ -23,17 +23,28 @@
</span>
</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 name="bindingMode" id="bindingMode">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
index ac6e088..f5cde40 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.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/Book.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
index d7924c1..a81ae26 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Book {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Book
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
index cddd4a0..604f8af 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/DMInquiry.aspx
@@ -104,7 +104,7 @@
</div>
</td>
<td>
- <select id='ysUnit' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
</td>
</tr>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index fce0e17..d674ee0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -136,6 +136,7 @@
int bindingMode = -1;
string gildingType = string.Empty;
string laFeng = string.Empty;
+ int ysuint = 1;
if (request["hidPrintTypeId"] != null)
printTypeId = request["hidPrintTypeId"].ToString().ToInt32().Value;
if (request["printMode"] != null)
@@ -224,6 +225,10 @@
gildingType = request["gildingType0"].ToString();
if (request["LaFeng"] != null)
laFeng = request["LaFeng"].ToString();
+
+ if (request["ysUnit"] != null)
+ ysuint = request["ysUnit"].ToString().ToInt32().Value;
+
model.PrintTypeId = printTypeId;
model.PrintMode = printMode;
model.PrintSizeId = sizeId;
@@ -231,6 +236,7 @@
model.GramWeight = gramWeight;
model.BrandId = brandId;
model.PrintCount = printCount;
+ model.Unit = ysuint;
model.SingleOrdouble = singleOrdouble;
if (!string.IsNullOrEmpty(works))
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
index e08ca1b..d7813a0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx
@@ -104,6 +104,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/NewsPaper.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
index c2c8cbb..629d311 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.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/NewsPaper.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
index 6c74a56..48cb545 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/NewsPaper.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class NewsPaper {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class NewsPaper
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
index ec39615..c90ad2a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/OtherType.aspx
@@ -27,7 +27,7 @@
</td>
<td align="left">
<input type="text" id="printCount" name="printCount" runat="server" class="validateInt textinput" value="5000" />
- <select id='ysUnit' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
+ <select id='ysUnit' runat="server" name="ysUnit" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'></select>
</td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
index 8e0af7e..8799e6b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx
@@ -29,17 +29,27 @@
</span>
</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 name="bindingMode" id="bindingMode">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
index 5463b6b..ad2ca7a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.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/PictureAlbumNew.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
index d4e85b0..95aaf7e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/PictureAlbumNew.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class PictureAlbumNew {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class PictureAlbumNew
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
index 9d40e64..6f7618e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx
@@ -26,12 +26,10 @@
<th style="text-align: center;" class="Brand0">
鍝佺墝
</th>
- <th style="text-align: center;" class="gramWeight0">
+ <th style="text-align: center;" class="gramWeight0">
鍏嬮噸
</th>
- <th style="text-align: center;">
- 鍗板埛鏁伴噺
- </th>
+ <th>鍗板埛鏁伴噺</th>
</tr>
<tr>
<td>
@@ -70,18 +68,27 @@
<select class="selectLaber" id="gramWeight0" name="gramWeight0">
</select>
</td>
- <td>
- <div class="xialap" style="display: inline-block;">
- <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 >
+ <table>
+ <tr>
+ <td>
+ <div class="xialap" style="display: inline-block;">
+ <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/Reticule.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
index 5bc3396..41d22ab 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.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/Reticule.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
index 1b2c882..7bb42eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/Reticule.aspx.designer.cs
@@ -2,14 +2,25 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.front {
-
-
- public partial class Reticule {
+namespace CY.WebForm.Pages.front
+{
+
+
+ public partial class Reticule
+ {
+
+ /// <summary>
+ /// ysUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect ysUnit;
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 65bea0d..a4ffe73 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -253,6 +253,7 @@
if (dataJson.PrintTypeId == "-1" || dataJson.PrintTypeId == -1) {
$("[name='printSizeName']").val(dataJson.PrintSizeName);
$("[name='printCount']").val(dataJson.PrintCount);
+ $("[name='ysUnit']").val(dataJson.Unit);
$("[name='txtPrintDemand']").val(dataJson.PrintDemand);
} else {
BindControlByPrintType(dataJson);
@@ -1215,6 +1216,7 @@
}
$("[name='gramWeight0']").val(dataJson.GramWeight);
$("#printCount").val(dataJson.PrintCount);
+ $("[name='ysUnit']").val(dataJson.Unit);
$("[name='RopeTypeName']").val(dataJson.RopeTypeName);
$("[name='RopeColor']").val(dataJson.RopeColor);
$("[name='printColor0']").val(dataJson.PrintColor);
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 ca7a8f2..49f76b4 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"
@@ -1,11 +1,30 @@
USE [ECTEST]
GO
+--2021.09.10 增加备注
alter table [OA_Kaipiaoshenqing]
add [remark] nvarchar(250) null
-go
--更新数据字典 EC_开票申请，管理员登录后台
-- 删除 （EC_开票申请—— 未申请）
-- 修改（已申请——未开票）
+
+go
+
+--2021.09.13
+--更新数据字典 印刷单位，管理员登录后台
+-- 新增 （印刷单位—— 张、本、册、只）
+-- 值（1、 2、 3、 4）
+
+
+--2021.09.15 增加印刷数量单位
+alter table [EC_OrderExtend]
+ add [printunit] [int] NULL
+
+update [EC_OrderExtend] set [printunit]=1
+
+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
diff --git "a/\350\256\242\345\215\225\346\211\251\345\261\225sql.sql" "b/\350\256\242\345\215\225\346\211\251\345\261\225sql.sql"
new file mode 100644
index 0000000..e3f3d79
--- /dev/null
+++ "b/\350\256\242\345\215\225\346\211\251\345\261\225sql.sql"
Binary files differ
diff --git "a/\350\256\242\345\215\225\346\237\245\350\257\242sql.sql" "b/\350\256\242\345\215\225\346\237\245\350\257\242sql.sql"
new file mode 100644
index 0000000..95e2d8d
--- /dev/null
+++ "b/\350\256\242\345\215\225\346\237\245\350\257\242sql.sql"
Binary files differ
diff --git "a/\350\256\242\345\215\225\346\237\245\350\257\242\345\255\230\345\202\250\350\277\207\347\250\213\345\217\202\346\225\260\346\265\213\350\257\225.sql" "b/\350\256\242\345\215\225\346\237\245\350\257\242\345\255\230\345\202\250\350\277\207\347\250\213\345\217\202\346\225\260\346\265\213\350\257\225.sql"
new file mode 100644
index 0000000..b1afb8a
--- /dev/null
+++ "b/\350\256\242\345\215\225\346\237\245\350\257\242\345\255\230\345\202\250\350\277\207\347\250\213\345\217\202\346\225\260\346\265\213\350\257\225.sql"
Binary files differ
--
Gitblit v1.9.1