From ad92b901b491d5921dbca2e91b0aafe8e2a0a017 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 九月 2024 13:30:53 +0800
Subject: [PATCH] 客户来源选择“政府采购”的才必选“机构代理”，除“政府采购”以外的客户来源，机构代码不用必填 “自联系”改为“上门送样”；“在线”改为“线上校对” 1）所有订单类型中的“印件名称”再增加几个字的长度，现在的格子有段短 （2）所有新增订单均把“客户单位”和“客户级别”这两行改到最前面，原来的“订单类型”这一行自动成为第3行 （3）“交货时间”现在默认的是第2天，全部改为默认第3天 在订单管理的列表中增加“封签”，列表中没打印显示“打印”，打印了就打“√” “订单管理”中，现在的“开票申请”栏目删除 生产安排中，生产“合版施工单”的前提必须是“订单类型”要相同，修改为不必相同。
---
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx | 15 ++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 10 +
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 12 +
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 95 +++++--------
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs | 108 +++++++-------
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 14 ++
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 7 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx | 14 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.designer.cs | 50 +++---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 20 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.designer.cs | 18 +-
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs | 19 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 8
16 files changed, 246 insertions(+), 158 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 9f0f4fb..8d97fd8 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -425,6 +425,16 @@
_eC_OrderBasicDAL.UpdatePrintState(orderId);
}
+
+ /// <summary>
+ /// 淇敼鎵撳嵃鐘舵��
+ /// </summary>
+ /// <param name="orderId"></param>
+ public void UpdatePrintfengqianState(int orderId)
+ {
+ _eC_OrderBasicDAL.UpdatePrintfengqianState(orderId);
+ }
+
/// <summary>
/// 淇敼鏍囩鎵撳嵃鐘舵��
/// </summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index 24ff6e0..f82425d 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -259,6 +259,13 @@
/// <param name="orderId"></param>
void UpdatePrintState(int orderId);
+
+ /// <summary>
+ /// 淇敼鎵撳嵃鐘舵��
+ /// </summary>
+ /// <param name="orderId"></param>
+ void UpdatePrintfengqianState(int orderId);
+
void UpdatePrintBiaoqianState(int orderId);
/// <summary>
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index 798b6e9..3a86f41 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -393,6 +393,12 @@
get;
set;
}
+
+ public bool? IsPrintfengqian
+ {
+ get;
+ set;
+ }
public string shuliuang
{
get;
@@ -869,6 +875,12 @@
this.IsPrintbiaoqian = isChange ? MyConvert.ConvertIntToBoolean(value) : this.IsPrintbiaoqian;
theValue = this.IsPrintbiaoqian;
}
+ else if ("IsPrintfengqian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 97)
+ {
+ this.IsPrintfengqian = isChange ? MyConvert.ConvertIntToBoolean(value) : this.IsPrintfengqian;
+ theValue = this.IsPrintfengqian;
+ }
+
else if ("Kehuqianshou".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 88)
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 9b35b71..f9b77bf 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -2632,6 +2632,26 @@
/// 淇敼鎵撳嵃鐘舵��
/// </summary>
/// <param name="orderId"></param>
+ public void UpdatePrintfengqianState(int orderId)
+ {
+ try
+ {
+ string sqlStr = string.Empty;
+ sqlStr = "UPDATE EC_OrderExtend SET IsPrintfengqian='true' WHERE Keyid=@orderId";
+ SqlParameter par = new SqlParameter("@orderId", orderId);
+ _dataBase.ExecuteSql(sqlStr, par);
+ }
+ catch
+ {
+
+ }
+ }
+
+
+ /// <summary>
+ /// 淇敼鎵撳嵃鐘舵��
+ /// </summary>
+ /// <param name="orderId"></param>
public void UpdatePrintBiaoqianState(int orderId)
{
try
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
index d0a0053..2589881 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx
@@ -29,15 +29,15 @@
var type = "";
$(".SelectCheck:checked").each(function (ii, vv) {
if (this.style.display == 'none') { return; }
- if (type == "" || type == $(vv).attr("value_type")) {
- type = $(vv).attr("value_type");
- } else {
- type = "false";
- return false;
- }
+ //if (type == "" || type == $(vv).attr("value_type")) {
+ // type = $(vv).attr("value_type");
+ //} else {
+ // type = "false";
+ // return false;
+ //}
keyid = keyid + "," + $(vv).attr("value_keyid");
});
-
+ type = "true";
if (keyid == "")
alertMsg("鏈�変腑浠讳綍璁㈠崟");
else if (type == "false") {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.designer.cs
index e85a2d2..47725e3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgOrderProduction {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgOrderProduction
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtBeginData 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBeginData;
-
+
/// <summary>
/// txtEndDate 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
-
+
/// <summary>
/// selPrintTypes 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPrintTypes;
-
+
/// <summary>
/// selOrderTypes 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderTypes;
-
+
/// <summary>
/// txtOrderId 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOrderId;
-
+
/// <summary>
/// txtCustormerName 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
-
+
/// <summary>
/// selOrderStates 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
-
+
/// <summary>
/// selPayStates 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
-
+
/// <summary>
/// txtCreaterName 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreaterName;
-
+
/// <summary>
/// selBusinessManager 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
-
+
/// <summary>
/// selClientManager 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selClientManager;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// txtCommission 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCommission;
-
+
/// <summary>
/// rptData 鎺т欢銆�
/// </summary>
@@ -164,7 +166,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater rptData;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealEdit.aspx.cs
index 5c9aa50..09f241e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealEdit.aspx.cs
@@ -102,7 +102,7 @@
}
else
{
- this.trbook.Style.Add("display", "block");
+ //this.trbook.Style.Add("display", "block");
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx
index 22d418d..6aa9bb7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx
@@ -27,6 +27,21 @@
// }
// });
}
+
+ $(function () {
+ $("#btnPrint").click(function () {
+ var orderId = '<%=Request["orderid"] %>';
+ $.ajax({
+ url: '/Pages/business/OrderDeatil.aspx?tmp' + (new Date()).valueOf(),
+ type: "POST",
+ async: false,
+ data: "Target=Printfengqian&orderIdStr=" + orderId,
+ success: function (dataStr) {
+
+ }
+ });
+ });
+ });
</script>
<script type="text/javascript">
$(function () {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs
index 83f032d..a95f482 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs
@@ -60,7 +60,9 @@
PrintType = "A4";
EC_OrderBasic _eC_OrderBasic = bll_EC_OrderBLL.SelectModelById(Convert.ToInt32(Keyid));
int iBagNum = 0;
- iBagNum = Convert.ToInt32(_eC_OrderBasic.OrderExtend.BagNum);
+
+
+ int.TryParse(_eC_OrderBasic.OrderExtend.BagNum, out iBagNum);
string sdate = _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd");
OA_CorporateClients oA_CorporateClients = null;
OA_CustomerCommunications oA_CustomerCommunications = null;
@@ -112,7 +114,7 @@
+ "<td align='center' height='23px'>" + _eC_OrderBasic.OrderExtend.PrintNum+ ""
+ "</td>"
+ "</tr>"
- + "<tr style=' height:45px; width:350px;display:" + (_eC_OrderBasic.PrintTypeId == 6 ? "block" : "none") + ";'>"
+ + "<tr style=' height:45px; width:350px;display:" + (_eC_OrderBasic.PrintTypeId == 6 ? "" : "none") + ";'>"
+ "<td align='center'>"
+ "涔﹀彿"
+ "</td> "
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.designer.cs
index 4a26d92..baae1ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgSealPrint {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgSealPrint
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// divPrintHtml 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index c9ec715..8428ea1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -87,7 +87,7 @@
<div class="ShowCustormDIV"><ul id="ShowCustormList"></ul></div>
</td>
<td class="ali03 w100px" >鏈烘瀯浠ｇ爜锛�</td>
- <td class="w150px"><input id="txtJigoudaima" type="text" runat="server" class="req" maxlength="50" style=" width:130px;" /><span style="color:red;">*</span></td>
+ <td class="w150px"><input id="txtJigoudaima" type="text" runat="server" maxlength="50" style=" width:130px;" /><span id="txtJigoudaimabitian" style="color:red;">*</span></td>
<td class="ali03 w100px" > </td>
<td class=""><input id="txtCredit" type="text" readonly="readonly" runat="server" class="req float " value="0" min="0" style="visibility:hidden;" /> </td>
@@ -126,7 +126,7 @@
<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' style=" width:220px;" class="req w220px"></select><span style="color:red;">*</span></td>
<td class="ali03 "><asp:Button ID="Button3" Text="鍏朵粬涓爣鍗曚綅" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /> </td>
<td colspan="2" ><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" style=" width:220px;" /> </td>
<td ></td>
</tr>
- <tr>
<td class="ali03 ">鍚堝悓閲戦锛�</td>
<td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class="req w120px"></select><span style="color:red;">*</span><input id="txtContractmoney" type="text" runat="server" maxlength="50" class="req 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>
<td ></td>
</tr>
+ <tr>
<td class="ali03 ">鍚堝悓閲戦锛�</td>
<td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class="req w120px"></select><span style="color:red;">*</span><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>
<td ></td>
</tr>
<tr id="ReceiptT_Html">
<td class="ali03 " >寮�閫氱櫥褰曪細</td>
@@ -501,6 +501,10 @@
$("#selExpiretype").change(function () {
if ($(this).val() != "1") {
$("#txtExpireTime").attr("disabled", "disabled");
$("#txtExpireTime").val("");
} else {
$("#txtExpireTime").removeAttr("disabled");
}
});
$("#selExpiretype").change();
+
+
+ $("#selSourcesInfoId").change(function () {
if ($(this).val() != "452") {
$("#txtJigoudaimabitian").hide();
} else {
$("#txtJigoudaimabitian").show();
}
});
$("#selSourcesInfoId").change();
+
});
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index a555040..8737fc7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -89,7 +89,11 @@
OA_CorporateClients m_OA_CorporateClients = new OA_CorporateClients();
OA_CustomerCommunications m_OA_CustomerCommunications = new OA_CustomerCommunications();
EC_AcceptWayByCustomers m_EC_AcceptWayByCustomers = new EC_AcceptWayByCustomers();
-
+ if ( this.selSourcesInfoId.Value.ToString() == "452" && string.IsNullOrWhiteSpace(this.txtJigoudaima.Value.ToString()))
+ {
+ JavaScript.MessageBox("瀹㈡埛鏉ユ簮涓烘斂搴滈噰璐紝璇峰～鍐欐満鏋勪唬鐮�", this);
+ return;
+ }
try
{
//var files = Request.Files;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
index e95fd01..d87a2f2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -57,6 +57,10 @@
int orderId = Request["orderIdStr"].ToString().ToInt32().Value;
UpdatePrintState(orderId);
break;
+ case "Printfengqian":
+ int orderIds = Request["orderIdStr"].ToString().ToInt32().Value;
+ UpdatePrintfengqianState(orderIds);
+ break;
default:
Page_Load_Default();
return;
@@ -163,5 +167,20 @@
}
}
}
+
+
+ /// <summary>
+ /// 鏀瑰彉鎵撳嵃灏佺鐘舵��
+ /// </summary>
+ private void UpdatePrintfengqianState(int orderId)
+ {
+
+ if (CurrentUser != null)
+ {
+
+ _eC_OrderBasicBLL.UpdatePrintfengqianState(orderId);
+
+ }
+ }
}
}
\ 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 2134efe..3f2b5e4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -43,7 +43,7 @@
///鏂板瀹㈡埛
function showCustomer() {
- top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?src=order", Title: "鏂板瀹㈡埛", Width: 900, Height: 680 });
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?src=order", Title: "鏂板瀹㈡埛", Width: 1200, Height: 780 });
}
function Saveyaoqiu() {
@@ -110,7 +110,7 @@
try {
document.getElementById('spnCustormerControl').style.display = document.getElementById('txtCustormerName') ? 'none' : '';
if ('0' == document.getElementById('txtKeyid').value) {
- document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 1 }).ToString('yyyy-MM-dd');
+ document.getElementById('txtDeliveryTime').value = new Date().ToFuture({ day: 2 }).ToString('yyyy-MM-dd');
ReceiptT('customer', '', 6, 120); return;
} else {
ReceiptT('order', '<%=Orderid %>', 6, 120);
@@ -185,6 +185,24 @@
</td>
</tr>
<tr>
+ <td align="right">
+ 瀹㈡埛鍗曚綅锛�
+ </td>
+ <td colspan="3" align="left">
+ <input type="hidden" id='txtCustormer' runat="server" />
+ <input id='txtCustormerName' runat="server" readonly="readonly" /><span id='spnCustormerControl'><select id='selCustormer' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select>
+ <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
+ </span>
+ <input type='hidden' runat="server" id='txtCompanyName' />
+ </td>
+ <td align="right">
+ 瀹㈡埛绾у埆锛�
+ </td>
+ <td align="left">
+ <select id='selCustormerLevel' class='Sreq' runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
+ </select>
+ <!--datavaluefield="MeanValue"-->
+ </td>
<td align="right">
璁㈠崟绫诲瀷锛�
</td>
@@ -194,7 +212,10 @@
<select id='selPrintTypes' runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepdefaultstyle='true' onchange='printTypeChange(this)' class=' Sreq'>
</select>
</td>
- <td align="right">
+
+ </tr>
+ <tr>
+ <td align="right">
璁㈠崟缂栧彿锛�
</td>
<td align="left">
@@ -213,13 +234,22 @@
<td align="left">
<input id='txtDeliveryTime' class='date req' runat="server" />
</td>
+ <td align="right">
+ 宸叉湁鍗颁欢锛�
+ </td>
+ <td align="left">
+ <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' onchange='printTypeChange1(this)' >
+ <option value="" >璇烽�夋嫨</option>
+ </select>
+ </td>
</tr>
+
<tr>
- <td align="right">
+ <td align="right">
鍗颁欢鍚嶇О锛�
</td>
<td align="left">
- <input id='txtDocumentName' runat="server" maxlength='200' class='req' />
+ <input id='txtDocumentName' runat="server" maxlength='200' class='req' style="width:200px;" />
</td>
<td align="right">
璁㈠崟鍗曚环锛�
@@ -240,52 +270,9 @@
<select id='selVerifyWay' class=' Sreq' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle='true'>
</select>
</td>
+
</tr>
- <tr>
- <td align="right">
- 宸叉湁鍗颁欢锛�
- </td>
- <td align="left">
- <select id='selprintask' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name' onchange='printTypeChange1(this)' >
- <option value="" >璇烽�夋嫨</option>
- </select>
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- <td align="right">
-
- </td>
- <td align="left">
-
- </td>
- </tr>
<tr>
- <td align="right">
- 瀹㈡埛鍗曚綅锛�
- </td>
- <td colspan="3" align="left">
- <input type="hidden" id='txtCustormer' runat="server" />
- <input id='txtCustormerName' runat="server" readonly="readonly" /><span id='spnCustormerControl'><select id='selCustormer' runat="server" keepdefaultstyle='true' datavaluefield='MemberId' datatextfield='CompanyName' onchange='custormerChange(this)' class='Sreq' selinputhtml="True" sign="" style=" width:123px;"></select>
- <%--<input type="button" value='鏂板' keepdefaultstyle='true' onclick="top.Dialog.open({ URL: '/Pages/business/CorporateClientsEdit.aspx', Title: '鏂板瀹㈡埛', Width: 900, Height: 680});" />--%>
- </span>
- <input type='hidden' runat="server" id='txtCompanyName' />
- </td>
<td align="right">
涓氬姟缁忕悊锛�
</td>
@@ -299,16 +286,6 @@
<td align="left">
<select id='selCustormerManagers' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
</select>
- </td>
- </tr>
- <tr>
- <td align="right">
- 瀹㈡埛绾у埆锛�
- </td>
- <td align="left">
- <select id='selCustormerLevel' class='Sreq' runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
- </select>
- <!--datavaluefield="MeanValue"-->
</td>
<td align="right">
鑱� 绯� 浜猴細
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs
index b4da7cf..e0e0cae 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs
@@ -51,6 +51,51 @@
protected global::System.Web.UI.HtmlControls.HtmlInputHidden hidOrderTypeId;
/// <summary>
+ /// txtCustormer 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCustormer;
+
+ /// <summary>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
+ /// selCustormer 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormer;
+
+ /// <summary>
+ /// txtCompanyName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCompanyName;
+
+ /// <summary>
+ /// selCustormerLevel 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerLevel;
+
+ /// <summary>
/// txtPrintTypes 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -96,6 +141,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDeliveryTime;
/// <summary>
+ /// selprintask 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selprintask;
+
+ /// <summary>
/// txtDocumentName 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -132,51 +186,6 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selVerifyWay;
/// <summary>
- /// selprintask 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selprintask;
-
- /// <summary>
- /// txtCustormer 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCustormer;
-
- /// <summary>
- /// txtCustormerName 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
-
- /// <summary>
- /// selCustormer 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormer;
-
- /// <summary>
- /// txtCompanyName 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtCompanyName;
-
- /// <summary>
/// selBusinessManagers 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -193,15 +202,6 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManagers;
-
- /// <summary>
- /// selCustormerLevel 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerLevel;
/// <summary>
/// txtContact 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index e07dec3..fbe5a95 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -32,6 +32,12 @@
top.Dialog.open({ URL: url, Title: "瀹屽伐", Height: 300, Width: 680 });
}
+ function ShowOrderFengqian(orderId) {
+ top.Dialog.open({ URL: "/Pages/business/AgSealPrint.aspx?orderid=" + orderId, Title: "鎵撳嵃灏佺", Width: 1100, Height: 900 });
+ }
+
+
+
function DeliverWork(orderId, orderCode, orderState) {
var url = "/Pages/business/DeliverWork.aspx?id=" + orderId;
url += "&OrderShowId=" + orderCode;
@@ -352,6 +358,9 @@
<th width="26" menu_member_case_id="case_ToAccept" menu_member_case_name="鍙楃悊">
鍙楃悊
</th>
+ <th width="26" >
+ 灏佺
+ </th>
<th width="26" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
瀹屽伐
</th>
@@ -461,6 +470,11 @@
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"鍙楃悊")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ?"title='宸插彈鐞�'":"title='鍙楃悊'"%> onclick="ToAccept(<%#Eval("SumPrice" )%>,'<%#Eval("SellerOrderId")%>',<%#Eval("Keyid")%>,<%#Eval("OrderTypeId")%>)">
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "鍙楃悊") ? "鈭�" : "鍙楃悊"%></span>
</td>
+ <td >
+ <%-- <span class="hand look" title="鏌ョ湅鎴栨墦鍗�" onclick='ShowOrder(<%#Eval("Keyid") %>)'>鎵撳嵃</span>--%>
+ <span class="hand_yes" <%#true.Equals(Eval("IsPrintfengqian"))? "title='宸叉墦鍗�'" : "title='鎵撳嵃'"%> onclick='ShowOrderFengqian(<%#Eval("Keyid") %>)'>
+ <%#true.Equals(Eval("IsPrintfengqian")) ? "鈭�" : "鎵撳嵃"%></span>
+ </td>
<td class="td_hide" menu_member_case_id="case_CompledWork" menu_member_case_name="瀹屽伐">
<span class="<%#IsCanOpearte(Eval("Keyid"),Eval("OrderState"),Eval("OutId"),"瀹屽伐")?"hand_yes":"hand_no"%>" <%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐")?"title='宸插畬宸�'":"title='瀹屽伐'"%> style='display: ' onclick="CompledWork(<%#Eval("Keyid")%>)">
<%#IsOpearted(Eval("Keyid"), Eval("OrderState"), "瀹屽伐") ? "鈭�" : "瀹屽伐"%></span>
--
Gitblit v1.9.1