From b63e4e9f97aba58867a01b85e7d128b6eb738a0a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 十月 2025 09:48:50 +0800
Subject: [PATCH] 请示类别要增加 维修申请 维修付款申请
---
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs | 14
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShouruqueren.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs | 308 +++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx | 130 +
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs | 13
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs | 347 +++
CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs | 297 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 6
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx | 221 ++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx | 12
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 3
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx | 237 ++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.cs | 94 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.cs | 132 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.designer.cs | 62
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs | 27
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs | 110 +
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 56
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 58
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 3
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 3
CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs | 22
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.designer.cs | 53
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx | 229 ++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx | 121 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.cs | 96 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs | 3
CY_ECommercePlatform/CY.Model/OA/OA_ShebeiCate.cs | 131 +
CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs | 99 +
CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiManageDAL.cs | 61
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.designer.cs | 116 +
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs | 27
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx | 69
CY_ECommercePlatform/AbstractFactory/Factory.cs | 17
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs | 6
CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomershouruqueren.aspx.cs | 1
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.designer.cs | 80
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 2
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiCateDAL.cs | 232 ++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs | 332 +++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.designer.cs | 107 +
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx | 14
CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiCateDAL.cs | 38
CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs | 46
CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs | 89
CY_ECommercePlatform/CY.Model/OA/OA_ShebeiManage.cs | 289 +++
CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiManageBLL.cs | 129 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx | 240 ++
CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiCateBLL.cs | 87
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs | 331 +++
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs | 116 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs | 17
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 12
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs | 154 +
57 files changed, 5,500 insertions(+), 24 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index 0ec717a..e2a542d 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -274,6 +274,9 @@
OBJECT_PATH.Add(DALInterface.IAdm_tongxunluDAL, "Adm_tongxunluDAL");
OBJECT_PATH.Add(DALInterface.IAdm_zhanghaomimaDAL, "Adm_zhanghaomimaDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderFahuoDAL, "CoreCmsPlanOrderFahuoDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_ShebeiCateDAL, "OA_ShebeiCateDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_ShebeiManageDAL, "OA_ShebeiManageDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_ShebeiWeixiuDAL, "OA_ShebeiWeixiuDAL");
OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -960,6 +963,20 @@
/// </summary>
ICoreCmsPlanOrderFahuoDAL = 1946,
+ /// <summary>
+ /// Shebei鍒嗙被鏁版嵁璁块棶鎺ュ彛
+ /// </summary>
+ IOA_ShebeiCateDAL = 1947,
+ /// <summary>
+ /// Shebei绠＄悊鏁版嵁璁块棶鎺ュ彛
+ /// </summary>
+ IOA_ShebeiManageDAL = 1948,
+
+ /// <summary>
+ /// Shebei绠＄悊鏁版嵁璁块棶鎺ュ彛
+ /// </summary>
+ IOA_ShebeiWeixiuDAL = 1949,
+
/// <summary>
/// 寮�绁ㄧ敵璇�
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index a503ba3..e99f05e 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -183,7 +183,10 @@
<Compile Include="OA\OA_KaipiaonewcuishouBLL.cs" />
<Compile Include="OA\OA_KaipiaonewhuikuanBLL.cs" />
<Compile Include="OA\OA_KaipiaoshenqingBLL.cs" />
+ <Compile Include="OA\OA_ShebeiCateBLL.cs" />
<Compile Include="OA\OA_PropertyCateBLL.cs" />
+ <Compile Include="OA\OA_ShebeiWeixiuBLL.cs" />
+ <Compile Include="OA\OA_ShebeiManageBLL.cs" />
<Compile Include="OA\OA_PropertyManageBLL.cs" />
<Compile Include="OA\OA_PropertyRecordBLL.cs" />
<Compile Include="OA\OA_ShejijijianBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiCateBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiCateBLL.cs
new file mode 100644
index 0000000..aceb614
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiCateBLL.cs
@@ -0,0 +1,87 @@
+锘縰sing 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_ShebeiCateBLL
+ {
+ IOA_ShebeiCateDAL iOA_ShebeiCateDAL = null;
+
+ public OA_ShebeiCateBLL()
+ {
+ iOA_ShebeiCateDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_ShebeiCateDAL) as IOA_ShebeiCateDAL;
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InsertModel(Model.OA_ShebeiCate model)
+ {
+ return iOA_ShebeiCateDAL.InserModel(model);
+ }
+
+ /// <summary>
+ /// 鏇存柊
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Model.OA_ShebeiCate model)
+ {
+
+ return iOA_ShebeiCateDAL.UpdateModel(model);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Model.OA_ShebeiCate model)
+ {
+
+ return iOA_ShebeiCateDAL.DeleteModel(model);
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiCate GetModelByKeyid(int? Keyid)
+ {
+ return iOA_ShebeiCateDAL.GetModelByKeyid(Keyid);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiCate> SelectModelPage(Infrastructure.Query.Pagination pagination,Guid _MemberId,string _Name,int? _Status,DateTime? _BeginLastUpdateTime,DateTime? _EndLastUpdateTime,string _Operator,string _Remark)
+ {
+ return iOA_ShebeiCateDAL.SelectModelPage(pagination, _MemberId, _Name, _Status,_BeginLastUpdateTime,_EndLastUpdateTime, _Operator, _Remark);
+ }
+
+ /// <summary>
+ /// 妫�娴嬬墿鍝佸垎绫绘槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="MemberId"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsName(string Name, Guid MemberId, string Keyid)
+ {
+ return iOA_ShebeiCateDAL.IsExitsName(Name,MemberId,Keyid);
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiManageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiManageBLL.cs
new file mode 100644
index 0000000..eab050f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiManageBLL.cs
@@ -0,0 +1,129 @@
+锘縰sing 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_ShebeiManageBLL
+ {
+ IOA_ShebeiManageDAL iOA_ShebeiManageDAL = null;
+
+ public OA_ShebeiManageBLL()
+ {
+ iOA_ShebeiManageDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_ShebeiManageDAL) as IOA_ShebeiManageDAL;
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InsertModel(Model.OA_ShebeiManage model)
+ {
+ return iOA_ShebeiManageDAL.InserModel(model);
+ }
+
+ /// <summary>
+ /// 鏇存柊
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Model.OA_ShebeiManage model)
+ {
+
+ return iOA_ShebeiManageDAL.UpdateModel(model);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Model.OA_ShebeiManage model)
+ {
+
+ return iOA_ShebeiManageDAL.DeleteModel(model);
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiManage GetModelByKeyid(int? Keyid)
+ {
+ return iOA_ShebeiManageDAL.GetModelByKeyid(Keyid);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren)
+ {
+ return iOA_ShebeiManageDAL.SelectModelPage(pagination, _MemberId, _CateId, _Name, _Status, Anzhuangdidian, Zerenren);
+ }
+
+
+ /// <summary>
+ /// 鏌ヨ鍏ㄩ儴
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> SelectAllModel(Query query)
+ {
+ return iOA_ShebeiManageDAL.SelectAllModel( query);
+ }
+
+ /// <summary>
+ /// 妫�娴嬬墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="MemberId"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsName(string Name, Guid MemberId, string Keyid)
+ {
+ return iOA_ShebeiManageDAL.IsExitsName(Name,MemberId,Keyid);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╁搧鍒嗙被
+ /// </summary>
+ /// <param name="_MemberId"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiCate> GetDataByType(Guid _MemberId)
+ {
+ return iOA_ShebeiManageDAL.GetDataByType(_MemberId);
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍒嗙被鑾峰彇鐗╁搧鍒楄〃
+ /// </summary>
+ /// <param name="_MemberId"></param>
+ /// <param name="_CateId"></param>
+ /// <param name="IsSearch"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId, int? _CateId, bool IsSearch)
+ {
+ return iOA_ShebeiManageDAL.GetDataByCate(_MemberId,_CateId,IsSearch);
+ }
+ /// <summary>
+ /// 鏍规嵁瀹㈡埛缂栧彿鑾峰彇瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">瀹㈡埛缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<OA_ShebeiManage> SelectListListByCustomId(string Keyid, Guid MemberId)
+ {
+ return iOA_ShebeiManageDAL.SelectListListByCustomId(Keyid, MemberId);
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs
new file mode 100644
index 0000000..4344477
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_ShebeiWeixiuBLL.cs
@@ -0,0 +1,99 @@
+锘縰sing 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_ShebeiWeixiuBLL
+ {
+ IOA_ShebeiWeixiuDAL iOA_ShebeiWeixiuDAL = null;
+
+ public OA_ShebeiWeixiuBLL()
+ {
+ iOA_ShebeiWeixiuDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_ShebeiWeixiuDAL) as IOA_ShebeiWeixiuDAL;
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InsertModel(Model.OA_ShebeiWeixiu model)
+ {
+ return iOA_ShebeiWeixiuDAL.InserModel(model);
+ }
+
+ /// <summary>
+ /// 鏇存柊
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateModel(Model.OA_ShebeiWeixiu model)
+ {
+
+ return iOA_ShebeiWeixiuDAL.UpdateModel(model);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Model.OA_ShebeiWeixiu model)
+ {
+
+ return iOA_ShebeiWeixiuDAL.DeleteModel(model);
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiWeixiu GetModelByKeyid(int? Keyid)
+ {
+ return iOA_ShebeiWeixiuDAL.GetModelByKeyid(Keyid);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiWeixiu GetModelBytiaojian(int? WeixiuShebeiId,int? FukuanShebeiId,int? FukuanshenqingId)
+ {
+ return iOA_ShebeiWeixiuDAL.GetModelBytiaojian(WeixiuShebeiId, FukuanShebeiId, FukuanshenqingId);
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇鏈哄櫒鐨勫綋骞村綋鏈堣垂鐢�
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public Model.OA_ShebeiWeixiu GetModelBytiaojian(int ShebeiId)
+ {
+ return iOA_ShebeiWeixiuDAL.GetModelBytiaojian(ShebeiId);
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren,int? Shifouzhifu)
+ {
+ return iOA_ShebeiWeixiuDAL.SelectModelPage(pagination, _MemberId, _CateId, _Name, _Status, Anzhuangdidian, Zerenren, Shifouzhifu);
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 1712c71..4e88652 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -173,6 +173,9 @@
<Compile Include="OA\IOA_KaipiaonewcuishouDAL.cs" />
<Compile Include="OA\IOA_KaipiaonewDAL.cs" />
<Compile Include="OA\IOA_KipiaoshenqingDAL.cs" />
+ <Compile Include="OA\IOA_ShebeiCateDAL.cs" />
+ <Compile Include="OA\IOA_ShebeiWeixiuDAL.cs" />
+ <Compile Include="OA\IOA_ShebeiManageDAL.cs" />
<Compile Include="OA\IOA_ShejijijianDAL.cs" />
<Compile Include="OA\IOA_ShiJuanBiaoQianDAL.cs" />
<Compile Include="OA\IOA_WageAwardPunishDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiCateDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiCateDAL.cs
new file mode 100644
index 0000000..f4dc275
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiCateDAL.cs
@@ -0,0 +1,38 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+ /// <summary>
+ ///琛屾斂鐗╁搧鍒嗙被-鏁版嵁搴撴搷浣滄帴鍙�
+ /// </summary>
+ public interface IOA_ShebeiCateDAL : ICommonDAL, IPaging<OA_ShebeiCate>, IGetAllModel<OA_ShebeiCate>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_ShebeiCate GetModelByKeyid(int? Keyid);
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_ShebeiCate> SelectModelPage(Infrastructure.Query.Pagination pagination,Guid _MemberId,string _Name,int? _Status,DateTime? _BeginLastUpdateTime,DateTime? _EndLastUpdateTime,string _Operator,string _Remark);
+
+ /// <summary>
+ /// 妫�娴嬬墿鍝佸垎绫绘槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="MemberId"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ int IsExitsName(string Name, Guid MemberId, string Keyid);
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiManageDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiManageDAL.cs
new file mode 100644
index 0000000..fd9dac9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiManageDAL.cs
@@ -0,0 +1,61 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+ /// <summary>
+ ///琛屾斂鐗╁搧绠＄悊-鏁版嵁搴撴搷浣滄帴鍙�
+ /// </summary>
+ public interface IOA_ShebeiManageDAL : ICommonDAL, IPaging<OA_ShebeiManage>, IGetAllModel<OA_ShebeiManage>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_ShebeiManage GetModelByKeyid(int? Keyid);
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_ShebeiManage> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren);
+
+ /// <summary>
+ /// 妫�娴嬬墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="MemberId"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ int IsExitsName(string Name, Guid MemberId, string Keyid);
+
+ /// <summary>
+ /// 鑾峰彇鐗╁搧鍒嗙被
+ /// </summary>
+ /// <param name="_MemberId"></param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_ShebeiCate> GetDataByType(Guid _MemberId);
+
+ /// <summary>
+ /// 鏍规嵁鍒嗙被鑾峰彇鐗╁搧鍒楄〃
+ /// </summary>
+ /// <param name="_MemberId"></param>
+ /// <param name="_CateId"></param>
+ /// <param name="IsSearch"></param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId, int? _CateId, bool IsSearch);
+
+ /// <summary>
+ /// 鏍规嵁瀹㈡埛缂栧彿鑾峰彇瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">瀹㈡埛缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_ShebeiManage> SelectListListByCustomId(string Keyid, Guid MemberId);
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs
new file mode 100644
index 0000000..1551439
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShebeiWeixiuDAL.cs
@@ -0,0 +1,46 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IBaseDAL;
+using CY.Model;
+
+namespace CY.IDAL
+{
+ /// <summary>
+ ///琛屾斂鐗╁搧绠＄悊-鏁版嵁搴撴搷浣滄帴鍙�
+ /// </summary>
+ public interface IOA_ShebeiWeixiuDAL : ICommonDAL, IPaging<OA_ShebeiWeixiu>, IGetAllModel<OA_ShebeiWeixiu>
+ {
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_ShebeiWeixiu GetModelByKeyid(int? Keyid);
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren,int? Shifoufufei);
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_ShebeiWeixiu GetModelBytiaojian(int? WeixiuShebeiId, int? FukuanShebeiId, int? FukuanshenqingId);
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ Model.OA_ShebeiWeixiu GetModelBytiaojian(int ShebeiId);
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index f72234f..773cbf7 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -253,10 +253,13 @@
<Compile Include="OA\OA_OrderWorkListRelation.cs" />
<Compile Include="OA\OA_OutOfStorage.cs" />
<Compile Include="OA\OA_Procurement.cs" />
+ <Compile Include="OA\OA_ShebeiCate.cs" />
<Compile Include="OA\OA_PropertyCate.cs" />
+ <Compile Include="OA\OA_ShebeiManage.cs" />
<Compile Include="OA\OA_PropertyManage.cs" />
<Compile Include="OA\OA_PropertyRecord.cs" />
<Compile Include="OA\OA_RemittanceAdvice.cs" />
+ <Compile Include="OA\OA_ShebeiWeixiu.cs" />
<Compile Include="OA\OA_Shejijijian.cs" />
<Compile Include="OA\OA_ShiJuanBiaoQian.cs" />
<Compile Include="OA\OA_Specification.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiCate.cs b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiCate.cs
new file mode 100644
index 0000000..69113c9
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiCate.cs
@@ -0,0 +1,131 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+namespace CY.Model{
+ /// <summary>
+ ///琛屾斂鐗╁搧鍒嗙被
+ /// </summary>
+ [Serializable]
+ public partial class OA_ShebeiCate : IAggregateRoot
+ {
+ public OA_ShebeiCate()
+ { }
+ #region Model
+ private int? _keyid;
+ private Guid _memberid;
+ private string _name;
+ private int? _status;
+ private DateTime? _lastupdatetime;
+ private string _operator;
+ private string _remark;
+
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public int? Keyid
+ {
+ get{ return _keyid; }
+ set{ _keyid = value; }
+ }
+ /// <summary>
+ /// 浼氬憳缂栧彿
+ /// </summary>
+ public Guid MemberId
+ {
+ get{ return _memberid; }
+ set{ _memberid = value; }
+ }
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name
+ {
+ get{ return _name; }
+ set{ _name = value; }
+ }
+ /// <summary>
+ /// 鐘舵��
+ /// </summary>
+ public int? Status
+ {
+ get{ return _status; }
+ set{ _status = value; }
+ }
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ public DateTime? LastUpdateTime
+ {
+ get{ return _lastupdatetime; }
+ set{ _lastupdatetime = value; }
+ }
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string Operator
+ {
+ get{ return _operator; }
+ set{ _operator = value; }
+ }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark
+ {
+ get{ return _remark; }
+ set{ _remark = value; }
+ }
+ #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.ConvertToInt(value) : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("MemberId".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.MemberId = isChange ? MyConvert.ConvertToGuid(value) : MemberId;
+ theValue = this.MemberId;
+ }
+ else if ("Name".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.Name = isChange ? MyConvert.ConvertToString(value) : Name;
+ theValue = this.Name;
+ }
+ else if ("Status".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.Status = isChange ? MyConvert.ConvertToInt(value) : Status;
+ theValue = this.Status;
+ }
+ else if ("LastUpdateTime".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+ theValue = this.LastUpdateTime;
+ }
+ else if ("Operator".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+ theValue = this.Operator;
+ }
+ else if ("Remark".Equals(name,StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
+ theValue = this.Remark;
+ }
+ return theValue;
+ }
+ #endregion Visiter
+}
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiManage.cs b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiManage.cs
new file mode 100644
index 0000000..351a7c4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiManage.cs
@@ -0,0 +1,289 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+namespace CY.Model
+{
+ /// <summary>
+ ///琛屾斂鐗╁搧绠＄悊
+ /// </summary>
+ [Serializable]
+ public partial class OA_ShebeiManage : IAggregateRoot
+ {
+ public OA_ShebeiManage()
+ {
+ }
+ #region Model
+ private int? _keyid;
+ private Guid _memberid;
+ private int? _cateid;
+ private string _name;
+ private decimal? _price;
+ private int? _status;
+
+ private DateTime? _lastupdatetime;
+ private string _operator;
+ private string _remark;
+ private int? _havenum;
+
+
+ public string Anzhuangdidian { get; set; }
+
+ public DateTime? QiyongTime { get; set; }
+
+ public int? Zerenren { get; set; }
+
+ public string ZerenrenName { get; set; }
+
+ public decimal? Yueprice { get; set; }
+
+ public decimal? Nianprice { get; set; }
+
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public int? Keyid
+ {
+ get
+ {
+ return _keyid;
+ }
+ set
+ {
+ _keyid = value;
+ }
+ }
+ /// <summary>
+ /// 浼氬憳缂栧彿
+ /// </summary>
+ public Guid MemberId
+ {
+ get
+ {
+ return _memberid;
+ }
+ set
+ {
+ _memberid = value;
+ }
+ }
+ /// <summary>
+ /// 鍒嗙被Id
+ /// </summary>
+ public int? CateId
+ {
+ get
+ {
+ return _cateid;
+ }
+ set
+ {
+ _cateid = value;
+ }
+ }
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name
+ {
+ get
+ {
+ return _name;
+ }
+ set
+ {
+ _name = value;
+ }
+ }
+ /// <summary>
+ /// 浠锋牸
+ /// </summary>
+ public decimal? Price
+ {
+ get
+ {
+ return _price;
+ }
+ set
+ {
+ _price = value;
+ }
+ }
+ /// <summary>
+ /// 鐘舵��/鍚敤1,绂佺敤2
+ /// </summary>
+ public int? Status
+ {
+ get
+ {
+ return _status;
+ }
+ set
+ {
+ _status = value;
+ }
+ }
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ public DateTime? LastUpdateTime
+ {
+ get
+ {
+ return _lastupdatetime;
+ }
+ set
+ {
+ _lastupdatetime = value;
+ }
+ }
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string Operator
+ {
+ get
+ {
+ return _operator;
+ }
+ set
+ {
+ _operator = value;
+ }
+ }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark
+ {
+ get
+ {
+ return _remark;
+ }
+ set
+ {
+ _remark = value;
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗙被鍚嶇О
+ /// </summary>
+ public string CateName
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 鎬绘暟閲�
+ /// </summary>
+ public int? havenum
+ {
+ get
+ {
+ return _havenum;
+ }
+ set
+ {
+ _havenum = value;
+ }
+ }
+ #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.ConvertToInt(value) : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("MemberId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.MemberId = isChange ? MyConvert.ConvertToGuid(value) : MemberId;
+ theValue = this.MemberId;
+ }
+ else if ("CateId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.CateId = isChange ? MyConvert.ConvertToInt(value) : CateId;
+ theValue = this.CateId;
+ }
+ else if ("Name".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.Name = isChange ? MyConvert.ConvertToString(value) : Name;
+ theValue = this.Name;
+ }
+ else if ("Price".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.Price = isChange ? MyConvert.ConvertToDecimal(value) : Price;
+ theValue = this.Price;
+ }
+ else if ("Status".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Status = isChange ? MyConvert.ConvertToInt(value) : Status;
+ theValue = this.Status;
+ }
+
+ else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+ theValue = this.LastUpdateTime;
+ }
+ else if ("Operator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+ theValue = this.Operator;
+ }
+ else if ("Remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
+ theValue = this.Remark;
+ }
+ else if ("CateName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.CateName = isChange ? MyConvert.ConvertToString(value) : CateName;
+ theValue = this.CateName;
+ }
+ else if ("havenum".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.havenum = isChange ? MyConvert.ConvertToInt(value) : havenum;
+ theValue = this.havenum;
+ }
+ else if ("Anzhuangdidian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+ {
+ this.Anzhuangdidian = isChange ? MyConvert.ConvertToString(value) : Anzhuangdidian;
+ theValue = this.Anzhuangdidian;
+ }
+
+ else if ("QiyongTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+ {
+ this.QiyongTime = isChange ? MyConvert.ConvertToDateTime(value) : QiyongTime;
+ theValue = this.QiyongTime;
+ }
+
+ else if ("Zerenren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+ {
+ this.Zerenren = isChange ? MyConvert.ConvertToInt(value) : Zerenren;
+ theValue = this.Zerenren;
+ }
+
+
+ else if ("ZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+ {
+ this.ZerenrenName = isChange ? MyConvert.ConvertToString(value) : ZerenrenName;
+ theValue = this.ZerenrenName;
+ }
+ return theValue;
+ }
+ #endregion Visiter
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
new file mode 100644
index 0000000..d6b0e63
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_ShebeiWeixiu.cs
@@ -0,0 +1,297 @@
+锘縰sing System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+namespace CY.Model
+{
+ /// <summary>
+ ///琛屾斂鐗╁搧绠＄悊
+ /// </summary>
+ [Serializable]
+ public partial class OA_ShebeiWeixiu : IAggregateRoot
+ {
+ public OA_ShebeiWeixiu()
+ {
+ }
+ #region Model
+ private int? _keyid;
+ private Guid _memberid;
+ public int? ShebeiId { get; set; }
+ public DateTime? WeixiuTime { get; set; }
+ private int? _cateid;
+ public string Anzhuangdidian { get; set; }
+ private string _name;
+ private string _remark;
+ public decimal? WeixiuPrice { get; set; }
+ public int? Zerenren { get; set; }
+ public string ZerenrenName { get; set; }
+ public decimal? DanzePrice { get; set; }
+
+ public int? WeixiuShebeiId { get; set; }
+
+ public int? FukuanShebeiId { get; set; }
+
+ public int? FukuanshenqingId { get; set; }
+
+ //鏄惁浠樿垂 1鏄�2鍚�
+ public int? Shifoufufei { get; set; }
+
+
+ public DateTime? CreateTime { get; set; }
+ public string Creator{ get; set; }
+
+
+
+ private DateTime? _lastupdatetime;
+ private string _operator;
+
+
+ public string Caozuo { get; set; }
+
+
+
+
+
+
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public int? Keyid
+ {
+ get
+ {
+ return _keyid;
+ }
+ set
+ {
+ _keyid = value;
+ }
+ }
+ /// <summary>
+ /// 浼氬憳缂栧彿
+ /// </summary>
+ public Guid MemberId
+ {
+ get
+ {
+ return _memberid;
+ }
+ set
+ {
+ _memberid = value;
+ }
+ }
+ /// <summary>
+ /// 鍒嗙被Id
+ /// </summary>
+ public int? CateId
+ {
+ get
+ {
+ return _cateid;
+ }
+ set
+ {
+ _cateid = value;
+ }
+ }
+ /// <summary>
+ /// 鍚嶇О
+ /// </summary>
+ public string Name
+ {
+ get
+ {
+ return _name;
+ }
+ set
+ {
+ _name = value;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ public DateTime? LastUpdateTime
+ {
+ get
+ {
+ return _lastupdatetime;
+ }
+ set
+ {
+ _lastupdatetime = value;
+ }
+ }
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string Operator
+ {
+ get
+ {
+ return _operator;
+ }
+ set
+ {
+ _operator = value;
+ }
+ }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark
+ {
+ get
+ {
+ return _remark;
+ }
+ set
+ {
+ _remark = value;
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗙被鍚嶇О
+ /// </summary>
+ public string CateName
+ {
+ 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.ConvertToInt(value) : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("MemberId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.MemberId = isChange ? MyConvert.ConvertToGuid(value) : MemberId;
+ theValue = this.MemberId;
+ }
+ else if ("ShebeiId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.ShebeiId = isChange ? MyConvert.ConvertToInt(value) : ShebeiId;
+ theValue = this.ShebeiId;
+ }
+ else if ("WeixiuTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.WeixiuTime = isChange ? MyConvert.ConvertToDateTime(value) : WeixiuTime;
+ theValue = this.WeixiuTime;
+ }
+ else if ("CateId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.CateId = isChange ? MyConvert.ConvertToInt(value) : CateId;
+ theValue = this.CateId;
+ }
+ else if ("Anzhuangdidian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Anzhuangdidian = isChange ? MyConvert.ConvertToString(value) : Anzhuangdidian;
+ theValue = this.Anzhuangdidian;
+ }
+ else if ("Name".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.Name = isChange ? MyConvert.ConvertToString(value) : Name;
+ theValue = this.Name;
+ }
+ else if ("Remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
+ theValue = this.Remark;
+ }
+ else if ("WeixiuPrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.WeixiuPrice = isChange ? MyConvert.ConvertToDecimal(value) : WeixiuPrice;
+ theValue = this.WeixiuPrice;
+ }
+ else if ("Zerenren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.Zerenren = isChange ? MyConvert.ConvertToInt(value) : Zerenren;
+ theValue = this.Zerenren;
+ }
+
+
+ else if ("ZerenrenName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.ZerenrenName = isChange ? MyConvert.ConvertToString(value) : ZerenrenName;
+ theValue = this.ZerenrenName;
+ }
+ else if ("DanzePrice".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.DanzePrice = isChange ? MyConvert.ConvertToDecimal(value) : DanzePrice;
+ theValue = this.DanzePrice;
+ }
+
+ else if ("WeixiuShebeiId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.WeixiuShebeiId = isChange ? MyConvert.ConvertToInt32(value) : WeixiuShebeiId;
+ theValue = this.WeixiuShebeiId;
+ }
+ else if ("FukuanshenqingId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+ {
+ this.FukuanshenqingId = isChange ? MyConvert.ConvertToInt32(value) : FukuanshenqingId;
+ theValue = this.FukuanshenqingId;
+ }
+ else if ("FukuanShebeiId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+ {
+ this.FukuanShebeiId = isChange ? MyConvert.ConvertToInt32(value) : FukuanShebeiId;
+ theValue = this.FukuanShebeiId;
+ }
+
+
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("Creator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+ {
+ this.Creator = isChange ? MyConvert.ConvertToString(value) : Creator;
+ theValue = this.Creator;
+ }
+
+ else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 18)
+ {
+ this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+ theValue = this.LastUpdateTime;
+ }
+ else if ("Operator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 19)
+ {
+ this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+ theValue = this.Operator;
+ }
+ else if ("Shifoufufei".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 20)
+ {
+ this.Shifoufufei = isChange ? MyConvert.ConvertToInt32(value) : Shifoufufei;
+ theValue = this.Shifoufufei;
+ }
+ else if ("CateName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+ {
+ this.CateName = isChange ? MyConvert.ConvertToString(value) : CateName;
+ theValue = this.CateName;
+ }
+
+
+
+ return theValue;
+ }
+ #endregion Visiter
+ }
+}
\ 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 36698b1..8201313 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -198,7 +198,10 @@
<Compile Include="OA\OA_KaipiaonewDAL.cs" />
<Compile Include="OA\OA_KaipiaonewhuikuanDAL.cs" />
<Compile Include="OA\OA_KipiaoshenqingDAL.cs" />
+ <Compile Include="OA\OA_ShebeiCateDAL.cs" />
<Compile Include="OA\OA_PropertyCateDAL.cs" />
+ <Compile Include="OA\OA_ShebeiWeixiuDAL.cs" />
+ <Compile Include="OA\OA_ShebeiManageDAL.cs" />
<Compile Include="OA\OA_PropertyManageDAL.cs" />
<Compile Include="OA\OA_PropertyRecordDAL.cs" />
<Compile Include="OA\OA_ShejijijianDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiCateDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiCateDAL.cs
new file mode 100644
index 0000000..2f55355
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiCateDAL.cs
@@ -0,0 +1,232 @@
+锘縰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_ShebeiCateDAL:IOA_ShebeiCateDAL
+ {
+ private Database _dataBase = null;
+
+ public OA_ShebeiCateDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ public OA_ShebeiCateDAL(Database dataBase)
+ {
+ _dataBase = dataBase;
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_ShebeiCate trueModel = model as Model.OA_ShebeiCate;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ { new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@Name", trueModel.Name) ,
+ new SqlParameter("@Status", trueModel.Status) ,
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@Remark", trueModel.Remark)
+ };
+ string sql = "Insert Into OA_ShebeiCate ([MemberId],[Name],[Status],[LastUpdateTime], [Operator])"
+ + " Values (@MemberId,@Name,@Status, @LastUpdateTime, @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_ShebeiCate trueModel = model as Model.OA_ShebeiCate;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ { new SqlParameter("@Keyid", trueModel.Keyid) ,
+ new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@Name", trueModel.Name) ,
+ new SqlParameter("@Status", trueModel.Status) ,
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@Remark", trueModel.Remark)
+ };
+ string sql = "Update OA_ShebeiCate Set [MemberId]=@MemberId,[Name]=@Name,[Status]=@Status, [LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator,[Remark]=@Remark where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_ShebeiCate trueModel = model as Model.OA_ShebeiCate;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_ShebeiCate Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiCate> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ throw new NotImplementedException();
+ }
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiCate> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ throw new NotImplementedException();
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiCate GetModelByKeyid(int? Keyid)
+ {
+ try
+ {
+ if (Keyid == null || Keyid < 0)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_ShebeiCate> result = _dataBase.SelectModel<OA_ShebeiCate>(" * ", " OA_ShebeiCate ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_ShebeiCate>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiCate> SelectModelPage(Infrastructure.Query.Pagination pagination,Guid _MemberId,string _Name,int? _Status,DateTime? _BeginLastUpdateTime,DateTime? _EndLastUpdateTime,string _Operator,string _Remark)
+ {
+ try
+ {
+ string condition = " 1=1 ";
+
+ if (_MemberId != Guid.Empty)
+ condition += " and MemberId = '" + _MemberId + "'";
+
+ if (!string.IsNullOrEmpty(_Name))
+ condition += " and Name = '" + _Name + "'";
+
+ if (_Status.HasValue)
+ condition += " and Status = '" + _Status + "'";
+
+ if (_BeginLastUpdateTime.HasValue)
+ condition += string.Format(" and CAST(LastUpdateTime AS DATE) >='{0}'", _BeginLastUpdateTime);
+
+ if (_EndLastUpdateTime.HasValue)
+ condition += string.Format(" and CAST(LastUpdateTime AS DATE) <='{0}'", _EndLastUpdateTime);
+
+ if (!string.IsNullOrEmpty(_Operator))
+ condition += " and Operator = '" + _Operator + "'";
+
+ if (!string.IsNullOrEmpty(_Remark))
+ condition += " and Remark = '" + _Remark + "'";
+
+ return _dataBase.SelectModelPage<Model.OA_ShebeiCate>(pagination, " * ", " OA_ShebeiCate ", " Keyid desc", " Keyid desc ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬬墿鍝佸垎绫绘槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="MemberId"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsName(string Name, Guid MemberId, string Keyid)
+ {
+ try
+ {
+ IList<OA_CarManage> result = _dataBase.SelectModel<OA_CarManage>("*", "OA_ShebeiCate", " Name = '" + Name + "' and MemberId ='" + MemberId + "' and Keyid <> '" + Keyid + "'") as IList<OA_CarManage>;//鎵ц鏌ヨ
+ if (null == result || result.Count == 0)
+ return 0;
+ else
+ return 1;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs
new file mode 100644
index 0000000..a5ab58b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiManageDAL.cs
@@ -0,0 +1,347 @@
+锘縰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_ShebeiManageDAL : IOA_ShebeiManageDAL
+ {
+ private Database _dataBase = null;
+
+ public OA_ShebeiManageDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ public OA_ShebeiManageDAL(Database dataBase)
+ {
+ _dataBase = dataBase;
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_ShebeiManage trueModel = model as Model.OA_ShebeiManage;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter QiyongTime = null;
+ if (trueModel.QiyongTime.HasValue)
+ {
+ QiyongTime = new SqlParameter("@QiyongTime", trueModel.QiyongTime.Value);
+ }
+ else
+ {
+ QiyongTime = new SqlParameter("@QiyongTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ { new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@CateId", trueModel.CateId) ,
+ new SqlParameter("@Name", trueModel.Name) ,
+ new SqlParameter("@Price", trueModel.Price.HasValue?trueModel.Price.Value:0) ,
+
+ new SqlParameter("@Anzhuangdidian", string.IsNullOrEmpty(trueModel.Anzhuangdidian)?"":trueModel.Anzhuangdidian) ,
+ QiyongTime,
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0 ) ,
+ new SqlParameter("@ZerenrenName", string.IsNullOrEmpty(trueModel.ZerenrenName)?"":trueModel.ZerenrenName) ,
+
+
+
+ new SqlParameter("@Status", trueModel.Status) ,
+
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@Remark",string.IsNullOrEmpty(trueModel.Remark)?"":trueModel.Remark )
+ };
+ string sql = "Insert Into OA_ShebeiManage ([MemberId],[CateId],[Name],[Price], [Status],[Anzhuangdidian],[QiyongTime],[Zerenren],[ZerenrenName],[LastUpdateTime],[Operator],[Remark])"
+ + " Values (@MemberId,@CateId,@Name, @Price, @Status,@Anzhuangdidian,@QiyongTime,@Zerenren,@ZerenrenName,@LastUpdateTime,@Operator,@Remark )";
+
+ 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_ShebeiManage trueModel = model as Model.OA_ShebeiManage;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter QiyongTime = null;
+ if (trueModel.QiyongTime.HasValue)
+ {
+ QiyongTime = new SqlParameter("@QiyongTime", trueModel.QiyongTime.Value);
+ }
+ else
+ {
+ QiyongTime = new SqlParameter("@QiyongTime", DBNull.Value);
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ { new SqlParameter("@Keyid", trueModel.Keyid) ,
+ new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@CateId", trueModel.CateId) ,
+ new SqlParameter("@Name", trueModel.Name) ,
+ new SqlParameter("@Price", trueModel.Price.HasValue?trueModel.Price.Value:0) ,
+
+ new SqlParameter("@Anzhuangdidian", string.IsNullOrEmpty(trueModel.Anzhuangdidian)?"":trueModel.Anzhuangdidian) ,
+ QiyongTime,
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0 ) ,
+ new SqlParameter("@ZerenrenName", string.IsNullOrEmpty(trueModel.ZerenrenName)?"":trueModel.ZerenrenName) ,
+
+
+
+ new SqlParameter("@Status", trueModel.Status) ,
+
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ new SqlParameter("@Remark",string.IsNullOrEmpty(trueModel.Remark)?"":trueModel.Remark )
+ };
+ string sql = "Update OA_ShebeiManage Set [MemberId]=@MemberId,[CateId]=@CateId,[Name]=@Name,[Price]=@Price,[Status]=@Status,[Anzhuangdidian]=@Anzhuangdidian,[QiyongTime]=@QiyongTime,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName, [LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator,[Remark]=@Remark where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_ShebeiManage trueModel = model as Model.OA_ShebeiManage;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_ShebeiManage Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ throw new NotImplementedException();
+ }
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_ShebeiManage>(" * ", " OA_ShebeiManage ") as IList<Model.OA_ShebeiManage>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiManage GetModelByKeyid(int? Keyid)
+ {
+ try
+ {
+ if (Keyid == null || Keyid < 0)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_ShebeiManage> result = _dataBase.SelectModel<OA_ShebeiManage>(" * ", " OA_ShebeiManage ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_ShebeiManage>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren)
+ {
+ try
+ {
+ string condition = " 1=1 ";
+
+ if (_MemberId != Guid.Empty)
+ condition += " and a.MemberId = '" + _MemberId + "'";
+
+ if (_CateId.HasValue)
+ condition += " and a.CateId = '" + _CateId + "'";
+
+ if (!string.IsNullOrEmpty(_Name))
+ condition += " and a.Name = '" + _Name + "'";
+
+ if (!string.IsNullOrEmpty(Anzhuangdidian))
+ condition += " and a.Anzhuangdidian = '" + Anzhuangdidian + "'";
+
+ if (_Status.HasValue)
+ condition += " and a.Status = '" + _Status + "'";
+
+ if (Zerenren.HasValue)
+ condition += " and a.Zerenren = '" + Zerenren + "'";
+
+
+
+ return _dataBase.SelectModelPage<Model.OA_ShebeiManage>(pagination, " a.*,b.Name as CateName ", " OA_ShebeiManage as a left join OA_ShebeiCate as b on a.CateId = b.Keyid ", " a.CateId ASC,a.Keyid DESC", " Keyid desc ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬬墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="MemberId"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsName(string Name, Guid MemberId, string Keyid)
+ {
+ try
+ {
+ IList<OA_CarManage> result = _dataBase.SelectModel<OA_CarManage>("*", "OA_ShebeiManage", " Name = '" + Name + "' and MemberId ='" + MemberId + "' and Keyid <> '" + Keyid + "'") as IList<OA_CarManage>;//鎵ц鏌ヨ
+ if (null == result || result.Count == 0)
+ return 0;
+ else
+ return 1;
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鐗╁搧鍒嗙被
+ /// </summary>
+ /// <param name="_MemberId"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiCate> GetDataByType(Guid _MemberId)
+ {
+ try
+ {
+ string condition = " 1=1 ";
+
+ if (_MemberId != Guid.Empty)
+ condition += " and MemberId = '" + _MemberId + "'";
+
+ return _dataBase.SelectModel<Model.OA_ShebeiCate>(" * ", " OA_ShebeiCate ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍒嗙被鑾峰彇鐗╁搧鍒楄〃
+ /// </summary>
+ /// <param name="_MemberId"></param>
+ /// <param name="_CateId"></param>
+ /// <param name="IsSearch"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiManage> GetDataByCate(Guid _MemberId,int? _CateId,bool IsSearch)
+ {
+ try
+ {
+ string condition = " 1=1 ";
+
+ if (_MemberId != Guid.Empty)
+ condition += " and MemberId = '" + _MemberId + "'";
+
+ if (_CateId>0)
+ condition += " and CateId = '" + _CateId + "'";
+
+ if (!IsSearch)
+ condition += " and AllNum > ReceiveNum and Status = '1' ";
+
+ return _dataBase.SelectModel<Model.OA_ShebeiManage>(" * ", " OA_ShebeiManage ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁瀹㈡埛缂栧彿鑾峰彇瀹㈡埛
+ /// </summary>
+ /// <param name="CustomId">瀹㈡埛缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<OA_ShebeiManage> SelectListListByCustomId(string CustomId, Guid MemberId)
+ {
+ if (string.IsNullOrEmpty(CustomId))
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ try
+ {
+ IList<OA_ShebeiManage> result = _dataBase.SelectModel<OA_ShebeiManage>(" a.*,a.AllNum-a.ReceiveNum as havenum,b.Name as CateName", "OA_ShebeiManage as a left join OA_ShebeiCate as b on a.CateId = b.Keyid", string.Format(" a.Keyid in ({0}) and a.MemberId ='{1}' order by b.Name ASC", CustomId, MemberId)) as IList<OA_ShebeiManage>;//鎵ц鏌ヨ
+ return result;//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
new file mode 100644
index 0000000..afa3815
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShebeiWeixiuDAL.cs
@@ -0,0 +1,332 @@
+锘縰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_ShebeiWeixiuDAL : IOA_ShebeiWeixiuDAL
+ {
+ private Database _dataBase = null;
+
+ public OA_ShebeiWeixiuDAL()
+ {
+ _dataBase = new Database();
+ }
+
+ public OA_ShebeiWeixiuDAL(Database dataBase)
+ {
+ _dataBase = dataBase;
+ }
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_ShebeiWeixiu trueModel = model as Model.OA_ShebeiWeixiu;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter WeixiuTime = null;
+ if (trueModel.WeixiuTime.HasValue)
+ {
+ WeixiuTime = new SqlParameter("@WeixiuTime", trueModel.WeixiuTime.Value);
+ }
+ else
+ {
+ WeixiuTime = new SqlParameter("@WeixiuTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ { new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@ShebeiId", trueModel.ShebeiId) ,
+ WeixiuTime,
+ new SqlParameter("@CateId", trueModel.CateId) ,
+ new SqlParameter("@Anzhuangdidian", string.IsNullOrEmpty(trueModel.Anzhuangdidian)?"":trueModel.Anzhuangdidian) ,
+ new SqlParameter("@Name", trueModel.Name) ,
+ new SqlParameter("@Remark",string.IsNullOrEmpty(trueModel.Remark)?"":trueModel.Remark ),
+ new SqlParameter("@WeixiuPrice", trueModel.WeixiuPrice.HasValue?trueModel.WeixiuPrice.Value:0) ,
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0 ) ,
+ new SqlParameter("@ZerenrenName", string.IsNullOrEmpty(trueModel.ZerenrenName)?"":trueModel.ZerenrenName) ,
+ new SqlParameter("@DanzePrice", trueModel.DanzePrice.HasValue?trueModel.DanzePrice.Value:0) ,
+
+ new SqlParameter("@WeixiuShebeiId", trueModel.WeixiuShebeiId.HasValue?trueModel.WeixiuShebeiId.Value:0) ,
+ new SqlParameter("@FukuanShebeiId", trueModel.FukuanShebeiId.HasValue?trueModel.FukuanShebeiId.Value:0) ,
+ new SqlParameter("@FukuanshenqingId", trueModel.FukuanshenqingId.HasValue?trueModel.FukuanshenqingId.Value:0) ,
+ new SqlParameter("@Shifoufufei", trueModel.Shifoufufei.HasValue?trueModel.Shifoufufei.Value:0) ,
+
+
+ new SqlParameter("@CreateTime", trueModel.CreateTime) ,
+ new SqlParameter("@Creator", trueModel.Creator) ,
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+
+ };
+ string sql = "Insert Into OA_ShebeiWeixiu ([MemberId],[ShebeiId],[WeixiuTime],[CateId],[Name],[Anzhuangdidian],[Remark],[WeixiuPrice],[Zerenren],[ZerenrenName],[DanzePrice],[WeixiuShebeiId],[FukuanShebeiId],[FukuanshenqingId],[Shifoufufei],[CreateTime],[Creator],[LastUpdateTime],[Operator])"
+ + " Values (@MemberId,@ShebeiId,@WeixiuTime,@CateId,@Name,@Anzhuangdidian,@Remark ,@WeixiuPrice,@Zerenren,@ZerenrenName,@DanzePrice,@WeixiuShebeiId,@FukuanShebeiId,@FukuanshenqingId,@Shifoufufei,@CreateTime,@Creator,@LastUpdateTime,@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_ShebeiWeixiu trueModel = model as Model.OA_ShebeiWeixiu;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter WeixiuTime = null;
+ if (trueModel.WeixiuTime.HasValue)
+ {
+ WeixiuTime = new SqlParameter("@WeixiuTime", trueModel.WeixiuTime.Value);
+ }
+ else
+ {
+ WeixiuTime = new SqlParameter("@WeixiuTime", DBNull.Value);
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ { new SqlParameter("@Keyid", trueModel.Keyid) ,
+ new SqlParameter("@MemberId", trueModel.MemberId) ,
+ new SqlParameter("@ShebeiId", trueModel.ShebeiId) ,
+ WeixiuTime,
+ new SqlParameter("@CateId", trueModel.CateId) ,
+ new SqlParameter("@Anzhuangdidian", string.IsNullOrEmpty(trueModel.Anzhuangdidian)?"":trueModel.Anzhuangdidian) ,
+ new SqlParameter("@Name", trueModel.Name) ,
+ new SqlParameter("@Remark",string.IsNullOrEmpty(trueModel.Remark)?"":trueModel.Remark ),
+ new SqlParameter("@WeixiuPrice", trueModel.WeixiuPrice.HasValue?trueModel.WeixiuPrice.Value:0) ,
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0 ) ,
+ new SqlParameter("@ZerenrenName", string.IsNullOrEmpty(trueModel.ZerenrenName)?"":trueModel.ZerenrenName) ,
+ new SqlParameter("@DanzePrice", trueModel.DanzePrice.HasValue?trueModel.DanzePrice.Value:0) ,
+
+ new SqlParameter("@WeixiuShebeiId", trueModel.WeixiuShebeiId.HasValue?trueModel.WeixiuShebeiId.Value:0) ,
+ new SqlParameter("@FukuanShebeiId", trueModel.FukuanShebeiId.HasValue?trueModel.FukuanShebeiId.Value:0) ,
+ new SqlParameter("@FukuanshenqingId", trueModel.FukuanshenqingId.HasValue?trueModel.FukuanshenqingId.Value:0) ,
+ new SqlParameter("@Shifoufufei", trueModel.Shifoufufei.HasValue?trueModel.Shifoufufei.Value:0) ,
+
+ new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
+ new SqlParameter("@Operator", trueModel.Operator) ,
+ };
+ string sql = "Update OA_ShebeiWeixiu Set [MemberId]=@MemberId,[ShebeiId]=@ShebeiId,[WeixiuTime]=@WeixiuTime,[CateId]=@CateId,[Name]=@Name,[Anzhuangdidian]=@Anzhuangdidian,[Remark]=@Remark,[WeixiuPrice]=@WeixiuPrice,[Zerenren]=@Zerenren,[ZerenrenName]=@ZerenrenName,[DanzePrice]=@DanzePrice, [WeixiuShebeiId]=@WeixiuShebeiId,[FukuanShebeiId]=@FukuanShebeiId,[FukuanshenqingId]=@FukuanshenqingId,[Shifoufufei]=@Shifoufufei,[LastUpdateTime]=@LastUpdateTime, [Operator]=@Operator where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_ShebeiWeixiu trueModel = model as Model.OA_ShebeiWeixiu;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_ShebeiWeixiu Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+
+ return true;
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ throw new NotImplementedException();
+ }
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_ShebeiWeixiu>(" * ", " OA_ShebeiWeixiu ") as IList<Model.OA_ShebeiWeixiu>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiWeixiu GetModelByKeyid(int? Keyid)
+ {
+ try
+ {
+ if (Keyid == null || Keyid < 0)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_ShebeiWeixiu> result = _dataBase.SelectModel<OA_ShebeiWeixiu>(" * ", " OA_ShebeiWeixiu ", string.Format(" Keyid='{0}'", Keyid)) as IList<OA_ShebeiWeixiu>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_ShebeiWeixiu GetModelBytiaojian(int? WeixiuShebeiId, int? FukuanShebeiId, int? FukuanshenqingId)
+ {
+ try
+ {
+ string tiaojian = "";
+ if (WeixiuShebeiId.HasValue)
+ {
+ tiaojian += "WeixiuShebeiId=" + WeixiuShebeiId.Value;
+ }
+ else if (FukuanShebeiId.HasValue)
+ {
+ tiaojian += "FukuanShebeiId=" + FukuanShebeiId.Value;
+ }
+ else if (FukuanshenqingId.HasValue)
+ {
+ tiaojian += "FukuanshenqingId=" + FukuanshenqingId.Value;
+ }
+
+
+ IList<OA_ShebeiWeixiu> result = _dataBase.SelectModel<OA_ShebeiWeixiu>(" * ", " OA_ShebeiWeixiu ", tiaojian ) as IList<OA_ShebeiWeixiu>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public Model.OA_ShebeiWeixiu GetModelBytiaojian(int ShebeiId)
+ {
+ try
+ {
+
+
+ string from = "( SELECT sum(WeixiuPrice) WeixiuPrice,0 as DanzePrice FROM OA_ShebeiWeixiu where ShebeiId="+ ShebeiId + " and Shifoufufei = 1 and DATEDIFF(MONTH,'"+DateTime.Now.ToString("yyyy-MM-dd")+"',WeixiuTime) =0 "
+ + " UNION ALL "
+ + " SELECT 0 as WeixiuPrice,sum(WeixiuPrice) DanzePrice FROM OA_ShebeiWeixiu where ShebeiId=" + ShebeiId + " and Shifoufufei = 1 and DATEDIFF(YEAR,'" + DateTime.Now.ToString("yyyy-MM-dd") + "',WeixiuTime) =0 "
+ + " ) AS subquery ";
+
+ IList<OA_ShebeiWeixiu> result = _dataBase.SelectModel<OA_ShebeiWeixiu>(" sum(WeixiuPrice) WeixiuPrice,sum(DanzePrice) DanzePrice ", from) as IList<OA_ShebeiWeixiu>;//鎵ц鏌ヨ
+
+
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_ShebeiWeixiu> SelectModelPage(Infrastructure.Query.Pagination pagination, Guid _MemberId, int? _CateId, string _Name, int? _Status, string Anzhuangdidian, int? Zerenren, int? Shifoufufei)
+ {
+ try
+ {
+ string condition = " 1=1 ";
+
+ if (_MemberId != Guid.Empty)
+ condition += " and a.MemberId = '" + _MemberId + "'";
+
+ if (_CateId.HasValue)
+ condition += " and a.CateId = '" + _CateId + "'";
+
+ if (!string.IsNullOrEmpty(_Name))
+ condition += " and a.Name = '" + _Name + "'";
+
+ if (!string.IsNullOrEmpty(Anzhuangdidian))
+ condition += " and a.Anzhuangdidian = '" + Anzhuangdidian + "'";
+
+ if (_Status.HasValue)
+ condition += " and a.Status = '" + _Status + "'";
+
+ if (Zerenren.HasValue)
+ condition += " and a.Zerenren = '" + Zerenren + "'";
+
+ if (Shifoufufei.HasValue)
+ condition += " and a.Shifoufufei = '" + Shifoufufei + "'";
+
+
+ return _dataBase.SelectModelPage<Model.OA_ShebeiWeixiu>(pagination, " a.*,b.Name as CateName ", " OA_ShebeiWeixiu as a left join OA_ShebeiCate as b on a.CateId = b.Keyid ", " a.WeixiuTime DESC", " Keyid desc ", condition);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+
+
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 46b2509..d8eef7c 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2221,7 +2221,13 @@
<Content Include="Pages\procurement\OutOfStorageListHTML.aspx" />
<Content Include="Pages\procurement\OutOfStorageListPrint.aspx" />
<Content Include="Pages\Property\PrintCheckTable.aspx" />
+ <Content Include="Pages\Property\ShebeimanageEdit.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuList.aspx" />
+ <Content Include="Pages\Property\ShebeimanageList.aspx" />
+ <Content Include="Pages\Property\ShebeiCateEdit.aspx" />
<Content Include="Pages\Property\PropertyCateEdit.aspx" />
+ <Content Include="Pages\Property\ShebeiCateList.aspx" />
<Content Include="Pages\Property\PropertyCateList.aspx" />
<Content Include="Pages\Property\PropertyEdit.aspx" />
<Content Include="Pages\Property\PropertyList.aspx" />
@@ -2231,6 +2237,7 @@
<Content Include="Pages\Property\PropertyRecordDetail.aspx" />
<Content Include="Pages\Property\PropertyRecordEdit.aspx" />
<Content Include="Pages\Property\PropertyRecordList.aspx" />
+ <Content Include="Pages\Property\ShebeiWeixiuAdd.aspx" />
<Content Include="Pages\Soft\ClientAdd.aspx" />
<Content Include="Pages\Soft\ClientDetail.aspx" />
<Content Include="Pages\Soft\ClientList.aspx" />
@@ -5723,12 +5730,54 @@
<Compile Include="Pages\Property\PrintCheckTable.aspx.designer.cs">
<DependentUpon>PrintCheckTable.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\Property\ShebeimanageEdit.aspx.cs">
+ <DependentUpon>ShebeimanageEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeimanageEdit.aspx.designer.cs">
+ <DependentUpon>ShebeimanageEdit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx.cs">
+ <DependentUpon>ShebeiWeixiuFukuanAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuFukuanAdd.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuFukuanAdd.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuList.aspx.cs">
+ <DependentUpon>ShebeiWeixiuList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuList.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeimanageList.aspx.cs">
+ <DependentUpon>ShebeimanageList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeimanageList.aspx.designer.cs">
+ <DependentUpon>ShebeimanageList.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateEdit.aspx.cs">
+ <DependentUpon>ShebeiCateEdit.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateEdit.aspx.designer.cs">
+ <DependentUpon>ShebeiCateEdit.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\Property\PropertyCateEdit.aspx.cs">
<DependentUpon>PropertyCateEdit.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Pages\Property\PropertyCateEdit.aspx.designer.cs">
<DependentUpon>PropertyCateEdit.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateList.aspx.cs">
+ <DependentUpon>ShebeiCateList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiCateList.aspx.designer.cs">
+ <DependentUpon>ShebeiCateList.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\Property\PropertyCateList.aspx.cs">
<DependentUpon>PropertyCateList.aspx</DependentUpon>
@@ -5793,6 +5842,13 @@
<Compile Include="Pages\Property\PropertyRecordList.aspx.designer.cs">
<DependentUpon>PropertyRecordList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuAdd.aspx.cs">
+ <DependentUpon>ShebeiWeixiuAdd.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\Property\ShebeiWeixiuAdd.aspx.designer.cs">
+ <DependentUpon>ShebeiWeixiuAdd.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\Soft\ClientAdd.aspx.cs">
<DependentUpon>ClientAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx
new file mode 100644
index 0000000..cd990c1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx
@@ -0,0 +1,69 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeiCateEdit.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeiCateEdit" %>
+
+<!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 CheckStaff() {
+ var IsCanSubmit = undefined;
+ var Name = $.trim($("#txtCarNumber").val());
+ if (Name != "") {
+ $.ajax({
+ url: "/Pages/common/CommonAjax.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { dateType: "Shebeicheckname", name: Name, keyid: '<%=Request["keyid"] %>' },
+ global: false,
+ cache: false,
+ async: false,
+ success: function (data) {
+ if (data == "1") {
+ IsCanSubmit = false;
+ } else {
+ IsCanSubmit = true;
+ }
+ }
+ });
+ if (!IsCanSubmit) {
+ alertMsg("姝ゅ垎绫诲凡瀛樺湪锛屽鏈夌浉鍚岋紝璇锋敞鎰忓尯鍒嗘坊鍔�");
+ return false;
+ }
+ } else {
+ alertMsg("璇峰～鍐欏垎绫诲悕绉�");
+ return false;
+ }
+ return true;
+ }
+
+ $(function () {
+ $("#txtCarNumber").blur(function () {
+ CheckStaff();
+ });
+ });
+ </script>
+</head>
+<body>
+ <form id="form1" class="form2" runat="server">
+ <div>
+ <table class="tableStyle" style="margin: 10px auto; line-height:40px;" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="ali03">
+ 鍒嗙被鍚嶇О锛�
+ </td>
+ <td>
+ <input id="txtCarNumber" style="width: 100px;" type="text" runat="server" />
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" style="text-align: center;">
+ <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckStaff())return true;else return false; " Text="鎻愪氦" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.cs
new file mode 100644
index 0000000..34eeb01
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.cs
@@ -0,0 +1,96 @@
+锘縰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.Property
+{
+ //鍚磋緣
+ //琛屾斂鐗╁搧鍒嗙被
+ public partial class ShebeiCateEdit : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_ShebeiCateBLL oA_WorkReminderBll = null;
+
+ public ShebeiCateEdit()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ oA_WorkReminderBll = new OA_ShebeiCateBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ OA_ShebeiCate m_OA_ShebeiCate = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_ShebeiCate != null)
+ {
+ this.txtCarNumber.Value = m_OA_ShebeiCate.Name;
+ }
+ }
+
+ //琛ㄥ崟鎻愪氦
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ try
+ {
+ DateTime nowTime = DateTime.Now;
+ OA_ShebeiCate m_OA_ShebeiCate = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_ShebeiCate == null)
+ {
+ m_OA_ShebeiCate = new OA_ShebeiCate();
+ m_OA_ShebeiCate.MemberId = CurrentUser.MemberId;
+ m_OA_ShebeiCate.Status = 1;
+ m_OA_ShebeiCate.Remark = "";
+ }
+ m_OA_ShebeiCate.Name = this.txtCarNumber.Value;
+ m_OA_ShebeiCate.Operator = CurrentUser.ShortName;
+ m_OA_ShebeiCate.LastUpdateTime = nowTime;
+
+ if (Request["keyid"].ToInt32() > 0)
+ {
+ if (oA_WorkReminderBll.UpdateModel(m_OA_ShebeiCate))
+ JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
+ else
+ JavaScript.MessageBox("鏇存柊澶辫触", this);
+ }
+ else
+ {
+ if (oA_WorkReminderBll.InsertModel(m_OA_ShebeiCate))
+ {
+ txtCarNumber.Value = "";
+ JavaScript.MessageBox("鏂板鎴愬姛", this, false, 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/Property/ShebeiCateEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.designer.cs
new file mode 100644
index 0000000..ea6d13f
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateEdit.aspx.designer.cs
@@ -0,0 +1,62 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeiCateEdit
+ {
+
+ /// <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>
+ /// txtCarNumber 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCarNumber;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx
new file mode 100644
index 0000000..e8f12c1
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx
@@ -0,0 +1,130 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeiCateList.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeiCateList" %>
+
+<!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" />
+ <script type="text/javascript">
+ //淇敼
+ function onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeiCateEdit.aspx?keyid=" + keyid, Title: "璁惧鍒嗙被淇敼", Width: 350, Height: 190 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeiCateEdit.aspx", Title: "鏂板璁惧鍒嗙被", Width: 350, Height: 190 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ璁惧鍒嗙被鍚楋紵", function () {
+ window.location = "/Pages/Property/ShebeiCateList.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/Property/ShebeiCateList.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="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>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th width="25">
+ </th>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th style="text-align: center">
+ 鍒嗙被鍚嶇О
+ </th>
+ <th style="text-align: center">
+ 鏇存柊鏃堕棿
+ </th>
+ <th style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" value='<%#Eval("Keyid")%>' />
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Name")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("LastUpdateTime")%>
+ </td>
+ <td class="Operate " style="text-align: center">
+ <span menu_member_case_id="case_CarEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span>
+ <span menu_member_case_id="case_CarDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.cs
new file mode 100644
index 0000000..4ced6a4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.cs
@@ -0,0 +1,94 @@
+锘縰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.Property
+{
+ //鍚磋緣
+ //琛屾斂鐗╁搧鍒嗙被绠＄悊
+ public partial class ShebeiCateList : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_ShebeiCateBLL bll_OA_ShebeiCateBLL = null;
+
+ //鍒濆鍖�
+ public ShebeiCateList()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_ShebeiCateBLL = new OA_ShebeiCateBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ BindList();
+ }
+ if (Request["delete"] != null)
+ {
+ OA_ShebeiCate model = bll_OA_ShebeiCateBLL.GetModelByKeyid(Request["delete"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ bll_OA_ShebeiCateBLL.DeleteModel(model);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/Property/ShebeiCateList.aspx");
+ }
+ else
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+
+ if (Request["deleteKeyIds"] != null)
+ {
+ List<int> deleteKeyIdList = new List<int>();
+ string deleteKeyIds = Request["deleteKeyIds"].ToString().Trim(',');
+ string[] keyIdArry = deleteKeyIds.Split(',');
+ foreach (string keyId in keyIdArry)
+ {
+ OA_ShebeiCate model = bll_OA_ShebeiCateBLL.GetModelByKeyid(keyId.ToInt32());
+ if (model.Keyid != null && model != null)
+ bll_OA_ShebeiCateBLL.DeleteModel(model);
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ return;
+ }
+ }
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/Property/ShebeiCateList.aspx");
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ pa.PageSize = UCPager1.AspNetPager.PageSize;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ this.RepClientList.DataSource = bll_OA_ShebeiCateBLL.SelectModelPage(pa, CurrentUser.MemberId, "",null,null,null,"","");
+ 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/Property/ShebeiCateList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.designer.cs
new file mode 100644
index 0000000..7dc444d
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiCateList.aspx.designer.cs
@@ -0,0 +1,53 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeiCateList
+ {
+
+ /// <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>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+
+ /// <summary>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx
new file mode 100644
index 0000000..5111511
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx
@@ -0,0 +1,229 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeiWeixiuAdd.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeiWeixiuAdd" %>
+
+<!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">
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ </head>
+ <body style="padding:10px">
+ <form runat="server">
+ <table class="tableStyle" >
+
+ <tr>
+ <td class="ali03">璁惧鍚嶇О锛�</td>
+ <td> <select keepdefaultstyle='true' id='selShebei' runat="server" datatextfield='Name' datavaluefield='Keyid' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鏁呴殰鍘熷洜锛�
+ </td>
+ <td colspan="3">
+ <textarea id="txtPlanRemark" runat="server" style="width: 390px; height: 50px;" MaxLength="100" class='req' ></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 缁翠慨鏃ユ湡锛�
+ </td>
+ <td>
+ <input type="text" id='txtWeixiuTime' class='date req' runat="server" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">鐢宠璐圭敤锛�</td>
+ <td> <input id='txtWeixiuPrice' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ラ噾棰�" /></td>
+ </tr>
+ <tr>
+
+ <td class="ali03">鏄惁鐢宠浠樻锛�</td>
+ <td> <select keepdefaultstyle='true' id='selShifoufukuan' runat="server" class='Sreq' >
+ <option value='2'>鍚�</option>
+ <option value='1'>鏄�</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦鐢宠" runat="server" OnClick="btn_Submit_form" />
+ <span style="margin-left:10px"></span>
+ <input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </body>
+ <script type="text/javascript" language="javascript">
+ function custormerChange(sel) {
+
+
+
+
+ window.submitUrl = '/Pages/Property/ShebeiWeixiuAdd.aspx';
+
+ CallServer({ Target: "GetSuplier", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj != '-2') {
+ document.getElementById('txtBank').value = jobj.Bank;
+ document.getElementById('txtAccountID').value = jobj.AccountID;
+ if (jobj.Huming == "") {
+ document.getElementById('txtHuming').value = jobj.Name;
+ } else {
+ document.getElementById('txtHuming').value = jobj.Huming;
+ }
+
+ } else {
+ document.getElementById('txtBank').value = "";
+ document.getElementById('txtAccountID').value = "";
+ document.getElementById('txtHuming').value = "";
+ }
+
+
+
+ });
+ }
+
+ ///鏂板瀹㈡埛
+ function showCustomer() {
+ top.Dialog.open({ URL: "/Pages/procurement/SuppliersEdit.aspx?Keyid='0'&&flasss=ddfffff", Title: "鏂板渚涘簲鍟�", Width: 950, Height: 650 });
+ }
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ $(function () {
+ SelectAddSearch();
+ });
+
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^\d+(\.\d+)?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑姝ｈ礋閲戦锛屼緥濡� 45.67');
+ }
+ }
+
+
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ var oFile = document.getElementById('file1');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return;
+
+ }
+
+
+
+ var formData = new FormData();
+ formData.append('file', oFile.files[0]); // this.files[0]鏄枃浠跺璞�
+
+
+ $.ajax({
+ url: '/Pages/Property/FileUploadHandler.ashx', // 鏇挎崲涓轰綘鐨勬湇鍔″櫒绔偣
+ type: 'POST',
+ data: formData,
+ contentType: false,
+ processData: false,
+ async: false, // 璁剧疆涓哄悓姝�
+ success: function (response) {
+ console.log('File uploaded successfully:', response);
+ if (response.code == 1) {
+
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().show();
+ $("input[name='HideKeyidFapiao']").last().val("");
+ $("input[name='HideAttachmentFapiao']").last().val(response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data+'" width="20" height="20" />');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg(response.message);
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ function deletefujian(obj) {
+ if (confirm("鏄惁鍒犻櫎閫変腑鏁版嵁锛�")) {
+ $(obj).parent().parent().remove()
+ }
+ }
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
new file mode 100644
index 0000000..6d12303
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.cs
@@ -0,0 +1,331 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.Integrity;
+using CY.BLL;
+using System.Threading.Tasks;
+using System.Transactions;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.Property
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class ShebeiWeixiuAdd : BasePage
+ {
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_ShebeiManageBLL oA_ShebeiManageBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
+
+
+
+
+ //鍒濆鍖�
+ public ShebeiWeixiuAdd()
+ {
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+
+
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetSuplier":
+ LoadCommunication();
+ break;
+
+ default:
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+
+ }
+
+ //缁戝畾鏁版嵁
+ public void InitData()
+ {
+
+
+ //渚涘簲鍟�
+ this.selShebei.DataSource = oA_ShebeiManageBLL.SelectAllModel(null).Where(x=>x.Status == 2);
+ this.selShebei.DataBind();
+ //this.selShebei.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ this.txtWeixiuTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
+
+
+ }
+
+
+ /// <summary>
+ /// 鍔犺浇渚涘簲鍟�
+ /// </summary>
+ private void LoadCommunication()
+ {
+ //Response.Clear();
+ //string id = Request["id"];
+ //if (string.IsNullOrEmpty(id))
+ //{
+ // Response.Write("-2");
+ // return;
+ //}
+
+ //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(id);
+
+
+ //Response.Write(null == oA_Suppliers ? "" : JsonHelper.GetJsonStringByObject(oA_Suppliers));
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ AcceptAll3();
+ }
+
+ /// <summary>
+ /// 鎵归噺寮�绁ㄧ敵璇�
+ /// </summary>
+ public void AcceptAll3()
+ {
+
+ if (string.IsNullOrEmpty(this.selShebei.Value))
+ {
+ JavaScript.MessageBox("璇烽�夋嫨缁翠慨璁惧锛�", this);
+ return;
+ }
+
+ if (this.selShifoufukuan.Value == "1" && string.IsNullOrEmpty(this.txtWeixiuPrice.Value))
+ {
+ JavaScript.MessageBox("璇疯緭鍏ョ敵璇烽噾棰濓紒", this);
+ return;
+ }
+
+
+
+
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+ bool result = false;
+
+
+ DateTime nowTime = DateTime.Now;
+
+
+ var oA_ShebeiWeixiu = new OA_ShebeiWeixiu();
+ oA_ShebeiWeixiu.MemberId = CurrentUser.MemberId;
+ oA_ShebeiWeixiu.ShebeiId = this.selShebei.Value.ToInt32();
+ oA_ShebeiWeixiu.WeixiuTime = this.txtWeixiuTime.Value.ToDateTime2();
+ var shebeiManage = oA_ShebeiManageBLL.GetModelByKeyid(oA_ShebeiWeixiu.ShebeiId);
+ if (shebeiManage != null)
+ {
+ oA_ShebeiWeixiu.CateId = shebeiManage.CateId;
+ oA_ShebeiWeixiu.Anzhuangdidian = shebeiManage.Anzhuangdidian;
+ oA_ShebeiWeixiu.Name = shebeiManage.Name;
+ }
+ oA_ShebeiWeixiu.Remark = this.txtPlanRemark.Value;
+ oA_ShebeiWeixiu.WeixiuPrice = this.txtWeixiuPrice.Value.ToDecimal2();
+ oA_ShebeiWeixiu.Zerenren = 0;
+ oA_ShebeiWeixiu.ZerenrenName = "";
+ oA_ShebeiWeixiu.DanzePrice = 0;
+ oA_ShebeiWeixiu.Shifoufufei = 2;
+ oA_ShebeiWeixiu.CreateTime = nowTime;
+ oA_ShebeiWeixiu.Creator = CurrentUser.ShortName;
+ oA_ShebeiWeixiu.LastUpdateTime = nowTime;
+ oA_ShebeiWeixiu.Operator = CurrentUser.ShortName;
+
+ //闇�瑕佹坊鍔犲鎵逛俊鎭�
+
+ OA_WorkPlan m_OA_WorkPlan = new OA_WorkPlan();
+
+
+ if (this.selShifoufukuan.Value == "1" )
+ {
+ OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing();
+
+
+
+ oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
+ oA_Fukuanshenqing.SupplierId = "0";
+ oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
+ oA_Fukuanshenqing.ApprovalStatus = 0;
+
+ oA_Fukuanshenqing.Molingmoney = 0;
+
+ oA_Fukuanshenqing.Fukuanmoney = this.txtWeixiuPrice.Value.ToDecimal2();
+ oA_Fukuanshenqing.Bank = "";
+ oA_Fukuanshenqing.Huming = "";
+ oA_Fukuanshenqing.AccountID = "";
+ oA_Fukuanshenqing.Yishoumoney = 0;
+ oA_Fukuanshenqing.Youwufapiao = 0;
+ oA_Fukuanshenqing.Fukuanyongtu = "璁惧缁翠慨璐�";
+ oA_Fukuanshenqing.FukuanStatus = 1;
+ oA_Fukuanshenqing.remark = "";
+ oA_Fukuanshenqing.DindanId = "";
+
+
+
+
+ oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.CreateTime = nowTime;
+ oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.LastUpdateTime = nowTime;
+ //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
+ //var _SupplierName = "";
+ //if (oA_Suppliers != null)
+ //{
+ // _SupplierName = oA_Suppliers.Name;
+ //}
+
+ var _SupplierName = oA_ShebeiWeixiu.Name + "缁翠慨";
+ oA_Fukuanshenqing.SupplierName = _SupplierName;
+ var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+
+ oA_ShebeiWeixiu.FukuanshenqingId = id;
+ m_OA_WorkPlan.PlanComplany = id.ToString();
+ }
+ else
+ {
+ m_OA_WorkPlan.PlanComplany = "";
+ }
+
+
+
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = bll_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;
+
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+
+ m_OA_WorkPlan.PlanContent = oA_ShebeiWeixiu.Name+"缁翠慨鐢宠";
+ m_OA_WorkPlan.PlanDataType = 18;
+ m_OA_WorkPlan.PlanMoney = this.txtWeixiuPrice.Value.ToDecimal2();
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.PlanRemark = "";
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = this.txtPlanRemark.Value+ ".缁翠慨鏃ユ湡:"+ this.txtWeixiuTime.Value;
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
+ m_OA_WorkPlan.Keyid = workid;
+ if (workid > 0)
+ {
+
+
+ oA_ShebeiWeixiu.WeixiuShebeiId = workid;
+
+
+ if (this.selShifoufukuan.Value == "1")
+ {
+ oA_ShebeiWeixiu.FukuanShebeiId = workid;
+ }
+
+
+ var ssss = oA_ShebeiWeixiuBLL.InsertModel(oA_ShebeiWeixiu);
+ }
+
+
+
+ result = true;
+
+
+
+
+
+
+
+
+
+ if (!result)
+ {
+ return;
+ }
+ //}
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("鎻愪氦鎴愬姛", this, true, true);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs
new file mode 100644
index 0000000..3c9a54e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuAdd.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeiWeixiuAdd
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// selShebei 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selShebei;
+
+ /// <summary>
+ /// txtPlanRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
+
+ /// <summary>
+ /// txtWeixiuTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtWeixiuTime;
+
+ /// <summary>
+ /// txtWeixiuPrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtWeixiuPrice;
+
+ /// <summary>
+ /// selShifoufukuan 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selShifoufukuan;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx
new file mode 100644
index 0000000..007f127
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx
@@ -0,0 +1,221 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeiWeixiuFukuanAdd.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeiWeixiuFukuanAdd" %>
+
+<!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">
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ </head>
+ <body style="padding:10px">
+ <form runat="server">
+ <table class="tableStyle" >
+
+ <tr>
+ <td class="ali03">璁惧鍚嶇О锛�</td>
+ <td>
+ <span id="ShebeiName" runat="server"></span>
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 鏁呴殰鍘熷洜锛�
+ </td>
+ <td colspan="3">
+ <textarea id="txtPlanRemark" runat="server" style="width: 390px; height: 50px;" MaxLength="100" class='req' readonly="readonly" ></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 缁翠慨鏃ユ湡锛�
+ </td>
+ <td>
+ <input type="text" id='txtWeixiuTime' runat="server" readonly="readonly" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">鐢宠璐圭敤锛�</td>
+ <td> <input id='txtWeixiuPrice' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ラ噾棰�" /></td>
+ </tr>
+
+ <tr>
+ <td colspan="2"></td>
+ </tr>
+ <tr id="trbtn" runat="server">
+ <td class="ali02" colspan="2">
+ <asp:Button ID="btn_Submit" Text="鎻愪氦鐢宠" runat="server" OnClick="btn_Submit_form" />
+ <span style="margin-left:10px"></span>
+ <input type="button" value="鍙栨秷 " onclick="top.Dialog.close()" />
+ </td>
+ </tr>
+ </table>
+ </form>
+ </body>
+ <script type="text/javascript" language="javascript">
+ function custormerChange(sel) {
+
+
+
+
+ window.submitUrl = '/Pages/Property/ShebeiWeixiuFukuanAdd.aspx';
+
+ CallServer({ Target: "GetSuplier", id: sel.value }, function (data, textStatus) {
+ var jobj = false;
+ try {
+ jobj = eval('[' + data + ']')[0];
+ } catch (ex) {
+ global.DealDataException(ex); return;
+ }
+ if (jobj != '-2') {
+ document.getElementById('txtBank').value = jobj.Bank;
+ document.getElementById('txtAccountID').value = jobj.AccountID;
+ if (jobj.Huming == "") {
+ document.getElementById('txtHuming').value = jobj.Name;
+ } else {
+ document.getElementById('txtHuming').value = jobj.Huming;
+ }
+
+ } else {
+ document.getElementById('txtBank').value = "";
+ document.getElementById('txtAccountID').value = "";
+ document.getElementById('txtHuming').value = "";
+ }
+
+
+
+ });
+ }
+
+ ///鏂板瀹㈡埛
+ function showCustomer() {
+ top.Dialog.open({ URL: "/Pages/procurement/SuppliersEdit.aspx?Keyid='0'&&flasss=ddfffff", Title: "鏂板渚涘簲鍟�", Width: 950, Height: 650 });
+ }
+
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
+
+ $(function () {
+ SelectAddSearch();
+ });
+
+ function validateAmount(event) {
+ var input = event.target;
+ var value = input.value;
+ var regex = /^\d+(\.\d+)?$/;
+
+ if (!regex.test(value)) {
+ // 杈撳叆鏃犳晥锛岄噸缃�煎苟灏嗙劍鐐硅鍥炴枃鏈
+ input.value = '0';
+ input.focus();
+ alert('璇疯緭鍏ユ湁鏁堢殑姝ｈ礋閲戦锛屼緥濡� 45.67');
+ }
+ }
+
+
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ var oFile = document.getElementById('file1');
+ if (oFile.value == "") {
+ alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ return;
+
+ }
+
+
+
+ var formData = new FormData();
+ formData.append('file', oFile.files[0]); // this.files[0]鏄枃浠跺璞�
+
+
+ $.ajax({
+ url: '/Pages/Property/FileUploadHandler.ashx', // 鏇挎崲涓轰綘鐨勬湇鍔″櫒绔偣
+ type: 'POST',
+ data: formData,
+ contentType: false,
+ processData: false,
+ async: false, // 璁剧疆涓哄悓姝�
+ success: function (response) {
+ console.log('File uploaded successfully:', response);
+ if (response.code == 1) {
+
+ $(".AddTab").last().after($(".AddTab").last().clone(true));
+ $(".AddTab").last().show();
+ $("input[name='HideKeyidFapiao']").last().val("");
+ $("input[name='HideAttachmentFapiao']").last().val(response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().attr("href", response.data);
+ $('a[name="HrefAttachmentFapiao"]').last().html('<img src="' + response.data+'" width="20" height="20" />');
+ alertMsg('涓婁紶鎴愬姛');
+ } else {
+ alertMsg(response.message);
+ }
+
+
+ },
+ error: function (xhr, status, error) {
+ console.error('File upload failed:', status, error);
+ alertMsg('涓婁紶澶辫触');
+ }
+ });
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ function deletefujian(obj) {
+ if (confirm("鏄惁鍒犻櫎閫変腑鏁版嵁锛�")) {
+ $(obj).parent().parent().remove()
+ }
+ }
+ </script>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs
new file mode 100644
index 0000000..ff92834
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.cs
@@ -0,0 +1,308 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Model;
+using CY.Infrastructure.Common;
+using CY.BLL.Integrity;
+using CY.BLL;
+using System.Threading.Tasks;
+using System.Transactions;
+using CY.BLL.OA;
+
+namespace CY.WebForm.Pages.Property
+{
+ //鍚磋緣
+ //鍗栧璇勪环
+ public partial class ShebeiWeixiuFukuanAdd : BasePage
+ {
+ EC_OrderBasicBLL bll_EC_OrderBasicBLL = null;
+
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_WorkPlanBll oA_WorkReminderBll = null;
+ OA_ShebeiManageBLL oA_ShebeiManageBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
+
+
+
+
+ //鍒濆鍖�
+ public ShebeiWeixiuFukuanAdd()
+ {
+ bll_EC_OrderBasicBLL = new EC_OrderBasicBLL();
+
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ oA_WorkReminderBll = new OA_WorkPlanBll();
+ oA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+
+
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetSuplier":
+ LoadCommunication();
+ break;
+
+ default:
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ //Response.Write("-1");
+ Response.Write(ex.Message);
+ }
+ Response.End();
+
+ }
+
+ //缁戝畾鏁版嵁
+ public void InitData()
+ {
+
+
+
+
+ this.txtWeixiuTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
+
+ var keyid = Request["keyid"];
+ var oA_ShebeiWeixiu =oA_ShebeiWeixiuBLL.GetModelByKeyid(keyid.ToInt32());
+ if (oA_ShebeiWeixiu!=null)
+ {
+ this.ShebeiName.InnerText = oA_ShebeiWeixiu.Name;
+ this.txtPlanRemark.InnerText = oA_ShebeiWeixiu.Remark;
+ this.txtWeixiuTime.Value = oA_ShebeiWeixiu.WeixiuTime.HasValue ? oA_ShebeiWeixiu.WeixiuTime.Value.ToString("yyyy-MM-dd") : "";
+ this.txtWeixiuPrice.Value = oA_ShebeiWeixiu.WeixiuPrice.Value.ToString("F2");
+ }
+
+
+ }
+
+
+ /// <summary>
+ /// 鍔犺浇渚涘簲鍟�
+ /// </summary>
+ private void LoadCommunication()
+ {
+ //Response.Clear();
+ //string id = Request["id"];
+ //if (string.IsNullOrEmpty(id))
+ //{
+ // Response.Write("-2");
+ // return;
+ //}
+
+ //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(id);
+
+
+ //Response.Write(null == oA_Suppliers ? "" : JsonHelper.GetJsonStringByObject(oA_Suppliers));
+ }
+
+ //鎻愪氦浜嬩欢
+ protected void btn_Submit_form(object sender, EventArgs e)
+ {
+ AcceptAll3();
+ }
+
+ /// <summary>
+ /// 鎵归噺寮�绁ㄧ敵璇�
+ /// </summary>
+ public void AcceptAll3()
+ {
+
+
+
+ if ( string.IsNullOrEmpty(this.txtWeixiuPrice.Value))
+ {
+ JavaScript.MessageBox("璇疯緭鍏ョ敵璇烽噾棰濓紒", this);
+ return;
+ }
+
+ var keyid = Request["keyid"];
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelByKeyid(keyid.ToInt32());
+ if (oA_ShebeiWeixiu.FukuanShebeiId.HasValue && oA_ShebeiWeixiu.FukuanShebeiId.Value>0)
+ {
+ JavaScript.MessageBox("宸茬粡鐢宠浠樻锛�", this);
+ return;
+ }
+
+
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ )
+ )
+ {
+
+ try
+ {
+ bool result = false;
+
+
+ DateTime nowTime = DateTime.Now;
+
+
+
+ oA_ShebeiWeixiu.WeixiuPrice = this.txtWeixiuPrice.Value.ToDecimal2();
+ oA_ShebeiWeixiu.LastUpdateTime = nowTime;
+ oA_ShebeiWeixiu.Operator = CurrentUser.ShortName;
+
+ //闇�瑕佹坊鍔犲鎵逛俊鎭�
+
+ OA_WorkPlan m_OA_WorkPlan = new OA_WorkPlan();
+
+
+
+ OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing();
+
+
+
+ oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
+ oA_Fukuanshenqing.SupplierId = "0";
+ oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
+ oA_Fukuanshenqing.ApprovalStatus = 0;
+
+ oA_Fukuanshenqing.Molingmoney = 0;
+
+ oA_Fukuanshenqing.Fukuanmoney = this.txtWeixiuPrice.Value.ToDecimal2();
+ oA_Fukuanshenqing.Bank = "";
+ oA_Fukuanshenqing.Huming = "";
+ oA_Fukuanshenqing.AccountID = "";
+ oA_Fukuanshenqing.Yishoumoney = 0;
+ oA_Fukuanshenqing.Youwufapiao = 0;
+ oA_Fukuanshenqing.Fukuanyongtu = "璁惧缁翠慨璐�";
+ oA_Fukuanshenqing.FukuanStatus = 1;
+ oA_Fukuanshenqing.remark = "";
+ oA_Fukuanshenqing.DindanId = "";
+
+
+
+
+ oA_Fukuanshenqing.Creater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.CreateTime = nowTime;
+ oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
+ oA_Fukuanshenqing.LastUpdateTime = nowTime;
+ //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
+ //var _SupplierName = "";
+ //if (oA_Suppliers != null)
+ //{
+ // _SupplierName = oA_Suppliers.Name;
+ //}
+
+ var _SupplierName = oA_ShebeiWeixiu.Name + "缁翠慨";
+ oA_Fukuanshenqing.SupplierName = _SupplierName;
+ var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+
+ oA_ShebeiWeixiu.FukuanshenqingId = id;
+ m_OA_WorkPlan.PlanComplany = id.ToString();
+
+
+
+
+ m_OA_WorkPlan.ApprovalContent = "";
+ m_OA_WorkPlan.ApprovalStaffId = Guid.Empty;
+ m_OA_WorkPlan.ApprovalStaffName = "";
+ m_OA_WorkPlan.ApprovalStatus = 0;
+ m_OA_WorkPlan.ApprovalTime = nowTime;
+ m_OA_WorkPlan.EvaluationContent = "";
+ m_OA_WorkPlan.EvaluationStaff = "";
+ m_OA_WorkPlan.EvaluationStaffId = Guid.Empty;
+ m_OA_WorkPlan.EvaluationStatus = 0;
+ m_OA_WorkPlan.EvaluationTime = nowTime;
+ m_OA_WorkPlan.RewardContent = "";
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.RewardResult = "";
+ m_OA_WorkPlan.RewardType = 0;
+
+ m_OA_WorkPlan.PlanStartTime = nowTime;
+ m_OA_WorkPlan.PlanStatus = 1;
+ m_OA_WorkPlan.SentStaffId = CurrentUser.TrueMemberId;
+ m_OA_WorkPlan.MemberId = CurrentUser.MemberId;
+
+ OA_Staff m_OA_Staff = bll_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;
+
+ m_OA_WorkPlan.Operator = CurrentUser.ShortName;
+
+ m_OA_WorkPlan.PlanContent = oA_ShebeiWeixiu.Name+ "缁翠慨浠樻鐢宠";
+ m_OA_WorkPlan.PlanDataType = 19;
+ m_OA_WorkPlan.PlanMoney = this.txtWeixiuPrice.Value.ToDecimal2();
+ m_OA_WorkPlan.RewardMoney = 0;
+ m_OA_WorkPlan.PlanRemark = "";
+ m_OA_WorkPlan.PlanRunTime = DateTime.Now;
+ m_OA_WorkPlan.PlanTitle = this.txtPlanRemark.Value+ ".缁翠慨鏃ユ湡:"+ this.txtWeixiuTime.Value;
+ m_OA_WorkPlan.PlanType = 3;
+ m_OA_WorkPlan.LastUpdateTime = nowTime;
+ var workid = oA_WorkReminderBll.InserModelAndGetId(m_OA_WorkPlan);
+ m_OA_WorkPlan.Keyid = workid;
+ if (workid > 0)
+ {
+ oA_ShebeiWeixiu.FukuanShebeiId = workid;
+ var ssss = oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+
+
+
+ result = true;
+
+
+
+
+
+
+
+
+
+ if (!result)
+ {
+ return;
+ }
+ //}
+ scope.Complete();
+ }
+ catch (Exception ex)
+ {
+ // 鍥炴粴浜嬪姟
+ }
+ finally
+ {
+ // 閲婃斁璧勬簮
+ scope.Dispose();
+ }
+ }
+ //JavaScript.MessageBox("鎻愪氦鎴愬姛", this);
+
+ //鎿嶄綔鎴愬姛
+ JavaScript.MessageBox("鎻愪氦鎴愬姛", this, true, true);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.designer.cs
new file mode 100644
index 0000000..efe7935
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuFukuanAdd.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeiWeixiuFukuanAdd
+ {
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// ShebeiName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl ShebeiName;
+
+ /// <summary>
+ /// txtPlanRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
+
+ /// <summary>
+ /// txtWeixiuTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtWeixiuTime;
+
+ /// <summary>
+ /// txtWeixiuPrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtWeixiuPrice;
+
+ /// <summary>
+ /// trbtn 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTableRow trbtn;
+
+ /// <summary>
+ /// btn_Submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_Submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
new file mode 100644
index 0000000..b61d9a8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx
@@ -0,0 +1,237 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeiWeixiuList.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeiWeixiuList" %>
+
+<!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 onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeiWeixiuFukuanAdd.aspx?keyid=" + keyid, Title: "缁翠慨浠樻鐢宠", Width: 500, Height: 430 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeiWeixiuAdd.aspx", Title: "缁翠慨鐢宠", Width: 500, Height: 430 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佹姤搴熻璁惧鍚楋紵", function () {
+ window.location = "/Pages/Property/ShebeiWeixiuList.aspx?delete=" + keyid;
+ });
+ }
+ //鎵撳嵃鐩樼偣琛�
+ function PrintCorATable() {
+ var keyid = "";
+ $(".SelectCheck:checked").each(function (ii, vv) {
+ keyid = keyid + "," + $(vv).attr("value_cid");
+ });
+ if (keyid == "")
+ alertMsg("鏈�変腑浠讳綍璁惧");
+ else {
+ openWindowTransferData("/Pages/Property/PrintCheckTable.aspx", "Keyid", 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/Property/ShebeiWeixiuList.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>
+ <select id="selAnzhuangdidian" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="涓�杞﹂棿">涓�杞﹂棿</option>
+ <option value="浜岃溅闂�">浜岃溅闂�</option>
+ <option value="涓夎溅闂�">涓夎溅闂�</option>
+ <option value="鏅鸿兘杞﹂棿">鏅鸿兘杞﹂棿</option>
+ <option value="鍏徃姹借溅">鍏徃姹借溅</option>
+ <option value="鎴愰兘鍏徃">鎴愰兘鍏徃</option>
+ <option value="鍏朵粬杞﹂棿">鍏朵粬杞﹂棿</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 鏁呴殰璐ｄ换浜猴細
+ </td>
+ <td>
+ <select id="selZerenren" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 璁惧绫诲瀷锛�
+ </td>
+ <td>
+ <select id="selCateId" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 鍚嶇О锛�
+ </td>
+ <td>
+ <input type="text" id="txtName" runat="server" />
+ </td>
+
+ <td class="ali03">
+ 鏄惁浠樿垂锛�
+ </td>
+ <td>
+ <select keepdefaultstyle="true" runat="server" id="selStatus">
+ <option value="">鍏ㄩ儴</option>
+ <option value="2" selected="selected">鏈粯璐�</option>
+ <option value="1" >宸蹭粯璐�</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="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="PrintCorATable()"><span class="icon_reply">鎵撳嵃鐩樼偣琛�</span></a>--%>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th width="25">
+ </th>
+
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th style="text-align: center">
+ 缁翠慨鏃堕棿
+ </th>
+ <th style="text-align: center">
+ 璁惧鍒嗙被
+ </th>
+ <th style="text-align: center">
+ 璁惧鍚嶇О
+ </th>
+ <th style="text-align: center">
+ 瀹夎鍦扮偣
+ </th>
+ <th style="text-align: center">
+ 缁存姢璐圭敤
+ </th>
+
+ <th style="text-align: center">
+ 鏁呴殰璐ｄ换浜�
+ </th>
+ <th style="text-align: center">
+ 鎷呰矗璐圭敤
+ </th>
+
+ <th style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" class="SelectCheck" value='<%#Eval("Keyid")%>' value_cid="<%#Eval("Keyid")%>"/>
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("WeixiuTime","{0:yyyy-MM-dd}") %>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("CateName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Name")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Anzhuangdidian")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("WeixiuPrice","{0:F2}")%>
+ </td>
+
+ <td style="text-align: center">
+ <%#Eval("ZerenrenName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("DanzePrice","{0:F2}")%>
+ </td>
+ <td class="Operate " style="text-align: center">
+
+
+ <%#Eval("Caozuo")%>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs
new file mode 100644
index 0000000..44a9503
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.cs
@@ -0,0 +1,110 @@
+锘縰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.Property
+{
+ //鍚磋緣
+ //琛屾斂鐗╁搧绠＄悊
+ public partial class ShebeiWeixiuList : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_ShebeiWeixiuBLL bll_OA_ShebeiWeixiuBLL = null;
+ OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+ //鍒濆鍖�
+ public ShebeiWeixiuList()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ InitData();
+ BindList();
+ }
+
+ }
+
+ //缁戝畾鍒嗙被
+ private void InitData()
+ {
+ this.selCateId.DataSource = bll_OA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId);
+ this.selCateId.DataTextField = "Name";
+ this.selCateId.DataValueField = "Keyid";
+ this.selCateId.DataBind();
+ this.selCateId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selCateId.Value = "";
+
+
+ this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null, null);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selZerenren.Value = "";
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ pa.PageSize = 50;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ var shebeiWeixius = bll_OA_ShebeiWeixiuBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selCateId.Value.ToInt32(), this.txtName.Value, null, this.selAnzhuangdidian.Value, this.selZerenren.Value.ToInt32(), this.selStatus.Value.ToInt32());
+ foreach(var oA_ShebeiWeixiu in shebeiWeixius)
+ {
+ if(oA_ShebeiWeixiu.FukuanShebeiId.HasValue && oA_ShebeiWeixiu.FukuanShebeiId.Value > 0)
+ {
+ if(oA_ShebeiWeixiu.Shifoufufei.HasValue && oA_ShebeiWeixiu.FukuanShebeiId.Value == 1)
+ {
+ oA_ShebeiWeixiu.Caozuo = "宸蹭粯娆�";
+ }
+ else
+ {
+ oA_ShebeiWeixiu.Caozuo = "宸茬敵璇蜂粯娆�";
+ }
+
+
+ }
+ else
+ {
+ oA_ShebeiWeixiu.Caozuo = "<span menu_member_case_id=\"case_Fukuan\" menu_member_case_name=\"缁翠慨浠樻鐢宠\" onclick=\"onEdit('" + oA_ShebeiWeixiu.Keyid + "')\">缁翠慨浠樻鐢宠</span>";
+ }
+ }
+
+ this.RepClientList.DataSource = shebeiWeixius;
+ 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/Property/ShebeiWeixiuList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs
new file mode 100644
index 0000000..e48484e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeiWeixiuList.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeiWeixiuList
+ {
+
+ /// <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>
+ /// selAnzhuangdidian 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAnzhuangdidian;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
+ /// selCateId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;
+
+ /// <summary>
+ /// txtName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
+
+ /// <summary>
+ /// selStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
+
+ /// <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>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx
new file mode 100644
index 0000000..ea07da2
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx
@@ -0,0 +1,121 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeimanageEdit.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeimanageEdit" %>
+
+<!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 CheckStaff() {
+ var IsCanSubmit = undefined;
+ var Name = $.trim($("#txtCarNumber").val());
+ if (Name != "") {
+ $.ajax({
+ url: "/Pages/common/CommonAjax.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { dateType: "shebeiNamecheckname", name: Name, keyid: '<%=Request["keyid"] %>' },
+ global: false,
+ cache: false,
+ async: false,
+ success: function (data) {
+ if (data == "1") {
+ IsCanSubmit = false;
+ } else {
+ IsCanSubmit = true;
+ }
+ }
+ });
+ if (!IsCanSubmit) {
+ alertMsg("姝よ澶囧悕绉板凡瀛樺湪锛屽鏈夌浉鍚岋紝璇锋敞鎰忓尯鍒嗘坊鍔�");
+ return false;
+ }
+ } else {
+ alertMsg("璇峰～鍐欒澶囧悕绉�");
+ return false;
+ }
+ return true;
+ }
+
+ $(function () {
+ $("#txtCarNumber").blur(function () {
+ CheckStaff();
+ });
+ });
+ </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>
+ <select id="selCateId" runat="server" keepdefaultstyle="true">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 璁惧鍚嶇О锛�
+ </td>
+ <td>
+ <input id="txtCarNumber" style="width: 100px;" type="text" runat="server" class="req" maxlength="50" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 璁惧浠峰�硷細
+ </td>
+ <td>
+ <input id="txtPrice" class="float req" style="width: 100px;" type="text" runat="server" />
+ </td>
+ </tr>
+
+ <tr>
+ <td class="ali03">
+ 瀹夎鍦扮偣锛�
+ </td>
+ <td>
+ <select id="selAnzhuangdidian" runat="server" keepdefaultstyle="true">
+ <option value="涓�杞﹂棿">涓�杞﹂棿</option>
+ <option value="浜岃溅闂�">浜岃溅闂�</option>
+ <option value="涓夎溅闂�">涓夎溅闂�</option>
+ <option value="鏅鸿兘杞﹂棿">鏅鸿兘杞﹂棿</option>
+ <option value="鍏徃姹借溅">鍏徃姹借溅</option>
+ <option value="鎴愰兘鍏徃">鎴愰兘鍏徃</option>
+ <option value="鍏朵粬杞﹂棿">鍏朵粬杞﹂棿</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 鍚敤鏃ユ湡锛�
+ </td>
+ <td>
+ <input id='txtQiyongTime' class='date req' runat="server" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03">
+ 璐ｄ换浜猴細
+ </td>
+ <td >
+ <select id="selZerenren" runat="server" keepdefaultstyle="true">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" style="text-align: center;">
+ <asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckStaff())return true;else return false; " Text="鎻愪氦" />
+ </td>
+ </tr>
+ </table>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs
new file mode 100644
index 0000000..e905a6b
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.cs
@@ -0,0 +1,154 @@
+锘縰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.Property
+{
+ //鍚磋緣
+ //琛屾斂鐗╁搧
+ public partial class ShebeimanageEdit : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+
+ public ShebeimanageEdit()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.selCateId.DataSource = bll_OA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId);
+ this.selCateId.DataTextField = "Name";
+ this.selCateId.DataValueField = "Keyid";
+ this.selCateId.DataBind();
+ //this.selCateId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ //this.selCateId.Value = "";
+
+
+ this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ //this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ //this.selZerenren.Value = "";
+
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ OA_ShebeiManage m_OA_ShebeiManage = bll_OA_ShebeiManageBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_ShebeiManage != null)
+ {
+ this.selCateId.Value = m_OA_ShebeiManage.CateId.ToString2();
+ this.txtCarNumber.Value = m_OA_ShebeiManage.Name;
+ this.txtPrice.Value = m_OA_ShebeiManage.Price.Value.ToString("0.00");
+ this.selAnzhuangdidian.Value = m_OA_ShebeiManage.Anzhuangdidian;
+ this.txtQiyongTime.Value = m_OA_ShebeiManage.QiyongTime.HasValue? m_OA_ShebeiManage.QiyongTime.Value.ToString("yyyy-MM-dd"):"";
+ this.selZerenren.Value = m_OA_ShebeiManage.Zerenren.HasValue? m_OA_ShebeiManage.Zerenren.ToString():"";
+ }
+ }
+
+ //琛ㄥ崟鎻愪氦
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ try
+ {
+ //if (string.IsNullOrEmpty(this.txtAllNum.Value) || string.IsNullOrEmpty(this.txtReceiveNum.Value))
+ //{
+ // JavaScript.MessageBox("鐗╁搧鎬绘暟閲忓拰宸查鍙栨暟閲忓潎涓嶈兘涓虹┖", this);
+ // return;
+ //}
+
+ //if (this.txtAllNum.Value.ToInt32() < this.txtReceiveNum.Value.ToInt32())
+ //{
+ // JavaScript.MessageBox("宸查鍙栨暟閲忎笉鑳藉ぇ浜庢�绘暟閲�",this);
+ // return;
+ //}
+
+ DateTime nowTime = DateTime.Now;
+ OA_ShebeiManage m_OA_ShebeiManage = bll_OA_ShebeiManageBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_ShebeiManage == null)
+ {
+ m_OA_ShebeiManage = new OA_ShebeiManage();
+ m_OA_ShebeiManage.MemberId = CurrentUser.MemberId;
+
+
+ }
+ m_OA_ShebeiManage.CateId = this.selCateId.Value.ToInt32();
+ m_OA_ShebeiManage.Name = this.txtCarNumber.Value;
+ m_OA_ShebeiManage.Price = this.txtPrice.Value.ToDecimal2();
+ m_OA_ShebeiManage.Anzhuangdidian = this.selAnzhuangdidian.Value;
+
+ m_OA_ShebeiManage.QiyongTime = this.txtQiyongTime.Value.ToDateTime2();
+
+ m_OA_ShebeiManage.Zerenren = this.selZerenren.Value.ToInt32();
+ var a_Staff = bll_OA_StaffBLL.GetModelByKeyid(m_OA_ShebeiManage.Zerenren);
+ if (a_Staff != null)
+ {
+ m_OA_ShebeiManage.ZerenrenName = a_Staff.Name;
+ }
+ else
+ {
+ m_OA_ShebeiManage.ZerenrenName = "";
+ }
+ m_OA_ShebeiManage.Remark = "";
+ m_OA_ShebeiManage.Operator = CurrentUser.ShortName;
+ m_OA_ShebeiManage.LastUpdateTime = nowTime;
+ m_OA_ShebeiManage.Status = 2;
+
+ if (Request["keyid"].ToInt32() > 0)
+ {
+ if (bll_OA_ShebeiManageBLL.UpdateModel(m_OA_ShebeiManage))
+ {
+ JavaScript.MessageBox("鏇存柊鎴愬姛", this, true, true);
+ }
+
+ else
+ JavaScript.MessageBox("鏇存柊澶辫触", this);
+ }
+ else
+ {
+ if (bll_OA_ShebeiManageBLL.InsertModel(m_OA_ShebeiManage))
+ {
+ this.txtCarNumber.Value = "";
+ this.txtPrice.Value="";
+ this.selAnzhuangdidian.Value = "";
+
+ this.txtQiyongTime.Value = "";
+ JavaScript.MessageBox("鏂板鎴愬姛", this, false, 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/Property/ShebeimanageEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.designer.cs
new file mode 100644
index 0000000..6c76685
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageEdit.aspx.designer.cs
@@ -0,0 +1,107 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeimanageEdit
+ {
+
+ /// <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>
+ /// selCateId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;
+
+ /// <summary>
+ /// txtCarNumber 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCarNumber;
+
+ /// <summary>
+ /// txtPrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrice;
+
+ /// <summary>
+ /// selAnzhuangdidian 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAnzhuangdidian;
+
+ /// <summary>
+ /// txtQiyongTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtQiyongTime;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx
new file mode 100644
index 0000000..5de3224
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx
@@ -0,0 +1,240 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShebeimanageList.aspx.cs" Inherits="CY.WebForm.Pages.Property.ShebeimanageList" %>
+
+<!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 onEdit(keyid) {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeimanageEdit.aspx?keyid=" + keyid, Title: "璁惧淇敼", Width: 500, Height: 430 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/Property/ShebeimanageEdit.aspx", Title: "璁惧鐗╁搧", Width: 500, Height: 430 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佹姤搴熻璁惧鍚楋紵", function () {
+ window.location = "/Pages/Property/ShebeimanageList.aspx?delete=" + keyid;
+ });
+ }
+ //鎵撳嵃鐩樼偣琛�
+ function PrintCorATable() {
+ var keyid = "";
+ $(".SelectCheck:checked").each(function (ii, vv) {
+ keyid = keyid + "," + $(vv).attr("value_cid");
+ });
+ if (keyid == "")
+ alertMsg("鏈�変腑浠讳綍璁惧");
+ else {
+ openWindowTransferData("/Pages/Property/PrintCheckTable.aspx", "Keyid", 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/Property/ShebeimanageList.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>
+ <select id="selAnzhuangdidian" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ <option value="涓�杞﹂棿">涓�杞﹂棿</option>
+ <option value="浜岃溅闂�">浜岃溅闂�</option>
+ <option value="涓夎溅闂�">涓夎溅闂�</option>
+ <option value="鏅鸿兘杞﹂棿">鏅鸿兘杞﹂棿</option>
+ <option value="鍏徃姹借溅">鍏徃姹借溅</option>
+ <option value="鎴愰兘鍏徃">鎴愰兘鍏徃</option>
+ <option value="鍏朵粬杞﹂棿">鍏朵粬杞﹂棿</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 璐ｄ换浜猴細
+ </td>
+ <td>
+ <select id="selZerenren" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 璁惧绫诲瀷锛�
+ </td>
+ <td>
+ <select id="selCateId" runat="server" keepdefaultstyle="true">
+ <option value="">鍏ㄩ儴</option>
+ </select>
+ </td>
+ <td class="ali03">
+ 鍚嶇О锛�
+ </td>
+ <td>
+ <input type="text" id="txtName" runat="server" />
+ </td>
+
+ <td class="ali03">
+ 鏄惁鎶ュ簾锛�
+ </td>
+ <td>
+ <select keepdefaultstyle="true" runat="server" id="selStatus">
+ <option value="">鍏ㄩ儴</option>
+ <option value="2" selected="selected">鏈姤搴�</option>
+ <option value="1" >宸叉姤搴�</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="box_tool_line">
+ </div>
+ <a href="javascript:;" onclick="PrintCorATable()"><span class="icon_reply">鎵撳嵃鐩樼偣琛�</span></a>--%>
+ <div class="clear">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="clear">
+ </div>
+ </div>
+ <div>
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle">
+ <tr>
+ <th width="25">
+ </th>
+ <th width="30" style="text-align: center">
+ 缂栧彿
+ </th>
+ <th style="text-align: center">
+ 璁惧鍒嗙被
+ </th>
+ <th style="text-align: center">
+ 璁惧鍚嶇О
+ </th>
+ <th style="text-align: center">
+ 瀹夎鍦扮偣
+ </th>
+ <th style="text-align: center">
+ 璁惧浠锋牸
+ </th>
+ <th style="text-align: center">
+ 鍚敤鏃堕棿
+ </th>
+ <th style="text-align: center">
+ 绠＄悊璐ｄ换浜�
+ </th>
+ <th style="text-align: center">
+ 鏈勾缁翠慨璐�
+ </th>
+ <th style="text-align: center">
+ 鏈湀缁翠慨璐�
+ </th>
+
+ <th style="text-align: center">
+ 鎿嶄綔
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" class="SelectCheck" value='<%#Eval("Keyid")%>' value_cid="<%#Eval("Keyid")%>"/>
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("CateName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Name")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Anzhuangdidian")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Price","{0:F2}")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("QiyongTime","{0:yyyy-MM-dd}") %>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("ZerenrenName")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Nianprice")%>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("Yueprice")%>
+ </td>
+ <td class="Operate " style="text-align: center">
+ <span menu_member_case_id="case_CarEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span>
+
+ <%#Eval("Status").ToString()=="1"?"宸叉姤搴�":"<span menu_member_case_id=\"case_Baofei\" menu_member_case_name=\"璁惧鎶ュ簾\" onclick=\"onDele('"+Eval("keyid") +"')\">璁惧鎶ュ簾</span>"%>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <div id="page">
+ <uc:UCPager ID="UCPager1" runat="server" />
+ </div>
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.cs
new file mode 100644
index 0000000..d0d6f77
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.cs
@@ -0,0 +1,132 @@
+锘縰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.Property
+{
+ //鍚磋緣
+ //琛屾斂鐗╁搧绠＄悊
+ public partial class ShebeimanageList : BasePage
+ {
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
+ OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
+ OA_StaffBLL bll_OA_StaffBLL = null;
+ OA_ShebeiWeixiuBLL bll_OA_ShebeiWeixiuBLL = null;
+ //鍒濆鍖�
+ public ShebeimanageList()
+ {
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
+ bll_OA_StaffBLL = new OA_StaffBLL();
+ bll_OA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ UCPager1.AspNetPager.PageChanged += AspNetPager1_PageChanged;
+ if (!IsPostBack)
+ {
+ InitData();
+ BindList();
+ }
+ if (Request["delete"] != null)
+ {
+ OA_ShebeiManage model = bll_OA_ShebeiManageBLL.GetModelByKeyid(Request["delete"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ model.Status = 1;
+ model.Operator = CurrentUser.ShortName;
+ model.LastUpdateTime = DateTime.Now;
+ bll_OA_ShebeiManageBLL.UpdateModel(model);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/Property/ShebeiManageList.aspx");
+ }
+ else
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+
+ if (Request["deleteKeyIds"] != null)
+ {
+ List<int> deleteKeyIdList = new List<int>();
+ string deleteKeyIds = Request["deleteKeyIds"].ToString().Trim(',');
+ string[] keyIdArry = deleteKeyIds.Split(',');
+ foreach (string keyId in keyIdArry)
+ {
+ OA_ShebeiManage model = bll_OA_ShebeiManageBLL.GetModelByKeyid(keyId.ToInt32());
+ if (model.Keyid != null && model != null)
+ bll_OA_ShebeiManageBLL.DeleteModel(model);
+ else
+ {
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ return;
+ }
+ }
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/Property/ShebeiManageList.aspx");
+ }
+ }
+
+ //缁戝畾鍒嗙被
+ private void InitData()
+ {
+ this.selCateId.DataSource = bll_OA_ShebeiManageBLL.GetDataByType(CurrentUser.MemberId);
+ this.selCateId.DataTextField = "Name";
+ this.selCateId.DataValueField = "Keyid";
+ this.selCateId.DataBind();
+ this.selCateId.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selCateId.Value = "";
+
+
+ this.selZerenren.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId,null, null);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selZerenren.Value = "";
+
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ Pagination pa = new Pagination();
+ pa.PageSize = 50;
+ pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
+ var shebeiManages = bll_OA_ShebeiManageBLL.SelectModelPage(pa, CurrentUser.MemberId, this.selCateId.Value.ToInt32(), this.txtName.Value, this.selStatus.Value.ToInt32(), this.selAnzhuangdidian.Value, this.selZerenren.Value.ToInt32());
+ foreach (var shebeiManage in shebeiManages)
+ {
+ var shebeiWeixiu = bll_OA_ShebeiWeixiuBLL.GetModelBytiaojian(shebeiManage.Keyid.Value);
+ if (shebeiWeixiu != null)
+ {
+ shebeiManage.Yueprice = shebeiWeixiu.WeixiuPrice;
+ shebeiManage.Nianprice = shebeiWeixiu.DanzePrice;
+ }
+ }
+
+ this.RepClientList.DataSource = shebeiManages;
+ 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/Property/ShebeimanageList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.designer.cs
new file mode 100644
index 0000000..5678871
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/ShebeimanageList.aspx.designer.cs
@@ -0,0 +1,116 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class ShebeimanageList
+ {
+
+ /// <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>
+ /// selAnzhuangdidian 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAnzhuangdidian;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
+ /// selCateId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;
+
+ /// <summary>
+ /// txtName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
+
+ /// <summary>
+ /// selStatus 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
+
+ /// <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>
+ /// UCPager1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.UCPager UCPager1;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 2493e5b..1b5688b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -80,7 +80,7 @@
<td class="ali03 w100px">瀹㈡埛鍚嶇О锛�</td>
<td class="w300px" >
- <input id="txtCompanyName" type="text" runat="server" class="req customcompany" style=" width:280px;" maxlength="20" AUTOCOMPLETE="OFF" /><span style="color:red;">*</span>
+ <input id="txtCompanyName" type="text" runat="server" class="req" style=" width:280px;" maxlength="100" AUTOCOMPLETE="OFF" /><span style="color:red;">*</span>
<input id="txtHideMemberId" type="hidden" runat="server"/>
<input id="txtHideMemberType" type="hidden" runat="server"/>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs
index 751375e..a89423d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingHuikuan.aspx.cs
@@ -90,11 +90,11 @@
bool isWin = false;
OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(orderIds.ToGuid2());
- if(oA_Kaipiaoshenqing.kpmoney - (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) < this.txtHuikuanJIne.Value.ToDecimal2())
- {
- JavaScript.MessageBox("鍥炴閲戦澶т簬鍓╀綑鍥炴閲戦锛�", this);
- return;
- }
+ //if(oA_Kaipiaoshenqing.kpmoney - (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) < this.txtHuikuanJIne.Value.ToDecimal2())
+ //{
+ // JavaScript.MessageBox("鍥炴閲戦澶т簬鍓╀綑鍥炴閲戦锛�", this);
+ // return;
+ //}
//oA_Kaipiaoshenqing.Kaipiaoshenqing = 3;
@@ -103,9 +103,9 @@
//oA_Kaipiaoshenqing.Fapiaohao = this.txtFapiaohao.Value.Trim();
- oA_Kaipiaoshenqing.Huikuanmoney = (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) + this.txtHuikuanJIne.Value.ToDecimal2();
+ //oA_Kaipiaoshenqing.Huikuanmoney = (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) + this.txtHuikuanJIne.Value.ToDecimal2();
- isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+ //isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index 1064da4..f3c9fe3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -147,7 +147,7 @@
}
//鏌ョ湅
function onView(keyid, yongtu) {
- if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�") {
+ if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�" && yongtu != "璁惧缁翠慨璐�" ) {
top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
}
@@ -213,6 +213,8 @@
<select keepdefaultstyle='true' id='selFukuanyongtu' runat="server" >
<option value="">鍏ㄩ儴</option>
<option value="澶栧崗鍔犲伐璐�">澶栧崗鍔犲伐璐�</option>
+ <option value="閲囪喘浠樻">閲囪喘浠樻</option>
+ <option value="璁惧缁翠慨璐�">璁惧缁翠慨璐�</option>
<option value="鍏朵粬浠樻">鍏朵粬浠樻</option>
</select>
</td>
@@ -371,7 +373,7 @@
<td>
- <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\",\""+Eval("SupplierId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻") || Eval("Fukuanyongtu").ToString().Equals("璁惧缁翠慨璐�")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\",\""+Eval("SupplierId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
index 468178e..81de6eb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -463,8 +463,8 @@
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
this.selPayStates.Value = "1";
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
@@ -562,7 +562,7 @@
IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
foreach(var oA_Fukuanshenqing in result)
{
- if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻")
+ if(oA_Fukuanshenqing.Fukuanyongtu == "澶栧崗鍔犲伐璐�" || oA_Fukuanshenqing.Fukuanyongtu == "閲囪喘浠樻" || oA_Fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
{
var workPlan = _WorkPlanBll.GetModelByFukuanshenqid(oA_Fukuanshenqing.Keyid.ToString(),"");
if (workPlan != null)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
index ef60b10..56a5aa1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/common/CommonAjax.aspx.cs
@@ -48,6 +48,7 @@
OA_CarManageBll bll_OA_CarManageBll = null;
OA_PropertyCateBLL bll_OA_PropertyCateBLL = null;
OA_PropertyManageBLL bll_OA_PropertyManageBLL = null;
+ OA_ShebeiManageBLL bll_OA_ShebeiManageBLL = null;
OA_StaffPostBLL bll_OA_StaffPostBLL = null;
OA_StaffResumeBLL bll_OA_StaffResumeBLL = null;
OA_StaffPostLogBLL bll_OA_StaffPostLogBLL = null;
@@ -90,6 +91,7 @@
bll_OA_CarManageBll = new OA_CarManageBll();
bll_OA_PropertyCateBLL = new OA_PropertyCateBLL();
bll_OA_PropertyManageBLL = new OA_PropertyManageBLL();
+ bll_OA_ShebeiManageBLL = new OA_ShebeiManageBLL();
bll_OA_StaffPostBLL = new OA_StaffPostBLL();
bll_OA_StaffResumeBLL = new OA_StaffResumeBLL();
bll_OA_StaffPostLogBLL = new OA_StaffPostLogBLL();
@@ -241,6 +243,10 @@
else if (Request["dateType"] == "propertyNamecheckname")
{
Response.Write(IsExitsPropertyNameCateName(Request["name"], Request["keyid"]));
+ }
+ else if (Request["dateType"] == "shebeiNamecheckname")
+ {
+ Response.Write(IsExitsShebeiNameCateName(Request["name"], Request["keyid"]));
}
else if (Request["dateType"] == "resumeCateChange")
{
@@ -1424,6 +1430,22 @@
#endregion
+
+ #region 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+
+ /// <summary>
+ /// 妫�娴嬭鏀跨墿鍝佹槸鍚﹂噸澶�
+ /// </summary>
+ /// <param name="Name"></param>
+ /// <param name="Keyid"></param>
+ /// <returns></returns>
+ public int IsExitsShebeiNameCateName(string Name, string Keyid)
+ {
+ return bll_OA_ShebeiManageBLL.IsExitsName(Name, CurrentUser.MemberId, Keyid);
+ }
+
+ #endregion
+
#region 鏍规嵁鑱屼綅绫诲埆鑾峰彇鍏ㄩ儴鑱屼綅
public string GetPostListByCateId(int? cateId, int? Num)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs
index d47b9dc..a9db54b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomerFapiao.aspx.cs
@@ -175,7 +175,8 @@
m_OA_AdvanceMoneyRecord.Remark = this.txtRemark.Value.ToString2();
kaipiaoshenqing.Kehumoney = Kehumoney + money.Value;
- var sss = oA_KaipiaoshenqingBLL.UpdateModel(kaipiaoshenqing);
+ kaipiaoshenqing.Huikuanmoney = (kaipiaoshenqing.Huikuanmoney.HasValue ? kaipiaoshenqing.Huikuanmoney.Value : 0) + money.Value;
+ var sss = oA_KaipiaoshenqingBLL.UpdateModel(kaipiaoshenqing);
if (bll_OA_AdvanceMoneyRecordBLL.DepositsMoney(m_OA_FirmAccount, m_OA_CorporateClients, m_OA_FirmAccountRecord, m_OA_AdvanceMoneyRecord))
{
BindList();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomershouruqueren.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomershouruqueren.aspx.cs
index b83d811..df45a50 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomershouruqueren.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/DepositsCustomershouruqueren.aspx.cs
@@ -222,6 +222,7 @@
m_OA_AdvanceMoneyRecord.Remark = "";
kaipiaoshenqing.Kehumoney = Kehumoney + money.Value;
+ kaipiaoshenqing.Huikuanmoney = (kaipiaoshenqing.Huikuanmoney.HasValue ? kaipiaoshenqing.Huikuanmoney.Value : 0) + money.Value;
isWin = oA_KaipiaoshenqingBLL.UpdateModel(kaipiaoshenqing);
isWin = bll_OA_CorporateClientsBLL.UpdateModel(m_OA_CorporateClients);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
index 1f23bc6..06eee39 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShoukuan.aspx.cs
@@ -267,9 +267,17 @@
}
}
+ OA_Kaipiaoshenqing oA_Kaipiaoshenqing = oA_KaipiaoshenqingBLL.GetModelByKeyid(id.ToGuid2());
+ if (oA_Kaipiaoshenqing != null)
+ {
+ oA_Kaipiaoshenqing.Huikuanmoney = (oA_Kaipiaoshenqing.Huikuanmoney.HasValue ? oA_Kaipiaoshenqing.Huikuanmoney.Value : 0) + this.txtReceiveMoney.Value.ToDecimal2();
+ isWin = oA_KaipiaoshenqingBLL.UpdateModel(oA_Kaipiaoshenqing);
+ }
+
-
+
+
scope.Complete();
}
catch (Exception ex)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShouruqueren.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShouruqueren.aspx.cs
index ae5e110..2885989 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShouruqueren.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/InvoicingShouruqueren.aspx.cs
@@ -265,11 +265,15 @@
}
}
-
-
+ if (a_Kaipiaoshenqing != null)
+ {
+ a_Kaipiaoshenqing.Huikuanmoney = (a_Kaipiaoshenqing.Huikuanmoney.HasValue ? a_Kaipiaoshenqing.Huikuanmoney.Value : 0) + this.txtReceiveMoney.Value.ToDecimal2();
+ isWin = oA_KaipiaoshenqingBLL.UpdateModel(a_Kaipiaoshenqing);
+ }
-
+
+
scope.Complete();
}
catch (Exception ex)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
index 26592f9..865d732 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -25,6 +25,7 @@
OA_SuppliersBLL oA_SuppliersBLL = null;
OA_StaffBLL staffBLL = null;
OA_BaozhengjinBLL oA_BaozhengjinBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
public WaixieExpenses()
{
@@ -38,6 +39,7 @@
oA_SuppliersBLL = new OA_SuppliersBLL();
staffBLL = new OA_StaffBLL();
oA_BaozhengjinBLL = new OA_BaozhengjinBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -169,6 +171,13 @@
if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
+ if(fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+ {
+ var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, null, fukuanshenqing.Keyid);
+ shebeiWeixiu.Shifoufufei = 1;
+ oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+ }
+
}
if (molingmoney.HasValue && molingmoney.Value > 0)
@@ -176,6 +185,12 @@
if ((money + molingmoney.Value) >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
{
fukuanshenqing.FukuanStatus = 2;
+ if (fukuanshenqing.Fukuanyongtu == "璁惧缁翠慨璐�")
+ {
+ var shebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(null, null, fukuanshenqing.Keyid);
+ shebeiWeixiu.Shifoufufei = 1;
+ oA_ShebeiWeixiuBLL.UpdateModel(shebeiWeixiu);
+ }
}
}
@@ -209,7 +224,7 @@
if (!string.IsNullOrEmpty(this.selSubject.Value))
{
var oA_SubjectSet = _OA_SubjectSetBLL.getSingleSubject(firmAccountRecord.SubjectId);
- if (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0)
+ if (fukuanshenqing.Fukuanyongtu == "鍏朵粬浠樻" && (oA_SubjectSet.SubjectName.IndexOf("鎶曟爣淇濊瘉閲�") >= 0 || oA_SubjectSet.SubjectName.IndexOf("灞ョ害淇濊瘉閲�") >= 0))
{
//濡傛灉閫夋嫨绉戠洰鏄繚璇侀噾锛屾彃鍏ヤ互鏉′繚璇侀噾鏁版嵁
OA_Baozhengjin oA_Baozhengjin = new OA_Baozhengjin();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
index 9e22a3e..946ef59 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
@@ -95,6 +95,18 @@
</asp:Repeater>
</td>
</tr>
+
+ <tr style='<%=planDataType=="18"?"":"display:none;" %>'>
+ <td colspan="6">
+ 鏄惁鐢宠浠樻锛�
+
+ <span id="spanShifoushenqingfukuan" runat="server"></span>
+
+ 鏁呴殰璐ｄ换浜猴細 <span id="spanZerenren" runat="server"></span>
+ 鎷呰矗璐圭敤锛� <span id="spanDanzefeiyong" runat="server"></span> </td>
+
+
+ </tr>
</table>
</fieldset>
<fieldset>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
index 20511d2..94d0f6d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
@@ -64,6 +64,19 @@
this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
this.RepClientList.DataBind();
}
+ else if(m_OA_WorkPlan.PlanDataType == 18)
+ {
+ if (string.IsNullOrEmpty(m_OA_WorkPlan.PlanComplany))
+ {
+ this.spanShifoushenqingfukuan.InnerText = "鍚�";
+ }
+ else
+ {
+ this.spanShifoushenqingfukuan.InnerText = "鏄�";
+ }
+ this.spanZerenren.InnerText = m_OA_WorkPlan.RewardResult;
+ this.spanDanzefeiyong.InnerText = m_OA_WorkPlan.RewardContent;
+ }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
index d5c2619..5390224 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
@@ -123,6 +123,33 @@
protected global::System.Web.UI.WebControls.Repeater RepClientList;
/// <summary>
+ /// spanShifoushenqingfukuan 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShifoushenqingfukuan;
+
+ /// <summary>
+ /// spanZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanZerenren;
+
+ /// <summary>
+ /// spanDanzefeiyong 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDanzefeiyong;
+
+ /// <summary>
/// panelApprovalNo 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index 72a2f94..6e2f616 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -85,8 +85,10 @@
<option value="11">瀹㈡埛鑱旇皧</option>
<option value="13">寮�绁ㄧ敵璇�</option>
<option value="14">澶栧崗浠樻鐢宠</option>
- <option value="15">浠樻鐢宠</option>
- <option value="16">閲囪喘浠樻鐢宠</option>
+ <option value="15">浠樻鐢宠</option>
+ <option value="16">閲囪喘浠樻鐢宠</option>
+ <option value="18">璁惧缁翠慨鐢宠</option>
+ <option value="19">缁翠慨浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
@@ -170,7 +172,7 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>' />
+ <input type="checkbox" value='<%#Eval("Keyid")%>' class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14"|| Eval("PlanDataType").ToString()=="18"|| Eval("PlanDataType").ToString()=="19"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>' />
</td>
<td style="text-align: center">
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
@@ -195,8 +197,8 @@
</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("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" || Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>淇敼</span>
- <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>鍒犻櫎</span>
+ <span menu_member_case_id="case_PlanEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" || Eval("PlanDataType").ToString()=="18"|| Eval("PlanDataType").ToString()=="19"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>淇敼</span>
+ <span menu_member_case_id="case_PlanDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')" class='<%#(Eval("ApprovalStatus").ToString()=="1" || Eval("ApprovalStatus").ToString()=="3" || Eval("PlanDataType").ToString()=="13" || Eval("PlanDataType").ToString()=="14" || Eval("PlanDataType").ToString()=="18"|| Eval("PlanDataType").ToString()=="19"|| Eval("PlanDataType").ToString()=="16")?"AlreadyReply":""%>'>鍒犻櫎</span>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
index ecc3792..29d025f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -97,6 +97,20 @@
</asp:Repeater>
</td>
</tr>
+
+ <tr style='<%=planDataType=="18"?"":"display:none;" %>'>
+ <td colspan="6">
+ 鏄惁鐢宠浠樻锛�
+
+ <span id="spanShifoushenqingfukuan" runat="server"></span>
+
+ 鏁呴殰璐ｄ换浜猴細 <select keepDefaultStyle="true" runat="server" id="selZerenren" class="wx100px" >
+
+ </select>
+ 鎷呰矗璐圭敤锛�<input id='txtDanzePrice' runat="server" maxlength='18' class="float" /></td>
+
+
+ </tr>
</table>
</fieldset>
<fieldset>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index 3344372..3bc6298 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -27,6 +27,8 @@
EC_MemberBasicBLL _eC_MemberBasicBLL = null;
public string planDataType = "";
OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_StaffBLL oA_StaffBLL = null;
+ OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -35,6 +37,8 @@
_oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
_eC_MemberBasicBLL = new EC_MemberBasicBLL();
oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ oA_StaffBLL = new OA_StaffBLL();
+ oA_ShebeiWeixiuBLL = new OA_ShebeiWeixiuBLL();
}
//椤甸潰鍔犺浇
@@ -76,6 +80,23 @@
{
this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 15);
this.RepClientList.DataBind();
+ }
+ else if(m_OA_WorkPlan.PlanDataType == 18)
+ {
+ if (string.IsNullOrEmpty(m_OA_WorkPlan.PlanComplany))
+ {
+ this.spanShifoushenqingfukuan.InnerText = "鍚�";
+ }
+ else
+ {
+ this.spanShifoushenqingfukuan.InnerText = "鏄�";
+ }
+ this.selZerenren.DataSource = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, null, null);
+ this.selZerenren.DataTextField = "Name";
+ this.selZerenren.DataValueField = "Keyid";
+ this.selZerenren.DataBind();
+ this.selZerenren.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ this.selZerenren.Value = "";
}
}
}
@@ -124,6 +145,43 @@
}
+ if (m_OA_WorkPlan.ApprovalStatus == 1 && (m_OA_WorkPlan.PlanDataType == 18 || m_OA_WorkPlan.PlanDataType == 19))
+ {//鎵瑰噯鍙嶅啓
+ if (!string.IsNullOrEmpty(m_OA_WorkPlan.PlanComplany))
+ {
+ var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ fukuanshenqing.ApprovalStatus = 1;
+ _oA_FukuanshenqingBLL.UpdateModel(fukuanshenqing);
+ }
+
+
+ if(m_OA_WorkPlan.PlanDataType == 18)
+ {
+ m_OA_WorkPlan.RewardContent = this.txtDanzePrice.Value;
+
+ var oA_ShebeiWeixiu = oA_ShebeiWeixiuBLL.GetModelBytiaojian(m_OA_WorkPlan.Keyid, null, null);
+ if (!string.IsNullOrEmpty(this.selZerenren.Value))
+ {
+ var staff = oA_StaffBLL.GetModelByKeyid(this.selZerenren.Value.ToInt32());
+ if (staff != null)
+ {
+ m_OA_WorkPlan.RewardResult = staff.Name;
+ oA_ShebeiWeixiu.ZerenrenName = staff.Name;
+ }
+ }
+ if (oA_ShebeiWeixiu != null)
+ {
+ oA_ShebeiWeixiu.Zerenren = this.selZerenren.Value.ToInt32();
+
+ oA_ShebeiWeixiu.DanzePrice = this.txtDanzePrice.Value.ToDecimal2();
+ oA_ShebeiWeixiuBLL.UpdateModel(oA_ShebeiWeixiu);
+ }
+ }
+
+
+ }
+
+
if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 15)
{//鎵瑰噯鏂板浠樻鐢宠
OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
index 80f2923..24c4992 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
@@ -123,6 +123,33 @@
protected global::System.Web.UI.WebControls.Repeater RepClientList;
/// <summary>
+ /// spanShifoushenqingfukuan 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShifoushenqingfukuan;
+
+ /// <summary>
+ /// selZerenren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selZerenren;
+
+ /// <summary>
+ /// txtDanzePrice 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtDanzePrice;
+
+ /// <summary>
/// selApprovalStatus 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 1e8195e..837aae3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -61,6 +61,8 @@
<option value="14">澶栧崗浠樻鐢宠</option>
<option value="15">浠樻鐢宠</option>
<option value="16">閲囪喘浠樻鐢宠</option>
+ <option value="18">璁惧缁翠慨鐢宠</option>
+ <option value="19">缁翠慨浠樻鐢宠</option>
<option value="12">鍏朵粬</option>
</select>
</td>
--
Gitblit v1.9.1