From a7e05ebe00fdcb649c012e5afc4a42a8d631e824 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 02 四月 2025 08:38:24 +0800
Subject: [PATCH] 删除客户管理查询条件中的“客户编号” 完成 新增订单---黑白印件 的后道工序最右边增加一个“口 竖式”，同前面套号、压痕一样，默认不勾选，是竖式的业务经理自己下单时勾选 完成提交外协付款申请时，增加上传审批证明的上传图片功能，可以添加多张图片；查询列表中增加“付款状态：全部、已付款、未付款”查询条件，默认全部；“完工状态”改为默认未完工 完成请示批复----付款申请 中也要向上面的需求一样，增加上传审批证明的上传图片功能，可以添加多张图片 完成在“请示批复”中进行“批复”操作的时候要能查看上传的审批图片 完成包装要求”要显示在打印的订单中 完成包装要求”要显示在打印的订单中 完成收据联单的新增订单中，纸张选无碳纸时，不显示“品牌”、“克重”，在联数的后面增加颜色选择：“颜色：上白下红”（匹配联数）订单管理中的“订单状态”删除，删除后新增两个状态：“完工状态：全部、未完工、已完工”和“送货状态：全部、已送货、未送货” 完成请示批复中默认“未批复” 完成请示批复中默认“未批复” 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
index 9a045c4..2e83a88 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchOperation.aspx.cs
@@ -453,6 +453,7 @@
{
// UCPager1.AspNetPager.PageChanged += AspNetPager_PageChanged;
btn_Search.Click += btn_Search_Click;
+
txtCommission.Value = CY.Config.WebInfo.Instance.FirmOrderAgencyFee;
List<EC_OrderDialogue> dialogues = _eC_OrderBasicBLL.SelectPropertyChangeRequest(CurrentUser.MemberId) as List<EC_OrderDialogue>;
@@ -503,7 +504,7 @@
this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
//this.selBusinessManager.Items.Insert(1, new ListItem(CurrentUser.ShortName, CurrentUser.ShortName));
- this.txtBeginData.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ this.txtBeginData.Value = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
this.txtEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
//鍒濇鏁版嵁鍔犺浇
@@ -513,6 +514,7 @@
#region 鏌ヨ
+
/// <summary>
/// 鎼滅储鎸夐挳鐐瑰嚮浜嬩欢
/// </summary>
@@ -521,11 +523,11 @@
private void btn_Search_Click(object sender, EventArgs e)
{
- /* if (this.txtCustormerName.Value.Trim() == "")
- {
- Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
- return;
- }*/
+ //if (this.txtCustormerName.Value.Trim() == "")
+ //{
+ // Response.Write("瀹㈡埛鍚嶇О涓嶈兘涓虹┖锛岃杈撳叆瀹㈡埛鍚嶇О鍐嶆煡璇⑩�︹��");
+ // return;
+ //}
Dictionary<int, object> searchParam = new Dictionary<int, object>();
SetParamValue(searchParam, 1, CurrentUser.MemberId);
@@ -544,7 +546,7 @@
SetParamValue(searchParam, 14, this.selPayType.SelectedValue);
SetParamValue(searchParam, 15, this.selReturnvisit.SelectedValue);
SetParamValue(searchParam, 16, this.selAppraise.SelectedValue);
- SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 1 : 0));
+ SetParamValue(searchParam, 18, 0); //(CurrentUser.StaffId > 0 ? 1 : 0)
SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
SetParamValue(searchParam, 20, CurrentUser.StaffId);
SetParamValue(searchParam, 21, CurrentUser.TrueName);
@@ -556,12 +558,24 @@
// AspNetPager_PageChanged(UCPager1.AspNetPager, new EventArgs());
Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
{
- PageSize = 100,// UCPager1.AspNetPager.PageSize,
+ PageSize = 500,// UCPager1.AspNetPager.PageSize,
PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
};
- IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x=>x.Quchudingdan == 2);
+ IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Seller(pagination, SearchParam);//.Where(x => x.OrderState != 0) .Where(x=>x.Quchudingdan == 2);
rptData.DataSource = result;
rptData.DataBind();
+
+ //EC_OrderBasic m_EC_OrderBasic = _eC_OrderBasicBLL.SumOrderMoney_receive(pagination, SearchParam);
+ //if (m_EC_OrderBasic != null)
+ //{
+ // //this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney * 9 ?? 0).ToString("0.00");
+ // //this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney * 9 ?? 0).ToString("0.00");
+ // //this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney * 9 ?? 0).ToString("0.00");
+ // this.AllMoney.InnerText = (m_EC_OrderBasic.OrAllTradingMoney ?? 0).ToString("0.00");
+ // this.AlreadyMoney.InnerText = (m_EC_OrderBasic.OrAllPayedMoney ?? 0).ToString("0.00");
+ // this.NoMoney.InnerText = (m_EC_OrderBasic.OrAllUnPayedMoney ?? 0).ToString("0.00");
+ //}
+
}
/// <summary>
--
Gitblit v1.9.1