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.Model/OA/OA_WorkPlan.cs | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 105 insertions(+), 0 deletions(-) diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs index beb9301..43cb98a 100644 --- a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs +++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs @@ -43,6 +43,66 @@ private string _rewardcontent; private string _rewardresult; private decimal? _rewardmoney; + public int? HoubufapiaoStatus { get; set; } + + public string Fujian { get; set; } + public string Fapiao { get; set; } + public string HoubufapiaoStatusName { get + { + if(HoubufapiaoStatus.HasValue) + { + if(HoubufapiaoStatus == 1) + { + return "鏈夊彂绁�"; + } + else if (HoubufapiaoStatus == 2) + { + return "鍚庤ˉ鍙戠エ"; + } + else if (HoubufapiaoStatus == 3) + { + return "鏃犲彂绁�"; + }else + return ""; + } + else + { + return ""; + } + + } + } + + public string EvaluationStatusName + { + get + { + if (EvaluationStatus.HasValue) + { + if (EvaluationStatus == 1) + { + return "宸蹭粯娆�"; + } + else if (EvaluationStatus == 2) + { + return "鏈粯娆�"; + } + + else + return "鏈粯娆�"; + } + else + { + return ""; + } + + } + } + + public int Nengfoushenpi { get; set; } + + public int Nengfoushanchu { get; set; } + public int? WufapiaoStatus { get; set; } /// <summary> /// 缂栧彿 @@ -297,6 +357,41 @@ _approvalstatus = value; } } + + + public string ApprovalStatusName + { + get + { + if (ApprovalStatus.HasValue) + { + if (ApprovalStatus == 0) + { + return "鏈鎵�"; + } + else if (ApprovalStatus == 1) + { + return "鎵瑰噯"; + } + else if (ApprovalStatus == 2) + { + return "涓嶆壒鍑�"; + } + else if (ApprovalStatus == 3) + { + return "鏈彁浜�"; + } + else + return "鏈鎵�"; + } + else + { + return ""; + } + + } + } + /// <summary> /// 瀹℃牳鏃堕棿 /// </summary> @@ -747,6 +842,16 @@ this.AllFine = isChange ? MyConvert.ConvertToDecimal(value) : AllFine; theValue = this.AllFine; } + else if ("HoubufapiaoStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30) + { + this.HoubufapiaoStatus = isChange ? MyConvert.ConvertToInt32(value) : HoubufapiaoStatus; + theValue = this.HoubufapiaoStatus; + } + else if ("WufapiaoStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 30) + { + this.WufapiaoStatus = isChange ? MyConvert.ConvertToInt32(value) : WufapiaoStatus; + theValue = this.WufapiaoStatus; + } return theValue; } #endregion Visiter -- Gitblit v1.9.1