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/EC/EC_AcceptWayByOrder.cs | 13
CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs | 25 +
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 48 ++
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 11
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 11
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 51 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx | 29
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs | 40 +
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx | 14
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx | 17
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs | 15
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx | 17
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 40 +
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs | 5
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs | 289 ++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx | 118 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs | 9
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs | 43 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs | 22
CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx | 73 +++
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx | 9
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx | 91 ++++
36 files changed, 954 insertions(+), 165 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 902ceab..1565a5c 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -463,9 +463,9 @@
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
+ public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
{
- return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType);
+ return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType, PayState);
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs
index d8090a0..b81226a 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs
@@ -105,6 +105,18 @@
return _IOA_WorkPlan_attachmentDAL.GetModelByKaipiaoId(BaozhengjinId);
}
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="BaozhengjinId">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoIdandType(int BaozhengjinId,int AttachmentType)
+ {
+
+ return _IOA_WorkPlan_attachmentDAL.GetModelByKaipiaoIdandType(BaozhengjinId, AttachmentType);
+ }
+
/// <summary>
/// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
/// </summary>
diff --git a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
index f9e9567..fa9abd8 100644
--- a/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -301,7 +301,7 @@
/// <param name="orderId"></param>
void UpdatePrintfengqianState(int orderId);
- void UpdatePrintBiaoqianState(int orderId);
+ void UpdatePrintBiaoqianState(int orderId);
/// <summary>
/// 鏌ヨ鍚庨亾(3)鏁村崟(4)
@@ -317,8 +317,9 @@
/// <param name="WorkStates"></param>
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
+ /// <param name="PayState"></param>
/// <returns></returns>
- IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType);
+ IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null);
/// <summary>
/// 鍒嗛〉鏌ヨ澶栧崗璁㈠崟(鏍规嵁鑱旂郴浜哄拰缁撴潫鐘舵��)
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs
index e714f16..5a08bdf 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs
@@ -25,5 +25,12 @@
/// <param name="OA_WorkPlanId">缂栧彿</param>
/// <returns></returns>
IEnumerable<OA_WorkPlan_attachment> GetModelByKaipiaoId(int OA_WorkPlanId);
+
+ /// <summary>
+ /// 鏍规嵁OA_WorkPlanId鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="OA_WorkPlanId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_WorkPlan_attachment> GetModelByKaipiaoIdandType(int OA_WorkPlanId, int AttachmentType);
}
}
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_AcceptWayByOrder.cs b/CY_ECommercePlatform/CY.Model/EC/EC_AcceptWayByOrder.cs
index dab0577..9c3a69c 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_AcceptWayByOrder.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_AcceptWayByOrder.cs
@@ -46,6 +46,19 @@
private string _remark;
private int? _accepttypeid;
private string _theawb;
+
+
+ public string NumPerBag
+ {
+ set;
+ get;
+ }
+ public string BagNum
+ {
+ set;
+ get;
+ }
+
/// <summary>
/// 鏀惰揣绫诲瀷缂栧彿
/// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
index 45d5e45..173abbc 100644
--- a/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
+++ b/CY_ECommercePlatform/CY.Model/Inquiry/InquiryCommonModel.cs
@@ -159,6 +159,31 @@
public string PaperMP { get; set; }
/// <summary>
+ /// 涓婅仈
+ /// </summary>
+ public string shanglian { get; set; }
+
+ /// <summary>
+ /// 涓仈
+ /// </summary>
+ public string zhonglianlian1 { get; set; }
+
+ /// <summary>
+ /// 涓仈
+ /// </summary>
+ public string zhonglianlian2 { get; set; }
+
+ /// <summary>
+ /// 涓仈
+ /// </summary>
+ public string zhonglianlian3 { get; set; }
+
+ /// <summary>
+ /// 涓嬭仈
+ /// </summary>
+ public string xialian { get; set; }
+
+ /// <summary>
/// 绾稿紶鍚嶇О
/// </summary>
public string pageNumsbs { get; set; }
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 8ad1113..d4e784a 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -714,6 +714,8 @@
new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+ new SqlParameter("@WorkStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+ new SqlParameter("@DeleverStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
};
@@ -798,9 +800,9 @@
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[34].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[33].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[35].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -2901,8 +2903,9 @@
/// <param name="WorkStates"></param>
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
+ /// <param name="PayState"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
+ public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
{
try
{
@@ -2913,6 +2916,9 @@
if (RelationType > 0)
condition += " and b.RelationTypeId = '" + RelationType + "' ";
+ if (!string.IsNullOrEmpty(PayState))
+ condition += " and a.PayState = " + PayState + " ";
+
if (StartCreatTime != null)
condition += " and a.CreateTime >= '" + StartCreatTime.Value + "' ";
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs
index 60235f0..dceba0f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs
@@ -166,11 +166,24 @@
/// <returns></returns>
public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoId(int OA_WorkPlanId)
{
- return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' order by CreateTime desc ") as IList<Model.OA_WorkPlan_attachment>;//鎵ц鏌ヨ
+ return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' and [AttachmentType] in (1,2) order by CreateTime desc ") as IList<Model.OA_WorkPlan_attachment>;//鎵ц鏌ヨ
}
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoIdandType(int OA_WorkPlanId, int AttachmentType)
+ {
+ return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' and [AttachmentType] = '" + AttachmentType + "' order by CreateTime desc ") as IList<Model.OA_WorkPlan_attachment>;//鎵ц鏌ヨ
+ }
+
+
+
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query"></param>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index 43b5eac..83f53db 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -260,11 +260,18 @@
<select id='selWorkStates' runat="server" keepdefaultstyle="true">
<option value="">鍏ㄩ儴</option>
<option value="true">宸插畬宸�</option>
- <option value="false">鏈畬宸�</option>
+ <option value="false" selected="selected">鏈畬宸�</option>
</select>
</td>
</tr>
<tr>
+ <td class="ali03">
+ 浠樻鐘舵�侊細
+ </td>
+ <td>
+ <select id='selPayStates' runat="server" datatextfield="Name" datavaluefield="MeanValue" keepdefaultstyle="true" style="width: 85px">
+ </select>
+ </td>
<td class="ali03">
杩斿洖鏃堕棿锛�
</td>
@@ -277,7 +284,7 @@
<td>
<input id="txtOutOrderId" type="text" runat="server" class='w80px' maxlength='20' />
</td>
- <td style="text-align: right;" colspan="3">
+ <td style="text-align: right;" >
</td>
<td>
<asp:Button ID="btn_Search" Text="鏌ヨ" OnClick="btn_Search_Click" runat="server" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
index 530672e..2a4ea7c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.cs
@@ -10,6 +10,7 @@
using CY.BLL.EC;
using CY.Infrastructure.Query;
using System.Transactions;
+using CY.BLL.Sys;
namespace CY.WebForm.Pages.business
{
@@ -117,6 +118,11 @@
this.selOutFirm.DataValueField = "FirmId";
this.selOutFirm.DataBind();
this.selOutFirm.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ Sys_DictionaryBLL _sys_DictionaryBLL = new Sys_DictionaryBLL();//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ this.selPayStates.DataSource = _sys_DictionaryBLL.GetDataByType("EC_璁㈠崟鏀粯鐘舵��");
+ this.selPayStates.DataBind();
+ this.selPayStates.Items.Insert(0,new ListItem("鍏ㄩ儴", ""));
}
//缁戝畾鏁版嵁
@@ -125,7 +131,7 @@
Pagination pa = new Pagination();
pa.PageSize = UCPager1.AspNetPager.PageSize;
pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
- this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4);
+ this.RepClientList.DataSource = bll_EC_OrderBasicBLL.SelectAferOfOutOrder(pa, CurrentUser.MemberId, this.txtStartCreatTime.Value.ToDateTime2(), this.txtEndCreatTime.Value.ToDateTime2(), this.txtStartReturnTime.Value.ToDateTime2(), this.txtEndReturnTime.Value.ToDateTime2(), this.txtCreater.Value, this.selOutFirm.Value, this.selWorkStates.Value, this.txtOutOrderId.Value, 4,this.selPayStates.Value);
this.RepClientList.DataBind();
UCPager1.AspNetPager.RecordCount = pa.RecordCount;
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
index c9d5ecf..52193b6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
@@ -87,6 +87,15 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
/// <summary>
+ /// selPayStates 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selPayStates;
+
+ /// <summary>
/// txtStartReturnTime 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
index e1b33b5..a672850 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -109,11 +109,7 @@
<td>
<input id="txtRegTimeStart" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />-<input id="txtRegTimeEnd" type="text" class="date w90px" datefmt="yyyy-MM-dd" runat="server" />
</td>
- <td class="ali03">瀹㈡埛缂栧彿锛�
- </td>
- <td>
- <input type="text" runat="server" id="txtUserNum" />
- </td>
+
<td class="ali03">瀹㈡埛鍚嶇О锛�
</td>
<td>
@@ -123,6 +119,14 @@
</td>
<td>
<select id="selSourcesInfoId" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
+ </select>
+ </td>
+ <td class="ali03" >鍚堝悓涓婁紶锛�</td>
+ <td>
+ <select id="selHetongshangchuan" runat="server" keepdefaultstyle='true'>
+ <option value="">鍏ㄩ儴</option>
+ <option value="1">鏄�</option>
+ <option value="0">鍚�</option>
</select>
</td>
</tr>
@@ -216,15 +220,14 @@
<option value="">鏈畬缁�</option>
</select>
</td>
- <td class="ali03" >鍚堝悓涓婁紶锛�</td>
- <td>
- <select id="selHetongshangchuan" runat="server" keepdefaultstyle='true'>
- <option value="">鍏ㄩ儴</option>
- <option value="1">鏄�</option>
- <option value="0">鍚�</option>
- </select>
+
+
+ <td class="ali03" style="display:none;">瀹㈡埛缂栧彿锛�
</td>
- <td>
+ <td style="display:none;">
+ <input type="text" runat="server" id="txtUserNum" />
+ </td>
+ <td colspan="2">
<asp:Button CssClass="button" ID="btn_Search" Text="鏌ヨ" runat="server" padding="0px" OnClick="btn_Search_Click" />
<input type="button" onclick="resetSearch()" value="閲嶇疆" />
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
index 05f6ade..91af86e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
@@ -51,15 +51,6 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
/// <summary>
- /// txtUserNum 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtUserNum;
-
- /// <summary>
/// txtquery_userName 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -76,6 +67,15 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSourcesInfoId;
+
+ /// <summary>
+ /// selHetongshangchuan 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selHetongshangchuan;
/// <summary>
/// selCustomerTypeId 鎺т欢銆�
@@ -222,13 +222,13 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selShifouwanjie;
/// <summary>
- /// selHetongshangchuan 鎺т欢銆�
+ /// txtUserNum 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selHetongshangchuan;
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtUserNum;
/// <summary>
/// btn_Search 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
index 0d2c641..5e265f4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -351,6 +351,20 @@
<%#Eval("FetchContacts")%>
</td>
</tr>
+ <tr>
+ <td class='left'>
+ 姣忓寘鏁伴噺锛�
+ </td>
+ <td>
+ <%#Eval("NumPerBag")%>
+ </td>
+ <td class="left">
+ 鎬诲寘鏁帮細
+ </td>
+ <td colspan="5">
+ <%#Eval("BagNum")%>
+ </td>
+ </tr>
</div>
</ItemTemplate>
</asp:Repeater>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
index 0ae4a99..80bc013 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx.cs
@@ -125,6 +125,9 @@
return false;
}
+ _eC_AcceptWayByOrder.NumPerBag = _eC_OrderBasic.OrderExtend.NumPerBag;
+ _eC_AcceptWayByOrder.BagNum = _eC_OrderBasic.OrderExtend.BagNum;
+
EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
InquiryCommonModel _inquiryCommonModel = null;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index e1dde4f..3cb4293 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
<link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
- <script src="../../js/Inquiry/Inquiry.js?v=179" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=184" type="text/javascript"></script>
<script src="../../js/business/Order.js?v=46" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
@@ -500,12 +500,11 @@
var count = document.getElementById('printCount').value;
var numPerBag = parseInt($("#txtNumberPerBag").val());
- if (isNaN(count)) {
+ if (isNaN(count) || isNaN(numPerBag)) {
- $("#txtBagNum").val(0);
+ /* $("#txtBagNum").val("");*/
}
else {
-
var bagNum = parseInt(count / numPerBag);
$("#txtBagNum").val(bagNum);
}
@@ -515,9 +514,9 @@
var count = document.getElementById('printCount').value;
var bagNum = parseInt($("#txtBagNum").val());
- if (isNaN(count)) {
+ if (isNaN(count) || isNaN(bagNum)) {
- $("#txtNumberPerBag").val(0);
+ /* $("#txtNumberPerBag").val("");*/
}
else {
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 353778e..8840546 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -264,13 +264,7 @@
<td>
<input id='txtCustormerName' runat="server" maxlength='50' />
</td>
- <td class="ali03">
- 瀹㈡埛缁忕悊锛�
- </td>
- <td>
- <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
- </select>
- </td>
+
<td class="ali03">
涓氬姟缁忕悊锛�
</td>
@@ -278,11 +272,24 @@
<select keepdefaultstyle='true' id='selBusinessManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
</select>
</td>
+ <td class="ali03">
+ 瀹屽伐鐘舵�侊細
+ </td>
+ <td>
+ <select id='selWorkStates' runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="true">宸插畬宸�</option>
+ <option value="false">鏈畬宸�</option>
+ </select>
+ </td>
<td class="ali03">
- 璁㈠崟鐘舵�侊細
+ 閫佽揣鐘舵�侊細
</td>
<td>
- <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ <select id='selDeleverStates' runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="true">宸查�佽揣</option>
+ <option value="false">鏈�佽揣</option>
</select>
</td>
</tr>
@@ -331,10 +338,14 @@
</td>
</tr>
<tr>
- <td class="ali03">
+ <td class="ali03">
+ 瀹㈡埛缁忕悊锛�
</td>
- <td>
+ <td>
+ <select keepdefaultstyle='true' id='selCustormerManager' runat="server" datatextfield='Name' datavaluefield='Keyid'>
+ </select>
</td>
+
<td class="ali03"> </td>
<td> </td>
<td class="ali03"> </td>
@@ -342,6 +353,13 @@
<td class="ali03"> </td>
<td> </td>
<td> </td>
+ <td class="ali03" style="display:none;">
+ 璁㈠崟鐘舵�侊細
+ </td>
+ <td style="display:none;">
+ <select keepdefaultstyle='true' id='selOrderStates' runat="server" datatextfield="Name" datavaluefield="MeanValue">
+ </select>
+ </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index cbf326d..cd6a5bc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -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
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
index 4d78102..244e2fb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
@@ -114,15 +114,6 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
/// <summary>
- /// selCustormerManager 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManager;
-
- /// <summary>
/// selBusinessManager 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -132,13 +123,22 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selBusinessManager;
/// <summary>
- /// selOrderStates 鎺т欢銆�
+ /// selWorkStates 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
+
+ /// <summary>
+ /// selDeleverStates 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selDeleverStates;
/// <summary>
/// selPayStates 鎺т欢銆�
@@ -186,6 +186,24 @@
protected global::System.Web.UI.WebControls.DropDownList selAppraise;
/// <summary>
+ /// selCustormerManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCustormerManager;
+
+ /// <summary>
+ /// selOrderStates 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selOrderStates;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
index 8b6c694..7a4456a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
@@ -42,6 +42,31 @@
<td class="ali03">璁㈠崟閲戦锛�</td>
<td> <span id="ordernjine" runat="server" ></span></td>
</tr>
+ <tr>
+ <td class="ali03 w100px">
+ 瀹℃壒璇佹槑锛�
+ </td>
+ <td>
+ <input type="file" id="file1" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" />
+ <input type="button" value="涓婁紶鍥剧墖" onclick="checkSelFile();" />
+ </td>
+
+ </tr>
+ <tr class="AddTab" style="display:none;" >
+ <td class="ali03 w100px">
+
+ </td>
+ <td>
+ <input type="hidden" name="HideKeyidFapiao" value="0" />
+ <input type="hidden" name="HideAttachmentFapiao" value="" />
+ <a title="鏌ョ湅鍥剧墖" name="HrefAttachmentFapiao" target="view_window" href="0">
+ 鍥剧墖
+ </a>
+ <a name="shanchuAttachmentFapiao" href="#" onclick="deletefujian(this);" >
+ X
+ </a>
+ </td>
+ </tr>
<tr>
<td colspan="2"></td>
</tr>
@@ -154,5 +179,71 @@
alert('璇疯緭鍏ユ湁鏁堢殑姝ｈ礋閲戦锛屼緥濡� 45.67');
}
}
+
+
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ var oFile = document.getElementById('file1');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return;
+
+ }
+
+
+
+ var formData = new FormData();
+ formData.append('file', oFile.files[0]); // this.files[0]鏄枃浠跺璞�
+
+
+ $.ajax({
+ url: 'https://yocaisim.51zhengcai.com/api/UpFile/UpdateFile', // 鏇挎崲涓轰綘鐨勬湇鍔″櫒绔偣
+ type: 'POST',
+ data: formData,
+ contentType: false,
+ processData: false,
+ async: false, // 璁剧疆涓哄悓姝�
+ success: function (response) {
+ console.log('File uploaded successfully:', response);
+ if (response.code == 1) {
+
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().show();
+ $("input[name='HideKeyidFapiao']").last().val("");
+ $("input[name='HideAttachmentFapiao']").last().val(response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data+'" width="20" height="20" />');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg('涓婁紶澶辫触');
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ function deletefujian(obj) {
+ if (confirm("鏄惁鍒犻櫎閫変腑鏁版嵁锛�")) {
+ $(obj).parent().parent().remove()
+ }
+ }
</script>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
index c95197e..6dfd5ad 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -26,6 +26,7 @@
OA_StaffBLL bll_OA_StaffBLL = null;
OA_WorkPlanBll oA_WorkReminderBll = null;
OA_SuppliersBLL _OA_SuppliersBLL = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
//鍒濆鍖�
@@ -38,6 +39,7 @@
bll_OA_StaffBLL = new OA_StaffBLL();
oA_WorkReminderBll = new OA_WorkPlanBll();
_OA_SuppliersBLL = new OA_SuppliersBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
}
//椤甸潰鍔犺浇
@@ -271,16 +273,47 @@
m_OA_WorkPlan.PlanTitle = "璁㈠崟閲戦锛�" + this.ordernjine.InnerText + ", 鏀舵鍗曚綅锛�" + _SupplierName + "銆�";
m_OA_WorkPlan.PlanType = 3;
m_OA_WorkPlan.LastUpdateTime = nowTime;
- result = oA_WorkReminderBll.InsertModel(m_OA_WorkPlan);
+ var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
+ m_OA_WorkPlan.Keyid = workid;
+ if (workid > 0)
+ {
+ var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+ var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+ for (int i = 0; i < HideKeyidFapiao.Length; i++)
+ {
+ if (HideKeyidFapiao[i] != "0")
+ {
+ var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+ a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+ a_WorkPlan_Attachment.AttachmentType = 14;
+ a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
+ a_WorkPlan_Attachment.CreateTime = DateTime.Now;
+ a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
+ var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
+ }
+ else
+ {
+ continue;
+ }
+ }
+
+
+
+
+
+
+
+
+ }
+ result = true;
-
-
-
-
+
+
+
if (!result)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
index 2c36242..851ee81 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
@@ -96,6 +96,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl ordernjine;
/// <summary>
+ /// file1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputFile file1;
+
+ /// <summary>
/// trbtn 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index 0c85dbf..9334be0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -138,6 +138,7 @@
<td align="left" style="padding-left: 40px;width:80px;" ><input type="checkbox" name="works" value="24" /> 濂楀彿</td>
<td align="left" style="width:80px;" ><input type="checkbox" name="works" value="4" /> 鍘嬬棔</td>
<td align="left" style="width:80px;" ><input type="checkbox" name="works" value="6" /> 鎵撶偣绾�</td>
+ <td align="left" style="width:80px;" ><input type="checkbox" name="works" value="101" /> 绔栧紡</td>
<%-- <td align="left"><div style="float:left"><input type="checkbox" id="worksjiaozuo" name="works" value="99" onclick="SelectFuc(this)" index="0"/> 鑳跺乏</div><div style="float:left; display:none" id="divJTT0"> 姣忔湰寮犳暟锛�<input type="text" name="pNameMP" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�</div></td>
<td align="left"><div style="float:left"><input type="checkbox" id="worksjiaotou" name="works" value="13" onclick="SelectFuc(this)" index="0"/> 鑳跺ご</div><div style="float:left; display:none" id="divJT0"> 姣忔湰寮犳暟锛�<input type="text" name="pageNum" style="width:60px" class="validateInt" defaultValue="1" value="1"/>寮�/鏈�</div></td>--%>
<td align="left" style="width:150px;" > 瑁呰锛�<select name='jtWZ' onchange="SelectjtWZ();" >
@@ -146,10 +147,10 @@
<option value="灏侀潰80鍏嬬墰鐨焊">灏侀潰80鍏嬬墰鐨焊</option>
<option value="灏侀潰100鍏嬬墰鐨焊">灏侀潰100鍏嬬墰鐨焊</option>
<option value="灏侀潰120鍏嬬墰鐨焊">灏侀潰120鍏嬬墰鐨焊</option>
- <option value="灏侀潰鍏扮毊鏂�">灏侀潰鍏扮毊鏂�</option>
- <option value="灏侀潰鐧界毊鏂�">灏侀潰鐧界毊鏂�</option>
- <option value="灏侀潰榛勭毊鏂�">灏侀潰榛勭毊鏂�</option>
- <option value="灏侀潰绾㈢毊鏂�">灏侀潰绾㈢毊鏂�</option>
+ <option value="灏侀潰鍏扮毊鏂�">灏侀潰鍏扮毊绾�</option>
+ <option value="灏侀潰鐧界毊鏂�">灏侀潰鐧界毊绾�</option>
+ <option value="灏侀潰榛勭毊鏂�">灏侀潰榛勭毊绾�</option>
+ <option value="灏侀潰绾㈢毊鏂�">灏侀潰绾㈢毊绾�</option>
<option value="灏侀潰200鍏嬮摐鐗堢焊">灏侀潰200鍏嬮摐鐗堢焊</option>
<option value="灏侀潰230鍏嬮摐鐗堢焊">灏侀潰230鍏嬮摐鐗堢焊</option>
<option value="鏁ｉ〉">鏁ｉ〉</option>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index 174ffde..6be0cf7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -195,6 +195,16 @@
remarks = request["remarks"].ToString();
if (request["pNameMP"] != null)
paperMP = request["pNameMP"].ToString();
+ if (request["shanglian"] != null)
+ model.shanglian = request["shanglian"].ToString();
+ if (request["zhonglianlian1"] != null)
+ model.zhonglianlian1 = request["zhonglianlian1"].ToString();
+ if (request["zhonglianlian2"] != null)
+ model.zhonglianlian2 = request["zhonglianlian2"].ToString();
+ if (request["zhonglianlian3"] != null)
+ model.zhonglianlian3 = request["zhonglianlian3"].ToString();
+ if (request["xialian"] != null)
+ model.xialian = request["xialian"].ToString();
if (request["pageNumsbs"] != null)
pageNumsbs = request["pageNumsbs"].ToString();
if (request["printBoxNumber"] != null)
@@ -1964,7 +1974,7 @@
if (model.PrintMode == 1)
{
printDemand += model.PaperMP + "锛�";
-
+ printDemand += model.RLNum + "锛�";
}
else
{
@@ -1972,7 +1982,7 @@
PaperInfoBLL _paperInfoBLL = new PaperInfoBLL();
SysInquiry_PaperInfo paperInfo = _paperInfoBLL.GetPaperModel(model.PaperMP.ToInt32().Value);
printDemand += paperInfo.PaperName;
- if (model.PaperId != 0)
+ if (model.PaperId != 0 && paperInfo.PaperName != "鏃犵⒊澶嶅啓绾�")
{
BrandInfoBLL _brandInfoBLL = new BrandInfoBLL();
SysInquiry_BrandInfo brandInfo = _brandInfoBLL.SelectModelByKey(model.BrandId);
@@ -1980,8 +1990,43 @@
printDemand += "锛�" + model.GramWeight + "鍏�";
}
printDemand += "锛屾瘡鏈�" + model.PageNum + "浠斤紝";
+ printDemand += model.RLNum + "锛�";
+ if (paperInfo.PaperName == "鏃犵⒊澶嶅啓绾�")
+ {
+ if(model.RLNum == "涓よ仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+ else if (model.RLNum == "涓夎仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.zhonglianlian1 + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+ else if (model.RLNum == "鍥涜仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.zhonglianlian1 + "锛�";
+ printDemand += model.zhonglianlian2 + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+ else if (model.RLNum == "浜旇仈")
+ {
+ printDemand += model.shanglian + "锛�";
+ printDemand += model.zhonglianlian1 + "锛�";
+ printDemand += model.zhonglianlian2 + "锛�";
+ printDemand += model.zhonglianlian3 + "锛�";
+ printDemand += model.xialian + "锛�";
+ }
+
+ }
+
+
+
+
}
- printDemand += model.RLNum + "锛�";
+
printDemand += model.PrintColor + "";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
index 55016a5..1647727 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/ReceiptDocument.aspx
@@ -5,6 +5,40 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>鏀舵嵁鑱斿崟璇环</title>
+
+ <script type="text/javascript" language="javascript">
+
+ function selectrlNum() {
+
+ var rlNum0 = $("#rlNum0").val();
+ if (rlNum0 == "涓よ仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").hide();
+ $("#zhonglianlian2").hide();
+ $("#zhonglianlian3").hide();
+ $("#xialian0").show();
+ } else if (rlNum0 == "涓夎仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").show();
+ $("#zhonglianlian2").hide();
+ $("#zhonglianlian3").hide();
+ $("#xialian0").show();
+ } else if (rlNum0 == "鍥涜仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").show();
+ $("#zhonglianlian2").show();
+ $("#zhonglianlian3").hide();
+ $("#xialian0").show();
+ } else if (rlNum0 == "浜旇仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").show();
+ $("#zhonglianlian2").show();
+ $("#zhonglianlian3").show();
+ $("#xialian0").show();
+ }
+
+ }
+ </script>
</head>
<body>
<table class="table2">
@@ -31,6 +65,9 @@
</th>
<th style="text-align: center;">
鑱旀暟
+ </th>
+ <th style="text-align: center;" class="yanse0">
+ 棰滆壊
</th>
<th style="text-align: center;">
鍗板埛鏁伴噺(鏈�)
@@ -81,13 +118,47 @@
</select>
</td>
<td>
- <select class="selectLaber" name="rlNum">
+ <select class="selectLaber" name="rlNum" id="rlNum0" onchange="selectrlNum();">
<option value="涓よ仈">涓よ仈</option>
<option value="涓夎仈">涓夎仈</option>
<option value="鍥涜仈">鍥涜仈</option>
<option value="浜旇仈">浜旇仈</option>
</select>
</td>
+ <td class="yanse0" >
+ <select class="selectLaber" name="shanglian" id="shanglian0">
+ <option value="鐧�">鐧�</option>
+ </select>
+ <select class="selectLaber" name="zhonglianlian1" id="zhonglianlian1">
+ <option value="绾�">绾�</option>
+ <option value="榛�">榛�</option>
+ <option value="钃�">钃�</option>
+ <option value="缁�">缁�</option>
+ <option value="鐧�">鐧�</option>
+ </select>
+ <select class="selectLaber" name="zhonglianlian2" id="zhonglianlian2">
+ <option value="绾�">绾�</option>
+ <option value="榛�">榛�</option>
+ <option value="钃�">钃�</option>
+ <option value="缁�">缁�</option>
+ <option value="鐧�">鐧�</option>
+ </select>
+ <select class="selectLaber" name="zhonglianlian3" id="zhonglianlian3">
+ <option value="绾�">绾�</option>
+ <option value="榛�">榛�</option>
+ <option value="钃�">钃�</option>
+ <option value="缁�">缁�</option>
+ <option value="鐧�">鐧�</option>
+ </select>
+ <select class="selectLaber" name="xialian" id="xialian0">
+ <option value="绾�">绾�</option>
+ <option value="榛�">榛�</option>
+ <option value="钃�">钃�</option>
+ <option value="缁�">缁�</option>
+ <option value="鐧�">鐧�</option>
+ </select>
+
+ </td>
<td align="center">
<table>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
index 540502c..232079f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -19,9 +19,13 @@
if ($(this).val() == "15") {
$(".trShoukuandanwei").css("display", "table-row");
+
+ $(".shangchanfujian").show();
} else {
$(".trShoukuandanwei").css("display", "none");
+
+ $(".shangchanfujian").hide();
}
@@ -37,9 +41,11 @@
if ($("#selPlanDataType").val() == "15") {
$(".trShoukuandanwei").css("display", "table-row");
+ $(".shangchanfujian").show();
} else {
$(".trShoukuandanwei").css("display", "none");
+ $(".shangchanfujian").hide();
}
SelectAddSearch();
@@ -93,6 +99,74 @@
});
});
}
+
+
+
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ var oFile = document.getElementById('file1');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return;
+
+ }
+
+
+
+ var formData = new FormData();
+ formData.append('file', oFile.files[0]); // this.files[0]鏄枃浠跺璞�
+
+
+ $.ajax({
+ url: 'https://yocaisim.51zhengcai.com/api/UpFile/UpdateFile', // 鏇挎崲涓轰綘鐨勬湇鍔″櫒绔偣
+ type: 'POST',
+ data: formData,
+ contentType: false,
+ processData: false,
+ async: false, // 璁剧疆涓哄悓姝�
+ success: function (response) {
+ console.log('File uploaded successfully:', response);
+ if (response.code == 1) {
+
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().show();
+ $("input[name='HideKeyidFapiao']").last().val("");
+ $("input[name='HideAttachmentFapiao']").last().val(response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data + '" width="20" height="20" />');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg('涓婁紶澶辫触');
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ function deletefujian(obj) {
+ if (confirm("鏄惁鍒犻櫎閫変腑鏁版嵁锛�")) {
+ $(obj).parent().parent().remove()
+ }
+ }
+
</script>
</head>
<body>
@@ -168,6 +242,50 @@
<textarea id="txtPlanRemark" runat="server" style="width: 390px; height: 50px;" ></textarea>
</td>
</tr>
+ <tr class="shangchanfujian">
+ <td class="ali03 w100px">
+ 瀹℃壒璇佹槑锛�
+ </td>
+ <td colspan="3">
+ <input type="file" id="file1" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" />
+ <input type="button" value="涓婁紶鍥剧墖" onclick="checkSelFile();" />
+ </td>
+
+ </tr>
+ <tr class="AddTab" style="display:none;" >
+ <td class="ali03 w100px">
+
+ </td>
+ <td colspan="3">
+ <input type="hidden" name="HideKeyidFapiao" value="0" />
+ <input type="hidden" name="HideAttachmentFapiao" value="" />
+ <a title="鏌ョ湅鍥剧墖" name="HrefAttachmentFapiao" target="view_window" href="0">
+ 鍥剧墖
+ </a>
+ <a name="shanchuAttachmentFapiao" href="#" onclick="deletefujian(this);" >
+ X
+ </a>
+ </td>
+ </tr>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+ <tr class="AddTab shangchanfujian" >
+ <td class="ali03 w100px">
+
+ </td>
+ <td colspan="3">
+ <input type="hidden" name="HideKeyidFapiao" value="<%#Eval("Keyid")%>" />
+ <input type="hidden" name="HideAttachmentFapiao" value="<%#Eval("PlanAttachment")%>" />
+ <a title="鏌ョ湅鍥剧墖" name="HrefAttachmentFapiao" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ <img src="<%#Eval("PlanAttachment")%>" width="20" height="20" />
+ </a>
+ <a name="shanchuAttachmentFapiao" href="#" onclick="deletefujian(this);" >
+ X
+ </a>
+ </td>
+ </tr>
+ </ItemTemplate>
+ </asp:Repeater>
<tr>
<td colspan="4" style="text-align: center;">
<asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
index bbbf045..de053fa 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -14,6 +14,7 @@
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;
using CY.BLL.OA;
+using System.Transactions;
namespace CY.WebForm.Pages.work
{
@@ -28,6 +29,7 @@
OA_WorkPlanBll oA_WorkReminderBll = null;
OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
OA_SuppliersBLL _OA_SuppliersBLL = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
public MyRequestAdd()
{
departmentBll = new OA_DepartmentBll();
@@ -35,7 +37,8 @@
oA_WorkReminderBll = new OA_WorkPlanBll();
oA_StaffBLL = new OA_StaffBLL();
bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
- _OA_SuppliersBLL = new OA_SuppliersBLL();
+ _OA_SuppliersBLL = new OA_SuppliersBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
}
//椤甸潰鍔犺浇
@@ -89,109 +92,221 @@
this.txtShoukuandanwei.Value = "";
}
this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent.ToString();
+
+ if(m_OA_WorkPlan.PlanDataType == 15)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value,15);
+ this.RepClientList.DataBind();
+ }
+
}
}
//琛ㄥ崟鎻愪氦
protected void btn_submit_form(object sender, EventArgs e)
{
- try
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
{
- DateTime nowTime = DateTime.Now;
- OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
- if (m_OA_WorkPlan == null)
+
+ try
{
- m_OA_WorkPlan = new OA_WorkPlan();
- m_OA_WorkPlan.ApprovalContent = "";
- m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
- m_OA_WorkPlan.ApprovalStaffName = "";
- m_OA_WorkPlan.ApprovalStatus = 0;
- m_OA_WorkPlan.ApprovalTime = nowTime;
- m_OA_WorkPlan.EvaluationContent = "";
- m_OA_WorkPlan.EvaluationStaff = "";
- m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
- m_OA_WorkPlan.EvaluationStatus = 0;
- m_OA_WorkPlan.EvaluationTime = nowTime;
- m_OA_WorkPlan.RewardContent = "";
- m_OA_WorkPlan.RewardMoney = 0;
- m_OA_WorkPlan.RewardResult = "";
- m_OA_WorkPlan.RewardType = 0;
-
- m_OA_WorkPlan.PlanStartTime = nowTime;
- m_OA_WorkPlan.PlanStatus = 1;
- m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
- m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
-
- OA_Staff m_OA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
- if (m_OA_Staff != null)
- m_OA_WorkPlan.DepartId = m_OA_Staff.DepartmentId;
- else
- m_OA_WorkPlan.DepartId = 0;
-
- m_OA_WorkPlan.PlanPeople = CurrentUser.TrueName;
- m_OA_WorkPlan.ReciveStaffId = CurrentUser.TrueMemberId;
- }
- else
- {
-
- }
-
- m_OA_WorkPlan.Operator = CurrentUser.ShortName;
- if (this.selPlanDataType.Value == "15")
- {
- if (!this.txtPlanMoney.Value.Trim().ToDecimal2().HasValue || this.txtPlanMoney.Value.Trim().ToDecimal2().Value <= 0)
+ bool res = true;
+ DateTime nowTime = DateTime.Now;
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_WorkPlan == null)
{
- JavaScript.MessageBox("浠樻鐢宠璇峰～鍐欑敵璇疯垂鐢紒", this);
- return;
+ m_OA_WorkPlan = new OA_WorkPlan();
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (m_OA_Staff != null)
+ m_OA_WorkPlan.DepartId = m_OA_Staff.DepartmentId;
+ else
+ m_OA_WorkPlan.DepartId = 0;
+
+ m_OA_WorkPlan.PlanPeople = CurrentUser.TrueName;
+ m_OA_WorkPlan.ReciveStaffId = CurrentUser.TrueMemberId;
}
- if (string.IsNullOrWhiteSpace(this.txtShoukuandanwei.Value))
+ else
{
- JavaScript.MessageBox("浠樻鐢宠璇峰～鍐欐敹娆惧崟浣嶏紒", this);
- return;
+
}
- m_OA_WorkPlan.PlanComplany = this.txtShoukuandanwei.Value;
- }
- else
- {
- m_OA_WorkPlan.PlanComplany = "";
- }
-
- m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value.Trim();
- m_OA_WorkPlan.PlanDataType = this.selPlanDataType.Value.ToInt32();
- m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.Trim().ToDecimal2()??0;
- m_OA_WorkPlan.PlanRemark = this.txtPlanRemark.Value.Trim();
- m_OA_WorkPlan.PlanRunTime = DateTime.Now;
- if (m_OA_WorkPlan.PlanDataType == 7)
- {
- m_OA_WorkPlan.PlanTitle = this.selPlanTitle.Value.Trim();
- }
- else
- {
- m_OA_WorkPlan.PlanTitle = this.txtPlanTitle.Value.Trim();
- }
- m_OA_WorkPlan.PlanType = 3;
- m_OA_WorkPlan.LastUpdateTime = nowTime;
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ if (this.selPlanDataType.Value == "15")
+ {
+ if (!this.txtPlanMoney.Value.Trim().ToDecimal2().HasValue || this.txtPlanMoney.Value.Trim().ToDecimal2().Value <= 0)
+ {
+ JavaScript.MessageBox("浠樻鐢宠璇峰～鍐欑敵璇疯垂鐢紒", this);
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(this.txtShoukuandanwei.Value))
+ {
+ JavaScript.MessageBox("浠樻鐢宠璇峰～鍐欐敹娆惧崟浣嶏紒", this);
+ return;
+ }
+ m_OA_WorkPlan.PlanComplany = this.txtShoukuandanwei.Value;
+ }
+ else
+ {
+ m_OA_WorkPlan.PlanComplany = "";
+ }
- if (Request["keyid"].ToInt32() > 0)
- {
- if (oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan))
- JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
+ m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value.Trim();
+ m_OA_WorkPlan.PlanDataType = this.selPlanDataType.Value.ToInt32();
+ m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.Trim().ToDecimal2() ?? 0;
+ m_OA_WorkPlan.PlanRemark = this.txtPlanRemark.Value.Trim();
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+
+ if (m_OA_WorkPlan.PlanDataType == 7)
+ {
+ m_OA_WorkPlan.PlanTitle = this.selPlanTitle.Value.Trim();
+ }
else
- JavaScript.MessageBox("鎿嶄綔澶辫触", this);
- }
- else
- {
- if (oA_WorkReminderBll.InsertModel(m_OA_WorkPlan))
- JavaScript.MessageBox("鏂板鎴愬姛", this, true, true);
+ {
+ m_OA_WorkPlan.PlanTitle = this.txtPlanTitle.Value.Trim();
+ }
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+
+ if (Request["keyid"].ToInt32() > 0)
+ {
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+
+ if (res && m_OA_WorkPlan.PlanDataType == 15)
+ {
+ var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+ var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+
+
+ //闇�瑕佸垹闄ょ殑闄勪欢
+ var oA_WorkPlan_Attachments = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(m_OA_WorkPlan.Keyid.Value, 15);
+ List<int> HideKeyidFujianid = new List<int>();
+ for (int i = 0; i < HideKeyidFapiao.Length; i++)
+ {
+ if (!string.IsNullOrEmpty(HideKeyidFapiao[i]) && HideKeyidFapiao[i].ToInt32() != 0)
+ {
+ HideKeyidFujianid.Add(HideKeyidFapiao[i].ToInt32().Value);
+ }
+ }
+
+ var oA_WorkPlan_Attachments1 = oA_WorkPlan_Attachments.Where(x => !HideKeyidFujianid.Contains(x.Keyid)).ToList();
+
+ foreach (var oa_WorkPlan_Attachment in oA_WorkPlan_Attachments1)
+ {
+ res = oA_WorkPlan_AttachmentBLL.DeleteModel(oa_WorkPlan_Attachment);
+ }
+
+ for (int i = 0; i < HideKeyidFapiao.Length; i++)
+ {
+ if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
+ {
+ var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+ a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+ a_WorkPlan_Attachment.AttachmentType = 15;
+ a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
+ a_WorkPlan_Attachment.CreateTime = DateTime.Now;
+ a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
+ var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
+ }
+ else
+ {
+ continue;
+ }
+ }
+
+ scope.Complete();
+
+
+ JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
+ }
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+
+ }
else
- JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ {
+
+ var aaaa = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
+ m_OA_WorkPlan.Keyid = aaaa;
+ if (aaaa > 0 && m_OA_WorkPlan.PlanDataType == 15)
+ {
+ var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+ var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+
+
+
+
+ for (int i = 0; i < HideKeyidFapiao.Length; i++)
+ {
+ if (string.IsNullOrEmpty(HideKeyidFapiao[i]))
+ {
+ var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+ a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+ a_WorkPlan_Attachment.AttachmentType = 15;
+ a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFapiao[i];
+ a_WorkPlan_Attachment.CreateTime = DateTime.Now;
+ a_WorkPlan_Attachment.Operator = CurrentUser.TrueName;
+ var sss = oA_WorkPlan_AttachmentBLL.InsertModel(a_WorkPlan_Attachment);
+ }
+ else
+ {
+ continue;
+ }
+ }
+
+
+
+ scope.Complete();
+
+
+
+ JavaScript.MessageBox("鏂板鎴愬姛", this, true, true);
+ }
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+
+
+
+
+
}
- }
- catch (Exception ex)
- {
- PAGEHandleException(ex);
- JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
}
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
index 6a0473e..0cb6449 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -114,6 +114,24 @@
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
/// <summary>
+ /// file1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputFile file1;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
index dae8edd..9e22a3e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
@@ -78,6 +78,23 @@
</div>
</td>
</tr>
+ <tr style='<%=planDataType=="14"||planDataType=="15"?"":"display:none;" %>' >
+
+ <td class="ali03 " >
+ 瀹℃壒璇佹槑锛�
+ </td>
+ <td colspan="3">
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅鍥剧墖" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ <img src="<%#Eval("PlanAttachment")%>" width="20" height="20" />
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
</table>
</fieldset>
<fieldset>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
index efb6bbd..20511d2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
@@ -22,9 +22,11 @@
{
OA_WorkPlanBll oA_WorkReminderBll = null;
public string planDataType = "";
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
public MyRequestDetail()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
}
//椤甸潰鍔犺浇
@@ -51,6 +53,20 @@
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
+
+ if(m_OA_WorkPlan.PlanDataType == 14)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
+ this.RepClientList.DataBind();
+ }
+ else if (m_OA_WorkPlan.PlanDataType == 15)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
+ this.RepClientList.DataBind();
+ }
+
+
+
if (m_OA_WorkPlan.PlanStatus == 1)
{
this.panelApprovalNo.Visible = true;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
index aea15c9..d5c2619 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
@@ -114,6 +114,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark;
/// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
/// panelApprovalNo 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
index 3f0048d..ecc3792 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -80,6 +80,23 @@
</div>
</td>
</tr>
+ <tr style='<%=planDataType=="14"||planDataType=="15"?"":"display:none;" %>' >
+
+ <td class="ali03 " >
+ 瀹℃壒璇佹槑锛�
+ </td>
+ <td colspan="3">
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅鍥剧墖" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ <img src="<%#Eval("PlanAttachment")%>" width="20" height="20" />
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
</table>
</fieldset>
<fieldset>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 5e370b4..01ef6e9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -26,6 +26,7 @@
OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
EC_MemberBasicBLL _eC_MemberBasicBLL = null;
public string planDataType = "";
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -33,6 +34,7 @@
_eC_OrderBLL = new EC_OrderBLL();
_oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
_eC_MemberBasicBLL = new EC_MemberBasicBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
}
//椤甸潰鍔犺浇
@@ -64,6 +66,17 @@
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany;
+
+ if (m_OA_WorkPlan.PlanDataType == 14)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
+ this.RepClientList.DataBind();
+ }
+ else if (m_OA_WorkPlan.PlanDataType == 15)
+ {
+ this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
+ this.RepClientList.DataBind();
+ }
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
index b1514a6..80f2923 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
@@ -114,6 +114,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark;
/// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
/// selApprovalStatus 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 7f0fcb0..3d5b7dc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -71,7 +71,7 @@
<select keepdefaultstyle="true" runat="server" id="selPlanStatus">
<option value="">鍏ㄩ儴</option>
<option value="2">宸叉壒澶�</option>
- <option value="1">鏈壒澶�</option>
+ <option value="1" selected="selected">鏈壒澶�</option>
</select>
</td>
<td class="ali03">
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 15a51b8..2c363d1 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -1610,6 +1610,48 @@
$(".Brand" + index).show();
$(".gramWeight" + index).show();
$(".Qitazhi" + index).hide();
+ if (printTypeId == 27) {
+ // 浣跨敤灞炴�ч�夋嫨鍣ㄦ壘鍒板搴旂殑option鍏冪礌
+ var optionText = $("#paper0MP option[value='" + paperId + "']").text();
+ if (optionText == "鏃犵⒊澶嶅啓绾�") {
+ $(".Brand" + index).hide();
+ $(".gramWeight" + index).hide();
+ $(".yanse0").show();
+
+ $(".Qitazhi" + index).show();
+ var rlNum0 = $("#rlNum0").val();
+ if (rlNum0 == "涓よ仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").hide();
+ $("#zhonglianlian2").hide();
+ $("#zhonglianlian3").hide();
+ $("#xialian0").show();
+ } else if (rlNum0 == "涓夎仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").show();
+ $("#zhonglianlian2").hide();
+ $("#zhonglianlian3").hide();
+ $("#xialian0").show();
+ } else if (rlNum0 == "鍥涜仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").show();
+ $("#zhonglianlian2").show();
+ $("#zhonglianlian3").hide();
+ $("#xialian0").show();
+ } else if (rlNum0 == "浜旇仈") {
+ $("#shanglian0").show();
+ $("#zhonglianlian1").show();
+ $("#zhonglianlian2").show();
+ $("#zhonglianlian3").show();
+ $("#xialian0").show();
+ }
+
+ } else {
+ $(".yanse0").hide();
+ }
+
+
+ }
if (printTypeId == 15 || printTypeId == 6) {
var isSuccess = true;
@@ -1824,6 +1866,12 @@
$("[name='printBoxNumber']").val(dataJson.PrintBoxNumber);
$("[name='printCountByBox']").val(dataJson.PrintCount);
$("[name='pNameMP']").val(dataJson.PaperMP);
+ $("[name='rlNum']").val(dataJson.RLNum);
+ $("[name='shanglian']").val(dataJson.shanglian);
+ $("[name='zhonglianlian1']").val(dataJson.zhonglianlian1);
+ $("[name='zhonglianlian2']").val(dataJson.zhonglianlian2);
+ $("[name='zhonglianlian3']").val(dataJson.zhonglianlian3);
+ $("[name='xialian']").val(dataJson.xialian);
$("[name='paper0']").val(dataJson.PaperId);
$("[name='Qitazhi0']").val(dataJson.Qitazhi);
if (dataJson.PrintMode == 0) {
--
Gitblit v1.9.1