From 93850ee66d5fcc6441e387d0a6622e17d881da04 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 十月 2024 15:01:38 +0800
Subject: [PATCH] 作业本,页面排版

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 776cee6..d7e5ac1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -117,7 +117,7 @@
 
             if (_eC_OrderBasic.UnitPrice.HasValue)
             {
-                this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.00");
+                this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.0000");
             }
             if (_eC_OrderBasic.SumPrice.HasValue)
             {
@@ -182,7 +182,7 @@
                 //this.rptCustormer.DataSource = corporateClients;
                 //this.rptCustormer.DataBind();
 
-                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId);
+                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).OrderBy(x=>x.orderNumHome);
                 this.selPrintTypes.DataBind();
                 this.selPrintTypes.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
                 this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
@@ -274,6 +274,7 @@
             _oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
             _oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
             _oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+            _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
             Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
         }
 
@@ -389,7 +390,15 @@
                     _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();
+                    if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+                    }
+                    else
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+                    }
+                    
                     _inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
                 }
                 else
@@ -569,7 +578,14 @@
                     _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();
+                    if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+                    }
+                    else
+                    {
+                        _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+                    }
                     _inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
                 }
                 else

--
Gitblit v1.9.1