CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderDetail.aspx.cs
@@ -22,7 +22,8 @@
    {
        EC_MergerSingleBLL bll_EC_MergerSingleBLL = null;
        Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
        public string therowspan = "";
        public string tablesee = "";
        //初始化
        public AgMergerOrderDetail()
        {
@@ -116,6 +117,15 @@
            this.spanPMS_TotalPrice.InnerText = (m_EC_MergerSingle.PMS_TotalPrice ?? 0).ToString("0.00");
            this.spanPMS_Remarks.InnerText = m_EC_MergerSingle.PMS_Remarks;
             
            if (string.IsNullOrEmpty(m_EC_MergerSingle.PMS_Remarks))
            {
                this.txtPSO_Remarks_o_TR1.Visible = false;
            }
            else
            {
                this.txtPSO_Remarks_o.InnerText = m_EC_MergerSingle.PMS_Remarks;
            }
            if (m_EC_MergerSingle.Keyid != null)
            {
                List<EC_MergerOrders> m_EC_MergerOrdersList = bll_EC_MergerSingleBLL.GetEC_MergerOrdersListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerOrders>;
@@ -169,6 +179,25 @@
                }
                this.Repeater1.DataSource = m_EC_MergerForumsList;
                this.Repeater1.DataBind();
                List<EC_MergerHoudaos> m_EC_MergerHoudaosList = bll_EC_MergerSingleBLL.GetEC_MergerHoudaosListByKeyid(m_EC_MergerSingle.Keyid) as List<EC_MergerHoudaos>;
                this.RepeaterHoudaoList.DataSource = m_EC_MergerHoudaosList;
                this.RepeaterHoudaoList.DataBind();
                if (m_EC_MergerHoudaosList == null || m_EC_MergerHoudaosList.Count <= 0)
                {
                    tablesee = "display:none;";
                }
                if (m_EC_MergerHoudaosList != null)
                {
                    therowspan = (m_EC_MergerHoudaosList.Count + 1) + "";
                }
                else
                {
                    therowspan = "1";
                }
            }
            return true;