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/work/MyBaoxiaoList.aspx.cs | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
index 0847367..ef3d05b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
@@ -40,14 +40,15 @@
}
if (Request["delete"] != null)
{
- var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
- if (oA_WorkPlan_Shenpis.Count > 0 )
+ //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
+ if (model.ApprovalStatus !=4 )
{
- JavaScript.MessageBox("宸叉湁瀹℃壒淇℃伅锛屼笉鑳藉垹闄�", this);
+ JavaScript.MessageBox("宸叉彁浜や俊鎭紝涓嶈兘鍒犻櫎", this);
return;
}
- OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
+
if (model != null && model.Keyid != null)
{
bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
@@ -110,7 +111,7 @@
DateTime? endTime = null;
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, CurrentUser.TrueMemberId, 3, 17, "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), "", -1, this.selApprovalStatus.Value.ToInt32(), null, null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
+ var oA_WorkPlans = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, CurrentUser.TrueMemberId, 3, 17, "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), "", -1, this.selApprovalStatus.Value.ToInt32(), this.selEvaluationStatus.Value.ToInt32(), null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
foreach (var oA_WorkPlan in oA_WorkPlans)
{
var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
@@ -146,23 +147,23 @@
{
oA_WorkPlan.Nengfoushenpi = 1;
}
- if( oA_WorkPlan.ApprovalStatus == 1 && oA_WorkPlan.HoubufapiaoStatus != 2)
+ if((oA_WorkPlan.ApprovalStatus == 0 || oA_WorkPlan.ApprovalStatus == 1) && oA_WorkPlan.HoubufapiaoStatus != 2)
{
oA_WorkPlan.Nengfoushenpi = 1;
}
- var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
- if (oA_WorkPlan_Shenpis.Count> 0 && oA_WorkPlan.HoubufapiaoStatus != 2)
- {
- oA_WorkPlan.Nengfoushenpi = 1;
- }
- if (oA_WorkPlan.ApprovalStatus == 2 || oA_WorkPlan.ApprovalStatus == 1)
- {
- oA_WorkPlan.Nengfoushanchu = 1;
- }
- if (oA_WorkPlan_Shenpis.Count > 0 )
- {
- oA_WorkPlan.Nengfoushanchu = 1;
- }
+ //var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
+ //if (oA_WorkPlan_Shenpis.Count> 0 && oA_WorkPlan.HoubufapiaoStatus != 2)
+ //{
+ // oA_WorkPlan.Nengfoushenpi = 1;
+ //}
+ //if (oA_WorkPlan.ApprovalStatus == 2 || oA_WorkPlan.ApprovalStatus == 1)
+ //{
+ // oA_WorkPlan.Nengfoushanchu = 1;
+ //}
+ //if (oA_WorkPlan_Shenpis.Count > 0 )
+ //{
+ // oA_WorkPlan.Nengfoushanchu = 1;
+ //}
--
Gitblit v1.9.1