chuanyin-group-project.git

			@@ -561,6 +561,8 @@
			SetParamValue(searchParam, 20, CurrentUser.StaffId);
			SetParamValue(searchParam, 21, CurrentUser.TrueName);
			SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
			SetParamValue(searchParam, 30, this.selWorkStates.Value);
			SetParamValue(searchParam, 31, this.selDeleverStates.Value);
			if (!IsPostBack && !IsCallback)
			{
			if (Session["OrderList"] != null)
			@@ -609,6 +611,10 @@
			this.selAppraise.SelectedValue = searchParam[index].ToString();
			if (index == 28)
			this.txtSearchyjname.Value = searchParam[index].ToString();
			if (index == 30)
			this.selWorkStates.Value = searchParam[index].ToString();
			if (index == 31)
			this.selDeleverStates.Value = searchParam[index].ToString();

			}

			@@ -620,7 +626,6 @@
			SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
			SetParamValue(searchParam, 20, CurrentUser.StaffId);
			SetParamValue(searchParam, 21, CurrentUser.TrueName);
			SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
			}
			}
			else
			@@ -877,6 +882,7 @@
			headerRow.CreateCell(12).SetCellValue("金额");
			headerRow.CreateCell(13).SetCellValue("已收款");
			headerRow.CreateCell(14).SetCellValue("未付款");
			headerRow.CreateCell(15).SetCellValue("送货金额");

			// 添加数据
			int rowIndex = 1;
			@@ -898,6 +904,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);


			}