From f1b2ef9600a038008e11b151a5cb7cffab336be5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 二月 2025 09:26:26 +0800
Subject: [PATCH] 把这个我们政财里面有个常用资料,常用资料有通讯录和账号密码。把这个也放到川一头去,川饮也需要这个东西,就放在川渝的行政管理好行政管理里面。你二级栏目就是常用资料。
---
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.BLL/CY.BLL.csproj | 1
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs | 111 +++-
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx | 18
CY_ECommercePlatform/CY.WebForm/js/business/Order.js | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 18
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShejijijianDAL.cs | 272 +++++++++++
CY_ECommercePlatform/CY.Model/OA/OA_Shejijijian.cs | 222 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs | 124 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.designer.cs | 40
CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs | 5
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.designer.cs | 71 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs | 9
CY_ECommercePlatform/CY.Model/OA/OA_Document.cs | 15
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx | 115 ++++
CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj | 1
CY_ECommercePlatform/AbstractFactory/Factory.cs | 6
CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj | 1
CY_ECommercePlatform/CY.BLL/OA/OA_ShejijijianBLL.cs | 175 +++++++
CY_ECommercePlatform/CY.IDAL/OA/IOA_ShejijijianDAL.cs | 33 +
CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.cs | 148 ++++++
CY_ECommercePlatform/CY.Model/OA/OA_FirmRole.cs | 8
24 files changed, 1,362 insertions(+), 50 deletions(-)
diff --git a/CY_ECommercePlatform/AbstractFactory/Factory.cs b/CY_ECommercePlatform/AbstractFactory/Factory.cs
index a3c3a68..e650a16 100644
--- a/CY_ECommercePlatform/AbstractFactory/Factory.cs
+++ b/CY_ECommercePlatform/AbstractFactory/Factory.cs
@@ -267,6 +267,7 @@
OBJECT_PATH.Add(DALInterface.IOA_BaozhengjinDAL, "OA_BaozhengjinDAL");
OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_shenpiDAL, "OA_WorkPlan_shenpiDAL");
OBJECT_PATH.Add(DALInterface.IOA_WorkPlan_attachmentDAL, "OA_WorkPlan_attachmentDAL");
+ OBJECT_PATH.Add(DALInterface.IOA_ShejijijianDAL, "OA_ShejijijianDAL");
OBJECT_PATH.Add(DALInterface.IOA_KaipiaonewDAL, "OA_KaipiaonewDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderDAL, "CoreCmsPlanOrderDAL");
OBJECT_PATH.Add(DALInterface.ICoreCmsPlanOrderItemDAL, "CoreCmsPlanOrderItemDAL");
@@ -917,6 +918,11 @@
/// </summary>
IOA_WorkPlan_attachmentDAL = 1939,
+ /// <summary>
+ /// 寮�绁ㄧ敵璇�
+ /// </summary>
+ IOA_ShejijijianDAL = 1940,
+
/// <summary>
/// 寮�绁ㄧ敵璇�
diff --git a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
index 7b85d31..1b065ae 100644
--- a/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
+++ b/CY_ECommercePlatform/CY.BLL/CY.BLL.csproj
@@ -181,6 +181,7 @@
<Compile Include="OA\OA_PropertyCateBLL.cs" />
<Compile Include="OA\OA_PropertyManageBLL.cs" />
<Compile Include="OA\OA_PropertyRecordBLL.cs" />
+ <Compile Include="OA\OA_ShejijijianBLL.cs" />
<Compile Include="OA\OA_StaffBLL.cs" />
<Compile Include="OA\OA_BrandBLL.cs" />
<Compile Include="OA\OA_CargoSpaceBLL.cs" />
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_ShejijijianBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_ShejijijianBLL.cs
new file mode 100644
index 0000000..a06f9a6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_ShejijijianBLL.cs
@@ -0,0 +1,175 @@
+锘�
+/**
+* OA_ShejijijianBLL.cs
+*
+* 鍔� 鑳斤細 鍚堜綔瀹㈡埛涓氬姟閫昏緫绫�
+* 绫� 鍚嶏細 OA_ShejijijianBLL
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 15:11 鍚磋緣 鍒濈増
+* V0.02 2013-5-29 17:43 鍚村磶鍧� 澧炲姞杞崲鍦ㄧ嚎浼氬憳涓哄巶鍟嗗鎴锋柟娉�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using CY.IDAL;
+using CY.Model;
+using AbstractFactory;
+using CY.IBaseDAL;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.BLL
+{
+ public class OA_ShejijijianBLL
+ {
+
+ IOA_ShejijijianDAL _IOA_ShejijijianDAL = null;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public OA_ShejijijianBLL()
+ {
+ //鑾峰彇OA_Shejijijian DAL瀹炵幇
+ _IOA_ShejijijianDAL = Factory.GetDALByInterfaceName(DALInterface.IOA_ShejijijianDAL) as IOA_ShejijijianDAL;
+
+
+ }
+
+ /// <summary>
+ /// 鏂板閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ public bool InsertModel(CY.Model.OA_Shejijijian m_OA_Shejijijian)
+ {
+ try
+ {
+
+ return _IOA_ShejijijianDAL.InserModel(m_OA_Shejijijian);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 淇敼閫佽揣瀹夋帓
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool UpdateModel(CY.Model.OA_Shejijijian m_OA_Shejijijian)
+ {
+ try
+ {
+ return _IOA_ShejijijianDAL.UpdateModel(m_OA_Shejijijian);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_Shejijijian> GetModelList()
+ {
+ Query query = new Query();
+ return _IOA_ShejijijianDAL.SelectAllModel(query);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Shejijijian> GetModelByformid(Guid formid, string Dingdanleixing, string Fengmianneiye, string Shejileixing, int? Status)
+ {
+
+ return _IOA_ShejijijianDAL.GetModelByformid(formid, Dingdanleixing, Fengmianneiye, Shejileixing, Status);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍏ㄩ儴鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public OA_Shejijijian GetModelByKeyid(int keyid)
+ {
+
+ return _IOA_ShejijijianDAL.GetModelByKeyid(keyid);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鍚堜綔瀹㈡埛
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool DeleteModel(CY.Model.OA_Shejijijian rType)
+ {
+ try
+ {
+ _IOA_ShejijijianDAL.DeleteModel(rType);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍚堜綔瀹㈡埛鍒嗛〉鍒楄〃
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<OA_Shejijijian> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
+ string Dingdanleixing, string Fengmianneiye, string Shejileixing, int? Status)
+ {
+ string Condition = " and ok.FirmId ='" + FirmId + "' ";
+
+ if (!string.IsNullOrEmpty(CreateTimeStart))
+ Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeStart + "')<=0 ";
+
+ if (!string.IsNullOrEmpty(CreateTimeEnd))
+ Condition += " and DATEDIFF(day,ok.[CreateTime],'" + CreateTimeEnd + "')>=0 ";
+
+ if (!string.IsNullOrEmpty(Dingdanleixing))
+ Condition += " and ok.Dingdanleixing = '" + Dingdanleixing + "'";
+
+ if (!string.IsNullOrEmpty(Fengmianneiye))
+ Condition += " and ok.Fengmianneiye = '" + Fengmianneiye + "' ";
+ if (!string.IsNullOrEmpty(Shejileixing))
+ Condition += " and ok.Shejileixing = '" + Shejileixing + "'";
+ if (Status.HasValue && Status > 0)
+ Condition += " and ok.[Status] = " + Status + "";
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," CreateTime desc ")
+ };
+ query.Criteria = criterias;
+ return _IOA_ShejijijianDAL.SelectModelPage(query, pa);
+ }
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
index 731bd73..06b75f2 100644
--- a/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
+++ b/CY_ECommercePlatform/CY.IDAL/CY.IDAL.csproj
@@ -168,6 +168,7 @@
<Compile Include="OA\IOA_KaipiaonewcuishouDAL.cs" />
<Compile Include="OA\IOA_KaipiaonewDAL.cs" />
<Compile Include="OA\IOA_KipiaoshenqingDAL.cs" />
+ <Compile Include="OA\IOA_ShejijijianDAL.cs" />
<Compile Include="OA\IOA_WageAwardPunishDAL.cs" />
<Compile Include="LF\ILF_OrderFilesDAL.cs" />
<Compile Include="OA\IOA_CarDictionaryDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShejijijianDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShejijijianDAL.cs
new file mode 100644
index 0000000..33a16f7
--- /dev/null
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_ShejijijianDAL.cs
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Data;
+using System.Data.SqlClient;
+using CY.IBaseDAL;
+using CY.Model;
+
+
+namespace CY.IDAL
+{
+ public interface IOA_ShejijijianDAL : ICommonDAL, IPaging<OA_Shejijijian>, IGetAllModel<OA_Shejijijian>
+ {
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_Shejijijian GetModelByKeyid(int keyid);
+
+ /// <summary>
+ /// 鏍规嵁formid鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_Shejijijian> GetModelByformid(Guid formid,string Dingdanleixing, string Fengmianneiye, string Shejileixing, int? Status);
+
+
+
+ }
+}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 7d14542..8a08c56 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -252,6 +252,7 @@
<Compile Include="OA\OA_PropertyManage.cs" />
<Compile Include="OA\OA_PropertyRecord.cs" />
<Compile Include="OA\OA_RemittanceAdvice.cs" />
+ <Compile Include="OA\OA_Shejijijian.cs" />
<Compile Include="OA\OA_Specification.cs" />
<Compile Include="OA\OA_Staff.cs" />
<Compile Include="OA\OA_StaffFirmProfile.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs
index a3ccb8b..15c97e3 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Document.cs
@@ -314,6 +314,15 @@
_operator = value;
}
}
+
+
+ /// <summary>
+ /// 鎿嶄綔浜�
+ /// </summary>
+ public string Jusequanxian
+ {
+ get;set;
+ }
#endregion Model
#region Visiter
@@ -428,6 +437,12 @@
this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
theValue = this.Operator;
}
+ else if ("Jusequanxian".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 21)
+ {
+ this.Jusequanxian = isChange ? MyConvert.ConvertToString(value) : Jusequanxian;
+ theValue = this.Jusequanxian;
+ }
+
return theValue;
}
#endregion Visiter
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_FirmRole.cs b/CY_ECommercePlatform/CY.Model/OA/OA_FirmRole.cs
index c92fc60..606c2c6 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_FirmRole.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_FirmRole.cs
@@ -91,6 +91,14 @@
set { _remark = value; }
get { return _remark; }
}
+
+ /// <summary>
+ /// 鏄惁閫夋嫨
+ /// </summary>
+ public string ShifouCheck
+ {
+ get;set;
+ }
#endregion Model
#region Visiter
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Shejijijian.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Shejijijian.cs
new file mode 100644
index 0000000..04069c5
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Shejijijian.cs
@@ -0,0 +1,222 @@
+锘�/**
+* OA_CorporateClients.cs
+*
+* 鍔� 鑳斤細 N/A
+* 绫� 鍚嶏細 OA_CorporateClients
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-2 14:27:43 N/A 鍒濈増
+*
+*
+*
+*
+*
+*
+*/
+
+using System;
+using CY.Infrastructure.Domain;
+using CY.Infrastructure.Common;
+
+namespace CY.Model
+{
+ /// <summary>
+ /// 鍗板埛鍙傛暟
+ /// </summary>
+ [Serializable]
+ public partial class OA_Shejijijian : IAggregateRoot
+ {
+
+ public OA_Shejijijian()
+ {
+ }
+ #region Model
+ /// <summary>
+ /// id
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// FirmId
+ /// </summary>
+ public Guid FirmId { get; set; }
+ /// <summary>
+ /// 璁㈠崟绫诲瀷
+ /// </summary>
+ public string Dingdanleixing { get; set; }
+
+ /// <summary>
+ ///璁㈠崟绫诲瀷
+ /// </summary>
+ public string DingdanleixingName { get; set; }
+
+ /// <summary>
+ /// 灏侀潰鍐呴〉
+ /// </summary>
+ public string Fengmianneiye { get; set; }
+
+ /// <summary>
+ ///灏侀潰鍐呴〉
+ /// </summary>
+ public string FengmianneiyeName { get; set; }
+
+ /// <summary>
+ /// 璁捐绫诲瀷
+ /// </summary>
+ public string Shejileixing { get; set; }
+
+ /// <summary>
+ ///璁捐绫诲瀷
+ /// </summary>
+ public string ShejileixingName { get; set; }
+
+
+
+
+ public decimal? Shejilemoney { get; set; }
+
+
+
+ public int? Status { get; set; }
+
+
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public string Creater
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public string Updater
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? LastUpdateTime
+ {
+ get;
+ set;
+ }
+
+
+
+ #endregion Model
+
+ #region Visiter
+
+ /// <summary>
+ /// 灞炴�ц闂櫒
+ /// </summary>
+ /// <param name="name">灞炴�у悕</param>
+ /// <param name="index">绱㈠紩</param>
+ /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+ /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+ /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+ public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+ {
+ object theValue = null;
+
+
+ if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+ {
+ this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("FirmId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.FirmId = isChange ? MyConvert.ConvertToGuid(value) : FirmId;
+ theValue = this.FirmId;
+ }
+ else if ("Dingdanleixing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.Dingdanleixing = isChange ? MyConvert.ConvertToString(value) : Dingdanleixing;
+ theValue = this.Dingdanleixing;
+ }
+ else if ("DingdanleixingName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.DingdanleixingName = isChange ? MyConvert.ConvertToString(value) : DingdanleixingName;
+ theValue = this.DingdanleixingName;
+ }
+
+ else if ("Fengmianneiye".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.Fengmianneiye = isChange ? MyConvert.ConvertToString(value) : Fengmianneiye;
+ theValue = this.Fengmianneiye;
+ }
+ else if ("FengmianneiyeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.FengmianneiyeName = isChange ? MyConvert.ConvertToString(value) : FengmianneiyeName;
+ theValue = this.FengmianneiyeName;
+ }
+
+ else if ("Shejileixing".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.Shejileixing = isChange ? MyConvert.ConvertToString(value) : Shejileixing;
+ theValue = this.Shejileixing;
+ }
+ else if ("ShejileixingName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.ShejileixingName = isChange ? MyConvert.ConvertToString(value) : ShejileixingName;
+ theValue = this.ShejileixingName;
+ }
+
+
+ else if ("Status".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.Status = isChange ? MyConvert.ConvertToInt32(value) : Status;
+ theValue = this.Status;
+ }
+
+
+
+
+
+
+
+ else if ("Creater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 14)
+ {
+ this.Creater = isChange ? MyConvert.ConvertToString(value) : Creater;
+ theValue = this.Creater;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 15)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("Updater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 16)
+ {
+ this.Updater = isChange ? MyConvert.ConvertToString(value) : Updater;
+ theValue = this.Updater;
+ }
+ else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 17)
+ {
+ this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+ theValue = this.LastUpdateTime;
+ }
+
+
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
+
diff --git a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
index 5840a35..432be83 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
+++ b/CY_ECommercePlatform/CY.SQLDAL/CY.SQLDAL.csproj
@@ -196,6 +196,7 @@
<Compile Include="OA\OA_PropertyCateDAL.cs" />
<Compile Include="OA\OA_PropertyManageDAL.cs" />
<Compile Include="OA\OA_PropertyRecordDAL.cs" />
+ <Compile Include="OA\OA_ShejijijianDAL.cs" />
<Compile Include="OA\OA_StaffFirmProfileDAL.cs" />
<Compile Include="OA\OA_StaffPostCategoryDAL.cs" />
<Compile Include="OA\OA_StaffPostDAL.cs" />
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs
index 342fb50..6a4ee89 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DocumentDAL.cs
@@ -100,8 +100,9 @@
new SqlParameter("@DM_PrintTime", trueModel.DM_PrintTime) ,
new SqlParameter("@DM_PrintStatus", trueModel.DM_PrintStatus) ,
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
- new SqlParameter("@Operator", trueModel.Operator)
- };
+ new SqlParameter("@Operator", trueModel.Operator),
+ new SqlParameter("@Jusequanxian", trueModel.Jusequanxian),
+ };
try
{
_dataBase.Query("sp_OA_Document_Update", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShejijijianDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShejijijianDAL.cs
new file mode 100644
index 0000000..7223609
--- /dev/null
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ShejijijianDAL.cs
@@ -0,0 +1,272 @@
+锘縰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_ShejijijianDAL : IOA_ShejijijianDAL
+ {
+
+ private Database _dataBase = null;
+ #region 甯搁噺
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE = " ( select distinct ok.* " +
+ //" oe.Name as SupplierName " +
+ " from [OA_Shejijijian] ok " +
+
+
+ " where 0=0 ";
+ const string FROMSOUCEEND = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY = " CreateTime desc ";
+ #endregion
+ public OA_ShejijijianDAL()
+ {
+ _dataBase = new Database();
+ }
+
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InserModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Shejijijian trueModel = model as Model.OA_Shejijijian;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter KehuqianshouTime = null;
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@FirmId",trueModel.FirmId),
+ new SqlParameter("@Dingdanleixing",string.IsNullOrEmpty(trueModel.Dingdanleixing)?"":trueModel.Dingdanleixing),
+ new SqlParameter("@DingdanleixingName",string.IsNullOrEmpty(trueModel.DingdanleixingName)?"":trueModel.DingdanleixingName),
+ new SqlParameter("@Fengmianneiye",string.IsNullOrEmpty(trueModel.Fengmianneiye)?"":trueModel.Fengmianneiye),
+ new SqlParameter("@FengmianneiyeName",string.IsNullOrEmpty(trueModel.FengmianneiyeName)?"":trueModel.FengmianneiyeName),
+ new SqlParameter("@Shejileixing",string.IsNullOrEmpty(trueModel.Shejileixing)?"":trueModel.Shejileixing),
+ new SqlParameter("@ShejileixingName",string.IsNullOrEmpty(trueModel.ShejileixingName)?"":trueModel.ShejileixingName),
+ new SqlParameter("@Shejilemoney",trueModel.Shejilemoney.HasValue?trueModel.Shejilemoney.Value:0),
+ new SqlParameter("@Status",trueModel.Status.HasValue?trueModel.Status.Value:0),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Updater",trueModel.Updater),
+ new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+ new SqlParameter("@Creater",trueModel.Creater),
+
+
+
+
+
+ };
+ string sql = "Insert Into OA_Shejijijian ([FirmId],[Dingdanleixing],[DingdanleixingName],[Fengmianneiye], [FengmianneiyeName], [Shejileixing],[ShejileixingName], [Shejilemoney],[Status], [Creater],[CreateTime],[Updater],[LastUpdateTime] )"
+ + " Values (@FirmId,@Dingdanleixing,@DingdanleixingName, @Fengmianneiye, @FengmianneiyeName, @Shejileixing, @ShejileixingName, @Shejilemoney, @Status, @Creater,@CreateTime,@Updater,@LastUpdateTime )";
+
+ 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_Shejijijian trueModel = model as Model.OA_Shejijijian;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ SqlParameter KehuqianshouTime = null;
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@FirmId",trueModel.FirmId),
+ new SqlParameter("@Dingdanleixing",string.IsNullOrEmpty(trueModel.Dingdanleixing)?"":trueModel.Dingdanleixing),
+ new SqlParameter("@DingdanleixingName",string.IsNullOrEmpty(trueModel.DingdanleixingName)?"":trueModel.DingdanleixingName),
+ new SqlParameter("@Fengmianneiye",string.IsNullOrEmpty(trueModel.Fengmianneiye)?"":trueModel.Fengmianneiye),
+ new SqlParameter("@FengmianneiyeName",string.IsNullOrEmpty(trueModel.FengmianneiyeName)?"":trueModel.FengmianneiyeName),
+ new SqlParameter("@Shejileixing",string.IsNullOrEmpty(trueModel.Shejileixing)?"":trueModel.Shejileixing),
+ new SqlParameter("@ShejileixingName",string.IsNullOrEmpty(trueModel.ShejileixingName)?"":trueModel.ShejileixingName),
+ new SqlParameter("@Shejilemoney",trueModel.Shejilemoney.HasValue?trueModel.Shejilemoney.Value:0),
+ new SqlParameter("@Status",trueModel.Status.HasValue?trueModel.Status.Value:0),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@Updater",trueModel.Updater),
+ new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime),
+ new SqlParameter("@Creater",trueModel.Creater),
+
+ };
+ string sql = "Update OA_Shejijijian Set [FirmId]=@FirmId,[Dingdanleixing]=@Dingdanleixing,[DingdanleixingName]=@DingdanleixingName,[Fengmianneiye]=@Fengmianneiye, [FengmianneiyeName]=@FengmianneiyeName, [Shejileixing]=@Shejileixing,[ShejileixingName]=@ShejileixingName, [Shejilemoney]=@Shejilemoney,[Status]=@Status, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰緱淇℃伅
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_Shejijijian GetModelByKeyid(int keyid)
+ {
+ try
+ {
+ string condition = " ";
+ if (keyid > 0)
+ {
+ condition = " Keyid=" + keyid + "";
+ }
+ else
+ {
+ return null;
+ }
+
+ // return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_Shejijijian> result = _dataBase.SelectModel<OA_Shejijijian>("*", "OA_Shejijijian", condition) as IList<OA_Shejijijian>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Shejijijian> SelectAllModel(Infrastructure.Query.Query query)
+ {
+ return _dataBase.SelectModel<Model.OA_Shejijijian>(" * ", " OA_Shejijijian ") as IList<Model.OA_Shejijijian>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Shejijijian> GetModelByformid(Guid FirmId, string Dingdanleixing, string Fengmianneiye, string Shejileixing, int? Status)
+ {
+ string query = " FirmId = '" + FirmId + "'";
+ if (!string.IsNullOrEmpty(Dingdanleixing))
+ {
+ query += " and Dingdanleixing = '" + Dingdanleixing + "'";
+ }
+ if (!string.IsNullOrEmpty(Fengmianneiye))
+ {
+ query += " and Fengmianneiye = '" + Fengmianneiye + "'";
+ }
+ if (!string.IsNullOrEmpty(Shejileixing))
+ {
+ query += " and Shejileixing = '" + Shejileixing + "'";
+ }
+ if (Status.HasValue && Status > 0)
+ {
+ query += " and Status = " + Status + "";
+ }
+
+ return _dataBase.SelectModel<Model.OA_Shejijijian>(" * ", " OA_Shejijijian ", query) as IList<Model.OA_Shejijijian>;//鎵ц鏌ヨ
+ }
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_Shejijijian> SelectModelPage(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_Shejijijian>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool DeleteModel(Infrastructure.Domain.IAggregateRoot model)
+ {
+ Model.OA_Shejijijian trueModel = model as Model.OA_Shejijijian;
+ if (trueModel == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid)
+ };
+ string sql = "Delete OA_Shejijijian Where [Keyid] = @Keyid ";
+
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 87eae53..63205e2 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2786,6 +2786,7 @@
<Content Include="Pages\work\OA_DocumentDetail.aspx" />
<Content Include="Pages\work\OA_DocumentDicAdd.aspx" />
<Content Include="Pages\work\OA_DocumentDicDetail.aspx" />
+ <Content Include="Pages\work\OA_DocumentJuese.aspx" />
<Content Include="Pages\work\OA_DocumentDicList.aspx" />
<Content Include="Pages\work\OA_DocumentList.aspx" />
<Content Include="Pages\work\BaoxiaoReplyAdd.aspx" />
@@ -9044,6 +9045,13 @@
<Compile Include="Pages\work\OA_DocumentDicDetail.aspx.designer.cs">
<DependentUpon>OA_DocumentDicDetail.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\OA_DocumentJuese.aspx.cs">
+ <DependentUpon>OA_DocumentJuese.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\OA_DocumentJuese.aspx.designer.cs">
+ <DependentUpon>OA_DocumentJuese.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\OA_DocumentDicList.aspx.cs">
<DependentUpon>OA_DocumentDicList.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
index 9b61da5..0343f7d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -10,7 +10,7 @@
<link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
<link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
<script src="../../js/Inquiry/Inquiry.js?v=157" type="text/javascript"></script>
- <script src="../../js/business/Order.js?v=45" type="text/javascript"></script>
+ <script src="../../js/business/Order.js?v=46" type="text/javascript"></script>
<!--鍓嶅彴椤甸潰end-->
<script type="text/javascript" language="javascript">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 75d16de..4bc84c6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -186,6 +186,19 @@
var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
}
+
+
+
+
+ function showProgress() {
+ document.getElementById('progressBar').style.display = 'block';
+
+
+ setTimeout(function () {
+ document.getElementById('progressBar').style.display = 'none';
+ }, 5000); // 10000姣绛変簬10绉�
+
+ }
</script>
<style type="text/css">
.tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; }
@@ -331,6 +344,11 @@
<td> </td>
<td>
<asp:button id="btn_Search" text="鏌ヨ" runat="server" /> <input type="button" value='閲嶇疆' onclick='document.body.innerHTML="";window.location=window.location;' />
+
+ <asp:Button ID="Button1" Text="瀵煎嚭" OnClientClick="showProgress();return true;" runat="server" OnClick="btn_Daochu_Click" />
+ <div id="progressBar" style="display:none; position:fixed; top:50%; left:50%; transform:translate(-50%, -50%);border:1px solid black;height:50px;background-color:azure;">
+ 姝e湪瀵煎嚭Excel鏂囦欢锛岃绋嶅��...
+</div>
<input type="hidden" id='txtCommission' runat="server" />
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
index 68ad024..0a891b2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs
@@ -28,6 +28,10 @@
using CY.Infrastructure.Common;
using CY.BLL;
using CY.WebForm.Pages.common;
+using System.IO;
+using CY.Infrastructure.Query;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
namespace CY.WebForm.Pages.business
{
@@ -780,6 +784,126 @@
return isCan;
}
+
+ //鏌ヨ浜嬩欢
+ protected void btn_Daochu_Click(object src, EventArgs e)
+ {
+
+ byte[] fileBytes = ExportToExcel();
+ if (fileBytes != null)
+ {
+ Response.Clear();
+ Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+ Response.AppendHeader("Content-Disposition", "attachment; filename=璁㈠崟瀵煎嚭.xlsx");
+ Response.BinaryWrite(fileBytes);
+ Response.End();
+ }
+ else
+ {
+ // 澶勭悊瀵煎嚭澶辫触鐨勬儏鍐�
+ Response.Write("瀵煎嚭澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+
+ }
+
+ public byte[] ExportToExcel()
+ {
+ byte[] bt = null;
+ try
+ {
+ Pagination pa = new Pagination();
+ pa.PageSize = 500;
+ pa.PageIndex = 1;
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 1, CurrentUser.MemberId);
+ SetParamValue(searchParam, 2, this.txtOrderId.Value.Trim());
+ SetParamValue(searchParam, 3, this.txtCustormerName.Value.Trim());
+ SetParamValue(searchParam, 4, this.txtBeginData.Value.Trim());
+ SetParamValue(searchParam, 5, this.txtEndDate.Value.Trim());
+ SetParamValue(searchParam, 6, this.selPrintTypes.Value);
+ SetParamValue(searchParam, 7, this.selOrderTypes.Value);
+ SetParamValue(searchParam, 8, this.selOrderStates.Value);
+ SetParamValue(searchParam, 9, this.selPayStates.Value);
+ SetParamValue(searchParam, 10, this.txtCreaterName.Value.Trim());
+ SetParamValue(searchParam, 11, this.selCustormerLevels.Value);
+ SetParamValue(searchParam, 12, this.selCustormerManager.Value);
+ SetParamValue(searchParam, 13, this.selBusinessManager.Value);
+ SetParamValue(searchParam, 14, this.selPayType.SelectedValue);
+ SetParamValue(searchParam, 15, this.selReturnvisit.SelectedValue);
+ SetParamValue(searchParam, 16, this.selAppraise.SelectedValue);
+ SetParamValue(searchParam, 18, (CurrentUser.StaffId > 0 ? 0 : 0));
+ SetParamValue(searchParam, 19, CurrentUser.TrueMemberId);
+ SetParamValue(searchParam, 20, CurrentUser.StaffId);
+ SetParamValue(searchParam, 21, CurrentUser.TrueName);
+ SetParamValue(searchParam, 28, this.txtSearchyjname.Value);
+
+ var oA_WorkPlans = _eC_OrderBasicBLL.SelectModelPage_Seller(pa, searchParam);
+
+
+ // 鍒涘缓宸ヤ綔绨�
+ IWorkbook workbook = new XSSFWorkbook();
+ ISheet sheet = workbook.CreateSheet("瀵煎嚭鏁版嵁");
+
+ // 鍒涘缓琛ㄥご
+ IRow headerRow = sheet.CreateRow(0);
+ headerRow.CreateCell(0).SetCellValue("缂栧彿");
+ headerRow.CreateCell(1).SetCellValue("璁㈠崟鍙�");
+ headerRow.CreateCell(2).SetCellValue("瀹㈡埛鍚嶇О");
+ headerRow.CreateCell(3).SetCellValue("璁㈠崟鏉ユ簮");
+ headerRow.CreateCell(4).SetCellValue("璁㈠崟绫诲埆");
+ headerRow.CreateCell(5).SetCellValue("鍚堝悓搴忓彿");
+ headerRow.CreateCell(6).SetCellValue("鍗颁欢鍚嶇О");
+ headerRow.CreateCell(7).SetCellValue("鏁伴噺");
+ headerRow.CreateCell(8).SetCellValue("鍗曚綅");
+ headerRow.CreateCell(9).SetCellValue("璁㈠崟鐘舵��");
+ headerRow.CreateCell(10).SetCellValue("鏀舵鐘舵��");
+ headerRow.CreateCell(11).SetCellValue("浠樻鏂瑰紡");
+ headerRow.CreateCell(12).SetCellValue("閲戦");
+ headerRow.CreateCell(13).SetCellValue("宸叉敹娆�");
+ headerRow.CreateCell(14).SetCellValue("鏈粯娆�");
+
+ // 娣诲姞鏁版嵁
+ int rowIndex = 1;
+ foreach (var order in oA_WorkPlans)
+ {
+ IRow row = sheet.CreateRow(rowIndex++);
+ row.CreateCell(0).SetCellValue((rowIndex - 1).ToString());
+ row.CreateCell(1).SetCellValue(order.SellerOrderId);
+ row.CreateCell(2).SetCellValue(order.BuyerName);
+ row.CreateCell(3).SetCellValue(order.OrderType.Name);
+ row.CreateCell(4).SetCellValue(order.PrintType.PrintName);
+ row.CreateCell(5).SetCellValue(order.Duiyinghetongbianhao);
+ row.CreateCell(6).SetCellValue(order.DocumentName);
+ row.CreateCell(7).SetCellValue(order.OrderExtend.PrintNum.HasValue? order.OrderExtend.PrintNum.Value:0);
+ row.CreateCell(8).SetCellValue(order.yssldw);
+ row.CreateCell(9).SetCellValue(order.OrderStateObj.Name);
+ row.CreateCell(10).SetCellValue(order.PayStateObj.Name);
+ row.CreateCell(11).SetCellValue(order.PayType);
+ row.CreateCell(12).SetCellValue(order.SumPrice.HasValue? order.SumPrice.Value.ToDouble2().Value:0);
+ row.CreateCell(13).SetCellValue(order.TradingSingle.PayedMoney.HasValue ? order.TradingSingle.PayedMoney.Value.ToDouble2().Value : 0);
+ row.CreateCell(14).SetCellValue(order.UnPayedMoney.ToDouble2().Value);
+
+
+ }
+
+ // 灏嗗伐浣滅翱鍐欏叆鍐呭瓨娴�
+ using (var ms = new MemoryStream())
+ {
+ workbook.Write(ms);
+ bt = ms.ToArray();
+ }
+ }
+ catch (Exception e)
+ {
+ bt = null;
+ // 璁板綍鏃ュ織
+
+ }
+ return bt;
+ }
+
/// <summary>
/// 鏄惁宸茬粡鎿嶄綔
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
index 9f67cc7..4d78102 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.designer.cs
@@ -195,6 +195,15 @@
protected global::System.Web.UI.WebControls.Button btn_Search;
/// <summary>
+ /// Button1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button1;
+
+ /// <summary>
/// txtCommission 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs
index 69faa27..337748d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentAdd.aspx.cs
@@ -57,6 +57,26 @@
this.txtDM_DocumentType.Value = "";
this.txtDM_Number.Value = "";
this.txtDM_DocumentNumber.InnerHtml = "";
+
+ if (!string.IsNullOrEmpty(Request["keyid"]))
+ {
+ OA_Document m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_Document != null)
+ {
+ this.txtDM_Title.Value = m_OA_Document.DM_Title.ToString2(); ;
+ this.txtDM_Content.Text = m_OA_Document.DM_Content;
+ this.txtDM_ThemeWords.Value = m_OA_Document.DM_ThemeWords;
+ this.txtDM_CCUnit.Text = m_OA_Document.DM_CCUnit;
+ this.txtDM_PrintNumber.Value = m_OA_Document.DM_PrintNumber.HasValue ? m_OA_Document.DM_PrintNumber.Value.ToString() : "";
+ this.txtDM_PostingId.SelectedValue = m_OA_Document.DM_PostingId.HasValue ? m_OA_Document.DM_PostingId.Value.ToString() : "";
+ OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
+ this.txtDM_PostingFirmName.InnerHtml = m_OA_DocumentDic.ParName;
+ this.txtDM_DocumentType.Value = m_OA_Document.DM_DocumentType;
+ this.txtDM_Number.Value = m_OA_Document.DM_Number.HasValue ? m_OA_Document.DM_Number.Value.ToString() : "";
+ this.txtDM_DocumentNumber.InnerHtml = m_OA_Document.DM_DocumentNumber;
+ }
+ }
+
}
//琛ㄥ崟鎻愪氦
@@ -66,36 +86,75 @@
{
DateTime nowTime = DateTime.Now;
OA_Document m_OA_Document = new OA_Document();
- m_OA_Document.FirmId = CurrentUser.MemberId;
- m_OA_Document.DM_PromulgatedDate = nowTime;
- m_OA_Document.DM_DelTime = nowTime;
- m_OA_Document.DM_PrintTime = nowTime;
- m_OA_Document.DM_PrintStatus = 1;
- m_OA_Document.DM_Status = 1;
- OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
- m_OA_Document.DM_PostingId = this.txtDM_PostingId.SelectedValue.ToInt32();
- m_OA_Document.DM_PostingName = m_OA_DocumentDic.ParType;
- m_OA_Document.DM_PostingFirmName = m_OA_DocumentDic.ParName;
- m_OA_Document.DM_DocumentType = this.txtDM_DocumentType.Value.ToString2();
- m_OA_Document.DM_Number = this.txtDM_Number.Value.ToInt32();
- m_OA_Document.DM_DocumentNumber = m_OA_DocumentDic.ParType + "(" + DateTime.Now.Year.ToString2() + ")" + "绗� " + this.txtDM_Number.Value.ToInt32().Value.ToString("000") + " 鍙�";
- m_OA_Document.DM_Title = this.txtDM_Title.Value.ToString2();
- m_OA_Document.DM_Content = this.txtDM_Content.Text.ToString2();
- m_OA_Document.DM_ThemeWords = this.txtDM_ThemeWords.Value.ToString2();
- m_OA_Document.DM_CCUnit = this.txtDM_CCUnit.Text.ToString2();
- m_OA_Document.DM_PrintNumber = this.txtDM_PrintNumber.Value.ToInt32();
- m_OA_Document.LastUpdateTime = nowTime;
- m_OA_Document.Operator = CurrentUser.ShortName;
-
-
- if (bll_OA_DocumentBLL.InsertModel(m_OA_Document))
+ if (!string.IsNullOrEmpty(Request["keyid"]))
{
- JavaScript.MessageBox("鏂板鎴愬姛", this, false, true);
- InitData();
+ m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ m_OA_Document.FirmId = CurrentUser.MemberId;
+ m_OA_Document.DM_PromulgatedDate = nowTime;
+ m_OA_Document.DM_DelTime = nowTime;
+ m_OA_Document.DM_PrintTime = nowTime;
+ m_OA_Document.DM_PrintStatus = 1;
+ m_OA_Document.DM_Status = 1;
+
+ OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
+ m_OA_Document.DM_PostingId = this.txtDM_PostingId.SelectedValue.ToInt32();
+ m_OA_Document.DM_PostingName = m_OA_DocumentDic.ParType;
+ m_OA_Document.DM_PostingFirmName = m_OA_DocumentDic.ParName;
+ m_OA_Document.DM_DocumentType = this.txtDM_DocumentType.Value.ToString2();
+ m_OA_Document.DM_Number = this.txtDM_Number.Value.ToInt32();
+ //m_OA_Document.DM_DocumentNumber = m_OA_DocumentDic.ParType + "(" + DateTime.Now.Year.ToString2() + ")" + "绗� " + this.txtDM_Number.Value.ToInt32().Value.ToString("000") + " 鍙�";
+ m_OA_Document.DM_Title = this.txtDM_Title.Value.ToString2();
+ m_OA_Document.DM_Content = this.txtDM_Content.Text.ToString2();
+ m_OA_Document.DM_ThemeWords = this.txtDM_ThemeWords.Value.ToString2();
+ m_OA_Document.DM_CCUnit = this.txtDM_CCUnit.Text.ToString2();
+ m_OA_Document.DM_PrintNumber = this.txtDM_PrintNumber.Value.ToInt32();
+ m_OA_Document.LastUpdateTime = nowTime;
+ m_OA_Document.Operator = CurrentUser.ShortName;
+
+
+ if (bll_OA_DocumentBLL.UpdateModel(m_OA_Document))
+ {
+ JavaScript.MessageBox("淇敼鎴愬姛", this, true, true);
+ //InitData();
+ }
+ else
+ JavaScript.MessageBox("淇敼澶辫触", this);
}
else
- JavaScript.MessageBox("鏂板澶辫触", this);
+ {
+ m_OA_Document.FirmId = CurrentUser.MemberId;
+ m_OA_Document.DM_PromulgatedDate = nowTime;
+ m_OA_Document.DM_DelTime = nowTime;
+ m_OA_Document.DM_PrintTime = nowTime;
+ m_OA_Document.DM_PrintStatus = 1;
+ m_OA_Document.DM_Status = 1;
+
+ OA_DocumentDic m_OA_DocumentDic = bll_OA_DocumentDicBLL.GetModelByKeyid(this.txtDM_PostingId.SelectedValue.ToInt32());
+ m_OA_Document.DM_PostingId = this.txtDM_PostingId.SelectedValue.ToInt32();
+ m_OA_Document.DM_PostingName = m_OA_DocumentDic.ParType;
+ m_OA_Document.DM_PostingFirmName = m_OA_DocumentDic.ParName;
+ m_OA_Document.DM_DocumentType = this.txtDM_DocumentType.Value.ToString2();
+ m_OA_Document.DM_Number = this.txtDM_Number.Value.ToInt32();
+ m_OA_Document.DM_DocumentNumber = m_OA_DocumentDic.ParType + "(" + DateTime.Now.Year.ToString2() + ")" + "绗� " + this.txtDM_Number.Value.ToInt32().Value.ToString("000") + " 鍙�";
+ m_OA_Document.DM_Title = this.txtDM_Title.Value.ToString2();
+ m_OA_Document.DM_Content = this.txtDM_Content.Text.ToString2();
+ m_OA_Document.DM_ThemeWords = this.txtDM_ThemeWords.Value.ToString2();
+ m_OA_Document.DM_CCUnit = this.txtDM_CCUnit.Text.ToString2();
+ m_OA_Document.DM_PrintNumber = this.txtDM_PrintNumber.Value.ToInt32();
+ m_OA_Document.LastUpdateTime = nowTime;
+ m_OA_Document.Operator = CurrentUser.ShortName;
+
+
+ if (bll_OA_DocumentBLL.InsertModel(m_OA_Document))
+ {
+ JavaScript.MessageBox("鏂板鎴愬姛", this, false, true);
+ InitData();
+ }
+ else
+ JavaScript.MessageBox("鏂板澶辫触", this);
+ }
+
}
catch (Exception ex)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx
new file mode 100644
index 0000000..6b24c0e
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx
@@ -0,0 +1,115 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="OA_DocumentJuese.aspx.cs" Inherits="CY.WebForm.Pages.work.OA_DocumentJuese" %>
+
+<!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/work/OA_DocumentDicDetail.aspx?keyid=" + keyid, Title: "鍏枃鍩虹鏁版嵁鏄庣粏", Width: 500, Height: 240 });
+ }
+
+ //娣诲姞
+ function addModel() {
+ top.Dialog.open({ URL: "/Pages/work/OA_DocumentDicAdd.aspx", Title: "鏂板鍏枃鍩虹鏁版嵁", Width: 500, Height: 240 });
+ }
+
+ //淇敼
+ function EditModel(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/OA_DocumentDicAdd.aspx?keyid=" + keyid, Title: "淇敼鍏枃鍩虹鏁版嵁", Width: 500, Height: 240 });
+ }
+
+ //鍒犻櫎
+ function onDele(keyid) {
+ top.Dialog.confirm("纭畾瑕佸垹闄よ鏁版嵁鍚楋紵", function () {
+ window.location = "/Pages/work/OA_DocumentJuese.aspx?delete=" + keyid;
+ });
+ }
+
+ //鎵归噺鍒犻櫎
+ function onAllDelete() {
+ var deleteKeyIds = "";
+ $(":checkbox").each(
+ function () {
+ if ($(this).is(":checked")) {
+ deleteKeyIds += $(this).val() + ",";
+ }
+ }
+ )
+ if (deleteKeyIds == "") {
+ // deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ //window.location = "/Pages/work/OA_DocumentJuese.aspx?deleteKeyIds=" + deleteKeyIds + "&&orderkeyid=<%=keyid %>";
+ $("#deleteKeyIds").val(deleteKeyIds);
+ }
+ else {
+ deleteKeyIds = deleteKeyIds.substring(0, deleteKeyIds.length - 1);
+ // window.location = "/Pages/work/OA_DocumentJuese.aspx?deleteKeyIds=" + deleteKeyIds + "&&orderkeyid=<%=keyid %>";
+ $("#deleteKeyIds").val(deleteKeyIds);
+ }
+ }
+ </script>
+</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="onAllDelete()" menu_member_case_id="case_onBaocunJuese" menu_member_case_name="淇濆瓨瑙掕壊"><span class="icon_add">淇濆瓨瑙掕壊</span></a>--%>
+
+ <asp:Button ID="btn_submit" runat="server" OnClientClick="onAllDelete()" OnClick="btn_submit_form" Text="鎻愪氦" />
+ <input type="hidden" id="deleteKeyIds" name="deleteKeyIds" runat="server" />
+ <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>
+
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+ <td>
+ <input type="checkbox" value='<%#Eval("Keyid")%>' <%#Eval("ShifouCheck") %> />
+ </td>
+ <td style="text-align: center">
+ <%#Container.ItemIndex + 1 %>
+ </td>
+ <td style="text-align: center">
+ <%#Eval("RoleName")%>
+ </td>
+
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+
+ </div>
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.cs
new file mode 100644
index 0000000..b0d28f4
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.cs
@@ -0,0 +1,148 @@
+锘縰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.Model;
+using CY.Infrastructure.Query;
+using CY.Infrastructure.Common;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //鍏枃鍩虹鏁版嵁鍒楄〃
+ public partial class OA_DocumentJuese : BasePage
+ {
+ OA_DocumentDicBLL bll_OA_DocumentDicBLL = null;
+ OA_DocumentBLL bll_OA_DocumentBLL = null;
+ OA_FirmRoleBLL oA_FirmRoleBLL = null;
+ public string keyid = "";
+
+ //鍒濆鍖�
+ public OA_DocumentJuese()
+ {
+ bll_OA_DocumentDicBLL = new OA_DocumentDicBLL();
+ bll_OA_DocumentBLL = new OA_DocumentBLL();
+ oA_FirmRoleBLL = new OA_FirmRoleBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ if (!IsPostBack)
+ {
+ BindList();
+ }
+ if (Request["delete"] != null)
+ {
+ OA_DocumentDic model = bll_OA_DocumentDicBLL.GetModelByKeyid(Request["delete"].ToInt32());
+ if (model != null && model.Keyid != null)
+ {
+ bll_OA_DocumentDicBLL.DeleteModel(model);
+ JavaScript.MessageBox("鍒犻櫎鎴愬姛", this);
+ Response.Redirect("/Pages/work/OA_DocumentJuese.aspx");
+ }
+ else
+ JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ }
+
+ if (Request["deleteKeyIdsfsdfdsfsdfd"] != null)
+ {
+ var orderkeyid = Request["orderkeyid"];
+ OA_Document m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["orderkeyid"].ToInt32());
+ m_OA_Document.Jusequanxian = Request["deleteKeyIds"].ToString();
+ if(bll_OA_DocumentBLL.UpdateModel(m_OA_Document))
+ {
+ JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, false);
+ }
+ else
+ {
+ JavaScript.MessageBox("淇濆瓨澶辫触", this);
+ return;
+ }
+
+ //List<int> deleteKeyIdList = new List<int>();
+ //string deleteKeyIds = Request["deleteKeyIds"].ToString().Trim(',');
+ //string[] keyIdArry = deleteKeyIds.Split(',');
+ //foreach (string keyId in keyIdArry)
+ //{
+ // OA_DocumentDic model = bll_OA_DocumentDicBLL.GetModelByKeyid(keyId.ToInt32());
+ // if (model.Keyid != null && model != null)
+ // bll_OA_DocumentDicBLL.DeleteModel(model);
+ // else
+ // {
+ // JavaScript.MessageBox("鍒犻櫎澶辫触", this);
+ // return;
+ // }
+ //}
+
+ //Response.Redirect("/Pages/work/OA_DocumentJuese.aspx");
+ }
+ }
+
+ //缁戝畾鏁版嵁
+ private void BindList()
+ {
+ keyid = Request["keyid"];
+ if (!string.IsNullOrEmpty(Request["keyid"]))
+ {
+ OA_Document m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ if (m_OA_Document != null)
+ {
+ var Jusequanxian = m_OA_Document.Jusequanxian;
+ var oA_FirmRoles = oA_FirmRoleBLL.SelectList(CurrentUser.MemberId).Where(x=>x.IsUsed == true);
+ foreach(var oA_FirmRole in oA_FirmRoles)
+ {
+ if (!string.IsNullOrEmpty(Jusequanxian))
+ {
+ var Jusequanxians = Jusequanxian.Split(',');
+ if(Jusequanxians.Count(x => x == oA_FirmRole.Keyid.Value.ToString()) > 0)
+ {
+ oA_FirmRole.ShifouCheck = "checked=\"checked\"";
+ }
+ }
+
+
+
+ }
+ this.RepClientList.DataSource = oA_FirmRoles;
+ this.RepClientList.DataBind();
+ }
+ }
+
+
+
+ }
+
+
+ //琛ㄥ崟鎻愪氦
+ protected void btn_submit_form(object sender, EventArgs e)
+ {
+ try
+ {
+
+ OA_Document m_OA_Document = bll_OA_DocumentBLL.GetModelByKeyid(Request["keyid"].ToInt32());
+ m_OA_Document.Jusequanxian = deleteKeyIds.Value;
+ if (bll_OA_DocumentBLL.UpdateModel(m_OA_Document))
+ {
+ JavaScript.MessageBox("淇濆瓨鎴愬姛", this, true, false);
+ }
+ else
+ {
+ JavaScript.MessageBox("淇濆瓨澶辫触", this);
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("淇濆瓨澶辫触", this);
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.designer.cs
new file mode 100644
index 0000000..389ebf5
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentJuese.aspx.designer.cs
@@ -0,0 +1,71 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class OA_DocumentJuese
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// btn_submit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button btn_submit;
+
+ /// <summary>
+ /// deleteKeyIds 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden deleteKeyIds;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx
index e44541f..c508648 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx
@@ -11,9 +11,20 @@
OpenSmallWindowByUrlUseSize("/Pages/work/OA_DocumentDetail.aspx?keyid=" + keyid, 1080, 780);
}
+ //鏌ョ湅
+ function Juesequanxian(keyid) {
+
+ top.Dialog.open({ URL: "/Pages/work/OA_DocumentJuese.aspx?keyid=" + keyid, Title: "鍒嗛厤鍏枃鏌ョ湅瑙掕壊", Width: 850, Height: 600 });
+ }
+
//娣诲姞
function addModel() {
top.Dialog.open({ URL: "/Pages/work/OA_DocumentAdd.aspx", Title: "鏂板鍏枃绠$悊", Width: 850, Height: 600 });
+ }
+
+ //娣诲姞
+ function editModel(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/OA_DocumentAdd.aspx?keyid=" + keyid, Title: "淇敼鍏枃绠$悊", Width: 850, Height: 600 });
}
//鍒犻櫎
@@ -193,7 +204,12 @@
<%#Eval("DM_PrintStatus").ToString() == "1" ? "鏈墦鍗�" : "宸叉墦鍗�"%>
</td>
<td class="Operate " style="text-align: center">
- <span menu_member_case_id="case_OnDetail" menu_member_case_name="鏌ョ湅" onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅</span> <span menu_member_case_id="case_OnDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span>
+ <span menu_member_case_id="case_OnDetail" menu_member_case_name="鏌ョ湅" onclick="onEdit('<%#Eval("Keyid")%>')">鏌ョ湅</span> <span menu_member_case_id="case_OnUpdate" menu_member_case_name="淇敼" onclick="editModel('<%#Eval("Keyid")%>')">淇敼</span> <span menu_member_case_id="case_OnDele" menu_member_case_name="鍒犻櫎" onclick="onDele('<%#Eval("Keyid")%>')">鍒犻櫎</span>
+
+ <span menu_member_case_id="case_Juesequanxian" menu_member_case_name="鏌ョ湅瑙掕壊鏉冮檺" onclick="Juesequanxian('<%#Eval("Keyid")%>')">鏌ョ湅瑙掕壊鏉冮檺</span>
+
+
+
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.designer.cs
index 69df9da..7f25d4c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/OA_DocumentList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠g爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝g‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠g爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class OA_DocumentList {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class OA_DocumentList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtDM_PromulgatedDateStart 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDM_PromulgatedDateStart;
-
+
/// <summary>
/// txtDM_PromulgatedDateEnd 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtDM_PromulgatedDateEnd;
-
+
/// <summary>
/// DM_DocumentType 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect DM_DocumentType;
-
+
/// <summary>
/// DM_Status 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect DM_Status;
-
+
/// <summary>
/// DM_PostingSector 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect DM_PostingSector;
-
+
/// <summary>
/// DM_DocumentNumber 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText DM_DocumentNumber;
-
+
/// <summary>
/// DM_Title 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText DM_Title;
-
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Submit;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛0鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
index 2fdf5ee..a04d821 100644
--- a/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
+++ b/CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -546,7 +546,7 @@
document.getElementById('txtDocumentName').value = document.getElementById('txtDocumentNameHide').value;
}
- $("#Duiyinghetongbianhao").hide();
+
}
else {
document.getElementById('tbFacing').style.display = '';
@@ -556,6 +556,12 @@
document.getElementById('selVerifyWay321').style.display = '';
document.getElementById('selVerifyWay1234').style.display = '';
document.getElementById('selVerifyWay4321').style.display = '';
+
+ }
+
+ if (sel.value == 37 || sel.value == 38) {
+ $("#Duiyinghetongbianhao").hide();
+ } else {
$("#Duiyinghetongbianhao").show();
}
}
--
Gitblit v1.9.1