作业本显示修改

username@email.com

2024-10-15 22a7922be8d234c04bdf894b48d9f57fe97c857f

作业本显示修改

 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),

 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);

 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 = '';
        }
    }


 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();

 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);//理论完成日期(确认收货日期)



 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 = '';