From dfbeaf00996f22400dd0b6a11d61550da8d6d32a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 16 五月 2025 08:36:37 +0800
Subject: [PATCH] 这个查看权限这里要修改,这个部门前面加个框框,如果我没这个框框打勾,这个部门的人的名字就不出来好,我在框框部门的前面的框框里面打了勾过后。好,这个部门的人就全部出来,而且系统自动把它打起。好,我再具体哪个人那儿再那个给我再点一下,就是不打,就那样子做。

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
index 861021a..7fbcf55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverOrderPrint.aspx.cs
@@ -104,7 +104,7 @@
                 this.spnBuyerName.InnerText = oA_DeliverPlan.CompanyName;
 
                 this.spnBuyerAddress.InnerText = oA_DeliverPlan.Dizhi;
-                this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-Mm-dd");
+                this.spnNowTime.InnerText = oA_DeliverPlan.DeliverTime.Value.ToString("yyyy-MM-dd");
                 this.SellerOrderId.InnerText = oA_DeliverPlan.SellerOrderId;
                 this.spnBuyerPhone.InnerText = oA_DeliverPlan.Dianhua;
 
@@ -114,8 +114,9 @@
 
 
 
+                this.spnRemark.InnerText = oA_DeliverPlan.Remark;
 
-               
+
 
 
 
@@ -134,7 +135,11 @@
 
                             if (m_EC_AwbInfo != null)
                             {
-                                this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+                                if (string.IsNullOrWhiteSpace(this.spnRemark.InnerText))
+                                {
+                                    this.spnRemark.InnerText = m_EC_AwbInfo.Remark;
+                                }
+                                
 
                             }
                         }
@@ -158,10 +163,7 @@
                         }
                     }
                 }
-                else
-                {
-                    this.spnRemark.InnerText = oA_DeliverPlan.Remark;
-                }
+                 
                 rptData.DataSource = eC_OrderBasics;
                 rptData.DataBind();
                

--
Gitblit v1.9.1