From a7711b47c02807531f04313ae829584310f37aba Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 12:17:10 +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