先提交一部分

username@email.com

8 天以前 f6cb981322bc4c2a27921ad0480dce7fb483a4d8

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs

@@ -44,6 +44,7 @@
        EC_OrderBasicBLL _eC_OrderBasicBLL = null;
        OA_StaffBLL bll_OA_StaffBLL = null;
        LF_OrderFileBLL _lF_OrderFileBLL = null;
        public bool bianji = false;

        /// <summary>
        /// 初始化构造
@@ -469,6 +470,11 @@
        /// </summary>
        private void Page_Load_Default()
        {
            if(CurrentUser.TrueLoginId == "00001")
            {
                bianji = true;
            }

            UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
            btn_Search.Click += btn_Search_Click;
            txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
@@ -783,7 +789,7 @@
                        {
                            if (opType == "撤单")
                            {
                                if (orderState == 4 || orderState == 5)
                                if (orderState == 3 || orderState == 4 || orderState == 5)
                                {
                                    isCan = false;
                                }
@@ -882,6 +888,7 @@
                headerRow.CreateCell(12).SetCellValue("金额");
                headerRow.CreateCell(13).SetCellValue("已收款");
                headerRow.CreateCell(14).SetCellValue("未付款");
                headerRow.CreateCell(15).SetCellValue("送货金额");

                // 添加数据
                int rowIndex = 1;
@@ -903,6 +910,7 @@
                    row.CreateCell(12).SetCellValue(order.SumPrice.HasValue? order.SumPrice.Value.ToDouble2().Value:0);
                    row.CreateCell(13).SetCellValue(order.TradingSingle.PayedMoney.HasValue ? order.TradingSingle.PayedMoney.Value.ToDouble2().Value : 0);
                    row.CreateCell(14).SetCellValue(order.UnPayedMoney.ToDouble2().Value);
                    row.CreateCell(15).SetCellValue(order.SonghuoJine.HasValue ? order.SonghuoJine.Value.ToDouble2().Value : 0);


                }