From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs |   66 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
index 2d368d4..57498a7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllEdit.aspx.cs
@@ -21,6 +21,7 @@
         OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
         Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
         EC_OrderBLL bll_EC_OrderBLL = null;
+        OA_StaffBLL bll_OA_StaffBLL = null;
 
         public Guid targetid = Guid.Empty;
         public static string Keyid;
@@ -39,6 +40,7 @@
             bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
             bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
             bll_EC_OrderBLL = new EC_OrderBLL();
+            bll_OA_StaffBLL = new OA_StaffBLL();
         }
 
         /// <summary>
@@ -127,17 +129,25 @@
             this.spanSumPrice.InnerText = (_eC_OrderBasic.SumPrice ??0).ToString("0.00");
             this.spanSurplusPrintNum.InnerText = _eC_OrderBasic.OrderExtend.SurplusPrintNum.ToString2();
 
-            this.spanSpecialOprator.InnerText = CurrentUser.ShortName;
+            //this.spanSpecialOprator.InnerText = CurrentUser.ShortName;
+            this.selBusinessManager.Value = _eC_OrderBasic.Creater;
             this.spanSpecialTime.InnerText = DateTime.Now.ToString("yyyy-MM-dd HH:mm");
             this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
 
             Pagination pa = new Pagination();
             pa.PageSize = 500;
             pa.PageIndex = 1;
-            this.selOutFirm.DataSource = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
+            var ss = bll_OA_CorporateClientsBLL.SelectModelPage(pa, CurrentUser.MemberId, "");
+            this.selOutFirm.DataSource = ss;
             this.selOutFirm.DataTextField = "OutVendorName";
             this.selOutFirm.DataValueField = "FirmId";
             this.selOutFirm.DataBind();
+            this.selOutFirm.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+           var aaa  = ss.FirstOrDefault(x => x.OutVendorName == "鍏朵粬");
+            if (aaa != null)
+            {
+                this.selOutFirm.SelectedValue = aaa.FirmId.ToString();
+            }
             selOutFirm_SelectedIndexChanged(null, null);
         }
 
@@ -154,6 +164,12 @@
                 this.selExigencyDegree.DataBind();
                 this.selExigencyDegree.Items.Add(new ListItem("璇烽�夋嫨", ""));
                 this.selExigencyDegree.Value = "0";
+
+                this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+                this.selBusinessManager.DataTextField = "Name";
+                this.selBusinessManager.DataValueField = "Name";
+                this.selBusinessManager.DataBind();
+                //this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
             }
         }
 
@@ -192,6 +208,12 @@
                 JavaScript.MessageBox("鏈紶閫掑弬鏁帮紒", this);
                 return false;
             }
+            if (string.IsNullOrEmpty(this.selOutFirm.SelectedValue))
+            {
+                JavaScript.MessageBox("鏈�夋嫨澶栧崗鍘傚晢锛�", this);
+                return false;
+            }
+            
             int? orderid = MyConvert.ConvertToInt32(orderIdStr);
             if (!orderid.HasValue)
             {
@@ -209,7 +231,7 @@
             m_EC_OrderBasicNew.SellerId = this.selOutFirm.SelectedValue.ToGuid2();
             m_EC_OrderBasicNew.BuyerId = CurrentUser.MemberId;
             m_EC_OrderBasicNew.BuyerName = CurrentUser.Name;
-            m_EC_OrderBasicNew.Creater = CurrentUser.ShortName;
+            m_EC_OrderBasicNew.Creater = this.selBusinessManager.Value;// CurrentUser.ShortName;
             m_EC_OrderBasicNew.Operator = CurrentUser.ShortName;
             m_EC_OrderBasicNew.DeliveryTime = this.txtDeliveryTime.Value.ToDateTime2();
             m_EC_OrderBasicNew.DocumentName = _eC_OrderBasic.DocumentName;
@@ -317,33 +339,43 @@
 
         protected void selOutFirm_SelectedIndexChanged(object sender, EventArgs e)
         {
-
-            OA_CorporateClients oA_CorporateClientsModel = new OA_CorporateClients();
-            oA_CorporateClientsModel = bll_OA_CorporateClientsBLL.GetModelByMemberIdAndName(CurrentUser.MemberId, selOutFirm.SelectedItem.Text.ToString());
-            if (oA_CorporateClientsModel.Keyid != oA_CorporateClientsModel.FirmId)
+            if(selOutFirm.SelectedValue != "")
             {
-                trFile.Visible = true;
-                LF_OrderFile lfModel = new LF_OrderFile();
-                LF_OrderFileBLL lF_OrderFileBLL = new LF_OrderFileBLL();
-                lfModel = lF_OrderFileBLL.GetModel(Convert.ToInt32(Request["orderid"]));
-                if (lfModel == null)
+                OA_CorporateClients oA_CorporateClientsModel = new OA_CorporateClients();
+                oA_CorporateClientsModel = bll_OA_CorporateClientsBLL.GetModelByMemberIdAndName(CurrentUser.MemberId, selOutFirm.SelectedItem.Text.ToString());
+                if (oA_CorporateClientsModel.Keyid != oA_CorporateClientsModel.FirmId)
                 {
-                    cbkIsAllRecovery.Visible = false;
-                    IsFiles = true;
+                    trFile.Visible = true;
+                    LF_OrderFile lfModel = new LF_OrderFile();
+                    LF_OrderFileBLL lF_OrderFileBLL = new LF_OrderFileBLL();
+                    lfModel = lF_OrderFileBLL.GetModel(Convert.ToInt32(Request["orderid"]));
+                    if (lfModel == null)
+                    {
+                        cbkIsAllRecovery.Visible = false;
+                        IsFiles = true;
+                    }
+                    else
+                    {
+                        cbkIsAllRecovery.Visible = true;
+                        IsFiles = false;
+                    }
+
+
                 }
                 else
                 {
-                    cbkIsAllRecovery.Visible = true;
+                    trFile.Visible = false;
                     IsFiles = false;
                 }
-
-
             }
             else
             {
                 trFile.Visible = false;
                 IsFiles = false;
             }
+            string script = "<script>ReceiptT('member', '"+ CurrentUser.MemberId + "', 4, 100)</script>";
+            this.ClientScript.RegisterStartupScript(this.Page.GetType(), "key", script);
+            
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1