From 22a7922be8d234c04bdf894b48d9f57fe97c857f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 十月 2024 15:55:30 +0800
Subject: [PATCH] 作业本显示修改
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 25 ++++++++++++++++++++++---
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 11 ++++++++---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 10 +++++-----
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs | 3 ++-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs | 2 +-
6 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index f9b77bf..4795903 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -124,6 +124,15 @@
{
unitPricePar = new SqlParameter("@UnitPrice", DBNull.Value);
}
+ SqlParameter DeliveryTime = null;
+ if (trueModel.DeliveryTime.HasValue)
+ {
+ DeliveryTime = new SqlParameter("@DeliveryTime", trueModel.DeliveryTime);
+ }
+ else
+ {
+ DeliveryTime = new SqlParameter("@DeliveryTime", DBNull.Value);
+ }
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
new SqlParameter(){ ParameterName ="@Keyid", SqlDbType=System.Data.SqlDbType.Int, DbType=System.Data.DbType.Int32, Direction=ParameterDirection.Output},
@@ -131,7 +140,7 @@
new SqlParameter("@OrderTypeId",trueModel.OrderTypeId),
new SqlParameter("@PrintTypeId",trueModel.PrintTypeId),
new SqlParameter("@DocumentName",trueModel.DocumentName),
- new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+ DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
new SqlParameter("@SellerId",trueModel.SellerId),
new SqlParameter("@BuyerId",trueModel.BuyerId),
new SqlParameter("@SellerName",trueModel.SellerName){SqlDbType=SqlDbType.VarChar,Size=200},
@@ -178,6 +187,16 @@
{
unitPricePar = new SqlParameter("@UnitPrice", DBNull.Value);
}
+ SqlParameter DeliveryTime = null;
+ if (trueModel.DeliveryTime.HasValue)
+ {
+ DeliveryTime = new SqlParameter("@DeliveryTime", trueModel.DeliveryTime);
+ }
+ else
+ {
+ DeliveryTime = new SqlParameter("@DeliveryTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -187,8 +206,8 @@
new SqlParameter("@SellerId",trueModel.SellerId),
new SqlParameter("@SellerName",trueModel.SellerName),
new SqlParameter("@DocumentName",trueModel.DocumentName),
- new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
- unitPricePar,
+ DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+ unitPricePar,
new SqlParameter("@SumPrice",trueModel.SumPrice),
new SqlParameter("@PayState",trueModel.PayState),
new SqlParameter("@Operator",trueModel.Operator),
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs
index a95f482..e869efe 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSealPrint.aspx.cs
@@ -63,7 +63,7 @@
int.TryParse(_eC_OrderBasic.OrderExtend.BagNum, out iBagNum);
- string sdate = _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd");
+ string sdate = _eC_OrderBasic.DeliveryTime.HasValue? _eC_OrderBasic.DeliveryTime.Value.ToString("yyyy-MM-dd"):"";
OA_CorporateClients oA_CorporateClients = null;
OA_CustomerCommunications oA_CustomerCommunications = null;
oA_CorporateClients = bll_OA_CorporateClientsBLL.SelectModelByFirmIdandMemberId(CurrentUser.MemberId, _eC_OrderBasic.BuyerId);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 3d74128..931670d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -10,7 +10,7 @@
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
<script src="../../js/Inquiry/Inquiry.js?v=49" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=32" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=35" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
@@ -528,8 +528,10 @@
document.getElementById('tbFacing').style.display = 'none';
document.getElementById('selVerifyWay12').style.display = 'none';
document.getElementById('selVerifyWay21').style.display = 'none';
- document.getElementById('selVerifyWay123').style.display = 'none';
- document.getElementById('selVerifyWay321').style.display = 'none';
+ //document.getElementById('selVerifyWay123').style.display = 'none';
+ //document.getElementById('selVerifyWay321').style.display = 'none';
+
+ document.getElementById('txtDeliveryTime').value = "";
}
@@ -537,8 +539,6 @@
document.getElementById('tbFacing').style.display = '';
document.getElementById('selVerifyWay12').style.display = '';
document.getElementById('selVerifyWay21').style.display = '';
- document.getElementById('selVerifyWay123').style.display = '';
- document.getElementById('selVerifyWay321').style.display = '';
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index d7e5ac1..b2ad99c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -109,7 +109,7 @@
this.txtCompanyName.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerName);
this.selPrintTypes.Value = _eC_OrderBasic.PrintTypeId.HasValue ? _eC_OrderBasic.PrintTypeId.Value.ToString() : "";
this.txtPrintTypes.Value = MyConvert.ConvertToString(_eC_OrderBasic.PrintType.PrintName);
- this.txtDeliveryTime.Value = _eC_OrderBasic.DeliveryTime.Value.ToString(FixedInfo.DATEFORMAT);
+ this.txtDeliveryTime.Value = _eC_OrderBasic.DeliveryTime.HasValue? _eC_OrderBasic.DeliveryTime.Value.ToString(FixedInfo.DATEFORMAT):"";
this.txtDocumentName.Value = MyConvert.ConvertToString(_eC_OrderBasic.DocumentName);
this.hidOrderTypeId.Value = _eC_OrderBasic.OrderTypeId.ToString();
this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
index f59d551..0d308b4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/PayAbout.aspx.cs
@@ -545,7 +545,8 @@
orderBasic.OrderTypeId = orderBasic.OrderTypeId.HasValue ? orderBasic.OrderTypeId : 1;//娌℃湁绫诲瀷鍒欓粯璁や负1:绾夸笅璁㈠崟
orderBasic.Remark = string.IsNullOrEmpty(orderBasic.Remark) ? eC_AcceptWayByOrder.Remark : orderBasic.Remark;//鑾峰彇澶囨敞
eC_AcceptWayByOrder.Operator = orderBasic.Creater;//鍒跺崟浜�/鎿嶄綔浜�
- orderBasic.DeliveryTime = orderBasic.DeliveryTime.HasValue ? orderBasic.DeliveryTime : DateTime.Now.AddDays(15);//榛樿15澶╁悗浜よ揣
+ if(orderBasic.PrintTypeId !=37)
+ orderBasic.DeliveryTime = orderBasic.DeliveryTime.HasValue ? orderBasic.DeliveryTime : DateTime.Now.AddDays(15);//榛樿15澶╁悗浜よ揣
//orderBasic.TheoryCompleteDate = DateTime.Now.AddDays(15);//鐞嗚瀹屾垚鏃ユ湡(纭鏀惰揣鏃ユ湡)
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 9dadc51..e1241fc 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -514,9 +514,14 @@
document.getElementById('tbFacing').style.display = 'none';
document.getElementById('selVerifyWay12').style.display = 'none';
document.getElementById('selVerifyWay21').style.display = 'none';
- document.getElementById('selVerifyWay123').style.display = 'none';
- document.getElementById('selVerifyWay321').style.display = 'none';
- document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value
+ if (OldOrderId == "" || OldOrderId == "0") {
+ document.getElementById('txtDeliveryTime').value = "";
+ }
+
+ if (document.getElementById('txtDocumentNameHide').value != "") {
+ document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
+ }
+
}
else {
document.getElementById('tbFacing').style.display = '';
--
Gitblit v1.9.1