From 8d51a0762a43eedada5eb15bd24180d7204e63b3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 17 一月 2025 08:58:19 +0800
Subject: [PATCH] 报销流程
---
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx | 231 ++
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx | 41
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 8
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 8
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs | 257 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs | 9
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx.cs | 8
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.cs | 93
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs | 347 +++
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.designer.cs | 134 +
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs | 36
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_shenpiBLL.cs | 137 +
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx | 214 ++
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs | 229 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs | 9
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs | 101
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.designer.cs | 125 +
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs | 14
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx | 201 +
CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs | 137 +
CY_ECommercePlatform/CY.BLL/OA/OA_StaffBLL.cs | 18
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 64
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs | 228 ++
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.designer.cs | 71
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx | 280 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs | 190 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx | 129 +
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js | 21
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 23
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx | 232 ++
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs | 29
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.cs | 176 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs | 21
CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs | 167 +
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx | 168 +
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx | 60
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs | 134 +
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.designer.cs | 125 +
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs | 90
CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs | 143 +
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs | 143 +
CY_ECommercePlatform/AbstractFactory/Factory.cs | 14
CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_shenpiDAL.cs | 244 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 26
CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_shenpiDAL.cs | 29
CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_shenpi.cs | 206 +
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 10
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.cs | 228 ++
CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs | 31
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx | 84
CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.designer.cs | 116 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.designer.cs | 152 +
CY_ECommercePlatform/CY.WebForm/MainPage.cs | 11
CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs | 7
CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs | 51
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 59
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs | 53
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx | 30
CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx | 4
72 files changed, 6,122 insertions(+), 138 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index b975b6e..a3c3a68 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -265,6 +265,8 @@
OBJECT_PATH.Add(DALInterface.IOA_FukuanshenqingDAL, "OA_FukuanshenqingDAL");
OBJECT_PATH.Add(DALInterface.IOA_BaozhengjincuishouDAL, "OA_BaozhengjincuishouDAL");
OBJECT_PATH.Add(DALInterface.IOA_BaozhengjinDAL, "OA_BaozhengjinDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_shenpiDAL, "OA_WorkPlan_shenpiDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_attachmentDAL, "OA_WorkPlan_attachmentDAL");
OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -904,7 +906,17 @@
/// 寮�绁ㄧ敵璇�
/// </summary>
IOA_BaozhengjinDAL = 1937,
-
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_WorkPlan_shenpiDAL = 1938,
+
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_WorkPlan_attachmentDAL = 1939,
+
/// <summary>
/// 寮�绁ㄧ敵璇�
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index 6379413..7b85d31 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -220,6 +220,8 @@
<Compile Include="OA\OA_ProcurementBLL.cs" />
<Compile Include="OA\OA_FirmRoleBLL.cs" />
<Compile Include="OA\OA_PaperWeightBLL.cs" />
+ <Compile Include="OA\OA_WorkPlan_attachmentBLL.cs" />
+ <Compile Include="OA\OA_WorkPlan_shenpiBLL.cs" />
<Compile Include="OA\OA_WorkReminderBLL.cs" />
<Compile Include="OA\OA_WorkPlanBLL.cs" />
<Compile Include="OA\OA_YujihuikuanBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_StaffBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_StaffBLL.cs
index ce85ada..c46477f 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_StaffBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_StaffBLL.cs
@@ -75,7 +75,23 @@
/// <returns></returns>
public IEnumerable<Model.OA_Staff> SelectModelPage(Infrastructure.Query.Pagination pagination, int? DepartmentId, Guid MemberId, string MemberName, string Status)
{
- return idal_IOA_StaffDAL.SelectModelPage(pagination, DepartmentId,MemberId, MemberName, Status);
+ var ssss = idal_IOA_StaffDAL.SelectModelPage(pagination, DepartmentId, MemberId, MemberName, Status);
+
+ OA_FirmRoleBLL bll_OA_FirmRoleBLL = new OA_FirmRoleBLL();
+ foreach (var oA_Staff in ssss)
+ {
+ var sss = bll_OA_FirmRoleBLL.SelectOA_StaffRoleRel(oA_Staff.Keyid);
+ if(sss != null)
+ {
+ var ssssss = bll_OA_FirmRoleBLL.SelectModel(sss.RoleId);
+ if (ssssss != null)
+ {
+ oA_Staff.RoleName = ssssss.RoleName;
+ }
+
+ }
+ }
+ return ssss;
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
index efb98e0..f63ff7a 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlanBLL.cs
@@ -31,6 +31,16 @@
}
/// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public int InserModelAndGetId(Model.OA_WorkPlan model)
+ {
+ return iOA_WorkPlanDAL.InserModelAndGetId(model);
+ }
+
+ /// <summary>
/// 鏇存柊
/// </summary>
/// <param name="model"></param>
@@ -81,9 +91,9 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType)
+ public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent= null, string PlanContent = null)
{
- return iOA_WorkPlanDAL.SelectModelPage(pagination, MemberId, SentStaffId, ReciveStaffId, PlanType, PlanDataType, PlanTitle, BeginPlanStartTime, EndPlanStartTime, BeginPlanRunTime, EndPlanRunTime, PlanPeople, PlanStatus, ApprovalStatus, EvaluationStatus, RewardType);
+ return iOA_WorkPlanDAL.SelectModelPage(pagination, MemberId, SentStaffId, ReciveStaffId, PlanType, PlanDataType, PlanTitle, BeginPlanStartTime, EndPlanStartTime, BeginPlanRunTime, EndPlanRunTime, PlanPeople, PlanStatus, ApprovalStatus, EvaluationStatus, RewardType, RewardContent, PlanContent);
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs
new file mode 100644
index 0000000..d8090a0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_attachmentBLL.cs
@@ -0,0 +1,137 @@
+锘�
+/**
+* OA_WorkPlan_attachmentBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_WorkPlan_attachmentBLL
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 15:11 鍚磋緣 鍒濈増
+* V0.02 2013-5-29 17:43 鍚村磶鍧� 澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+ public class OA_WorkPlan_attachmentBLL
+ {
+ IOA_WorkPlan_attachmentDAL _IOA_WorkPlan_attachmentDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ /// </summary>
+ public OA_WorkPlan_attachmentBLL()
+ {
+ //鑾峰彇OA_WorkPlan_attachment DAL瀹炵幇
+ _IOA_WorkPlan_attachmentDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_WorkPlan_attachmentDAL) as IOA_WorkPlan_attachmentDAL;
+
+
+ }
+
+ /// <summary>
+ /// 鏂板閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ public bool InsertModel(CY.Model.OA_WorkPlan_attachment m_OA_WorkPlan_attachment)
+ {
+ try
+ {
+
+ return _IOA_WorkPlan_attachmentDAL.InserModel(m_OA_WorkPlan_attachment);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_WorkPlan_attachment m_OA_WorkPlan_attachment)
+ {
+ try
+ {
+ return _IOA_WorkPlan_attachmentDAL.UpdateModel(m_OA_WorkPlan_attachment);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_WorkPlan_attachment> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_WorkPlan_attachmentDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="BaozhengjinId">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_attachment> GetModelByKaipiaoId(int BaozhengjinId)
+ {
+
+ return _IOA_WorkPlan_attachmentDAL.GetModelByKaipiaoId(BaozhengjinId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_WorkPlan_attachment GetModelByKeyid(int keyid)
+ {
+
+ return _IOA_WorkPlan_attachmentDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_WorkPlan_attachment rType)
+ {
+ try
+ {
+ _IOA_WorkPlan_attachmentDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_shenpiBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_shenpiBLL.cs
new file mode 100644
index 0000000..e1f9bb8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_WorkPlan_shenpiBLL.cs
@@ -0,0 +1,137 @@
+锘�
+/**
+* OA_WorkPlan_shenpiBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_WorkPlan_shenpiBLL
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 15:11 鍚磋緣 鍒濈増
+* V0.02 2013-5-29 17:43 鍚村磶鍧� 澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+ public class OA_WorkPlan_shenpiBLL
+ {
+ IOA_WorkPlan_shenpiDAL _IOA_WorkPlan_shenpiDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ /// </summary>
+ public OA_WorkPlan_shenpiBLL()
+ {
+ //鑾峰彇OA_WorkPlan_shenpi DAL瀹炵幇
+ _IOA_WorkPlan_shenpiDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_WorkPlan_shenpiDAL) as IOA_WorkPlan_shenpiDAL;
+
+
+ }
+
+ /// <summary>
+ /// 鏂板閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ public bool InsertModel(CY.Model.OA_WorkPlan_shenpi m_OA_WorkPlan_shenpi)
+ {
+ try
+ {
+
+ return _IOA_WorkPlan_shenpiDAL.InserModel(m_OA_WorkPlan_shenpi);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_WorkPlan_shenpi m_OA_WorkPlan_shenpi)
+ {
+ try
+ {
+ return _IOA_WorkPlan_shenpiDAL.UpdateModel(m_OA_WorkPlan_shenpi);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_WorkPlan_shenpi> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_WorkPlan_shenpiDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="BaozhengjinId">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_shenpi> GetModelByKaipiaoId(int BaozhengjinId)
+ {
+
+ return _IOA_WorkPlan_shenpiDAL.GetModelByKaipiaoId(BaozhengjinId);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_WorkPlan_shenpi GetModelByKeyid(int keyid)
+ {
+
+ return _IOA_WorkPlan_shenpiDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_WorkPlan_shenpi rType)
+ {
+ try
+ {
+ _IOA_WorkPlan_shenpiDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 5e1aa21..731bd73 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -226,6 +226,8 @@
<Compile Include="OA\IOA_WarehouseInfoDAL.cs" />
<Compile Include="OA\IOA_SuppliersOtherQualificationDAL.cs" />
<Compile Include="OA\IOA_PaperWeightDAL.cs" />
+ <Compile Include="OA\IOA_WorkPlan_attachmentDAL.cs" />
+ <Compile Include="OA\IOA_WorkPlan_shenpiDAL.cs" />
<Compile Include="OA\IOA_WorkReminderDAL.cs" />
<Compile Include="OA\IOA_WorkPlanDAL.cs" />
<Compile Include="OA\IOA_YujihuikuanDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
index 02b3cc3..d6dba07 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlanDAL.cs
@@ -12,6 +12,15 @@
/// </summary>
public interface IOA_WorkPlanDAL : ICommonDAL, IPaging<OA_WorkPlan>, IGetAllModel<OA_WorkPlan>
{
+
+
+ /// <summary>
+ /// InserModelAndGetId
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ int InserModelAndGetId(OA_WorkPlan model);
+
/// <summary>
/// 鏍规嵁缂栧彿鑾峰緱淇℃伅
/// </summary>
@@ -38,7 +47,7 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType);
+ IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null);
/// <summary>
/// 鍒犻櫎宸ヤ綔瀹夋帓
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs
new file mode 100644
index 0000000..e714f16
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_attachmentDAL.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+
+namespace CY.IDAL
+{
+ public interface IOA_WorkPlan_attachmentDAL : ICommonDAL, IPaging<OA_WorkPlan_attachment>, IGetAllModel<OA_WorkPlan_attachment>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_WorkPlan_attachment GetModelByKeyid(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁OA_WorkPlanId鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="OA_WorkPlanId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_WorkPlan_attachment> GetModelByKaipiaoId(int OA_WorkPlanId);
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_shenpiDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_shenpiDAL.cs
new file mode 100644
index 0000000..1a396a3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_WorkPlan_shenpiDAL.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+
+namespace CY.IDAL
+{
+ public interface IOA_WorkPlan_shenpiDAL : ICommonDAL, IPaging<OA_WorkPlan_shenpi>, IGetAllModel<OA_WorkPlan_shenpi>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_WorkPlan_shenpi GetModelByKeyid(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁OA_WorkPlanId鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="OA_WorkPlanId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_WorkPlan_shenpi> GetModelByKaipiaoId(int OA_WorkPlanId);
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index b4f0428..aa5a836 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -278,6 +278,8 @@
<Compile Include="OA\OA_VisitNoteExtend.cs" />
<Compile Include="OA\OA_PaperWeight.cs" />
<Compile Include="OA\OA_WorkPlan.cs" />
+ <Compile Include="OA\OA_WorkPlan_attachment.cs" />
+ <Compile Include="OA\OA_WorkPlan_shenpi.cs" />
<Compile Include="OA\OA_WorkReminder.cs" />
<Compile Include="OA\OA_CarExamined.cs" />
<Compile Include="OA\OA_Yujihuikuan.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
index 01e16cb..84b96a4 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasic.cs
@@ -53,6 +53,10 @@
private bool? _isDeferPay;
private bool? _isPrint;
private int? _outid;
+
+ public string Duiyinghetongbianhao { get; set; }
+
+
/// <summary>
/// 鍞竴缂栧彿
/// </summary>
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
index 31d4066..a29fc8d 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -952,8 +952,12 @@
this.BusinessManagerId = isChange ? MyConvert.ConvertToInt32(value) : this.BusinessManagerId;
theValue = this.BusinessManagerId;
}
+ else if ("Duiyinghetongbianhao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 100)
+ {
+ this.Duiyinghetongbianhao = isChange ? MyConvert.ConvertToString(value) : this.Duiyinghetongbianhao;
+ theValue = this.Duiyinghetongbianhao;
+ }
-
#endregion
return theValue;
diff --git a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
index a9fa991..d3c6997 100644
--- a/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
+++ b/CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -251,6 +251,7 @@
get;
set;
}
+ public string Duiyinghetongbianhao { get; set; }
#endregion
#region Visiter
@@ -500,6 +501,12 @@
this.shifouDelivery = isChange ? MyConvert.ConvertToInt32(value) : this.shifouDelivery;
theValue = this.shifouDelivery;
}
+ else if ("Duiyinghetongbianhao".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 54)
+ {
+ this.Duiyinghetongbianhao = isChange ? MyConvert.ConvertToString(value) : this.Duiyinghetongbianhao;
+ theValue = this.Duiyinghetongbianhao;
+ }
+
#endregion
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
index 10b8853..ff5b7d3 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Staff.cs
@@ -74,7 +74,7 @@
private string _managecity;
private string _managecountry;
private string _managecountry1;
-
+ public string RoleName { get; set; }
/// <summary>
/// 鍛樺伐缂栧彿
/// </summary>
@@ -327,6 +327,25 @@
/// BF_IsDeliverManage
/// </summary>
public bool BF_IsDeliverManage
+ {
+ get;
+
+ set;
+ }
+ /// <summary>
+ /// BF_IsBaoxiaozhuguan
+ /// </summary>
+ public bool BF_IsBaoxiaozhuguan
+ {
+ get;
+
+ set;
+ }
+
+ /// <summary>
+ /// BF_Isbaoxiaojingli
+ /// </summary>
+ public bool BF_Isbaoxiaojingli
{
get;
@@ -1307,6 +1326,16 @@
this.BF_IsDeliverManage = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsDeliverManage;
theValue = this.BF_IsDeliverManage;
}
+ else if ("BF_IsBaoxiaozhuguan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 67)
+ {
+ this.BF_IsBaoxiaozhuguan = isChange ? MyConvert.ConvertToBoolean(value) : BF_IsBaoxiaozhuguan;
+ theValue = this.BF_IsBaoxiaozhuguan;
+ }
+ else if ("BF_Isbaoxiaojingli".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 68)
+ {
+ this.BF_Isbaoxiaojingli = isChange ? MyConvert.ConvertToBoolean(value) : BF_Isbaoxiaojingli;
+ theValue = this.BF_Isbaoxiaojingli;
+ }
return theValue;
}
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan.cs
index beb9301..2e8f212 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,37 @@
_approvalstatus = value;
}
}
+
+
+ public string ApprovalStatusName
+ {
+ get
+ {
+ if (ApprovalStatus.HasValue)
+ {
+ if (ApprovalStatus == 0)
+ {
+ return "鏈壒澶�";
+ }
+ else if (ApprovalStatus == 1)
+ {
+ return "鎵瑰噯";
+ }
+ else if (ApprovalStatus == 2)
+ {
+ return "涓嶆壒鍑�";
+ }
+ else
+ return "鏈壒澶�";
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ }
+
/// <summary>
/// 瀹℃牳鏃堕棿
/// </summary>
@@ -747,6 +838,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
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs
new file mode 100644
index 0000000..c6a7f7a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_attachment.cs
@@ -0,0 +1,143 @@
+锘�/**
+*OA_CorporateClients.cs
+*
+*鍔� 鑳斤細 N / A
+* 绫� 鍚嶏細 OA_CorporateClients
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 14:27:43 N / A 鍒濈増
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+using System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+ /// <summary>
+ /// 鍗板埛鍙傛暟
+ /// </summary>
+ [Serializable]
+ public partial class OA_WorkPlan_attachment : IAggregateRoot
+ {
+ #region Model
+ /// <summary>
+ /// Keyid
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// OA_WorkPlanId
+ /// </summary>
+ public int? OA_WorkPlanId { get; set; }
+
+
+ /// <summary>
+ /// PlanAttachment
+ /// </summary>
+ public string PlanAttachment
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// AttachmentType
+ /// </summary>
+ public int? AttachmentType
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+
+
+
+
+
+
+
+
+
+ /// <summary>
+ /// Operator
+ /// </summary>
+ public string Operator
+ {
+ get;
+ set;
+ }
+
+ #endregion Model
+
+ #region Visiter
+
+ /// <summary>
+ /// 灞炴�ц闂櫒
+ /// </summary>
+ /// <param name="name">灞炴�у悕</param>
+ /// <param name="index">绱㈠紩</param>
+ /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+ /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+ /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+ public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+ {
+ object theValue = null;
+
+
+ if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+ {
+ this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("OA_WorkPlanId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.OA_WorkPlanId = isChange ? MyConvert.ConvertToInt32(value).Value : OA_WorkPlanId;
+ theValue = this.OA_WorkPlanId;
+ }
+
+
+
+
+ else if ("PlanAttachment".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.PlanAttachment = isChange ? MyConvert.ConvertToString(value) : PlanAttachment;
+ theValue = this.PlanAttachment;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("AttachmentType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.AttachmentType = isChange ? MyConvert.ConvertToInt32(value) : AttachmentType;
+ theValue = this.AttachmentType;
+ }
+ else if ("Operator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+ theValue = this.Operator;
+ }
+
+
+ return theValue;
+ }
+
+ #endregion
+}
+}
+
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_shenpi.cs b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_shenpi.cs
new file mode 100644
index 0000000..87276c4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_WorkPlan_shenpi.cs
@@ -0,0 +1,206 @@
+锘�/**
+*OA_CorporateClients.cs
+*
+*鍔� 鑳斤細 N / A
+* 绫� 鍚嶏細 OA_CorporateClients
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 14:27:43 N / A 鍒濈増
+ *
+ *
+ *
+ *
+ *
+ *
+ */
+
+using System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+ /// <summary>
+ /// 鍗板埛鍙傛暟
+ /// </summary>
+ [Serializable]
+ public partial class OA_WorkPlan_shenpi : IAggregateRoot
+ {
+
+
+
+
+ #region Model
+ /// <summary>
+ /// Keyid
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// OA_WorkPlanId
+ /// </summary>
+ public int? OA_WorkPlanId { get; set; }
+
+ /// <summary>
+ /// ApprovalStaffId
+ /// </summary>
+ public Guid ApprovalStaffId { get; set; }
+ /// <summary>
+ /// ApprovalStaffId
+ /// </summary>
+ public string ApprovalStaffName { get; set; }
+
+ /// <summary>
+ /// ApprovalStatus
+ /// </summary>
+ public int? ApprovalStatus { get; set; }
+
+ public string ApprovalStatusName
+ {
+ get
+ {
+ if (ApprovalStatus.HasValue)
+ {
+ if (ApprovalStatus == 0)
+ {
+ return "鏈壒澶�";
+ }
+ else if (ApprovalStatus == 1)
+ {
+ return "鎵瑰噯";
+ }
+ else if (ApprovalStatus == 2)
+ {
+ return "涓嶆壒鍑�";
+ }
+ else
+ return "鏈壒澶�";
+ }
+ else
+ {
+ return "";
+ }
+
+ }
+ }
+
+ /// <summary>
+ /// ApprovalTime
+ /// </summary>
+ public DateTime? ApprovalTime
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// ApprovalContent
+ /// </summary>
+ public string ApprovalContent
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// Operator
+ /// </summary>
+ public string Operator
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// Buzhou
+ /// </summary>
+ public int? Buzhou { get; set; }
+
+
+
+
+
+
+
+ #endregion Model
+
+ #region Visiter
+
+ /// <summary>
+ /// 灞炴�ц闂櫒
+ /// </summary>
+ /// <param name="name">灞炴�у悕</param>
+ /// <param name="index">绱㈠紩</param>
+ /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+ /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+ /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+ public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+ {
+ object theValue = null;
+
+
+ if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+ {
+ this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("OA_WorkPlanId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.OA_WorkPlanId = isChange ? MyConvert.ConvertToInt32(value) : OA_WorkPlanId;
+ theValue = this.OA_WorkPlanId;
+ }
+
+
+
+
+ else if ("ApprovalStaffId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.ApprovalStaffId = isChange ? MyConvert.ConvertToGuid(value) : ApprovalStaffId;
+ theValue = this.ApprovalStaffId;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("ApprovalStatus".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.ApprovalStatus = isChange ? MyConvert.ConvertToInt32(value) : ApprovalStatus;
+ theValue = this.ApprovalStatus;
+ }
+ else if ("ApprovalTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.ApprovalTime = isChange ? MyConvert.ConvertToDateTime(value) : ApprovalTime;
+ theValue = this.ApprovalTime;
+ }
+ else if ("ApprovalContent".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.ApprovalContent = isChange ? MyConvert.ConvertToString(value) : ApprovalContent;
+ theValue = this.ApprovalContent;
+ }
+ else if ("Operator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+ theValue = this.Operator;
+ }
+ else if ("Buzhou".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.Buzhou = isChange ? MyConvert.ConvertToInt32(value) : Buzhou;
+ theValue = this.Buzhou;
+ }
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 0c0f5f8..5840a35 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -239,6 +239,8 @@
<Compile Include="OA\OA_BrandDAL.cs" />
<Compile Include="OA\OA_AdvanceMoneyRecordDAL.cs" />
<Compile Include="OA\OA_PaperWeightDAL.cs" />
+ <Compile Include="OA\OA_WorkPlan_attachmentDAL.cs" />
+ <Compile Include="OA\OA_WorkPlan_shenpiDAL.cs" />
<Compile Include="OA\OA_WorkReminderDAL.cs" />
<Compile Include="OA\OA_WorkPlanDAL.cs" />
<Compile Include="OA\OA_YujihuikuanDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
index a4a0cc6..9c0b71b 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -97,7 +97,8 @@
delayTime,
new SqlParameter("@Productionprogress",trueModel.Productionprogress),
new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
- new SqlParameter("@printunit",trueModel.printunit)
+ new SqlParameter("@printunit",trueModel.printunit),
+ new SqlParameter("@Duiyinghetongbianhao",trueModel.Duiyinghetongbianhao)
};
int i = -1;
@@ -159,7 +160,8 @@
new SqlParameter("@NumPerBag",trueModel.NumPerBag),
new SqlParameter("@BagNum",trueModel.BagNum),
new SqlParameter("@PrintPackDeliveryRequir",trueModel.PrintPackDeliveryRequir),
- new SqlParameter("@printunit",trueModel.printunit)
+ new SqlParameter("@printunit",trueModel.printunit),
+ new SqlParameter("@Duiyinghetongbianhao",trueModel.Duiyinghetongbianhao)
};
try
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
index 6d89381..693abff 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_StaffDAL.cs
@@ -99,6 +99,8 @@
new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) ,
new SqlParameter("@BF_IsDeliverManage", trueModel.BF_IsDeliverManage) ,
new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
+ new SqlParameter("@BF_Isbaoxiaojingli", trueModel.BF_Isbaoxiaojingli) ,
+ new SqlParameter("@BF_IsBaoxiaozhuguan", trueModel.BF_IsBaoxiaozhuguan) ,
};
try
{
@@ -191,6 +193,8 @@
new SqlParameter("@ManageCountry1", trueModel.ManageCountry1) ,
new SqlParameter("@BF_IsDeliverManage", trueModel.BF_IsDeliverManage) ,
new SqlParameter("@BF_IsDriver", trueModel.BF_IsDriver) ,
+ new SqlParameter("@BF_Isbaoxiaojingli", trueModel.BF_Isbaoxiaojingli) ,
+ new SqlParameter("@BF_IsBaoxiaozhuguan", trueModel.BF_IsBaoxiaozhuguan) ,
};
try
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
index fad64df..9efec7b 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlanDAL.cs
@@ -61,7 +61,9 @@
new SqlParameter("@PlanType", trueModel.PlanType) ,
new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
- new SqlParameter("@PlanContent", trueModel.PlanContent)
+ new SqlParameter("@PlanContent", trueModel.PlanContent) ,
+ new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
+ new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
};
try
{
@@ -73,6 +75,71 @@
}
return true;
}
+
+
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public int InserModelAndGetId(OA_WorkPlan trueModel)
+ {
+
+ if (trueModel == null)
+ {
+ return 0;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@PlanRunTime", trueModel.PlanRunTime) ,
+ new SqlParameter("@PlanMoney", trueModel.PlanMoney) ,
+ new SqlParameter("@PlanRemark", trueModel.PlanRemark) ,
+ new SqlParameter("@PlanStartTime", trueModel.PlanStartTime) ,
+ new SqlParameter("@PlanPeople", trueModel.PlanPeople) ,
+ new SqlParameter("@PlanComplany", trueModel.PlanComplany) ,
+ new SqlParameter("@PlanStatus", trueModel.PlanStatus) ,
+ new SqlParameter("@ApprovalStaffId", trueModel.ApprovalStaffId) ,
+ new SqlParameter("@ApprovalStatus", trueModel.ApprovalStatus) ,
+ new SqlParameter("@ApprovalTime", trueModel.ApprovalTime) ,
+ new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@ApprovalContent", trueModel.ApprovalContent) ,
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@EvaluationStatus", trueModel.EvaluationStatus) ,
+ new SqlParameter("@EvaluationContent", trueModel.EvaluationContent) ,
+ new SqlParameter("@EvaluationStaffId", trueModel.EvaluationStaffId) ,
+ new SqlParameter("@EvaluationTime", trueModel.EvaluationTime) ,
+ new SqlParameter("@RewardType", trueModel.RewardType) ,
+ new SqlParameter("@RewardContent", trueModel.RewardContent) ,
+ new SqlParameter("@RewardResult", trueModel.RewardResult) ,
+ new SqlParameter("@SentStaffId", trueModel.SentStaffId) ,
+ new SqlParameter("@RewardMoney", trueModel.RewardMoney) ,
+ new SqlParameter("@DepartId", trueModel.DepartId) ,
+ new SqlParameter("@ReciveStaffId", trueModel.ReciveStaffId) ,
+ new SqlParameter("@PlanType", trueModel.PlanType) ,
+ new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
+ new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
+ new SqlParameter("@PlanContent", trueModel.PlanContent) ,
+ new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
+ new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
+ };
+ string sql = "Insert Into OA_WorkPlan ([PlanRunTime],[PlanMoney],[PlanRemark],[PlanStartTime], [PlanPeople], [PlanComplany],[PlanStatus], [ApprovalStaffId],[ApprovalStatus], [ApprovalTime],[MemberId],[ApprovalContent],[LastUpdateTime],[Operator],EvaluationStatus,EvaluationContent,EvaluationStaffId,EvaluationTime,RewardType,RewardContent,RewardResult,SentStaffId,RewardMoney,DepartId,ReciveStaffId,PlanType,PlanDataType,PlanTitle,PlanContent,HoubufapiaoStatus,WufapiaoStatus)"
+ + " Values ( @PlanRunTime,@PlanMoney,@PlanRemark, @PlanStartTime, @PlanPeople, @PlanComplany, @PlanStatus, @ApprovalStaffId, @ApprovalStatus, @ApprovalTime,@MemberId,@ApprovalContent,@LastUpdateTime,@Operator,@EvaluationStatus,@EvaluationContent,@EvaluationStaffId,@EvaluationTime,@RewardType,@RewardContent,@RewardResult,@SentStaffId,@RewardMoney,@DepartId,@ReciveStaffId,@PlanType,@PlanDataType,@PlanTitle,@PlanContent,@HoubufapiaoStatus,@WufapiaoStatus )";
+
+ int id = 0;
+ try
+ {
+ id = _dataBase.InsertDataAndGetId(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return id;
+ }
+
+
/// <summary>
/// 淇敼
@@ -117,7 +184,9 @@
new SqlParameter("@PlanType", trueModel.PlanType) ,
new SqlParameter("@PlanDataType", trueModel.PlanDataType) ,
new SqlParameter("@PlanTitle", trueModel.PlanTitle) ,
- new SqlParameter("@PlanContent", trueModel.PlanContent)
+ new SqlParameter("@PlanContent", trueModel.PlanContent) ,
+ new SqlParameter("@HoubufapiaoStatus", trueModel.HoubufapiaoStatus.HasValue?trueModel.HoubufapiaoStatus.Value:3) ,
+ new SqlParameter("@WufapiaoStatus", trueModel.WufapiaoStatus.HasValue?trueModel.WufapiaoStatus.Value:3) ,
};
try
{
@@ -225,7 +294,7 @@
/// <param name="EvaluationStatus"></param>
/// <param name="RewardType"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType)
+ public IEnumerable<Model.OA_WorkPlan> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid MemberId, Guid SentStaffId, Guid ReciveStaffId, int? PlanType, int? PlanDataType, string PlanTitle, DateTime? BeginPlanStartTime, DateTime? EndPlanStartTime, DateTime? BeginPlanRunTime, DateTime? EndPlanRunTime, string PlanPeople, int? PlanStatus, int? ApprovalStatus, int? EvaluationStatus, int? RewardType, string RewardContent = null, string PlanContent = null)
{
try
{
@@ -248,7 +317,14 @@
}
if (PlanDataType > 0)
+ {
condition += " and a.PlanDataType = '" + PlanDataType + "'";
+ }
+ else
+ {
+ condition += " and a.PlanDataType != '17' ";
+ }
+
if (!string.IsNullOrEmpty(PlanTitle))
condition += " and a.PlanTitle like '%" + PlanTitle + "%'";
@@ -273,6 +349,14 @@
else
condition += " and a.EvaluationStatus = '" + EvaluationStatus + "'";
}
+ if (!string.IsNullOrWhiteSpace(RewardContent))
+ {
+ condition += " and a.RewardContent like '%" + RewardContent + "%'";
+ }
+ if (!string.IsNullOrWhiteSpace(PlanContent))
+ {
+ condition += " and a.PlanContent like '%" + PlanContent + "%'";
+ }
if (RewardType > 0)
condition += " and a.RewardType = '" + RewardType + "'";
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs
new file mode 100644
index 0000000..60235f0
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_attachmentDAL.cs
@@ -0,0 +1,229 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+
+namespace CY.SQLDAL
+{
+ public class OA_WorkPlan_attachmentDAL : IOA_WorkPlan_attachmentDAL
+ {
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ( select distinct ok.*,d_kaipiaoshenqing.Name as KaipiaoshenqingName,d_fapiaoqianshou.Name as KehuqianshouName, " +
+ " oe.CompanyName as BuyerName,eo.shuliang,eo.jine, os.Name as BusinessManager " +
+ " from [OA_WorkPlan_attachment] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
+
+ " left join (select count(*) as shuliang,sum(eo.[SumPrice]) as jine,eoe.KaipiaoshenqingId from [EC_OrderBasic] eo ,[EC_OrderExtend] eoe where eoe.Keyid=eo.Keyid group by eoe.KaipiaoshenqingId ) eo on ok.Keyid =eo.KaipiaoshenqingId " +
+ " left join [OA_Staff] os on ok.BusinessManagerId = os.Keyid " +
+
+ " Left Join Sys_Dictionary as d_kaipiaoshenqing On(d_kaipiaoshenqing.DicType= 'EC_寮�绁ㄧ敵璇�' and ok.[Kaipiaoshenqing]= d_kaipiaoshenqing.MeanValue) " +
+ " Left Join Sys_Dictionary as d_fapiaoqianshou On(d_fapiaoqianshou.DicType= 'EC_鍙戠エ绛炬敹' and ok.[Kehuqianshou]= d_fapiaoqianshou.MeanValue) where 0=0 ";
+ const string FROMSOUCEEND = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " SellerOrderId desc ";
+ #endregion
+
+ public OA_WorkPlan_attachmentDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_WorkPlan_attachment trueModel = model as Model.OA_WorkPlan_attachment;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@OA_WorkPlanId",trueModel.OA_WorkPlanId),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@PlanAttachment",trueModel.PlanAttachment),
+ new SqlParameter("@AttachmentType",trueModel.AttachmentType),
+ new SqlParameter("@Operator",string.IsNullOrWhiteSpace(trueModel.Operator)?"":trueModel.Operator),
+
+
+ };
+ string sql = "Insert Into OA_WorkPlan_attachment ( [OA_WorkPlanId] , [PlanAttachment],[AttachmentType],[CreateTime],[Operator] )"
+ + " Values ( @OA_WorkPlanId, @PlanAttachment,@AttachmentType,@CreateTime,@Operator )";
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_WorkPlan_attachment trueModel = model as Model.OA_WorkPlan_attachment;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@OA_WorkPlanId",trueModel.OA_WorkPlanId),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@PlanAttachment",trueModel.PlanAttachment),
+ new SqlParameter("@AttachmentType",trueModel.AttachmentType),
+ new SqlParameter("@Operator",string.IsNullOrWhiteSpace(trueModel.Operator)?"":trueModel.Operator),
+ };
+ string sql = "Update OA_WorkPlan_attachment Set [OA_WorkPlanId]=@OA_WorkPlanId,[CreateTime]=@CreateTime,[PlanAttachment]=@PlanAttachment,[AttachmentType]=@AttachmentType ,[Operator]=@Operator where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_WorkPlan_attachment GetModelByKeyid(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (keyid > 0)
+ {
+ condition = " Keyid=" + keyid + "";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_WorkPlan_attachment> result = _dataBase.SelectModel<OA_WorkPlan_attachment>("*", "OA_WorkPlan_attachment", condition) as IList<OA_WorkPlan_attachment>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_attachment> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_WorkPlan_attachment>(" * ", " OA_WorkPlan_attachment ") as IList<Model.OA_WorkPlan_attachment>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <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>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_attachment> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_WorkPlan_attachment>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_WorkPlan_attachment trueModel = model as Model.OA_WorkPlan_attachment;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_WorkPlan_attachment Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_shenpiDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_shenpiDAL.cs
new file mode 100644
index 0000000..6e6d778
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WorkPlan_shenpiDAL.cs
@@ -0,0 +1,244 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using System.Data.SqlClient;
+using System.Data;
+using CY.Model;
+using System.Transactions;
+
+
+namespace CY.SQLDAL
+{
+ public class OA_WorkPlan_shenpiDAL : IOA_WorkPlan_shenpiDAL
+ {
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ( select distinct ok.*,d_kaipiaoshenqing.Name as KaipiaoshenqingName,d_fapiaoqianshou.Name as KehuqianshouName, " +
+ " oe.CompanyName as BuyerName,eo.shuliang,eo.jine, os.Name as BusinessManager " +
+ " from [OA_WorkPlan_shenpi] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " +
+
+ " left join (select count(*) as shuliang,sum(eo.[SumPrice]) as jine,eoe.KaipiaoshenqingId from [EC_OrderBasic] eo ,[EC_OrderExtend] eoe where eoe.Keyid=eo.Keyid group by eoe.KaipiaoshenqingId ) eo on ok.Keyid =eo.KaipiaoshenqingId " +
+ " left join [OA_Staff] os on ok.BusinessManagerId = os.Keyid " +
+
+ " Left Join Sys_Dictionary as d_kaipiaoshenqing On(d_kaipiaoshenqing.DicType= 'EC_寮�绁ㄧ敵璇�' and ok.[Kaipiaoshenqing]= d_kaipiaoshenqing.MeanValue) " +
+ " Left Join Sys_Dictionary as d_fapiaoqianshou On(d_fapiaoqianshou.DicType= 'EC_鍙戠エ绛炬敹' and ok.[Kehuqianshou]= d_fapiaoqianshou.MeanValue) where 0=0 ";
+ const string FROMSOUCEEND = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " SellerOrderId desc ";
+ #endregion
+
+ public OA_WorkPlan_shenpiDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_WorkPlan_shenpi trueModel = model as Model.OA_WorkPlan_shenpi;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+
+ new SqlParameter("@OA_WorkPlanId",trueModel.OA_WorkPlanId),
+ new SqlParameter("@ApprovalStaffId",trueModel.ApprovalStaffId),
+ new SqlParameter("@ApprovalStatus",trueModel.ApprovalStatus),
+ new SqlParameter("@ApprovalTime",trueModel.ApprovalTime),
+ new SqlParameter("@ApprovalContent",trueModel.ApprovalContent),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Operator",string.IsNullOrWhiteSpace(trueModel.Operator)?"":trueModel.Operator),
+ new SqlParameter("@Buzhou", trueModel.Buzhou.HasValue?trueModel.Buzhou.Value:0),
+
+
+
+
+
+
+
+ };
+ string sql = "Insert Into OA_WorkPlan_shenpi ( [OA_WorkPlanId] , [ApprovalStaffId],[ApprovalStatus],[ApprovalTime],[ApprovalContent],[CreateTime],[Operator],[Buzhou] )"
+ + " Values ( @OA_WorkPlanId, @ApprovalStaffId,@ApprovalStatus,@ApprovalTime,@ApprovalContent,@CreateTime,@Operator,@Buzhou )";
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_WorkPlan_shenpi trueModel = model as Model.OA_WorkPlan_shenpi;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+
+
+ new SqlParameter("@OA_WorkPlanId",trueModel.OA_WorkPlanId),
+ new SqlParameter("@ApprovalStaffId",trueModel.ApprovalStaffId),
+ new SqlParameter("@ApprovalStatus",trueModel.ApprovalStatus),
+ new SqlParameter("@ApprovalTime",trueModel.ApprovalTime),
+ new SqlParameter("@ApprovalContent",trueModel.ApprovalContent),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Operator",string.IsNullOrWhiteSpace(trueModel.Operator)?"":trueModel.Operator),
+ new SqlParameter("@Buzhou", trueModel.Buzhou.HasValue?trueModel.Buzhou.Value:0),
+ };
+ string sql = "Update OA_WorkPlan_shenpi Set [OA_WorkPlanId]=@OA_WorkPlanId,[ApprovalStaffId]=@ApprovalStaffId,[ApprovalStatus]=@ApprovalStatus,[ApprovalTime]=@ApprovalTime,[ApprovalContent]=@ApprovalContent ,[CreateTime]=@CreateTime ,[Operator]=@Operator ,[Buzhou]=@Buzhou where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_WorkPlan_shenpi GetModelByKeyid(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (keyid > 0)
+ {
+ condition = " Keyid=" + keyid + "";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_WorkPlan_shenpi> result = _dataBase.SelectModel<OA_WorkPlan_shenpi>("*", "OA_WorkPlan_shenpi", condition) as IList<OA_WorkPlan_shenpi>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_shenpi> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_WorkPlan_shenpi>(" * ", " OA_WorkPlan_shenpi ") as IList<Model.OA_WorkPlan_shenpi>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_shenpi> GetModelByKaipiaoId(int OA_WorkPlanId)
+ {
+ return _dataBase.SelectModel<Model.OA_WorkPlan_shenpi>(" * ", " OA_WorkPlan_shenpi ", " OA_WorkPlanId = '" + OA_WorkPlanId + "' order by CreateTime desc ") as IList<Model.OA_WorkPlan_shenpi>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_WorkPlan_shenpi> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_WorkPlan_shenpi>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_WorkPlan_shenpi trueModel = model as Model.OA_WorkPlan_shenpi;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_WorkPlan_shenpi Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 3f5652f..5190394 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2047,6 +2047,7 @@
<Content Include="Pages\financial\DepositsCustomershouruqueren.aspx" />
<Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
<Content Include="Pages\financial\BaozhengjinIncome.aspx" />
+ <Content Include="Pages\financial\BaoxiaoFukuanEdit.aspx" />
<Content Include="Pages\financial\NewWaixieExpenses.aspx" />
<Content Include="Pages\financial\OutsourcePiliangPayMoney.aspx" />
<Content Include="Pages\financial\CaigouPayEdit.aspx" />
@@ -2173,6 +2174,7 @@
<Content Include="Pages\personnel\OA_WagesRecordAdd.aspx" />
<Content Include="Pages\personnel\OA_WagesRecordDetail.aspx" />
<Content Include="Pages\personnel\OA_WagesRecordList.aspx" />
+ <Content Include="Pages\personnel\StaffQuanxianshezhi.aspx" />
<Content Include="Pages\personnel\StaffPropertyRecordList.aspx" />
<Content Include="Pages\personnel\WorkReminderEdit.aspx" />
<Content Include="Pages\personnel\WorkReminderList.aspx" />
@@ -2766,10 +2768,15 @@
<Content Include="Pages\workcar\CarViolationList.aspx" />
<Content Include="Pages\workcar\MemberDictionaryEdit.aspx" />
<Content Include="Pages\workcar\MemberDictionaryList.aspx" />
+ <Content Include="Pages\work\BaoxiaoFukuanList.aspx" />
+ <Content Include="Pages\work\BaoxiaoReplyList.aspx" />
<Content Include="Pages\work\MyPlanAdd.aspx" />
<Content Include="Pages\work\MyPlanList.aspx" />
+ <Content Include="Pages\work\MyBaoxiaoAdd.aspx" />
<Content Include="Pages\work\MyRequestAdd.aspx" />
+ <Content Include="Pages\work\MyBaoxiaoDetail.aspx" />
<Content Include="Pages\work\MyRequestDetail.aspx" />
+ <Content Include="Pages\work\MyBaoxiaoList.aspx" />
<Content Include="Pages\work\MyRequestList.aspx" />
<Content Include="Pages\work\OA_DocumentAdd.aspx" />
<Content Include="Pages\work\OA_DocumentDetail.aspx" />
@@ -2777,6 +2784,7 @@
<Content Include="Pages\work\OA_DocumentDicDetail.aspx" />
<Content Include="Pages\work\OA_DocumentDicList.aspx" />
<Content Include="Pages\work\OA_DocumentList.aspx" />
+ <Content Include="Pages\work\BaoxiaoReplyAdd.aspx" />
<Content Include="Pages\work\RequestReplyAdd.aspx" />
<Content Include="Pages\work\RequestReplyList.aspx" />
<Content Include="Pages\work\WorkPlanAdd.aspx" />
@@ -4457,6 +4465,13 @@
<Compile Include="Pages\financial\BaozhengjinIncome.aspx.designer.cs">
<DependentUpon>BaozhengjinIncome.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\financial\BaoxiaoFukuanEdit.aspx.cs">
+ <DependentUpon>BaoxiaoFukuanEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\BaoxiaoFukuanEdit.aspx.designer.cs">
+ <DependentUpon>BaoxiaoFukuanEdit.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\financial\NewWaixieExpenses.aspx.cs">
<DependentUpon>NewWaixieExpenses.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -5338,6 +5353,13 @@
</Compile>
<Compile Include="Pages\personnel\OA_WagesRecordList.aspx.designer.cs">
<DependentUpon>OA_WagesRecordList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\personnel\StaffQuanxianshezhi.aspx.cs">
+ <DependentUpon>StaffQuanxianshezhi.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\personnel\StaffQuanxianshezhi.aspx.designer.cs">
+ <DependentUpon>StaffQuanxianshezhi.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\personnel\StaffPropertyRecordList.aspx.cs">
<DependentUpon>StaffPropertyRecordList.aspx</DependentUpon>
@@ -8898,6 +8920,20 @@
<Compile Include="Pages\workcar\MemberDictionaryList.aspx.designer.cs">
<DependentUpon>MemberDictionaryList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\BaoxiaoFukuanList.aspx.cs">
+ <DependentUpon>BaoxiaoFukuanList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\BaoxiaoFukuanList.aspx.designer.cs">
+ <DependentUpon>BaoxiaoFukuanList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\work\BaoxiaoReplyList.aspx.cs">
+ <DependentUpon>BaoxiaoReplyList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\BaoxiaoReplyList.aspx.designer.cs">
+ <DependentUpon>BaoxiaoReplyList.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\MyPlanAdd.aspx.cs">
<DependentUpon>MyPlanAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -8912,6 +8948,13 @@
<Compile Include="Pages\work\MyPlanList.aspx.designer.cs">
<DependentUpon>MyPlanList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\MyBaoxiaoAdd.aspx.cs">
+ <DependentUpon>MyBaoxiaoAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\MyBaoxiaoAdd.aspx.designer.cs">
+ <DependentUpon>MyBaoxiaoAdd.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\MyRequestAdd.aspx.cs">
<DependentUpon>MyRequestAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -8919,12 +8962,26 @@
<Compile Include="Pages\work\MyRequestAdd.aspx.designer.cs">
<DependentUpon>MyRequestAdd.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\MyBaoxiaoDetail.aspx.cs">
+ <DependentUpon>MyBaoxiaoDetail.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\MyBaoxiaoDetail.aspx.designer.cs">
+ <DependentUpon>MyBaoxiaoDetail.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\MyRequestDetail.aspx.cs">
<DependentUpon>MyRequestDetail.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\work\MyRequestDetail.aspx.designer.cs">
<DependentUpon>MyRequestDetail.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\work\MyBaoxiaoList.aspx.cs">
+ <DependentUpon>MyBaoxiaoList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\MyBaoxiaoList.aspx.designer.cs">
+ <DependentUpon>MyBaoxiaoList.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\work\MyRequestList.aspx.cs">
<DependentUpon>MyRequestList.aspx</DependentUpon>
@@ -8975,6 +9032,13 @@
<Compile Include="Pages\work\OA_DocumentList.aspx.designer.cs">
<DependentUpon>OA_DocumentList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\BaoxiaoReplyAdd.aspx.cs">
+ <DependentUpon>BaoxiaoReplyAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\BaoxiaoReplyAdd.aspx.designer.cs">
+ <DependentUpon>BaoxiaoReplyAdd.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\RequestReplyAdd.aspx.cs">
<DependentUpon>RequestReplyAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/MainPage.cs b/CY_ECommercePlatform/CY.WebForm/MainPage.cs
index 8066e29..a4ee718 100644
--- a/CY_ECommercePlatform/CY.WebForm/MainPage.cs
+++ b/CY_ECommercePlatform/CY.WebForm/MainPage.cs
@@ -190,6 +190,17 @@
string script = "alertMsg('" + Message + "')";
JavaScript.ExecuteClientScript("key", script, page);
}
+
+ /// <summary>
+ /// 鏄剧ずIE娴忚鍣ㄧ鐨勫璇濇骞朵笖璺宠浆椤甸潰
+ /// </summary>
+ /// <param name="Message">娑堟伅</param>
+ /// <param name="page">婧愰〉闈�</param>
+ public static void MessageBoxandhideLoadingIndicator(string Message, System.Web.UI.Page page)
+ {
+ string script = "alertMsg('" + Message + "');hideLoadingIndicator();";
+ JavaScript.ExecuteClientScript("key", script, page);
+ }
/// <summary>
/// 鏄剧ず瀵硅瘽妗�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
index 85c810c..b3c2236 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx
@@ -295,7 +295,7 @@
</td>
<td>
<%--<input type="text" name="PO_Requirement" class=" noJ" style="width: 300px;" value="<%#Eval("PrintDemandAfterWorksDemand") %>" />--%>
- <input type="text" name="PO_Requirement" class=" noJ" style="width: 405px;" />
+ <input type="text" name="PO_Requirement" class=" noJ" maxlength="500" style="width: 405px;" value="<%#Eval("PrintDemandAfterWorksDemand")%>" />
<%--<%#Eval("m_InquiryCommonModel.PrintDemand")%><%#Eval("m_InquiryCommonModel.AfterWorksDemand")%>--%>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
index e47b8b9..b86a807 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgMergerOrderEdit.aspx.cs
@@ -165,7 +165,12 @@
{
_inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
}
- _eC_OrderBasic.PrintDemandAfterWorksDemand = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
+ var ssss = _inquiryCommonModel.PrintDemand + _inquiryCommonModel.AfterWorksDemand;
+ if (ssss.Length > 500)
+ {
+ ssss.Substring(0,499);
+ }
+ _eC_OrderBasic.PrintDemandAfterWorksDemand = ssss;
string strPrintSizeName;
strPrintSizeName = _inquiryCommonModel.PrintSizeName;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index ae03bca..e1d31cf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -974,9 +974,66 @@
$("select[name='PSF_PrintedColorPositive'][value_selspec='" + value_SelWaerId + "']").val("鍗曡壊");
$("select[name='PSF_PrintedColorRear'][value_ppwaerid='" + value_SelWaerId + "']").val("鍗曡壊");
$("input[name='CTPSpecName'][value_ppwaerid='" + value_SelWaerId + "']").val("395*460");
- $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("4寮�");
+ $("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").val("");
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").change();
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").show();
+
+ if ($("#spanOrderPrintDemand").html() != "") {
+ var sss = $("#spanOrderPrintDemand").html().split('锛�');
+ if (sss != null) {
+
+ for (var i = 0; i < sss.length; i++) {
+ var sfdsdfdf = sss[i].split('锛�');
+
+
+
+
+ if (sfdsdfdf[0].indexOf('(') >= 0 && sfdsdfdf[0].indexOf(')') >= 0) {
+
+
+ // 鍋囪瑕佹埅鍙栫殑瀛楃涓蹭负str锛屽紑濮嬪瓧绗︿覆涓簊tart锛岀粨鏉熷瓧绗︿覆涓篹nd
+ var startIndex = sfdsdfdf[0].indexOf('(') + 1;
+ var endIndex = sfdsdfdf[0].indexOf(')');
+ var substr = sfdsdfdf[0].slice(startIndex, endIndex);
+
+
+ var ssssaaa = substr;
+
+ if (ssssaaa.indexOf('脳') >= 0) {
+
+ var dfdfdf = ssssaaa.split('脳');
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ } else if (ssssaaa.indexOf('*') >= 0) {
+
+ var dfdfdf = ssssaaa.split('*');
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ }
+
+
+
+ } else {
+ if (sss[i].indexOf('脳') >= 0) {
+ var sfdsdfdf = sss[i].split('锛�');
+
+ var dfdfdf = sfdsdfdf[0].split('脳');
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ } else if (sss[i].indexOf('*') >= 0) {
+
+ var sfdsdfdf = sss[i].split('锛�');
+
+ var dfdfdf = sfdsdfdf[0].split('*');
+ $("input[name='PSF_OpenWidth'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[0]);
+ $("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").val(dfdfdf[1]);
+ }
+ }
+
+ }
+ }
+ }
+
$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").show();
$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").show();
$("input[name='PSF_OpenLength'][value_ppwaerid='" + value_SelWaerId + "']").show();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 4d5d048..edf6046 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -197,8 +197,10 @@
<td class="ali02" colspan="6">
<asp:Button ID="btn_Submit" Text="淇濆瓨" runat="server" OnClick="btn_Submit_Config" />
- <% if (Shifouwanjie != "1") {%>
+ <% if (string.IsNullOrEmpty(Shifouwanjie) || Shifouwanjie == "2") {%>
<asp:Button ID="btn_wanjie" Text="瀹岀粨" runat="server" OnClientClick="if(removeOnSubmit())return true;else return false;" OnClick="btn_Submit_Wanjie" />
+ <% }else if (Shifouwanjie == "1") { %>
+ <asp:Button ID="btn_chongxinkaitong" Text="閲嶆柊寮�閫�" runat="server" OnClientClick="if(removeOnSubmiton())return true;else return false;" OnClick="btn_Submit_chongxinkaitong" />
<% } %>
<input type="hidden" id="HideKeyid" value="<%=Request["Keyid"]%>" />
<input type="hidden" id="saveKey" runat="server" />
@@ -509,11 +511,25 @@
function removeOnSubmit() {
+
+ if (confirm("纭瀹岀粨瀹㈡埛锛�"))
+ return true;
+
+ return false;
+
+
- document.getElementById('txtCompanyName').value = "232323";
- document.getElementById('txtDetailedAddress').value = "232323";
- document.getElementById('txtCompanyPhone').value = "232323";
- return true;
+ }
+
+ function removeOnSubmiton() {
+
+ if (confirm("纭閲嶆柊寮�閫氬鎴凤紵"))
+ return true;
+
+ return false;
+
+
+
}
</script>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index f7afaf2..b9d27d6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -385,6 +385,56 @@
}
+
+ //瀹岀粨浜嬩欢
+ protected void btn_Submit_chongxinkaitong(object sender, EventArgs e)
+ {
+ OA_CorporateClients m_OA_CorporateClients = new OA_CorporateClients();
+
+
+ try
+ {
+ Guid Keyid = Request["Keyid"].ToGuid2();
+
+
+
+
+ if (Request["Keyid"] != null)
+ {
+ m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModel(Request["Keyid"].ToGuid2());
+
+ }
+ else
+ {
+ JavaScript.MessageBox("璇峰厛淇濆瓨瀹㈡埛", this);
+ }
+
+ m_OA_CorporateClients.Shifouwanjie = 2;
+
+ m_OA_CorporateClients.LastUpdateTime = DateTime.Now;
+
+
+
+
+ #region 娣诲姞鎴栫紪杈�
+
+
+ bool result = bll_OA_CorporateClientsBLL.UpdateModel(m_OA_CorporateClients);//鏇存柊淇℃伅
+ if (result)
+ JavaScript.MessageBox("瀹岀粨鎴愬姛", this, true, true);
+ else
+ JavaScript.MessageBox("瀹岀粨澶辫触", this);
+
+ #endregion
+
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ }
////瀹岀粨浜嬩欢
//protected void btn_Submit_Visit(object sender, EventArgs e)
//{
@@ -481,7 +531,7 @@
this.selCustomerIndustriesId.DataTextField = "Name";
this.selCustomerIndustriesId.DataBind();
- this.selCustomerIndustriesId.Value = "69";
+ this.selCustomerIndustriesId.Value = "454";
this.selCustomerTypeId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("瀹㈡埛绫诲瀷");
this.selCustomerTypeId.DataValueField = "Keyid";
@@ -666,6 +716,7 @@
this.txtFinancialOfficers.Value = "";
this.txtOfficersMobile.Value = "";
this.txtOfficersQQ.Value = "";
+ Shifouwanjie = "3";
#endregion
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs
index aff51d3..b937150 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs
@@ -501,6 +501,15 @@
protected global::System.Web.UI.WebControls.Button btn_wanjie;
/// <summary>
+ /// btn_chongxinkaitong 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_chongxinkaitong;
+
+ /// <summary>
/// saveKey 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx
index 38cd8c1..4305042 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx
@@ -12,7 +12,19 @@
<uc:CMSHead ID="CMSHead1" runat="server" />
-
+ <style>
+ .toast-message {
+ position: absolute;
+ width: 90px; /* 鍥哄畾瀹藉害 */
+ height: 60px; /* 鍥哄畾楂樺害 */
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%); /* 璋冩暣浣嶇疆浣垮叾灞呬腑 */
+ background-color: lightblue;
+ font-size: 20px; /* 璁剧疆鏂囧瓧澶у皬 */
+ text-align: center; /* 璁剧疆鏂囧瓧灞呬腑 */
+ }
+</style>
</head>
<body>
<form id="form1" runat="server">
@@ -31,7 +43,10 @@
<td class="ali03">
<input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" /></td>
<td>
- <asp:Button ID="UpdateFileNew" Text="涓婁紶" runat="server" OnClick="btn_Submit_Click" OnClientClick="return checkSelFile()" /></td>
+ <asp:Button ID="UpdateFileNew" Text="涓婁紶" runat="server" OnClick="btn_Submit_Click" OnClientClick="return checkSelFile()" />
+<div id="loading" class="toast-message" style="display: none;">涓婁紶涓紒</div>
+ </td>
+
</tr>
</table>
@@ -148,6 +163,7 @@
}
//debugger;
//replaceParamVal("deleteKeyIds", "");
+ showLoadingIndicator();
return true;
}
//鏌ョ湅
@@ -164,11 +180,21 @@
return false;
}
+ showLoadingIndicator();
//debugger;
//replaceParamVal("deleteKeyIds", "");
return true;
}
+
+ function showLoadingIndicator() {
+ document.getElementById('loading').style.display = 'block';
+ }
+
+ function hideLoadingIndicator() {
+ document.getElementById('loading').style.display = 'none';
+ }
+
//鏀瑰彉鍙傛暟
function changeURLArg(url, arg, arg_val) {
var pattern = arg + '=([^&]*)';
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx.cs
index 6f2c9e8..ec15658 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsUpLoadContract.aspx.cs
@@ -311,14 +311,14 @@
{
uploadContract.SavAndUpDataContractFile(item, CountractFileKeiId: g);
- JavaScript.MessageBox( "涓婁紶鏂囦欢鎴愬姛", this);
+ JavaScript.MessageBoxandhideLoadingIndicator( "涓婁紶鏂囦欢鎴愬姛", this);
//JavaScript.RefreshSelf(this);
//JavaScript.RefreshOpener(this);
}
catch (Exception)
{
- JavaScript.MessageBox("涓婁紶鏂囦欢澶辫触", this);
+ JavaScript.MessageBoxandhideLoadingIndicator("涓婁紶鏂囦欢澶辫触", this);
// JavaScript.RefreshSelf(this);
//JavaScript.RefreshOpener(this);
@@ -468,14 +468,14 @@
{
uploadContract.SavAndUpDataContractFile(postedFile,CountractFileKeiId :g);
- JavaScript.MessageBox("涓婁紶鏂囦欢鎴愬姛", this);
+ JavaScript.MessageBoxandhideLoadingIndicator("涓婁紶鏂囦欢鎴愬姛", this);
//JavaScript.RefreshSelf(this);
//JavaScript.RefreshOpener(this);
BindList();
}
catch (Exception)
{
- JavaScript.MessageBox("涓婁紶鏂囦欢澶辫触", this);
+ JavaScript.MessageBoxandhideLoadingIndicator("涓婁紶鏂囦欢澶辫触", this);
// JavaScript.RefreshSelf(this);
//JavaScript.RefreshOpener(this);
BindList();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index ba617c5..3b67f4e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,8 +9,8 @@
<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=116" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=36" type="text/javascript"></script>
+ <script src="../../js/Inquiry/Inquiry.js?v=130" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=38" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
@@ -47,9 +47,15 @@
}
function Saveyaoqiu() {
+ if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <=0 ) {
+ if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
+ return false;
+ }
+
+
if (document.getElementById('selPrintTypes').value != "6") {
alertMsg("鐩墠鍙繚瀛樹功鍒婅姹�!");
- return;
+ return false;
}
return ValidateForm();
}
@@ -337,6 +343,17 @@
<div id="divInquiry" style=' display: block;width:1010px;' >
</div>
<br />
+ <table class="table2 table2Left" align="left" style=" width:1000px;">
+ <tr style=" height:11px;">
+ <td style="width:100px;text-align:right;">
+ 瀵瑰簲鍚堝悓缂栧彿锛�
+ </td>
+ <td style="text-align:left;" >
+ <input id='txtDuiyinghetongbianhao' runat="server" maxlength="100" style="width:300px;" />
+ </td>
+ </tr>
+ </table>
+ <br />
<table class="table2 table2Left" align="left" style=" width:1000px;">
<thead>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 2760ddc..9debbd0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -117,6 +117,7 @@
this.hidOrderTypeId.Value = _eC_OrderBasic.OrderTypeId.ToString();
this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
this.txtPrintPackDeliveryRequir.Value = _eC_OrderBasic.PrintPackDeliveryRequir.ToString2();
+ this.txtDuiyinghetongbianhao.Value = _eC_OrderBasic.Duiyinghetongbianhao;
if (_eC_OrderBasic.UnitPrice.HasValue)
{
@@ -397,11 +398,11 @@
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
eC_OrderBasic.Operator = eC_OrderBasic.Creater = eC_OrderExtend.Operate;
-
if (Request["txtUnitPrice"] != null && !string.IsNullOrEmpty(Request["txtUnitPrice"]))
{
eC_OrderBasic.UnitPrice = MyConvert.ConvertToDecimal(Request["txtUnitPrice"]);
@@ -452,6 +453,7 @@
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
+ eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
@@ -536,6 +538,7 @@
eC_OrderExtend.BookPrice = MyConvert.ConvertToString(Request["txtBookPrice"]).Trim();
eC_OrderExtend.NumPerBag = MyConvert.ConvertToString(Request["txtNumberPerBag"]).Trim();
eC_OrderExtend.BagNum = MyConvert.ConvertToString(Request["txtBagNum"]).Trim();
+ eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
if (!eC_OrderBasic.Keyid.HasValue || 0 == eC_OrderBasic.Keyid.Value)
{
isWin = null != PayAbout.NewOrder(eC_OrderBasic, eC_OrderExtend, _inquiryCommonModel);
@@ -585,6 +588,7 @@
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -639,7 +643,7 @@
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
-
+ eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs
index e0e0cae..bab50ea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.designer.cs
@@ -231,6 +231,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtQQ;
/// <summary>
+ /// txtDuiyinghetongbianhao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDuiyinghetongbianhao;
+
+ /// <summary>
/// txtBookNumber 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 10f5d13..4934f37 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -383,6 +383,9 @@
<th style="text-align: center;">
鍗颁欢鍚嶇О
</th>
+ <th style="width:100px;">
+ 瀵瑰簲鍚堝悓缂栧彿
+ </th>
<th width="36">
鏁伴噺
</th>
@@ -497,6 +500,13 @@
<td style="text-align: center; color:<%#(Eval("OrderExtend.ExigencyCaseId").ToString()=="-1" && int.Parse(Eval("OrderState").ToString()) <5 && int.Parse(Eval("OrderState").ToString()) > 0)?"red":""%>;">
<span title="<%#Eval("DocumentName")%>"><%#Eval("DocumentName").ToString().Length >15? (Eval("DocumentName").ToString().Substring(0,15)+".."):Eval("DocumentName").ToString() %></span>
</td>
+
+ <td style="text-align: center;">
+ <div style="word-wrap: break-word; text-align:justify;">
+ <a href='javascript:void(0)' title='<%#Eval("Duiyinghetongbianhao").ToString()%>' class='a_under' onclick='View("<%#Eval("BuyerId")%>")'><%#Eval("Duiyinghetongbianhao").ToString().Length > 20 ? (Eval("Duiyinghetongbianhao").ToString().Substring(0, 20) + "..") : Eval("Duiyinghetongbianhao").ToString()%></a>
+ </div>
+ </td>
+
<td>
<%#Eval("OrderExtend.PrintNum")%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx
new file mode 100644
index 0000000..b020ea3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx
@@ -0,0 +1,129 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaoxiaoFukuanEdit.aspx.cs" Inherits="CY.WebForm.Pages.financial.BaoxiaoFukuanEdit" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+ <title>娣诲姞鏀嚭璁板綍</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+</head>
+<body>
+ <form id="form1" runat="server" class="form2">
+ <div class="scrollCotent">
+ <table class="tableStyle">
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛绫诲瀷锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛绫诲瀷">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛鍚嶇О锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛鍚嶇О">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 绉戠洰鍚嶇О锛�
+ </td>
+ <td>
+ <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О" >
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03 ">
+ 浠樻閲戦锛�
+ </td>
+ <td>
+ <input runat="server" id="txtMoney" type="text" class=" float req" maxlength="12" minNot="0" readonly="readonly" />(鍏�)
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 閮ㄩ棬锛�
+ </td>
+ <td>
+ <input runat="server" id="txtDepartment" maxlength="50" type="text" style="width: 259px" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏀舵浜�(鍗曚綅)锛�
+ </td>
+ <td>
+ <input runat="server" id="txtPaymentUnit" type="text" style="width: 259px" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鎽樿锛�
+ </td>
+ <td>
+ <textarea runat="server" class="req" id="txtOperationalMatters" style="height: 40px" msg="璇峰～鍐欐憳瑕�"></textarea>
+ </td>
+ </tr>
+ <tr style="display: none">
+ <td class="ali03 ">
+ 澶囨敞锛�
+ </td>
+ <td>
+ <textarea runat="server" id="txtRemark" style="width: 400px;"></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ </td>
+ <td>
+ <asp:Button ID="btn_Submit" Text="鎻愪氦" runat="server" OnClick="btn_Submit_Click" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+ <script language="javascript" type="text/javascript">
+
+
+
+
+
+ function ChangeThisType(obj) {
+ $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
+ $.ajax({
+ url: "/Pages/financial/BaoxiaoFukuanEdit.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), DataType: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selAccountName"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ ChangeThisType("#selAcoountType");
+ });
+ </script>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.cs
new file mode 100644
index 0000000..be190c7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.cs
@@ -0,0 +1,176 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.OA;
+using CY.BLL.Sys;
+using CY.BLL;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+ public partial class BaoxiaoFukuanEdit : BasePage
+ {
+ Sys_DictionaryBLL _Sys_DictionaryBLL = null;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+ OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
+ OA_FirmAccountRecord firmAccountRecord = null;
+ OA_FirmAccount firmAccount = null;
+ OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+ OA_StaffBLL staffBLL = null;
+ OA_WorkPlanBll bll_OA_WorkPlanBll = null;
+ OA_DepartmentBll oA_DepartmentBll = null;
+ public BaoxiaoFukuanEdit()
+ {
+ firmAccount = new OA_FirmAccount();
+ _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+ _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ firmAccountRecord = new OA_FirmAccountRecord();
+ oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ staffBLL = new OA_StaffBLL();
+ bll_OA_WorkPlanBll = new OA_WorkPlanBll();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["DataType"])
+ {
+ case "change":
+ Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+ break;
+ default://涓�鑸儏鍐典笉澶勭悊
+ if (IsPostBack || IsCallback)
+ return;
+ else
+ {
+ InitialData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ }
+
+ protected void InitialData()
+ {
+ var keyid = Request["keyid"].ToInt32();
+ //绉戠洰鍚嶇О
+ selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+ selSubject.DataBind();
+ selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ ///璐︽埛绫诲瀷
+ selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
+ selAcoountType.DataBind();
+
+
+
+ if (keyid > 0)
+ {
+ var oA_WorkPlan = bll_OA_WorkPlanBll.GetModelByKeyid(keyid);
+ this.selSubject.Value = oA_WorkPlan.RewardResult;
+ this.txtMoney.Value = oA_WorkPlan.PlanMoney.Value.ToString("0.00");
+ this.txtPaymentUnit.Value = oA_WorkPlan.PlanPeople;
+ var oA_Department = oA_DepartmentBll.GetModelByKeyid(oA_WorkPlan.DepartId);
+ if (oA_Department != null)
+ this.txtDepartment.Value = oA_Department.Name;
+ this.txtOperationalMatters.Value = oA_WorkPlan.PlanContent;
+ }
+
+ }
+
+ protected string reLoadAccountName(string selAcoountType)
+ {
+ return JsonHelper.GetJsonStringByObject(_OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, selAcoountType));
+ }
+
+ protected void btn_Submit_Click(object sender, EventArgs e)
+ {
+ var keyid = Request["keyid"].ToInt32();
+ var oA_WorkPlan = bll_OA_WorkPlanBll.GetModelByKeyid(keyid);
+ if(oA_WorkPlan.EvaluationStatus == 1)
+ {
+ JavaScript.MessageBox("璇ユ姤閿�宸茬粡浠樻锛屼笉鑳介噸澶嶄粯娆�", this);
+ return;
+ }
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+
+
+ firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
+
+ firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
+ firmAccountRecord.LastUpdateTime = DateTime.Now;
+ firmAccountRecord.Money = this.txtMoney.Value.ToDecimal2();
+ firmAccountRecord.OperationalMatters = this.txtOperationalMatters.Value;
+ firmAccountRecord.Operator = CurrentUser.ShortName;
+ firmAccountRecord.PaymentUnit = this.txtPaymentUnit.Value;
+ firmAccountRecord.RecordTypeId = 2;//鏀嚭
+ firmAccountRecord.Remark = this.txtRemark.Value;
+ firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
+ firmAccountRecord.ResidualAmount = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
+ firmAccountRecord.Department = this.txtDepartment.Value;
+
+ firmAccount.AllExpenses = this.txtMoney.Value.ToDecimal2() + firmAccount.AllExpenses;
+ firmAccount.Balance = firmAccount.Balance - this.txtMoney.Value.ToDecimal2();
+
+ if (_OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount))
+ {
+ //淇敼OA_WorkPlan鐨勭姸鎬佹湭宸叉姤閿�
+
+ if (keyid > 0)
+ {
+
+ oA_WorkPlan.EvaluationStatus = 1;
+ oA_WorkPlan.Operator = CurrentUser.ShortName;
+ oA_WorkPlan.LastUpdateTime = DateTime.Now;
+ var res = bll_OA_WorkPlanBll.UpdateModel(oA_WorkPlan);
+ }
+
+
+ scope.Complete();
+ JavaScript.MessageBox("娣诲姞鎴愬姛", this, true, true);
+ }
+ else
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.designer.cs
new file mode 100644
index 0000000..e9c1362
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaoxiaoFukuanEdit.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class BaoxiaoFukuanEdit
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// selAcoountType 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
+
+ /// <summary>
+ /// selAccountName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+ /// <summary>
+ /// selSubject 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
+
+ /// <summary>
+ /// txtMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtMoney;
+
+ /// <summary>
+ /// txtDepartment 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDepartment;
+
+ /// <summary>
+ /// txtPaymentUnit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPaymentUnit;
+
+ /// <summary>
+ /// txtOperationalMatters 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtOperationalMatters;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx
index b19a5df..c9dca27 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/BaozhengjinIncome.aspx
@@ -126,7 +126,7 @@
<td>
</td>
<td align="left">
- <input type="button" value="纭浠樻" runat="server" id='btnSubmit' />
+ <input type="button" value="纭鏀舵" runat="server" id='btnSubmit' />
</td>
</tr>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx
index bc3463c..e50356e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OutsourcePayOrder.aspx
@@ -211,7 +211,7 @@
</asp:Repeater>
<tr class="StatisticsMoney">
- <td colspan="9" class="ali03">
+ <td colspan="10" class="ali03">
褰撳墠椤电粺璁★細
</td>
<td>
@@ -227,7 +227,7 @@
</td>
</tr>
<tr class="StatisticsMoney">
- <td colspan="9" class="ali03">
+ <td colspan="10" class="ali03">
鏌ヨ椤圭粺璁★細
</td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
index 5c391ef..bebe6d1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/BlackAndWhite.aspx
@@ -140,8 +140,8 @@
<td align="left" style="padding-left: 40px;"><input type="checkbox" name="works" value="24" /> 濂楀彿</td>
<td align="left"><input type="checkbox" name="works" value="4" /> 鍘嬬棔</td>
<td align="left"><input type="checkbox" name="works" value="6" /> 鎵撶偣绾�</td>
- <td align="left"><div style="float:left"><input type="checkbox" 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" 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"><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>
</tr>
</tbody>
</table>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
index b3f4ae1..752cd93 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/front/InquiryOnLine.aspx.cs
@@ -2429,7 +2429,7 @@
if (afterInfo.ParameterName == "鑳跺ご")
{
if(model.PrintTypeId!=27)
- afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "椤�)";
+ afterInfo.ParameterName = "鑳跺ご(姣忔湰" + model.PageNum.ToString() + "寮�)";
if (model.PrintTypeId == 39)
{
@@ -2439,7 +2439,7 @@
if (afterInfo.ParameterName == "鑳跺乏")
{
if (model.PrintTypeId == 29)
- afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "椤�)";
+ afterInfo.ParameterName = "鑳跺乏(姣忔湰" + model.PaperMP.ToString() + "寮�)";
}
afterWorkStr += afterInfo.ParameterName + "锛�";
}
@@ -2455,13 +2455,16 @@
}
}
- //if (model.PrintTypeId == 27)
- //{
- // afterWorkStr += "濂楀彿鍙锋(" + model.ThStart.ToString() + "-" + model.ThEnd.ToString() + ")";
- // afterWorkStr += "锛�" + model.JTWZ;
- //}
-
- if (model.PrintTypeId == 25)
+ if (model.PrintTypeId == 27)
+ {
+ if(!string.IsNullOrEmpty(model.ThStart) || !string.IsNullOrEmpty(model.ThEnd))
+ {
+ afterWorkStr += "锛屽鍙峰彿娈�(" + model.ThStart + "-" + model.ThEnd + ")";
+ //afterWorkStr += "锛�" + model.JTWZ;
+ }
+ }
+
+ if (model.PrintTypeId == 25)
{
InquiryInsideModel insideModel = model.InquiryInsideList[0];
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
index dbbf547..53c90a3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx
@@ -176,25 +176,25 @@
</select>
</td>
<td class="ali03">
- 鏄惁涓氬姟缁忕悊锛�
+ <%-- 鏄惁涓氬姟缁忕悊锛�--%>
</td>
<td>
- <asp:RadioButtonList runat="server" ID="IsBusinessManager" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+ <%-- <asp:RadioButtonList runat="server" ID="IsBusinessManager" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
<asp:ListItem Text="鏄�" Value="True" />
<asp:ListItem Text="鍚�" Value="False" />
- </asp:RadioButtonList>
+ </asp:RadioButtonList>--%>
</td>
<td class="ali03">
- 鏄惁瀹㈡埛缁忕悊锛�
+ <%-- 鏄惁瀹㈡埛缁忕悊锛�--%>
</td>
<td>
- <asp:RadioButtonList runat="server" ID="IsAccountManager" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+ <%-- <asp:RadioButtonList runat="server" ID="IsAccountManager" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
<asp:ListItem Text="鏄�" Value="True" />
<asp:ListItem Text="鍚�" Value="False" />
- </asp:RadioButtonList>
+ </asp:RadioButtonList>--%>
</td>
</tr>
- <tr>
+ <%-- <tr>
<td class="ali03">
鏄惁鍙告満锛�
</td>
@@ -217,8 +217,33 @@
</td>
<td>
</td>
- </tr>
+ </tr>--%>
+
+ <%--<tr>
+ <td class="ali03">
+ 鏄惁鎶ラ攢涓荤锛�
+ </td>
+ <td>
+ <asp:RadioButtonList runat="server" ID="BF_IsBaoxiaozhuguan" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+ <asp:ListItem Text="鏄�" Value="True" />
+ <asp:ListItem Text="鍚�" Value="False" />
+ </asp:RadioButtonList>
+ </td>
+ <td class="ali03">
+ 鏄惁鎶ラ攢缁忕悊锛�
+ </td>
+ <td>
+ <asp:RadioButtonList runat="server" ID="BF_Isbaoxiaojingli" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+ <asp:ListItem Text="鏄�" Value="True" />
+ <asp:ListItem Text="鍚�" Value="False" />
+ </asp:RadioButtonList>
+ </td>
+ <td class="ali03">
+ </td>
+ <td>
+ </td>
+ </tr>--%>
<tr>
<td class="ali03">
鎵嬫満鍙风爜锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
index ef88746..72b84b7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.cs
@@ -89,10 +89,12 @@
this.selSex.SelectedIndex = 0;
this.txtStaffUserName.Value = "";
this.txtSM_Post.Value = "";
- this.IsBusinessManager.SelectedValue = "False";
- this.IsAccountManager.SelectedValue = "False";
- this.BF_IsDriver.SelectedValue = "False";
- this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.IsBusinessManager.SelectedValue = "False";
+ //this.IsAccountManager.SelectedValue = "False";
+ //this.BF_IsDriver.SelectedValue = "False";
+ //this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = "False";
this.txtMobieNum.Value = "";
this.txtSM_Money.Value = "";
@@ -166,10 +168,12 @@
this.txtQQ.Value = m_OA_StaffResume.R_G_QQ;
this.txtEmail.Value = m_OA_StaffResume.R_G_Email;
this.selSex.Value = m_OA_StaffResume.R_G_Sex;
- this.IsBusinessManager.SelectedValue = "False";
- this.IsAccountManager.SelectedValue = "False";
- this.BF_IsDeliverManage.SelectedValue = "False";
- this.BF_IsDriver.SelectedValue = "False";
+ //this.IsBusinessManager.SelectedValue = "False";
+ //this.IsAccountManager.SelectedValue = "False";
+ //this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = "False";
+ //this.BF_IsDriver.SelectedValue = "False";
this.txtSM_Birthday.Value = m_OA_StaffResume.R_G_DocumentsType;
this.txtSM_IDCardNum.Value = m_OA_StaffResume.R_G_DocumentsNumber;
this.aSM_IDCardPic.Visible = false;
@@ -202,10 +206,12 @@
this.selSex.Value = m_OA_Staff.Sex;
this.selStatus.Value = m_OA_Staff.Status;
this.selDepartmentId.Value = m_OA_Staff.DepartmentId.ToString2();
- this.IsBusinessManager.SelectedValue = m_OA_Staff.IsBusinessManager ? "True" : "False";
- this.IsAccountManager.SelectedValue = m_OA_Staff.IsAccountManager ? "True" : "False";
- this.BF_IsDeliverManage.SelectedValue = m_OA_Staff.BF_IsDeliverManage ? "True" : "False";
- this.BF_IsDriver.SelectedValue = m_OA_Staff.BF_IsDriver ? "True" : "False";
+ //this.IsBusinessManager.SelectedValue = m_OA_Staff.IsBusinessManager ? "True" : "False";
+ //this.IsAccountManager.SelectedValue = m_OA_Staff.IsAccountManager ? "True" : "False";
+ //this.BF_IsDeliverManage.SelectedValue = m_OA_Staff.BF_IsDeliverManage ? "True" : "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = m_OA_Staff.BF_IsBaoxiaozhuguan ? "True" : "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = m_OA_Staff.BF_Isbaoxiaojingli ? "True" : "False";
+ //this.BF_IsDriver.SelectedValue = m_OA_Staff.BF_IsDriver ? "True" : "False";
this.selRole.Value = m_OA_StaffRoleRel.RoleId.ToString2();
this.txtName.Style.Add("display", "none");
@@ -287,10 +293,12 @@
}
else
{
- this.IsBusinessManager.SelectedValue = "False";
- this.IsAccountManager.SelectedValue = "False";
- this.BF_IsDriver.SelectedValue = "False";
- this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.IsBusinessManager.SelectedValue = "False";
+ //this.IsAccountManager.SelectedValue = "False";
+ //this.BF_IsDriver.SelectedValue = "False";
+ //this.BF_IsDeliverManage.SelectedValue = "False";
+ //this.BF_IsBaoxiaozhuguan.SelectedValue = "False";
+ //this.BF_Isbaoxiaojingli.SelectedValue = "False";
}
}
}
@@ -381,10 +389,13 @@
m_OA_Staff.SM_EndWorkTime = nowTime;
}
- m_OA_Staff.IsBusinessManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
- m_OA_Staff.IsAccountManager = this.IsAccountManager.SelectedValue.ToBoolean2();
- m_OA_Staff.BF_IsDeliverManage = this.BF_IsDeliverManage.SelectedValue.ToBoolean2();
- m_OA_Staff.BF_IsDriver = this.BF_IsDriver.SelectedValue.ToBoolean2();
+ //m_OA_Staff.IsBusinessManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ //m_OA_Staff.IsAccountManager = this.IsAccountManager.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_IsDeliverManage = this.BF_IsDeliverManage.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_IsBaoxiaozhuguan = this.BF_IsBaoxiaozhuguan.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_Isbaoxiaojingli = this.BF_Isbaoxiaojingli.SelectedValue.ToBoolean2();
+ //m_OA_Staff.BF_IsDriver = this.BF_IsDriver.SelectedValue.ToBoolean2();
+
m_OA_Staff.DepartmentId = this.selDepartmentId.Value.ToInt32();
m_OA_Staff.SM_SpouseName = this.txtSM_SpouseName.Value.ToString2();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs
index 477863a..4ca843d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffEdit.aspx.designer.cs
@@ -123,42 +123,6 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
/// <summary>
- /// IsBusinessManager 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.WebControls.RadioButtonList IsBusinessManager;
-
- /// <summary>
- /// IsAccountManager 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.WebControls.RadioButtonList IsAccountManager;
-
- /// <summary>
- /// BF_IsDriver 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.WebControls.RadioButtonList BF_IsDriver;
-
- /// <summary>
- /// BF_IsDeliverManage 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.WebControls.RadioButtonList BF_IsDeliverManage;
-
- /// <summary>
/// txtMobieNum 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
index d92155d..5538fa4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffList.aspx
@@ -43,6 +43,11 @@
});
});
}
+
+ function CompledWork(orderId,type) {
+ var url = "/Pages/personnel/StaffQuanxianshezhi.aspx?keyid=" + orderId + "&&type=" + type;
+ top.Dialog.open({ URL: url, Title: "鏉冮檺璁剧疆", Height: 300, Width: 680 });
+ }
</script>
</head>
<body>
@@ -106,26 +111,32 @@
<th>
濮撳悕
</th>
- <th>
+ <%-- <th>
鎬у埆
- </th>
+ </th>--%>
<th>
鐧诲綍甯愬彿
</th>
<th>
- 鎵嬫満
+ 宸ヤ綔鎵嬫満
</th>
<th>
- 鑱旂郴鐢佃瘽
+ 绉佷汉鎵嬫満
</th>
- <th>
+ <th>
+ 瑙掕壊
+ </th>
+ <%-- <th>
QQ
</th>
<th>
Email
- </th>
+ </th>--%>
<th>
鐘舵��
+ </th>
+ <th>
+ 鏌ヨ鍖哄煙
</th>
<th>
涓氬姟缁忕悊
@@ -134,14 +145,18 @@
瀹㈡埛缁忕悊
</th>
<th>
- 鏄惁鍙告満
+ 鍙告満
</th>
<th>
- 鏄惁閰嶉�佹潈闄�
+ 閰嶉�佹潈闄�
</th>
- <th>
- 璐熻矗鍖哄煙
+ <th>
+ 鎶ラ攢涓荤
</th>
+ <th>
+ 鎶ラ攢缁忕悊
+ </th>
+
<th>
鎿嶄綔
</th>
@@ -158,9 +173,9 @@
<td>
<%#Eval("Name")%>
</td>
- <td>
+ <%-- <td>
<%#Eval("Sex")%>
- </td>
+ </td>--%>
<td>
<%#Eval("StaffUserName")%>
</td>
@@ -171,29 +186,46 @@
<%#Eval("PhoneNum")%>
</td>
<td>
+ <%#Eval("RoleName")%>
+ </td>
+ <%-- <td>
<%#Eval("QQ")%>
</td>
<td>
<%#Eval("Email")%>
- </td>
+ </td>--%>
<td>
<%#Eval("Status")%>
</td>
- <td>
- <%#bool.Parse(Eval("IsBusinessManager").ToString())?"鏄�":"鍚�"%>
- </td>
- <td>
- <%#bool.Parse(Eval("IsAccountManager").ToString()) ? "鏄�" : "鍚�"%>
- </td>
- <td>
- <%#bool.Parse(Eval("BF_IsDriver").ToString())?"鏄�":"鍚�"%>
- </td>
- <td>
- <%#bool.Parse(Eval("BF_IsDeliverManage").ToString()) ? "鏄�" : "鍚�"%>
- </td>
- <td class="Operate">
+ <td class="Operate">
<span menu_member_case_id="case_ManageAddress" menu_member_case_name="淇敼璐熻矗鍖哄煙" onclick="ManageAddress('<%#Eval("Keyid")%>')">淇敼</span>
+ </td >
+ <td class="Operate">
+ <span onclick="CompledWork('<%#Eval("Keyid")%>',1)">
+ <%#bool.Parse(Eval("IsBusinessManager").ToString())?"鈭�":"脳"%> </span>
+
</td>
+ <td class="Operate" >
+ <span onclick="CompledWork('<%#Eval("Keyid")%>',2)">
+ <%#bool.Parse(Eval("IsAccountManager").ToString()) ? "鈭�" : "脳"%></span>
+ </td>
+ <td class="Operate" >
+ <span onclick="CompledWork('<%#Eval("Keyid")%>',3)">
+ <%#bool.Parse(Eval("BF_IsDriver").ToString())?"鈭�":"脳"%></span>
+ </td>
+ <td class="Operate" >
+ <span onclick="CompledWork('<%#Eval("Keyid")%>',4)">
+ <%#bool.Parse(Eval("BF_IsDeliverManage").ToString()) ? "鈭�" : "脳"%></span>
+ </td>
+ <td class="Operate" >
+ <span onclick="CompledWork('<%#Eval("Keyid")%>',5)">
+ <%#bool.Parse(Eval("BF_IsBaoxiaozhuguan").ToString()) ? "鈭�" : "脳"%></span>
+ </td>
+ <td class="Operate" >
+ <span onclick="CompledWork('<%#Eval("Keyid")%>',6)">
+ <%#bool.Parse(Eval("BF_Isbaoxiaojingli").ToString()) ? "鈭�" : "脳"%></span>
+ </td>
+
<td class="Operate">
<span menu_member_case_id="case_ViewThings" menu_member_case_name="鐗╁搧棰嗗彇璁板綍" onclick="ViewModel('<%#Eval("MemberId")%>')">鐗╁搧棰嗗彇璁板綍</span>
<span menu_member_case_id="case_EditModel" menu_member_case_name="鍛樺伐绠�鍘�" onclick="EditModel('<%#Eval("Keyid")%>')">鍛樺伐绠�鍘�</span>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx
new file mode 100644
index 0000000..d964895
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx
@@ -0,0 +1,60 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="StaffQuanxianshezhi.aspx.cs" Inherits="CY.WebForm.Pages.personnel.StaffQuanxianshezhi" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鍛樺伐璇︽儏</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script src="../../js/common/CityTool.js" type="text/javascript"></script>
+ <script src="../../js/ColorBox/jquery.colorbox.js" type="text/javascript"></script>
+ <link href="../../js/ColorBox/colorbox.css" rel="stylesheet" type="text/css" />
+ <style type="text/css">
+ .tableStyle1 td { word-break: normal; border-left: 1pt solid #CCCCCC; border-bottom: 1pt solid #CCCCCC; height: 28px; line-height:28px; padding: 1px 2px 1px 4px; }
+ .NoBorder td { border: none; }
+ label { cursor: pointer; }
+ .CmsInput_from { width: 120px; font-size: 12px; background: url('') repeat-x scroll left top #ffffff; border-color: #a2b3bd; border-style: solid; border-width: 1px; color: #336699; height: 20px; line-height: 20px; }
+ </style>
+ <script type="text/javascript">
+
+ });
+ </script>
+ <script type="text/javascript">
+
+ </script>
+</head>
+<body>
+ <form id="form1" class="form2" runat="server" enctype="multipart/form-data">
+ <div>
+ <table class="tableStyle1" style="border-right: 1pt solid #CCCCCC; border-top: 1pt solid #CCCCCC; width: 100%; margin: 10px auto;" cellpadding="0" cellspacing="0">
+
+
+
+ <tr>
+
+ <td class="ali03">
+ <span id="types" runat="server">涓氬姟缁忕悊锛�</span>
+ </td>
+ <td>
+ <asp:RadioButtonList runat="server" ID="IsBusinessManager" RepeatDirection="Horizontal" CellPadding="0" CellSpacing="0" CssClass="w120px NoBorder">
+ <asp:ListItem Text="鏄�" Value="True" />
+ <asp:ListItem Text="鍚�" Value="False" />
+ </asp:RadioButtonList>
+ </td>
+
+ </tr>
+
+
+
+ <tr>
+ <td colspan="6" style="text-align: center;">
+ <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+</body>
+<script type="text/javascript">
+
+</script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs
new file mode 100644
index 0000000..6a2d838
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.cs
@@ -0,0 +1,167 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.Model;
+using CY.BLL;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.EC;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+using System.Collections;
+
+namespace CY.WebForm.Pages.personnel
+{
+ //鍚磋緣
+ //鍛樺伐璇︽儏
+ public partial class StaffQuanxianshezhi : BasePage
+ {
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ EC_MemberBasicBLL bll_EC_MemberBasicBLL = null;
+ OA_FirmRoleBLL bll_OA_FirmRoleBLL = null;
+ OA_DepartmentBll bll_OA_DepartmentBll = null;
+ OA_StaffResumeBLL bll_OA_StaffResumeBLL = null;
+ OA_StaffPostLogBLL bll_OA_StaffPostLogBLL = null;
+
+ public string OLDProvince = ""; //鎺ユ敹鍊� Request["selectProvince"].ToString2();
+ public string OLDCity = "";//鎺ユ敹鍊� Request["selectCity"].ToString2();
+ public string OLDCounty = "";//鎺ユ敹鍊� Request["selectCounty"].ToString2();
+ public string NowProvince = ""; //鎺ユ敹鍊� Request["selectProvince"].ToString2();
+ public string NowCity = "";//鎺ユ敹鍊� Request["selectCity"].ToString2();
+ public string NowCounty = "";//鎺ユ敹鍊� Request["selectCounty"].ToString2();
+ public string ManageProvince = ""; //鎺ユ敹鍊� Request["selectProvince"].ToString2();
+ public string ManageCity = "";//鎺ユ敹鍊� Request["selectCity"].ToString2();
+ public string ManageCounty = "";//鎺ユ敹鍊� Request["selectCounty"].ToString2();
+ public string[] OldFileds;
+ public string[] NowFileds;
+
+ //鍒濆鍖�
+ public StaffQuanxianshezhi()
+ {
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_EC_MemberBasicBLL = new EC_MemberBasicBLL();
+ bll_OA_FirmRoleBLL = new OA_FirmRoleBLL();
+ bll_OA_DepartmentBll = new OA_DepartmentBll();
+ bll_OA_StaffResumeBLL = new OA_StaffResumeBLL();
+ bll_OA_StaffPostLogBLL = new OA_StaffPostLogBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+ public void ClearData()
+ {
+
+
+
+ }
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ var keyid = Request["keyid"];
+ var type = Request["type"];
+
+ OA_Staff m_OA_Staff = bll_OA_StaffBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_Staff != null)
+ {
+ if (type.ToInt32() == 1)
+ {
+ this.types.InnerText = "涓氬姟缁忕悊锛�";
+ this.IsBusinessManager.SelectedValue = m_OA_Staff.IsBusinessManager ? "True" : "False";
+ }
+ else if (type.ToInt32() == 2)
+ {
+ this.types.InnerText = "瀹㈡埛缁忕悊锛�";
+ this.IsBusinessManager.SelectedValue = m_OA_Staff.IsAccountManager ? "True" : "False";
+ }
+ else if (type.ToInt32() == 3)
+ {
+ this.types.InnerText = "鍙告満锛�";
+ this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_IsDriver ? "True" : "False";
+ }
+ else if (type.ToInt32() == 4)
+ {
+ this.types.InnerText = "閰嶉�佹潈闄愶細";
+ this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_IsDeliverManage ? "True" : "False";
+ }
+ else if (type.ToInt32() == 5)
+ {
+ this.types.InnerText = "鎶ラ攢涓荤锛�";
+ this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_IsBaoxiaozhuguan ? "True" : "False";
+ }
+ else if (type.ToInt32() == 6)
+ {
+ this.types.InnerText = "鎶ラ攢缁忕悊锛�";
+ this.IsBusinessManager.SelectedValue = m_OA_Staff.BF_Isbaoxiaojingli ? "True" : "False";
+ }
+
+
+
+ }
+
+
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ try
+ {
+ var keyid = Request["keyid"];
+ var type = Request["type"];
+ OA_Staff m_OA_Staff = bll_OA_StaffBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+
+ if (type.ToInt32() == 1)
+ {
+ m_OA_Staff.IsBusinessManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ }
+ else if (type.ToInt32() == 2)
+ {
+ m_OA_Staff.IsAccountManager = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ }
+ else if (type.ToInt32() == 3)
+ {
+ m_OA_Staff.BF_IsDriver = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ }
+ else if (type.ToInt32() == 4)
+ {
+ m_OA_Staff.BF_IsDeliverManage = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ }
+ else if (type.ToInt32() == 5)
+ {
+ m_OA_Staff.BF_IsBaoxiaozhuguan = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ }
+ else if (type.ToInt32() == 6)
+ {
+ m_OA_Staff.BF_Isbaoxiaojingli = this.IsBusinessManager.SelectedValue.ToBoolean2();
+ }
+
+
+
+
+
+ if (bll_OA_StaffBLL.UpdateModel(m_OA_Staff))
+ JavaScript.MessageBox("鎿嶄綔鎴愬姛", this,true,true);
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鏇存柊澶辫触", this);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.designer.cs
new file mode 100644
index 0000000..588ac93
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/personnel/StaffQuanxianshezhi.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.personnel
+{
+
+
+ public partial class StaffQuanxianshezhi
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// types 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl types;
+
+ /// <summary>
+ /// IsBusinessManager 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.RadioButtonList IsBusinessManager;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
new file mode 100644
index 0000000..a2f0fd6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx
@@ -0,0 +1,231 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaoxiaoFukuanList.aspx.cs" Inherits="CY.WebForm.Pages.work.BaoxiaoFukuanList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎶ラ攢鎵瑰</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //鏄庣粏
+ function onView(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoDetail.aspx?keyid=" + keyid, Title: "鎶ラ攢鏄庣粏", Width: 620, Height: 600 });
+ }
+
+ //娣诲姞
+ function addModel(keyid) {
+ top.Dialog.open({ URL: "/Pages/financial/BaoxiaoFukuanEdit.aspx?keyid=" + keyid, Title: "鎶ラ攢浠樻", Width: 550, Height: 600 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoAdd.aspx?keyid=" + keyid, Title: "淇敼鎶ラ攢", Width: 550, Height: 600 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/work/BaoxiaoFukuanList.aspx?delete=" + keyid;
+ });
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+ window.location = "/Pages/work/BaoxiaoFukuanList.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td class="ali03">
+ 鐢宠鏃堕棿锛�
+ </td>
+ <td style="width: 215px">
+ <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 style="width: 215px">
+ <input id="txtPlanPeople" type="text" class=" w90px" runat="server" />
+ </td>
+ <td class="ali03">
+ 绉戠洰锛�
+ </td>
+ <td style="width: 215px">
+ <input id="TxtRewardContent" type="text" class=" w90px" runat="server" />
+ </td>
+ <td class="ali03">
+ 鎽樿锛�
+ </td>
+ <td style="width: 215px">
+ <input id="txtPlanContent" type="text" class=" w90px" runat="server" />
+ </td>
+
+ <td class="ali03">
+ 鎶ラ攢鐘舵�侊細
+ </td>
+ <td>
+ <select keepdefaultstyle="true" runat="server" id="selEvaluationStatus">
+ <option value="-1">鍏ㄩ儴</option>
+ <option value="1">宸蹭粯娆�</option>
+ <option value="2">鏈粯娆�</option>
+ </select>
+ </td>
+ <td>
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="box_tool_min ">
+ <div class="center">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+ <%-- <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>
+ <div>
+ <table class="tableStyle">
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+
+ <tr>
+ <th width="25">
+ </th>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th width="130" style="text-align: center">
+ 鐢宠鏃ユ湡
+ </th>
+ <th width="70" style="text-align: center">
+ 閮ㄩ棬
+ </th>
+ <th width="70" style="text-align: center">
+ 濮撳悕
+ </th>
+ <th width="70" style="text-align: center">
+ 绉戠洰
+ </th>
+ <th style="text-align: center">
+ 鎽樿
+ </th>
+ <th width="70" style="text-align: center">
+ 閲戦
+ </th>
+ <th width="250" style="text-align: center">
+ 鍙戠エ
+ </th>
+ <th width="250" style="text-align: center">
+ 闄勪欢
+ </th>
+ <th width="150" style="text-align: center">
+ 鎶ラ攢鐘舵��
+ </th>
+ <th width="250" style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("EvaluationStatus").ToString()=="1" )?"AlreadyReply":""%>' />
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanStartTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("DepartName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanPeople")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("RewardContent")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanContent")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanMoney", "{0:F2}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Fapiao")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Fujian")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("EvaluationStatusName")%>
+ </td>
+ <td class="Operate " style="text-align: center">
+ <span menu_member_case_id="case_PlanView" menu_member_case_name="鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="浠樻" onclick="addModel('<%#Eval("Keyid")%>')" class='<%#(Eval("EvaluationStatus").ToString()=="1" )?"AlreadyReply":""%>' >浠樻</span>
+
+ </td>
+ </tr>
+ </ItemTemplate>
+
+
+
+ </asp:Repeater>
+ <tr class="StatisticsMoney">
+ <td colspan="7" class="ali03">
+ 鍚堣锛�
+ </td>
+ <td colspan="5" class="ali01">
+ <span id="NowMoney" runat="server" ></span>
+ </td>
+ </tr>
+ </table>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.cs
new file mode 100644
index 0000000..7620d6a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.cs
@@ -0,0 +1,228 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //鎴戠殑璇风ず
+ public partial class BaoxiaoFukuanList : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_WorkPlanBll bll_OA_WorkPlanBll = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_DepartmentBll oA_DepartmentBll = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ //鍒濆鍖�
+ public BaoxiaoFukuanList()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_WorkPlanBll = new OA_WorkPlanBll();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ oA_StaffBLL = new OA_StaffBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ this.selEvaluationStatus.Value = "2";
+ BindList();
+ }
+ if (Request["delete"] != null)
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/work/BaoxiaoFukuanList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+ }
+
+ if (Request["deleteKeyIds"] != null)
+ {
+ List<int> deleteKeyIdList = new List<int>();
+ string deleteKeyIds = Request["deleteKeyIds"].ToString();
+ if (deleteKeyIds.Contains(","))
+ {
+ string[] keyIdArry = deleteKeyIds.Split(',');
+ foreach (string keyId in keyIdArry)
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(keyId.ToInt32());
+ if (model.Keyid != null && model != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ break;
+ }
+
+ }
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ }
+ else
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["deleteKeyIds"].ToInt32());
+ if (model.Keyid != null && model != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+
+ }
+ }
+
+ Response.Redirect("/Pages/work/BaoxiaoFukuanList.aspx");
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ DateTime? beginTime = null;
+ 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, Guid.Empty, 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), this.txtPlanPeople.Value.Trim(), -1, 1, this.selEvaluationStatus.Value.ToInt32(), null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
+ var oA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+
+ foreach (var oA_WorkPlan in oA_WorkPlans)
+ {
+ var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
+
+ var fapiaos = sss.Where(x => x.AttachmentType == 1).ToList();
+ var fujians = sss.Where(x => x.AttachmentType == 2).ToList();
+ if (fapiaos.Count > 0)
+ {
+ int i = 1;
+ oA_WorkPlan.Fapiao = "";
+ foreach (var oA_WorkPlan_Attachment in fapiaos)
+ {
+ oA_WorkPlan.Fapiao += "<a title=\"鏌ョ湅鍙戠エ\" target=\"view_window\" href=\""+ oA_WorkPlan_Attachment.PlanAttachment+ "\">鍙戠エ"+i+" </a> ";
+
+ i = i + 1;
+ }
+ }
+
+ if (fujians.Count > 0)
+ {
+ int i = 1;
+ oA_WorkPlan.Fujian = "";
+ foreach (var oA_WorkPlan_Attachment in fujians)
+ {
+ oA_WorkPlan.Fujian += "<a title=\"鏌ョ湅闄勪欢\" target=\"view_window\" href=\"" + oA_WorkPlan_Attachment.PlanAttachment + "\">闄勪欢" + i + " </a> ";
+
+ i = i + 1;
+ }
+ }
+
+ var oA_Department = oA_DepartmentBll.GetModelByKeyid(oA_WorkPlan.DepartId);
+ if (oA_Department != null)
+ {
+ oA_WorkPlan.DepartName = oA_Department.Name;
+ }
+ oA_WorkPlan.Nengfoushenpi = 0;
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
+ if (oA_WorkPlan.ApprovalStatus == 1 || oA_WorkPlan.ApprovalStatus == 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ else
+ {
+ if (!oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ else if(oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
+ if (oA_WorkPlan_Shenpis1.Count > 1)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+
+ var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
+ if (shenpicount > 0)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ }
+ else if (!oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (oA_WorkPlan_Shenpis.Count > 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ if (oA_WorkPlan_Shenpis.Count < 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ }
+ else if (oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
+
+
+ var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
+
+
+
+ if(oA_WorkPlan_Shenpis.Count != 2 && ((oA_WorkPlan_Shenpis1.Count > 1) || shenpicount > 0))
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+
+
+ }
+ }
+
+
+
+
+
+ }
+
+
+ this.NowMoney.InnerText = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
+ this.RepClientList.DataSource = oA_WorkPlans;
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.designer.cs
new file mode 100644
index 0000000..af675ed
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoFukuanList.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class BaoxiaoFukuanList
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtRegTimeStart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
+
+ /// <summary>
+ /// txtRegTimeEnd 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
+
+ /// <summary>
+ /// txtPlanPeople 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanPeople;
+
+ /// <summary>
+ /// TxtRewardContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText TxtRewardContent;
+
+ /// <summary>
+ /// txtPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanContent;
+
+ /// <summary>
+ /// selEvaluationStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selEvaluationStatus;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// NowMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowMoney;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx
new file mode 100644
index 0000000..996ef70
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx
@@ -0,0 +1,201 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaoxiaoReplyAdd.aspx.cs" Inherits="CY.WebForm.Pages.work.BaoxiaoReplyAdd" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎵瑰鎶ラ攢</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style type="text/css">
+ .w70px{ width:70px;}
+ .wx100px{ width:100px;}
+ fieldset{ padding:3px; margin:5px auto;}
+ </style>
+</head>
+<body>
+ <form id="form1" class="form2" runat="server">
+ <div>
+ <fieldset>
+ <legend>鎶ラ攢淇℃伅</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03" colspan="3" style="width:30%; ">
+ 閮ㄩ棬锛�
+ </td>
+ <td style="width:70%; ">
+ <span id="spanDepart" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03" colspan="3">
+ 濮撳悕锛�
+ </td>
+ <td>
+ <span id="spanPlanPeople" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 閲戦锛�
+ </td>
+ <td>
+ <span id="spanPlanMoney" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 绉戠洰锛�
+ </td>
+ <td>
+ <span id="spanSubject" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鎽樿锛�
+ </td>
+ <td>
+ <span id="spanPlanContent" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鍙戠エ锛�
+ </td>
+ <td>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅鍙戠エ" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ 鍙戠エ <%#Container.ItemIndex + 1 %>
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
+
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 闄勪欢锛�
+ </td>
+ <td>
+ <asp:Repeater ID="Repeater1" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅闄勪欢" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ 闄勪欢 <%#Container.ItemIndex + 1 %>
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鍊欒ˉ鍙戠エ锛�
+ </td>
+ <td>
+ <span id="spanHoubufapiaoStatus" runat="server"></span>
+ </td>
+ </tr>
+
+
+ </table>
+ </fieldset>
+
+ <fieldset>
+ <legend>鎵瑰淇℃伅</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+
+
+ <asp:Repeater ID="Repeater2" runat="server">
+
+ <HeaderTemplate>
+
+ <tr>
+
+ <th width="60" style="text-align: center">
+ 瀹℃壒浜�
+ </th>
+ <th width="130" style="text-align: center">
+ 瀹℃壒鏃堕棿
+ </th>
+ <th width="70" style="text-align: center">
+ 瀹℃壒缁撴灉
+ </th>
+ <th style="text-align: center">
+ 瀹℃壒鍥炲
+ </th>
+
+ </tr>
+ </HeaderTemplate>
+
+ <ItemTemplate>
+ <tr>
+
+ <td>
+ <%#Eval("ApprovalStaffName")%>
+ </td>
+
+ <td>
+ <%#Eval("ApprovalTime", "{0:yyyy-MM-dd HH:mm:ss}")%>
+ </td>
+ <td>
+ <%#Eval("ApprovalStatusName")%>
+ </td>
+ <td>
+ <%#Eval("ApprovalContent")%>
+ </td>
+
+ </tr>
+
+
+ </ItemTemplate>
+ </asp:Repeater>
+
+
+
+
+ </table>
+ </fieldset>
+
+ <fieldset>
+ <legend>鎵瑰鎿嶄綔</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03 w70px">
+ 瀹℃壒缁撴灉锛�
+ </td>
+ <td colspan="3">
+ <select keepDefaultStyle="true" runat="server" id="selApprovalStatus" class="wx100px Sreq" msg="璇烽�夋嫨瀹℃壒缁撴灉">
+ <option value="">璇烽�夋嫨</option>
+ <option value="1" selected="selected" >鎵瑰噯</option>
+ <option value="2">涓嶆壒鍑�</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 瀹℃壒鍥炲锛�
+ </td>
+ <td colspan="3">
+ <textarea id="txtApprovalContent" runat="server" style="width: 460px; height: 40px;" ></textarea>
+ </td>
+ </tr>
+ <td colspan="4" style="text-align: center;">
+ <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
+ </td>
+ </table>
+ </fieldset>
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
new file mode 100644
index 0000000..0530a34
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.cs
@@ -0,0 +1,257 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using System.Data.SqlClient;
+using CY.Model;
+using CY.BLL;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.EC;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //宸ヤ綔鑰冭瘎
+ public partial class BaoxiaoReplyAdd : BasePage
+ {
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null;
+ EC_OrderBLL _eC_OrderBLL = null;
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ EC_MemberBasicBLL _eC_MemberBasicBLL = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ OA_DepartmentBll oA_DepartmentBll = null;
+ public string planDataType = "";
+ public BaoxiaoReplyAdd()
+ {
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ _eC_OrderBLL = new EC_OrderBLL();
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ _eC_MemberBasicBLL = new EC_MemberBasicBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ oA_StaffBLL = new OA_StaffBLL();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_WorkPlan != null)
+ {
+ planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString();
+ var department = oA_DepartmentBll.GetModelByKeyid(m_OA_WorkPlan.DepartId);
+ if (department != null)
+ {
+ this.spanDepart.InnerText = department.Name;
+ }
+ this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
+
+
+ this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
+
+ this.spanSubject.InnerText = m_OA_WorkPlan.RewardContent.ToString();
+ this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
+ this.spanHoubufapiaoStatus.InnerText = m_OA_WorkPlan.HoubufapiaoStatusName;
+ var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
+
+ this.RepClientList.DataSource = sss.Where(x => x.AttachmentType == 1);
+ this.RepClientList.DataBind();
+
+ this.Repeater1.DataSource = sss.Where(x => x.AttachmentType == 2);
+ this.Repeater1.DataBind();
+
+
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
+ foreach (var a_WorkPlan_Shenpi in oA_WorkPlan_Shenpis)
+ {
+ var oA_Staff = oA_StaffBLL.GetModelByMemberId(a_WorkPlan_Shenpi.ApprovalStaffId);
+ if (oA_Staff != null)
+ {
+ a_WorkPlan_Shenpi.ApprovalStaffName = oA_Staff.Name;
+ }
+ }
+
+ this.Repeater2.DataSource = oA_WorkPlan_Shenpis.OrderBy(x => x.Keyid);
+ this.Repeater2.DataBind();
+
+
+ }
+ }
+
+ //琛ㄥ崟鎻愪氦
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+ try
+ {
+ string Messagezhuguan = null;
+ var oA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+ if (!oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ JavaScript.MessageBox("浣犳病鏈夊鎵规潈闄�", this);
+ return;
+ }
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_WorkPlan.ApprovalStatus == 1 || m_OA_WorkPlan.ApprovalStatus == 2)
+ {
+ JavaScript.MessageBox("璇ユ姤閿�宸茬粡瀹℃壒瀹屾垚", this);
+ return;
+ }
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value).ToList();
+
+
+ if (oA_Staff.BF_IsBaoxiaozhuguan)
+ {
+ var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
+ if (oA_WorkPlan_Shenpis1.Count > 1)
+ {
+ Messagezhuguan = "璇ユ祦绋嬪凡缁忎笉鍦ㄤ富绠″鎵规楠わ紒";
+ }
+
+ var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
+ if (shenpicount > 0)
+ {
+ Messagezhuguan = "浣犲凡缁忓鎵硅繃璇ユ祦绋嬶紒";
+ }
+ }
+ if (oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (!string.IsNullOrEmpty(Messagezhuguan))
+ {
+
+ JavaScript.MessageBox(Messagezhuguan, this);
+ return;
+ }
+ }
+
+ string Messagejingli = null;
+ if (oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (oA_WorkPlan_Shenpis.Count > 2)
+ {
+ Messagejingli = "璇ユ祦绋嬪凡缁忓鎵瑰畬鎴愶紒";
+ }
+ if (oA_WorkPlan_Shenpis.Count < 2)
+ {
+ Messagejingli = "娌″埌缁忕悊瀹℃壒姝ラ锛�";
+ }
+ }
+ if (!oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (!string.IsNullOrEmpty(Messagejingli))
+ {
+
+ JavaScript.MessageBox(Messagejingli, this);
+ return;
+ }
+ }
+
+ if (oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (!string.IsNullOrEmpty(Messagezhuguan) && !string.IsNullOrEmpty(Messagejingli))
+ {
+
+ JavaScript.MessageBox(Messagezhuguan + Messagejingli, this);
+ return;
+ }
+ }
+
+
+
+
+ DateTime nowTime = DateTime.Now;
+ var res = false;
+ OA_WorkPlan_shenpi oA_WorkPlan_Shenpi = new OA_WorkPlan_shenpi();
+ oA_WorkPlan_Shenpi.OA_WorkPlanId = Request["keyid"].ToInt32();
+ oA_WorkPlan_Shenpi.ApprovalStaffId = CurrentUser.TrueMemberId;
+ oA_WorkPlan_Shenpi.ApprovalStatus = this.selApprovalStatus.Value.ToInt32();
+ oA_WorkPlan_Shenpi.ApprovalTime = nowTime;
+ oA_WorkPlan_Shenpi.ApprovalContent = this.txtApprovalContent.Value.Trim();
+ oA_WorkPlan_Shenpi.CreateTime = nowTime;
+ oA_WorkPlan_Shenpi.Operator = CurrentUser.TrueName;
+ if (oA_WorkPlan_Shenpis.Count == 2)
+ {
+ oA_WorkPlan_Shenpi.Buzhou = 2;
+ }
+ else
+ {
+ oA_WorkPlan_Shenpi.Buzhou = 1;
+ }
+ res = oA_WorkPlan_ShenpiBLL.InsertModel(oA_WorkPlan_Shenpi);
+
+
+ if (oA_WorkPlan_Shenpis.Count == 2 || this.selApprovalStatus.Value == "2")
+ {
+
+ m_OA_WorkPlan.ApprovalContent = this.txtApprovalContent.Value.Trim();
+ m_OA_WorkPlan.ApprovalStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.ApprovalStaffName = CurrentUser.TrueName;
+ m_OA_WorkPlan.ApprovalStatus = this.selApprovalStatus.Value.ToInt32();
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 2;
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+ }
+
+
+
+
+
+ if (Request["keyid"].ToInt32() > 0)
+ {
+ if (res)
+ {
+ scope.Complete();
+ JavaScript.MessageBox("瀹℃壒鎴愬姛", this, true, true);
+ }
+
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ else
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.designer.cs
new file mode 100644
index 0000000..b3febfb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyAdd.aspx.designer.cs
@@ -0,0 +1,152 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class BaoxiaoReplyAdd
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanDepart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDepart;
+
+ /// <summary>
+ /// spanPlanPeople 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
+
+ /// <summary>
+ /// spanPlanMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanMoney;
+
+ /// <summary>
+ /// spanSubject 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSubject;
+
+ /// <summary>
+ /// spanPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// Repeater1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater Repeater1;
+
+ /// <summary>
+ /// spanHoubufapiaoStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanHoubufapiaoStatus;
+
+ /// <summary>
+ /// Repeater2 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater Repeater2;
+
+ /// <summary>
+ /// selApprovalStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
+
+ /// <summary>
+ /// txtApprovalContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtApprovalContent;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
new file mode 100644
index 0000000..39581ab
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx
@@ -0,0 +1,232 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BaoxiaoReplyList.aspx.cs" Inherits="CY.WebForm.Pages.work.BaoxiaoReplyList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎶ラ攢鎵瑰</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //鏄庣粏
+ function onView(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoDetail.aspx?keyid=" + keyid, Title: "鎶ラ攢鏄庣粏", Width: 620, Height: 600 });
+ }
+
+ //娣诲姞
+ function addModel(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/BaoxiaoReplyAdd.aspx?keyid=" + keyid, Title: "鎶ラ攢鎵瑰", Width: 550, Height: 600 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoAdd.aspx?keyid=" + keyid, Title: "淇敼鎶ラ攢", Width: 550, Height: 600 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/work/BaoxiaoReplyList.aspx?delete=" + keyid;
+ });
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+ window.location = "/Pages/work/BaoxiaoReplyList.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td class="ali03">
+ 鐢宠鏃堕棿锛�
+ </td>
+ <td style="width: 215px">
+ <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 style="width: 215px">
+ <input id="txtPlanPeople" type="text" class=" w90px" runat="server" />
+ </td>
+ <td class="ali03">
+ 绉戠洰锛�
+ </td>
+ <td style="width: 215px">
+ <input id="TxtRewardContent" type="text" class=" w90px" runat="server" />
+ </td>
+ <td class="ali03">
+ 鎽樿锛�
+ </td>
+ <td style="width: 215px">
+ <input id="txtPlanContent" type="text" class=" w90px" runat="server" />
+ </td>
+
+ <td class="ali03">
+ 鎵瑰缁撴灉锛�
+ </td>
+ <td>
+ <select keepdefaultstyle="true" runat="server" id="selApprovalStatus">
+ <option value="-1">鍏ㄩ儴</option>
+ <option value="0">鏈壒澶�</option>
+ <option value="1">鎵瑰噯</option>
+ <option value="2">涓嶆壒鍑�</option>
+ </select>
+ </td>
+ <td>
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="box_tool_min ">
+ <div class="center">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+ <%-- <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
+ <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>
+ <div>
+ <table class="tableStyle">
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+
+ <tr>
+ <th width="25">
+ </th>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th width="130" style="text-align: center">
+ 鐢宠鏃ユ湡
+ </th>
+ <th width="70" style="text-align: center">
+ 閮ㄩ棬
+ </th>
+ <th width="70" style="text-align: center">
+ 濮撳悕
+ </th>
+ <th width="70" style="text-align: center">
+ 绉戠洰
+ </th>
+ <th style="text-align: center">
+ 鎽樿
+ </th>
+ <th width="70" style="text-align: center">
+ 閲戦
+ </th>
+ <th width="250" style="text-align: center">
+ 鍙戠エ
+ </th>
+ <th width="250" style="text-align: center">
+ 闄勪欢
+ </th>
+ <th width="150" style="text-align: center">
+ 鎶ラ攢鐘舵��
+ </th>
+ <th width="250" style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("Nengfoushenpi").ToString()=="1" )?"AlreadyReply":""%>' />
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanStartTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("DepartName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanPeople")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("RewardContent")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanContent")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanMoney", "{0:F2}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Fapiao")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Fujian")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("ApprovalStatusName")%>
+ </td>
+ <td class="Operate " style="text-align: center">
+ <span menu_member_case_id="case_PlanView" menu_member_case_name="鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="鎵瑰" onclick="addModel('<%#Eval("Keyid")%>')" class='<%#(Eval("Nengfoushenpi").ToString()=="1" )?"AlreadyReply":""%>'>鎵瑰</span>
+
+ </td>
+ </tr>
+ </ItemTemplate>
+
+
+
+ </asp:Repeater>
+ <tr class="StatisticsMoney">
+ <td colspan="7" class="ali03">
+ 鍚堣锛�
+ </td>
+ <td colspan="5" class="ali01">
+ <span id="NowMoney" runat="server" ></span>
+ </td>
+ </tr>
+ </table>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
new file mode 100644
index 0000000..6a0e9d9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.cs
@@ -0,0 +1,228 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //鎴戠殑璇风ず
+ public partial class BaoxiaoReplyList : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_WorkPlanBll bll_OA_WorkPlanBll = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_DepartmentBll oA_DepartmentBll = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ //鍒濆鍖�
+ public BaoxiaoReplyList()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_WorkPlanBll = new OA_WorkPlanBll();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ oA_StaffBLL = new OA_StaffBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ this.selApprovalStatus.Value = "0";
+ BindList();
+ }
+ if (Request["delete"] != null)
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["delete"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/work/BaoxiaoReplyList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+ }
+
+ if (Request["deleteKeyIds"] != null)
+ {
+ List<int> deleteKeyIdList = new List<int>();
+ string deleteKeyIds = Request["deleteKeyIds"].ToString();
+ if (deleteKeyIds.Contains(","))
+ {
+ string[] keyIdArry = deleteKeyIds.Split(',');
+ foreach (string keyId in keyIdArry)
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(keyId.ToInt32());
+ if (model.Keyid != null && model != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ break;
+ }
+
+ }
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ }
+ else
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["deleteKeyIds"].ToInt32());
+ if (model.Keyid != null && model != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+
+ }
+ }
+
+ Response.Redirect("/Pages/work/BaoxiaoReplyList.aspx");
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ DateTime? beginTime = null;
+ 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, Guid.Empty, 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), this.txtPlanPeople.Value.Trim(), -1, this.selApprovalStatus.Value.ToInt32(), null, null,this.TxtRewardContent.Value.Trim(), this.txtPlanContent.Value.Trim());
+ var oA_Staff = oA_StaffBLL.GetModelByMemberId(CurrentUser.TrueMemberId);
+
+ foreach (var oA_WorkPlan in oA_WorkPlans)
+ {
+ var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
+
+ var fapiaos = sss.Where(x => x.AttachmentType == 1).ToList();
+ var fujians = sss.Where(x => x.AttachmentType == 2).ToList();
+ if (fapiaos.Count > 0)
+ {
+ int i = 1;
+ oA_WorkPlan.Fapiao = "";
+ foreach (var oA_WorkPlan_Attachment in fapiaos)
+ {
+ oA_WorkPlan.Fapiao += "<a title=\"鏌ョ湅鍙戠エ\" target=\"view_window\" href=\""+ oA_WorkPlan_Attachment.PlanAttachment+ "\">鍙戠エ"+i+" </a> ";
+
+ i = i + 1;
+ }
+ }
+
+ if (fujians.Count > 0)
+ {
+ int i = 1;
+ oA_WorkPlan.Fujian = "";
+ foreach (var oA_WorkPlan_Attachment in fujians)
+ {
+ oA_WorkPlan.Fujian += "<a title=\"鏌ョ湅闄勪欢\" target=\"view_window\" href=\"" + oA_WorkPlan_Attachment.PlanAttachment + "\">闄勪欢" + i + " </a> ";
+
+ i = i + 1;
+ }
+ }
+
+ var oA_Department = oA_DepartmentBll.GetModelByKeyid(oA_WorkPlan.DepartId);
+ if (oA_Department != null)
+ {
+ oA_WorkPlan.DepartName = oA_Department.Name;
+ }
+ oA_WorkPlan.Nengfoushenpi = 0;
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value).ToList();
+ if (oA_WorkPlan.ApprovalStatus == 1 || oA_WorkPlan.ApprovalStatus == 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ else
+ {
+ if (!oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ else if(oA_Staff.BF_IsBaoxiaozhuguan && !oA_Staff.BF_Isbaoxiaojingli)
+ {
+ var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
+ if (oA_WorkPlan_Shenpis1.Count > 1)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+
+ var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
+ if (shenpicount > 0)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ }
+ else if (!oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ if (oA_WorkPlan_Shenpis.Count > 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ if (oA_WorkPlan_Shenpis.Count < 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ }
+ else if (oA_Staff.BF_IsBaoxiaozhuguan && oA_Staff.BF_Isbaoxiaojingli)
+ {
+ var oA_WorkPlan_Shenpis1 = oA_WorkPlan_Shenpis.Where(x => x.Buzhou == 1).ToList();
+
+
+ var shenpicount = oA_WorkPlan_Shenpis1.Count(x => x.ApprovalStaffId == CurrentUser.TrueMemberId);
+
+
+
+ if(oA_WorkPlan_Shenpis.Count != 2 && ((oA_WorkPlan_Shenpis1.Count > 1) || shenpicount > 0))
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+
+
+ }
+ }
+
+
+
+
+
+ }
+
+
+ this.NowMoney.InnerText = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
+ this.RepClientList.DataSource = oA_WorkPlans;
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs
new file mode 100644
index 0000000..cb2da52
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/BaoxiaoReplyList.aspx.designer.cs
@@ -0,0 +1,134 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class BaoxiaoReplyList
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtRegTimeStart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
+
+ /// <summary>
+ /// txtRegTimeEnd 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
+
+ /// <summary>
+ /// txtPlanPeople 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanPeople;
+
+ /// <summary>
+ /// TxtRewardContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText TxtRewardContent;
+
+ /// <summary>
+ /// txtPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanContent;
+
+ /// <summary>
+ /// selApprovalStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// NowMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowMoney;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
new file mode 100644
index 0000000..2ef5988
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx
@@ -0,0 +1,280 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MyBaoxiaoAdd.aspx.cs" Inherits="CY.WebForm.Pages.work.MyBaoxiaoAdd" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鏂板璇风ず</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+
+ //鏌ョ湅
+ function checkSelFile(obj) {
+ if (obj == 1) {
+ 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().text('鍙戠エ');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg('涓婁紶澶辫触');
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+ }
+ if (obj == 2) {
+ var oFile = document.getElementById('filesel');
+ 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) {
+
+ $(".AddTabfujian").last().after($(".AddTabfujian").last().clone(true));
+ $(".AddTabfujian").last().show();
+ $("input[name='HideKeyidFujian']").last().val("");
+ $("input[name='HideAttachmentFujian']").last().val(response.data);
+ $('a[name="HrefAttachmentFujian"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFujian"]').last().text('闄勪欢');
+ 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>
+ <form id="form1" class="form2" runat="server">
+ <div>
+ <table class="tableStyle" style="margin: 10px auto;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03">
+ 閮ㄩ棬锛�
+ </td>
+ <td>
+ <input id="txtDepart" type="text" runat="server" style=" width:180px;" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 濮撳悕锛�
+ </td>
+ <td>
+ <input id="txtStaff" type="text" runat="server" style=" width:180px;" readonly="readonly" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 閲戦(鍏�)锛�
+ </td>
+ <td>
+ <input id="txtPlanMoney" type="text" class="float req" runat="server" style=" width:180px;" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03 ">
+ 绉戠洰锛�
+ </td>
+ <td>
+ <select id="selSubject" class="Sreq" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О" onchange="ChangeThisSubject(this);" >
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 鎽樿锛�
+ </td>
+ <td >
+ <textarea id="txtPlanContent" runat="server" style="width: 390px; height: 50px;" class="req" msg="璇疯緭鍏ユ憳瑕�"></textarea>
+ </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(1);" />
+ </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>
+
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+ <tr class="AddTab" >
+ <td class="ali03 w100px">
+
+ </td>
+ <td>
+ <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")%>">
+ 鍙戠エ <%#Container.ItemIndex + 1 %>
+ </a>
+ <a name="shanchuAttachmentFapiao" href="#" onclick="deletefujian(this);" >
+ X
+ </a>
+ </td>
+ </tr>
+ </ItemTemplate>
+ </asp:Repeater>
+
+ <tr>
+ <td class="ali03 w100px">
+ 涓婁紶闄勪欢锛�
+ </td>
+ <td>
+ <input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" runat="server" text="璇烽�夋嫨鏂囦欢" />
+ <input type="button" value="涓婁紶闄勪欢" onclick="checkSelFile(2);" />
+ </td>
+
+ </tr>
+ <tr class="AddTabfujian" style="display:none;" >
+ <td class="ali03 w100px">
+
+ </td>
+ <td>
+ <input type="hidden" name="HideKeyidFujian" value="0" />
+ <input type="hidden" name="HideAttachmentFujian" value="" />
+ <a title="鏌ョ湅闄勪欢" name="HrefAttachmentFujian" target="view_window" href="0">
+ 闄勪欢
+ </a>
+ <a name="shanchuAttachmentFujian" href="#" onclick="deletefujian(this);" >
+ X
+ </a>
+ </td>
+ </tr>
+
+ <asp:Repeater ID="Repeater1" runat="server">
+ <ItemTemplate>
+ <tr class="AddTabfujian" >
+ <td class="ali03 w100px">
+
+ </td>
+ <td>
+ <input type="hidden" name="HideKeyidFujian" value="<%#Eval("Keyid")%>" />
+ <input type="hidden" name="HideAttachmentFujian" value="<%#Eval("PlanAttachment")%>" />
+ <a title="鏌ョ湅闄勪欢" name="HrefAttachmentFujian" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ 闄勪欢 <%#Container.ItemIndex + 1 %>
+ </a>
+ <a name="shanchuAttachmentFujian" href="#" onclick="deletefujian(this);" >
+ X
+ </a>
+ </td>
+ </tr>
+ </ItemTemplate>
+ </asp:Repeater>
+
+ <tr>
+ <td class="ali03 w100px">
+ 鍊欒ˉ鍙戠エ锛�
+ </td>
+ <td>
+ <select id="selHoubufapiaoStatus" runat="server" keepdefaultstyle="true" style=" width:100px;">
+ <option value="1">鏈夊彂绁�</option>
+ <option value="2">鍊欒ˉ鍙戠エ</option>
+ <option value="3">鏃犲彂绁�</option>
+
+ </select>
+ </td>
+
+ </tr>
+
+
+ <tr>
+ <td colspan="2" style="text-align: center;">
+ <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" Text="鎻愪氦" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs
new file mode 100644
index 0000000..7fef456
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.cs
@@ -0,0 +1,347 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using System.Data.SqlClient;
+using CY.Model;
+using CY.BLL;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.EC;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+using CY.BLL.OA;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //鏂板璇风ず
+ public partial class MyBaoxiaoAdd : BasePage
+ {
+
+ OA_DepartmentBll departmentBll = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
+ OA_SuppliersBLL _OA_SuppliersBLL = null;
+ OA_SubjectSetBLL _OA_SubjectSetBLL = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ public string reado = "";
+ public MyBaoxiaoAdd()
+ {
+ departmentBll = new OA_DepartmentBll();
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ oA_StaffBLL = new OA_StaffBLL();
+ bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
+ _OA_SuppliersBLL = new OA_SuppliersBLL();
+ _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+
+ this.txtStaff.Value = CurrentUser.TrueName;
+ var staff = oA_StaffBLL.GetModelByKeyid(CurrentUser.StaffId);
+ if (staff != null)
+ {
+ this.txtDepart.Value = staff.DepartmentName;
+ }
+ //绉戠洰鍚嶇О
+ this.selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+ this.selSubject.DataBind();
+ this.selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ if (Request["keyid"].ToInt32() > 0)
+ {
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value).ToList();
+ if (oA_WorkPlan_Shenpis.Count > 0)
+ {
+ txtPlanMoney.Disabled = true;
+ selSubject.Disabled = true;
+ txtPlanContent.Disabled = true;
+ selHoubufapiaoStatus.Disabled = true;
+
+ }
+
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_WorkPlan != null)
+ {
+
+ this.txtPlanMoney.Value = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
+ this.selHoubufapiaoStatus.Value = m_OA_WorkPlan.HoubufapiaoStatus.ToString();
+ this.selSubject.Value = m_OA_WorkPlan.RewardResult;
+ this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent.ToString();
+ }
+
+ var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
+
+ this.RepClientList.DataSource = sss.Where(x => x.AttachmentType == 1);
+ this.RepClientList.DataBind();
+
+ this.Repeater1.DataSource = sss.Where(x => x.AttachmentType == 2);
+ this.Repeater1.DataBind();
+ }
+
+
+
+ }
+
+ //琛ㄥ崟鎻愪氦
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+ if(HideKeyidFapiao.Length<=1 && this.selHoubufapiaoStatus.Value == "1")
+ {
+ JavaScript.MessageBox("閫夋嫨鏈夊彂绁ㄥ繀椤讳笂浼犲彂绁�", this);
+ return;
+ }
+
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+ try
+ {
+
+
+ DateTime nowTime = DateTime.Now;
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_WorkPlan == null)
+ {
+ 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 = 2;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardType = 1;
+
+
+ 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.RewardResult = this.selSubject.Value;
+ var a_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(this.selSubject.Value.ToInt32());
+ if (a_SubjectSet != null)
+ {
+ m_OA_WorkPlan.RewardContent = a_SubjectSet.SubjectName;
+ }
+
+ m_OA_WorkPlan.PlanComplany = "";
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+ m_OA_WorkPlan.HoubufapiaoStatus = this.selHoubufapiaoStatus.Value.ToInt32();
+
+
+ m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value.Trim();
+ m_OA_WorkPlan.PlanDataType = 17;
+ m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.Trim().ToDecimal2() ?? 0;
+ m_OA_WorkPlan.PlanRemark = "";
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = "";
+
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+
+ if (Request["keyid"].ToInt32() > 0)
+ {
+ bool res = true;
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value).ToList();
+ if (oA_WorkPlan_Shenpis.Count == 0)
+ {
+ res = oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan);
+ }
+
+ if (res)
+ {
+ //var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+ var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+
+
+ var HideKeyidFujian = Request["HideKeyidFujian"].Split(',');
+ var HideAttachmentFujian = Request["HideAttachmentFujian"].Split(',');
+ //闇�瑕佸垹闄ょ殑闄勪欢
+ var oA_WorkPlan_Attachments = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(m_OA_WorkPlan.Keyid.Value);
+ 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);
+ }
+ }
+ for (int i = 0; i < HideKeyidFujian.Length; i++)
+ {
+ if (!string.IsNullOrEmpty(HideKeyidFujian[i]) && HideKeyidFujian[i].ToInt32() != 0)
+ {
+ HideKeyidFujianid.Add(HideKeyidFujian[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 = 1;
+ 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;
+ }
+ }
+
+
+ for (int i = 0; i < HideKeyidFujian.Length; i++)
+ {
+ if (string.IsNullOrEmpty(HideKeyidFujian[i]))
+ {
+ var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+ a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+ a_WorkPlan_Attachment.AttachmentType = 2;
+ a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFujian[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
+ {
+ var aaaa = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
+ m_OA_WorkPlan.Keyid = aaaa;
+ if (aaaa > 0)
+ {
+ //var HideKeyidFapiao = Request["HideKeyidFapiao"].Split(',');
+ var HideAttachmentFapiao = Request["HideAttachmentFapiao"].Split(',');
+
+
+ var HideKeyidFujian = Request["HideKeyidFujian"].Split(',');
+ var HideAttachmentFujian = Request["HideAttachmentFujian"].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 = 1;
+ 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;
+ }
+ }
+
+
+ for (int i = 0; i < HideKeyidFujian.Length; i++)
+ {
+ if (string.IsNullOrEmpty(HideKeyidFujian[i]))
+ {
+ var a_WorkPlan_Attachment = new OA_WorkPlan_attachment();
+ a_WorkPlan_Attachment.OA_WorkPlanId = m_OA_WorkPlan.Keyid;
+ a_WorkPlan_Attachment.AttachmentType = 2;
+ a_WorkPlan_Attachment.PlanAttachment = HideAttachmentFujian[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);
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs
new file mode 100644
index 0000000..9e105fa
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoAdd.aspx.designer.cs
@@ -0,0 +1,143 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyBaoxiaoAdd
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtDepart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDepart;
+
+ /// <summary>
+ /// txtStaff 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtStaff;
+
+ /// <summary>
+ /// txtPlanMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanMoney;
+
+ /// <summary>
+ /// selSubject 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
+
+ /// <summary>
+ /// txtPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanContent;
+
+ /// <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>
+ /// filesel 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputFile filesel;
+
+ /// <summary>
+ /// Repeater1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater Repeater1;
+
+ /// <summary>
+ /// selHoubufapiaoStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selHoubufapiaoStatus;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx
new file mode 100644
index 0000000..c13b6cf
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx
@@ -0,0 +1,168 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MyBaoxiaoDetail.aspx.cs" Inherits="CY.WebForm.Pages.work.MyBaoxiaoDetail" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎶ラ攢鏄庣粏</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style type="text/css">
+ .w70px { width: 70px; }
+ fieldset { padding: 3px; margin: 5px auto; }
+ </style>
+</head>
+<body>
+ <form id="form1" class="form2" runat="server">
+ <div>
+ <fieldset>
+ <legend>鎶ラ攢淇℃伅</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03" colspan="3" style="width:30%; ">
+ 閮ㄩ棬锛�
+ </td>
+ <td style="width:70%; ">
+ <span id="spanDepart" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03" colspan="3">
+ 濮撳悕锛�
+ </td>
+ <td>
+ <span id="spanPlanPeople" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 閲戦锛�
+ </td>
+ <td>
+ <span id="spanPlanMoney" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 绉戠洰锛�
+ </td>
+ <td>
+ <span id="spanSubject" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鎽樿锛�
+ </td>
+ <td>
+ <span id="spanPlanContent" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鍙戠エ锛�
+ </td>
+ <td>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅鍙戠エ" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ 鍙戠エ <%#Container.ItemIndex + 1 %>
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
+
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 闄勪欢锛�
+ </td>
+ <td>
+ <asp:Repeater ID="Repeater1" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅闄勪欢" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ 闄勪欢 <%#Container.ItemIndex + 1 %>
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鍊欒ˉ鍙戠エ锛�
+ </td>
+ <td>
+ <span id="spanHoubufapiaoStatus" runat="server"></span>
+ </td>
+ </tr>
+
+
+ </table>
+ </fieldset>
+ <fieldset>
+ <legend>鎵瑰淇℃伅</legend>
+ <table class="tableStyle" style="margin: 0px auto;" cellpadding="0" cellspacing="0">
+
+
+ <asp:Repeater ID="Repeater2" runat="server">
+
+ <HeaderTemplate>
+
+ <tr>
+
+ <th width="60" style="text-align: center">
+ 瀹℃壒浜�
+ </th>
+ <th width="130" style="text-align: center">
+ 瀹℃壒鏃堕棿
+ </th>
+ <th width="70" style="text-align: center">
+ 瀹℃壒缁撴灉
+ </th>
+ <th style="text-align: center">
+ 瀹℃壒鍥炲
+ </th>
+
+ </tr>
+ </HeaderTemplate>
+
+ <ItemTemplate>
+ <tr>
+
+ <td>
+ <%#Eval("ApprovalStaffName")%>
+ </td>
+
+ <td>
+ <%#Eval("ApprovalTime", "{0:yyyy-MM-dd HH:mm:ss}")%>
+ </td>
+ <td>
+ <%#Eval("ApprovalStatusName")%>
+ </td>
+ <td>
+ <%#Eval("ApprovalContent")%>
+ </td>
+
+ </tr>
+
+
+ </ItemTemplate>
+ </asp:Repeater>
+
+
+
+
+ </table>
+ </fieldset>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.cs
new file mode 100644
index 0000000..d7aa3eb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.cs
@@ -0,0 +1,93 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using System.Data.SqlClient;
+using CY.Model;
+using CY.BLL;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.EC;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //璇风ず鏄庣粏
+ public partial class MyBaoxiaoDetail : BasePage
+ {
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ public string planDataType = "";
+ OA_DepartmentBll oA_DepartmentBll = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ public MyBaoxiaoDetail()
+ {
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ oA_DepartmentBll = new OA_DepartmentBll();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ oA_StaffBLL = new OA_StaffBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_WorkPlan != null)
+ {
+ planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString();
+ var department = oA_DepartmentBll.GetModelByKeyid(m_OA_WorkPlan.DepartId);
+ if (department != null)
+ {
+ this.spanDepart.InnerText = department.Name;
+ }
+ this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
+
+
+ this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00");
+
+ this.spanSubject.InnerText = m_OA_WorkPlan.RewardContent.ToString();
+ this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
+ this.spanHoubufapiaoStatus.InnerText = m_OA_WorkPlan.HoubufapiaoStatusName ;
+ var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
+
+ this.RepClientList.DataSource = sss.Where(x => x.AttachmentType == 1);
+ this.RepClientList.DataBind();
+
+ this.Repeater1.DataSource = sss.Where(x => x.AttachmentType == 2);
+ this.Repeater1.DataBind();
+
+
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["keyid"].ToInt32().Value);
+ foreach(var a_WorkPlan_Shenpi in oA_WorkPlan_Shenpis)
+ {
+ var oA_Staff = oA_StaffBLL.GetModelByMemberId(a_WorkPlan_Shenpi.ApprovalStaffId);
+ if (oA_Staff != null)
+ {
+ a_WorkPlan_Shenpi.ApprovalStaffName = oA_Staff.Name;
+ }
+ }
+
+ this.Repeater2.DataSource = oA_WorkPlan_Shenpis.OrderBy(x=>x.Keyid);
+ this.Repeater2.DataBind();
+
+
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.designer.cs
new file mode 100644
index 0000000..a1608a7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoDetail.aspx.designer.cs
@@ -0,0 +1,125 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyBaoxiaoDetail
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanDepart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDepart;
+
+ /// <summary>
+ /// spanPlanPeople 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
+
+ /// <summary>
+ /// spanPlanMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanMoney;
+
+ /// <summary>
+ /// spanSubject 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSubject;
+
+ /// <summary>
+ /// spanPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// Repeater1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater Repeater1;
+
+ /// <summary>
+ /// spanHoubufapiaoStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanHoubufapiaoStatus;
+
+ /// <summary>
+ /// Repeater2 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater Repeater2;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
new file mode 100644
index 0000000..93bb4b7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx
@@ -0,0 +1,214 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MyBaoxiaoList.aspx.cs" Inherits="CY.WebForm.Pages.work.MyBaoxiaoList" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎴戠殑鎶ラ攢</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+ //鏄庣粏
+ function onView(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoDetail.aspx?keyid=" + keyid, Title: "鎶ラ攢鏄庣粏", Width: 620, Height: 600 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoAdd.aspx", Title: "鏂板鎶ラ攢", Width: 550, Height: 600 });
+ }
+
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyBaoxiaoAdd.aspx?keyid=" + keyid, Title: "淇敼鎶ラ攢", Width: 550, Height: 600 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁板綍鍚楋紵", function () {
+ window.location = "/Pages/work/MyBaoxiaoList.aspx?delete=" + keyid;
+ });
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ top.Dialog.alert("璇烽�夋嫨瑕佸垹闄ょ殑璁板綍", function () {
+ });
+ return;
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ top.Dialog.confirm("纭畾瑕佸垹闄ゆ墍閫夎褰曞悧锛�", function () {
+ window.location = "/Pages/work/MyBaoxiaoList.aspx?deleteKeyIds=" + deleteKeyIds;
+ });
+ }
+ }
+ $(function () {
+ $(".AlreadyReply").remove();
+ });
+ </script>
+ <style type="text/css">
+ .AlreadyReply { display: none; }
+ </style>
+</head>
+<body>
+ <form id="form1" runat="server">
+ <div id="scrollContent">
+ <div class="box1" paneltitle="鍔熻兘闈㈡澘" roller="false">
+ <table class="TableNewStyle">
+ <tr>
+ <td class="ali03">
+ 鐢宠鏃堕棿锛�
+ </td>
+ <td style="width: 215px">
+ <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 style="width: 215px">
+ <input id="TxtRewardContent" type="text" class=" w90px" runat="server" />
+ </td>
+ <td class="ali03">
+ 鎽樿锛�
+ </td>
+ <td style="width: 215px">
+ <input id="txtPlanContent" type="text" class=" w90px" runat="server" />
+ </td>
+
+ <td class="ali03">
+ 鎵瑰缁撴灉锛�
+ </td>
+ <td>
+ <select keepdefaultstyle="true" runat="server" id="selApprovalStatus">
+ <option value="-1">鍏ㄩ儴</option>
+ <option value="0">鏈壒澶�</option>
+ <option value="1">鎵瑰噯</option>
+ <option value="2">涓嶆壒鍑�</option>
+ </select>
+ </td>
+ <td>
+ <asp:Button ID="btn_Submit" Text="鏌ヨ" runat="server" OnClick="btn_Search_Click" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="box_tool_min ">
+ <div class="center">
+ <div class="left">
+ <div class="right">
+ <div class="padding_top5 padding_left10">
+ <a href="javascript:;" onclick="addModel()" class="aaddModel" menu_member_case_id="case_addModel" menu_member_case_name="鏂板鎶ラ攢"><span class="icon_add">鏂板鎶ラ攢</span></a>
+ <%-- <div class="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="onAllDelete()" menu_member_case_id="case_onAllDeleteList" menu_member_case_name="鎵归噺鍒犻櫎"><span class="icon_delete">鎵归噺鍒犻櫎</span></a>--%>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>
+ <div>
+ <table class="tableStyle">
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+
+ <tr>
+ <th width="25">
+ </th>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th width="130" style="text-align: center">
+ 鐢宠鏃ユ湡
+ </th>
+ <th width="70" style="text-align: center">
+ 绉戠洰
+ </th>
+ <th style="text-align: center">
+ 鎽樿
+ </th>
+ <th width="70" style="text-align: center">
+ 閲戦
+ </th>
+ <th width="250" style="text-align: center">
+ 鍙戠エ
+ </th>
+ <th width="250" style="text-align: center">
+ 闄勪欢
+ </th>
+ <th width="150" style="text-align: center">
+ 鎶ラ攢鐘舵��
+ </th>
+ <th width="150" style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("Nengfoushanchu").ToString()=="1" )?"AlreadyReply":""%>' />
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanStartTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("RewardContent")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanContent")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("PlanMoney", "{0:F2}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Fapiao")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Fujian")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("ApprovalStatusName")%>
+ </td>
+ <td class="Operate " style="text-align: center">
+ <span menu_member_case_id="case_PlanView" menu_member_case_name="鏌ョ湅" onclick="onView('<%#Eval("Keyid")%>')">鏌ョ湅</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("Nengfoushenpi").ToString()=="1")?"AlreadyReply":""%>'>淇敼</span>
+ <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("Nengfoushanchu").ToString()=="1" )?"AlreadyReply":""%>'>鍒犻櫎</span>
+ </td>
+ </tr>
+ </ItemTemplate>
+
+
+
+ </asp:Repeater>
+ <tr class="StatisticsMoney">
+ <td colspan="5" class="ali03">
+ 鍚堣锛�
+ </td>
+ <td colspan="5" class="ali01">
+ <span id="NowMoney" runat="server" ></span>
+ </td>
+ </tr>
+ </table>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
new file mode 100644
index 0000000..0847367
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.cs
@@ -0,0 +1,190 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL;
+using CY.BLL.Sys;
+using CY.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //鎴戠殑璇风ず
+ public partial class MyBaoxiaoList : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_WorkPlanBll bll_OA_WorkPlanBll = null;
+ OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_WorkPlan_shenpiBLL oA_WorkPlan_ShenpiBLL = null;
+
+ //鍒濆鍖�
+ public MyBaoxiaoList()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_WorkPlanBll = new OA_WorkPlanBll();
+ oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_WorkPlan_ShenpiBLL = new OA_WorkPlan_shenpiBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ BindList();
+ }
+ if (Request["delete"] != null)
+ {
+ var oA_WorkPlan_Shenpis = oA_WorkPlan_ShenpiBLL.GetModelByKaipiaoId(Request["delete"].ToInt32().Value).ToList();
+ if (oA_WorkPlan_Shenpis.Count > 0 )
+ {
+ 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);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/work/MyBaoxiaoList.aspx");
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+ }
+
+ if (Request["deleteKeyIds"] != null)
+ {
+ List<int> deleteKeyIdList = new List<int>();
+ string deleteKeyIds = Request["deleteKeyIds"].ToString();
+ if (deleteKeyIds.Contains(","))
+ {
+ string[] keyIdArry = deleteKeyIds.Split(',');
+ foreach (string keyId in keyIdArry)
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(keyId.ToInt32());
+ if (model.Keyid != null && model != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ break;
+ }
+
+ }
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ }
+ else
+ {
+ OA_WorkPlan model = bll_OA_WorkPlanBll.GetModelByKeyid(Request["deleteKeyIds"].ToInt32());
+ if (model.Keyid != null && model != null)
+ {
+ bll_OA_WorkPlanBll.DeleteModel(model, CurrentUser.TrueName);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ }
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+
+ }
+ }
+
+ Response.Redirect("/Pages/work/MyBaoxiaoList.aspx");
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ DateTime? beginTime = null;
+ 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());
+ foreach (var oA_WorkPlan in oA_WorkPlans)
+ {
+ var sss = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoId(oA_WorkPlan.Keyid.Value);
+
+ var fapiaos = sss.Where(x => x.AttachmentType == 1).ToList();
+ var fujians = sss.Where(x => x.AttachmentType == 2).ToList();
+ if (fapiaos.Count > 0)
+ {
+ int i = 1;
+ oA_WorkPlan.Fapiao = "";
+ foreach (var oA_WorkPlan_Attachment in fapiaos)
+ {
+ oA_WorkPlan.Fapiao += "<a title=\"鏌ョ湅鍙戠エ\" target=\"view_window\" href=\""+ oA_WorkPlan_Attachment.PlanAttachment+ "\">鍙戠エ"+i+" </a> ";
+
+ i = i + 1;
+ }
+ }
+
+ if (fujians.Count > 0)
+ {
+ int i = 1;
+ oA_WorkPlan.Fujian = "";
+ foreach (var oA_WorkPlan_Attachment in fujians)
+ {
+ oA_WorkPlan.Fujian += "<a title=\"鏌ョ湅闄勪欢\" target=\"view_window\" href=\"" + oA_WorkPlan_Attachment.PlanAttachment + "\">闄勪欢" + i + " </a> ";
+
+ i = i + 1;
+ }
+ }
+
+ oA_WorkPlan.Nengfoushenpi = 0;
+ if ( oA_WorkPlan.ApprovalStatus == 2)
+ {
+ oA_WorkPlan.Nengfoushenpi = 1;
+ }
+ if( 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;
+ }
+
+
+
+ }
+
+
+ this.NowMoney.InnerText = oA_WorkPlans.Sum(x => x.PlanMoney).Value.ToString("F2");
+ this.RepClientList.DataSource = oA_WorkPlans;
+ this.RepClientList.DataBind();
+ UCPager1.AspNetPager.RecordCount = pa.RecordCount;
+ }
+
+ //鍒嗛〉浜嬩欢
+ protected void AspNetPager1_PageChanged(object src, EventArgs e)
+ {
+ BindList();
+ }
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Search_Click(object src, EventArgs e)
+ {
+ BindList();
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.designer.cs
new file mode 100644
index 0000000..4ad348e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyBaoxiaoList.aspx.designer.cs
@@ -0,0 +1,125 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyBaoxiaoList
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// txtRegTimeStart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
+
+ /// <summary>
+ /// txtRegTimeEnd 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
+
+ /// <summary>
+ /// TxtRewardContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText TxtRewardContent;
+
+ /// <summary>
+ /// txtPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanContent;
+
+ /// <summary>
+ /// selApprovalStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selApprovalStatus;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// NowMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowMoney;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
index 17fd469..2f92ff0 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -1038,6 +1038,12 @@
$("#paperSize").val(100);
}
+ if (printTypeId == "29") {
+ var optionText = "澶�16寮�(210脳285)";
+ $("#paperSize").val($("#paperSize option:contains('" + optionText + "')").val());
+
+ }
+
}
);
@@ -1353,7 +1359,7 @@
$("#selCovered").val(dataJson.CoveredTypeId);
$("[name='printBoxNumber']").val(dataJson.PrintBoxNumber);
$("[name='printCountByBox']").val(dataJson.PrintCount);
- $("[name='singleOrdouble']").val(dataJson.SingleOrdouble);
+ $("[name='singleOrdouble0']").val(dataJson.SingleOrdouble);
$("[name='pNameMP']").val(dataJson.PaperMP);
$("[name='paper0']").val(dataJson.PaperId);
if (dataJson.PrintMode == 0) {
@@ -2462,13 +2468,26 @@
else {
$("#divJT" + index + "").hide();
}
+
+
+ if ($('#worksjiaozuo').length > 0) {
+ $("#worksjiaozuo").prop('checked', false);
+ $("#divJTT" + index + "").hide();
+ }
+
} else if ($(obj).val() == "99") {
+
if ($("#divJTT" + index + "").is(":hidden")) {
$("#divJTT" + index + "").show();
}
else {
$("#divJTT" + index + "").hide();
}
+
+ if ($('#worksjiaotou').length > 0) {
+ $("#worksjiaotou").prop('checked', false);
+ $("#divJT" + index + "").hide();
+ }
} else if ($(obj).val() == "47") {
if ($("#divLY" + index + "").is(":hidden")) {
$("#divLY" + index + "").show();
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index df309d1..19aa827 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -657,4 +657,10 @@
return verfy_form(document.forms[0]);
}
}
-function Save() { return ValidateForm(); }
\ No newline at end of file
+function Save() {
+ if (document.getElementById('txtSumPrice').value == "" || parseFloat(document.getElementById('txtSumPrice').value) <= 0) {
+ if (!confirm("璁㈠崟鎬讳环涓�0锛屾槸鍚︾户缁繚瀛橈紵"))
+ return false;
+ }
+ return ValidateForm();
+}
\ No newline at end of file
--
Gitblit v1.9.1