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/DeliverPlanList.aspx.cs | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index f4e3645..06c85df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -66,17 +66,26 @@
//鍔犺浇鏌ヨ鏉′欢
protected void InitialSelectData()
{
- this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
- this.selDriverId.DataTextField = "Name";
- this.selDriverId.DataValueField = "Keyid";
- this.selDriverId.DataBind();
- this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selDriverId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�")) ;
+ //this.selDriverId.DataTextField = "Name";
+ //this.selDriverId.DataValueField = "Keyid";
+ //this.selDriverId.DataBind();
+ //this.selDriverId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
this.selCarId.DataSource = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
this.selCarId.DataTextField = "CarNumber";
this.selCarId.DataValueField = "Keyid";
this.selCarId.DataBind();
this.selCarId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+
+ this.selBusinessManager.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, true, false);
+ this.selBusinessManager.DataTextField = "Name";
+ this.selBusinessManager.DataValueField = "Keyid";
+ this.selBusinessManager.DataBind();
+ this.selBusinessManager.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ this.selPaiche.Value = "2";
//this.selDriverIddo.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null).Where(x => x.BF_IsDriver == true);//.Where(x => x.SM_Post.Equals("椹鹃┒鍛�"));
@@ -296,9 +305,25 @@
CurrentUser.MemberId,
this.txtDeliveryTime.Value,
this.selCarId.Value,
- this.selDriverId.Value
+ "",
+ "",
+ this.txtCustormerName.Value.Trim(),
+ this.selBusinessManager.Value,this.selPaiche.Value
);
-
+
+ foreach (var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua = oA_DeliverPlan.Dizhi;
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Lianxiren))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鑱旂郴浜猴細" + oA_DeliverPlan.Lianxiren;
+ }
+
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Dianhua))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鐢佃瘽锛�" + oA_DeliverPlan.Dianhua;
+ }
+ }
--
Gitblit v1.9.1