From b73be4c097b5e12c9534fbefd8df54b404c05cb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 25 二月 2026 08:45:15 +0800
Subject: [PATCH] “对开单位”改为不需要必填；执行时间不要“秒”
---
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx | 4
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs | 42 ++
CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsSheji.cs | 228 ++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx | 22 +
CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx.designer.cs | 34
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx | 5
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.cs | 4
CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs | 27 +
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.cs | 195 +++++++++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx | 173 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.designer.cs | 89 ++++
CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.designer.cs | 125 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx | 72 +++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs | 112 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 21
CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.cs | 68 +++
21 files changed, 1,218 insertions(+), 31 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
index d07475a..762800b 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
@@ -1063,6 +1063,37 @@
+
+ /// <summary>
+ /// 鏂板鍚堜綔瀹㈡埛璁捐娌熼��
+ /// </summary>
+ /// <param name="trueModel"></param>
+ /// <returns></returns>
+ public bool InsertModelSheji(CY.Model.OA_CorporateClientsSheji trueModel)
+ {
+ try
+ {
+ return _IOA_CorporateClientsDal.InsertModelSheji(trueModel);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁瀹㈡埛id鏌ヨ璁捐娌熼��
+ /// </summary>
+ /// <param name="CustomId">瀹㈡埛id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_CorporateClientsSheji> SelectShejiListByCorId(Guid CustomId)
+ {
+ return _IOA_CorporateClientsDal.SelectShejiListByCorId(CustomId);
+ }
+
+
+
/// <summary>
/// 鏂板鍚堜綔瀹㈡埛璁㈠崟闇�姹�
/// </summary>
@@ -1244,5 +1275,16 @@
{
return _IOA_CorporateClientsDal.SelectVisitByKeyid(Keyid);
}
+
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ璁捐娌熼��
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_CorporateClientsSheji SelectShejiByKeyid(Guid Keyid)
+ {
+ return _IOA_CorporateClientsDal.SelectShejiByKeyid(Keyid);
+ }
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
index 08bb28c..c4be8b2 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
@@ -287,6 +287,25 @@
IEnumerable<OA_CorporateClientsVisit> SelectVisitListByCorId(Guid kehuId);
+
+ /// <summary>
+ /// 鏂板鍚堜綔瀹㈡埛璁捐娌熼��
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <param name="m_OA_CustomerCommunications"></param>
+ /// <param name="m_EC_AcceptWayByCustomers"></param>
+ /// <returns></returns>
+ bool InsertModelSheji(CY.Model.OA_CorporateClientsSheji rType);
+
+
+ /// <summary>
+ /// 鏍规嵁瀹㈡埛id鏌ヨ璁捐娌熼��
+ /// </summary>
+ /// <param name="MemberId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_CorporateClientsSheji> SelectShejiListByCorId(Guid kehuId);
+
+
/// <summary>
/// 鏂板鍚堜綔瀹㈡埛璁㈠崟闇�姹�
/// </summary>
@@ -390,6 +409,14 @@
OA_CorporateClientsVisit SelectVisitByKeyid(Guid Keyid);
+ /// <summary>
+ /// 鍗曚釜鏌ヨ璁捐娌熼��
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_CorporateClientsSheji SelectShejiByKeyid(Guid Keyid);
+
+
/// <summary>
/// 淇敼瀹岀粨
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 57ea5dc..1b99e3b 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -216,6 +216,7 @@
<Compile Include="OA\OA_CorporateClientsContract.cs" />
<Compile Include="OA\OA_CorporateClientsParameter.cs" />
<Compile Include="OA\OA_CorporateClientsPrint.cs" />
+ <Compile Include="OA\OA_CorporateClientsSheji.cs" />
<Compile Include="OA\OA_CorporateClientsVisit.cs" />
<Compile Include="OA\OA_Cuikuanjilu.cs" />
<Compile Include="OA\OA_CustomerApply.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsSheji.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsSheji.cs
new file mode 100644
index 0000000..d95d71a
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsSheji.cs
@@ -0,0 +1,228 @@
+锘�/**
+* 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_CorporateClientsSheji : IAggregateRoot
+ {
+
+ public OA_CorporateClientsSheji()
+ {
+ }
+ #region Model
+ /// <summary>
+ /// 缁存姢id
+ /// </summary>
+ public Guid Keyid { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛id
+ /// </summary>
+ public Guid CorporateClientsid { get; set; }
+
+
+ /// <summary>
+ /// 瀹㈡埛id
+ /// </summary>
+ public string CorporateClientName { get; set; }
+
+ /// <summary>
+ /// 鎷滆鏃堕棿
+ /// </summary>
+ public DateTime? ShejiTime
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鎷滆鏃堕棿
+ /// </summary>
+ public string ShejiTimeName
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鎷滆鍐呭
+ /// </summary>
+ public string Remark
+ {
+ get;
+ set;
+ }
+
+
+ /// <summary>
+ /// 鍗颁欢鍚嶇О
+ /// </summary>
+ public string YinjianName
+ {
+ get;
+ set;
+ }
+
+
+
+ /// <summary>
+ /// 鏍＄娆℃暟
+ /// </summary>
+ public int? JiaogaoCount
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ public Guid? Creater
+ {
+ get;
+ set;
+ }
+ public string CreaterName
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ public Guid? Updater
+ {
+ get;
+ set;
+ }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public DateTime? LastUpdateTime
+ {
+ get;
+ set;
+ }
+ public System.Collections.Generic.List<OA_attachment> attachments
+ {
+ 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.ConvertToGuid(value) : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("CorporateClientsid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.CorporateClientsid = isChange ? MyConvert.ConvertToGuid(value) : CorporateClientsid;
+ theValue = this.CorporateClientsid;
+ }
+ else if ("ShejiTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.ShejiTime = isChange ? MyConvert.ConvertToDateTime(value) : ShejiTime;
+ theValue = this.ShejiTime;
+ }
+ else if ("Remark".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.Remark = isChange ? MyConvert.ConvertToString(value) : Remark;
+ theValue = this.Remark;
+ }
+ else if ("Creater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.Creater = isChange ? MyConvert.ConvertToGuid(value) : Creater;
+ theValue = this.Creater;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("Updater".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.Updater = isChange ? MyConvert.ConvertToGuid(value) : Updater;
+ theValue = this.Updater;
+ }
+ else if ("LastUpdateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.LastUpdateTime = isChange ? MyConvert.ConvertToDateTime(value) : LastUpdateTime;
+ theValue = this.LastUpdateTime;
+ }
+ else if ("ShejiTimeName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 9)
+ {
+ this.ShejiTimeName = isChange ? MyConvert.ConvertToString(value) : ShejiTimeName;
+ theValue = this.ShejiTimeName;
+ }
+ else if ("CreaterName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 10)
+ {
+ this.CreaterName = isChange ? MyConvert.ConvertToString(value) : CreaterName;
+ theValue = this.CreaterName;
+ }
+ else if ("CorporateClientName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 11)
+ {
+ this.CorporateClientName = isChange ? MyConvert.ConvertToString(value) : CorporateClientName;
+ theValue = this.CorporateClientName;
+ }
+ else if ("YinjianName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 12)
+ {
+ this.YinjianName = isChange ? MyConvert.ConvertToString(value) : YinjianName;
+ theValue = this.YinjianName;
+ }
+ else if ("JiaogaoCount".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 13)
+ {
+ this.JiaogaoCount = isChange ? MyConvert.ConvertToInt32(value) : JiaogaoCount;
+ theValue = this.JiaogaoCount;
+ }
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
index cc4b2cf..7b8a2ce 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
@@ -1264,7 +1264,100 @@
try
{
- IList<OA_CorporateClientsVisit> result = _dataBase.SelectModel<OA_CorporateClientsVisit>(" a.*,b.[Name] as CreaterName ", "OA_CorporateClientsVisit a left join EC_MemberBasic b on a.Creater = b.MemberId ", string.Format(" CorporateClientsid = '{0}' order by a.[VisitTime] desc", CustomId)) as IList<OA_CorporateClientsVisit>;//鎵ц鏌ヨ
+ IList<OA_CorporateClientsVisit> result = _dataBase.SelectModel<OA_CorporateClientsVisit>(" top 50 a.*,b.[Name] as CreaterName ", "OA_CorporateClientsVisit a left join EC_MemberBasic b on a.Creater = b.MemberId ", string.Format(" CorporateClientsid = '{0}' order by a.[VisitTime] desc", CustomId)) as IList<OA_CorporateClientsVisit>;//鎵ц鏌ヨ
+ return result;//杩斿洖缁撴灉
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+
+
+
+ /// <summary>
+ /// 鏂板鍚堜綔瀹㈡埛璁捐娌熼��
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool InsertModelSheji(CY.Model.OA_CorporateClientsSheji trueModel)
+ {
+ //Model.OA_CorporateClients trueModel = model as Model.OA_CorporateClientsVist;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+ SqlParameter par = null;
+ if (trueModel.ShejiTime.HasValue)
+ {
+ par = new SqlParameter("@ShejiTime", trueModel.ShejiTime.Value);
+ }
+ else
+ {
+ par = new SqlParameter("@ShejiTime", DBNull.Value);
+ }
+ SqlParameter par1 = null;
+ if (trueModel.CreateTime.HasValue)
+ {
+ par1 = new SqlParameter("@CreateTime", trueModel.CreateTime.Value);
+ }
+ else
+ {
+ par1 = new SqlParameter("@CreateTime", DBNull.Value);
+ }
+ SqlParameter par2 = null;
+ if (trueModel.LastUpdateTime.HasValue)
+ {
+ par2 = new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime.Value);
+ }
+ else
+ {
+ par2 = new SqlParameter("@LastUpdateTime", DBNull.Value);
+ }
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid",trueModel.Keyid),
+ new SqlParameter("@CorporateClientsid",trueModel.CorporateClientsid),
+ par,
+ new SqlParameter("@YinjianName",trueModel.YinjianName),
+ new SqlParameter("@JiaogaoCount",trueModel.JiaogaoCount.HasValue?trueModel.JiaogaoCount.Value:0),
+ new SqlParameter("@Remark",trueModel.Remark),
+ new SqlParameter("@Creater",trueModel.Creater),
+ par1,
+ new SqlParameter("@Updater",trueModel.Updater),
+ par2,
+
+ };
+ string sql = "Insert Into OA_CorporateClientsSheji ([Keyid],[CorporateClientsid],[ShejiTime],[YinjianName], [JiaogaoCount], [Remark],[Creater], [CreateTime],[Updater], [LastUpdateTime] )"
+ + " Values (@Keyid,@CorporateClientsid,@ShejiTime, @YinjianName, @JiaogaoCount, @Remark, @Creater, @CreateTime, @Updater, @LastUpdateTime )";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁瀹㈡埛id鏌ヨ璁捐娌熼��
+ /// </summary>
+ /// <param name="CustomId">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<OA_CorporateClientsSheji> SelectShejiListByCorId(Guid CustomId)
+ {
+ if (CustomId == null)
+ return null;//閿欒鏁版嵁杩斾細绌�
+ try
+ {
+ IList<OA_CorporateClientsSheji> result = _dataBase.SelectModel<OA_CorporateClientsSheji>(" top 50 a.*,b.[Name] as CreaterName ", "OA_CorporateClientsSheji a left join EC_MemberBasic b on a.Creater = b.MemberId ", string.Format(" CorporateClientsid = '{0}' order by a.[ShejiTime] desc", CustomId)) as IList<OA_CorporateClientsSheji>;//鎵ц鏌ヨ
return result;//杩斿洖缁撴灉
}
catch (Exception ex)
@@ -1635,5 +1728,22 @@
return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
}
+
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ璁捐娌熼��
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_CorporateClientsSheji SelectShejiByKeyid(Guid Keyid)
+ {
+ if (Keyid == null)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_CorporateClientsSheji> result = _dataBase.SelectModel<OA_CorporateClientsSheji>(" a.* ", " OA_CorporateClientsSheji a ", string.Format(" a.Keyid='{0}'", Keyid)) as IList<OA_CorporateClientsSheji>;//鎵ц鏌ヨ
+
+ return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+ }
+
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 4e50c9b..1f05756 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1888,6 +1888,7 @@
<Content Include="Pages\business\Caigoufukuanshenqing.aspx" />
<Content Include="Pages\business\Baozhengjinfukuan.aspx" />
<Content Include="Pages\business\BaozhengjinCuishou.aspx" />
+ <Content Include="Pages\business\CorporateClientsSheji.aspx" />
<Content Include="Pages\business\DeliverPlanDakaList.aspx" />
<Content Include="Pages\business\DeliverWorkBookAnPaiDetailsongdao.aspx" />
<Content Include="Pages\business\DeliverWorkBookAnPaiEdit.aspx" />
@@ -2829,6 +2830,7 @@
<Content Include="Pages\work\Gongzuozuzhijiagou.aspx" />
<Content Include="Pages\work\GongzuoneirongList.aspx" />
<Content Include="Pages\work\GongzuoneirongEdit.aspx" />
+ <Content Include="Pages\work\MyShejiDetail.aspx" />
<Content Include="Pages\work\MyvisitDetail.aspx" />
<Content Include="Pages\work\MyPlanAdd.aspx" />
<Content Include="Pages\work\MyPlanList.aspx" />
@@ -3407,6 +3409,13 @@
</Compile>
<Compile Include="Pages\business\BaozhengjinCuishou.aspx.designer.cs">
<DependentUpon>BaozhengjinCuishou.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsSheji.aspx.cs">
+ <DependentUpon>CorporateClientsSheji.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\CorporateClientsSheji.aspx.designer.cs">
+ <DependentUpon>CorporateClientsSheji.aspx</DependentUpon>
</Compile>
<Compile Include="Pages\business\DeliverPlanDakaList.aspx.cs">
<DependentUpon>DeliverPlanDakaList.aspx</DependentUpon>
@@ -9406,6 +9415,13 @@
<Compile Include="Pages\work\GongzuoneirongEdit.aspx.designer.cs">
<DependentUpon>GongzuoneirongEdit.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\MyShejiDetail.aspx.cs">
+ <DependentUpon>MyShejiDetail.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\MyShejiDetail.aspx.designer.cs">
+ <DependentUpon>MyShejiDetail.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\MyvisitDetail.aspx.cs">
<DependentUpon>MyvisitDetail.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx
index f8654ad..0a43cf0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx
@@ -37,6 +37,18 @@
}
</style>
+ <script type="text/javascript">
+ //鏌ョ湅
+ function onViewWeihu(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsVisit.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛缁存姢璁板綍", Width: 1200, Height: 900 });
+ }
+ //鏌ョ湅
+ function onViewSheji(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsSheji.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛璁捐娌熼��", Width: 1200, Height: 900 });
+ }
+
+
+ </script>
</head>
<body>
<form runat="server" id="form1" class="form">
@@ -150,7 +162,7 @@
</HeaderTemplate>
<ItemTemplate>
<tr>
- <td rowspan="5" style="width:10px;">
+ <td rowspan="6" style="width:10px;">
<%# Container.ItemIndex + 1%>
</td>
<td>
@@ -239,6 +251,14 @@
</asp:Repeater>
</fieldset>
+ <fieldset>
+ <legend>缁存姢璁板綍</legend>
+ <button id="Button4" onclick="onViewWeihu('<%=CorporateClientsid%>')" >鏌ョ湅缁存姢璁板綍</button>
+ </fieldset>
+ <fieldset>
+ <legend>璁捐娌熼��</legend>
+ <button id="Button5" onclick="onViewSheji('<%=CorporateClientsid%>')" >鏌ョ湅璁捐娌熼��</button>
+ </fieldset>
<%-- <fieldset>
<legend>缁存姢璁板綍</legend>
<asp:Repeater ID="RepClientList" runat="server">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx.cs
index 1058389..94ddacb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx.cs
@@ -20,7 +20,7 @@
OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
SysInquiry_PrintingTypeBLL bll_SysInquiry_PrintingTypeBLL = null;//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
-
+ public string CorporateClientsid = "";
//鍒濆鍖�
public CorporateClientsDetail()
{
@@ -35,6 +35,7 @@
if (Request["Keyid"] != null || Request["MemberId"] != null)
{
+ CorporateClientsid = Request["Keyid"].ToString2();
OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModelDetail(Request["Keyid"].ToGuid2());
if (m_OA_CorporateClients == null)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 0e053b8..5e64818 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -48,6 +48,17 @@
return false
}
+
+ //鏌ョ湅
+ function onViewWeihu(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsVisit.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛缁存姢璁板綍", Width: 1200, Height: 900 });
+ }
+ //鏌ョ湅
+ function onViewSheji(keyid) {
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsSheji.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛璁捐娌熼��", Width: 1200, Height: 900 });
+ }
+
+
</script>
</head>
<body>
@@ -271,8 +282,14 @@
</asp:Repeater>
</fieldset>
-
-
+ <fieldset>
+ <legend>缁存姢璁板綍</legend>
+ <button id="Button4" onclick="onViewWeihu('<%=CorporateClientsid%>')" >鏌ョ湅缁存姢璁板綍</button>
+ </fieldset>
+ <fieldset>
+ <legend>璁捐娌熼��</legend>
+ <button id="Button5" onclick="onViewSheji('<%=CorporateClientsid%>')" >鏌ョ湅璁捐娌熼��</button>
+ </fieldset>
<%-- <fieldset id="weihujilu">
<legend>娣诲姞缁存姢璁板綍</legend>
<table class="tableStyle" width="100%">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx
new file mode 100644
index 0000000..a8d7189
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx
@@ -0,0 +1,173 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CorporateClientsSheji.aspx.cs" Inherits="CY.WebForm.Pages.business.CorporateClientsSheji" %>
+
+<!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 printview() {
+ bdhtml = window.document.body.innerHTML;
+ sprnstr = "<!--startprint-->"; //寮�濮嬫墦鍗版爣璇嗗瓧绗︿覆鏈�17涓瓧绗�
+ eprnstr = "<!--endprint-->"; //缁撴潫鎵撳嵃鏍囪瘑瀛楃涓�
+ prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr) + 17); //浠庡紑濮嬫墦鍗版爣璇嗕箣鍚庣殑鍐呭
+ prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr)); //鎴彇寮�濮嬫爣璇嗗拰缁撴潫鏍囪瘑涔嬮棿鐨勫唴瀹�
+ window.document.body.innerHTML = prnhtml; //鎶婇渶瑕佹墦鍗扮殑鎸囧畾鍐呭璧嬬粰body.innerHTML
+ window.print(); //璋冪敤娴忚鍣ㄧ殑鎵撳嵃鍔熻兘鎵撳嵃鎸囧畾鍖哄煙
+
+ window.document.body.innerHTML = bdhtml;//閲嶆柊缁欓〉闈㈠唴瀹硅祴鍊硷紱
+ }
+
+ //鏌ョ湅
+ function checkSelFile() {
+
+ //var oFile = document.getElementById('filesel');
+ //if (oFile.value == "") {
+ // alertMsg('娌℃湁閫夋嫨鏂囦欢');
+ // return false;
+
+ //}
+ showLoadingIndicator();
+ //debugger;
+ //replaceParamVal("deleteKeyIds", "");
+ return true;
+ }
+
+ function showLoadingIndicator() {
+ document.getElementById('loading').style.display = 'block';
+ }
+
+ function hideLoadingIndicator() {
+ document.getElementById('loading').style.display = 'none';
+ }
+
+ //鏌ョ湅
+ function onViewSheji(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyShejiDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅璁捐娌熼�氳鎯�", Width: 1100, Height: 800 });
+ }
+ </script>
+ <style>
+ .table-wrap {
+ width: 100%; /* 闄愬埗瀹瑰櫒瀹藉害 */
+ word-break: break-all; /* 寮哄埗鑻辨枃/鏁板瓧鎹㈣ */
+ /* 鎴栦娇鐢� word-wrap: break-word; 鍙湪鍗曡瘝鍐呮崲琛� */
+ }
+ .truncate {
+ white-space: nowrap; /* 涓嶆崲琛� */
+ overflow: hidden; /* 闅愯棌瓒呭嚭閮ㄥ垎 */
+ text-overflow: ellipsis; /* 鏄剧ず鐪佺暐鍙� */
+ max-width: 150px; /* 闄愬埗鍗曞厓鏍兼渶澶у搴� */
+ }
+</style>
+</head>
+<body>
+ <form runat="server" id="form1" class="form">
+
+ <table class="TableNewStyle" width="100%">
+ <tr>
+
+ <tr>
+
+ <td>
+
+ <input type="button" class="button" value="鎵撳嵃" onclick="printview();" />
+ </td>
+ </tr>
+ </table>
+ <fieldset id="weihujilu">
+ <legend>娣诲姞璁捐娌熼��</legend>
+ <table class="tableStyle" width="100%">
+ <tr>
<td class="ali01 " style="width:10%;">娌熼�氭棩鏈燂細</td>
<td style="width:20%;" ><input id="txtShejiTime" type="text" runat="server" maxlength="50" class="date w90px" datefmt="yyyy-MM-dd" /></td>
<td class="ali01 " style="width:10%;">鍗颁欢鍚嶇О锛�</td>
<td style="width:20%;" ><input id="txtYinjianName" type="text" runat="server" maxlength="100" class="req" /></td>
<td class="ali01 " style="width:10%;">鏍＄娆℃暟锛�</td>
<td style="width:20%;" ><input id="txtJiaogaoCount" type="text" runat="server" maxlength="100" class="req int" /></td>
</tr>
+
+ <tr>
+ <td class="ali03 " style="width:10%;">娌熼�氬唴瀹癸細</td>
<td colspan="5" style="width:90%;" ><textarea runat="server" id="txtShejiRemark" style=" width:92%; height:30px;" maxlength="2000"></textarea></td>
+ </tr>
+
+
+ <tr>
<td colspan="6" ><asp:Button ID="Button1" Text="娣诲姞璁捐娌熼��" runat="server" OnClick="btn_Submit_Sheji" /></td>
<div id="loading" class="toast-message" style="display: none;">淇濆瓨涓紒</div>
</tr>
+ </table>
+
+
+ </fieldset>
+ <fieldset>
+ <legend>璁捐娌熼��</legend>
+ <!--startprint-->
+ <table class="tableStyle" style="margin-bottom:10px;" width="100%;">
+
+ <tr>
+
+ <td class="ali03 " style="width:10%">瀹㈡埛鍗曚綅锛�</td>
+ <td style="width:30%">
+ <span id="spanCompanyName" runat="server" ></span>
+ </td>
+ <td class="ali03 " style="width:10%">涓氬姟缁忕悊锛�</td><td style="width:20%"><span id="spanBusinessManagerId" runat="server" ></span></td>
+ <td class="ali03 " style="width:10%">鎵撳嵃鏃ユ湡锛�</td><td style="width:20%"><span id="spanprintdate" runat="server" ></span></td>
+ </tr>
+ </table>
+
+ <asp:Repeater ID="RepClientList" runat="server">
+ <HeaderTemplate>
+ <table class="tableStyle" border="1" cellspacing="0" cellpadding="0" style="text-align: center;" width="100%;">
+ <tr>
+ <th style="text-align: center;width:10px;">
+ 搴忓彿
+ </th>
+ <th style="text-align: center;width:10%;">
+ 鏃ユ湡
+ </th>
+ <th style="text-align: center;width:10%;">
+ 鍗颁欢鍚嶇О
+ </th>
+ <th style="text-align: center;width:10%;">
+ 璁捐甯�
+ </th>
+ <th style="text-align: center;width:10%;">
+ 鏍＄娆℃暟
+ </th>
+ <th style="text-align: center;width:40%;">
+ 娌熼�氬唴瀹�
+ </th>
+
+ <th style="text-align: center;width:10%;">
+ 璇︽儏
+ </th>
+ </tr>
+ </HeaderTemplate>
+ <ItemTemplate>
+ <tr>
+
+ <td>
+ <%# Container.ItemIndex + 1%>
+ </td>
+ <td>
+ <%#Eval("ShejiTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%#Eval("YinjianName")%>
+ </td>
+ <td>
+ <%#Eval("CreaterName")%>
+ </td>
+ <td>
+ <%#Eval("JiaogaoCount")%>
+ </td>
+ <td class="truncate" title="<%#Eval("Remark")%>" >
+ <%#Eval("Remark")%>
+ </td>
+
+ <td>
+ <span onclick="onViewSheji('<%#Eval("Keyid")%>')">璇︽儏</span>
+ </td>
+ </tr>
+ </ItemTemplate>
+ <FooterTemplate>
+ </table>
+ </FooterTemplate>
+ </asp:Repeater>
+ <!--endprint-->
+ </fieldset>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.cs
new file mode 100644
index 0000000..cb31f6c
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.cs
@@ -0,0 +1,195 @@
+锘縰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;
+using CY.BLL.Sys;
+using CY.Model.Inquiry;
+using CY.SQLDAL;
+using System.Data.SqlClient;
+using CY.Infrastructure.Logging;
+using CY.WebForm.Helper;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class CorporateClientsSheji : BasePage
+ {
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;//瀛楀吀涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ SysInquiry_PrintingTypeBLL bll_SysInquiry_PrintingTypeBLL = null;//鍗板埛涓氬姟绫诲瀷涓氬姟閫昏緫鎿嶄綔绫诲璞�
+ /// <summary>
+ /// 鏄惁闇�瑕佽妭鍋囨棩缁存姢
+ /// </summary>
+ public bool IsNeedJiejiaRi { get; set; }
+ /// <summary>
+ /// 鏄惁闇�瑕佺淮鎶�
+ /// </summary>
+ public bool NeedWeihu { get; set; }
+
+ /// <summary>
+ /// 鍚堜綔瀹㈡埛渚嬪瓙
+ /// </summary>
+ public OA_CorporateClients client { get; set; }
+ //鍒濆鍖�
+ public CorporateClientsSheji()
+ {
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ bll_SysInquiry_PrintingTypeBLL = new SysInquiry_PrintingTypeBLL();
+ }
+ /// <summary>
+ /// 鏄惁鏃剁淮鎶ゆ彁閱掍紶杩囨潵鐨�
+ /// </summary>
+ public bool IsWeihuTixingUrl { get; set; } = false;
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ if (Request["Keyid"] != null || Request["MemberId"] != null)
+ {
+ OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModelDetail(Request["Keyid"].ToGuid2());
+ this.spanCompanyName.InnerText = m_OA_CorporateClients.CompanyName;
+ this.spanBusinessManagerId.InnerText = m_OA_CorporateClients.BusinessmanagerName;
+ this.spanprintdate.InnerText = DateTime.Now.ToString("yyyy-MM-dd");
+ client = bll_OA_CorporateClientsBLL.GetModel(Request["Keyid"].ToGuid2());
+ this.txtShejiTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.SelectShejiListByCorId(Request["Keyid"].ToGuid2());
+
+ this.RepClientList.DataBind();
+
+
+
+
+
+ }
+ }
+
+
+
+ }
+ //瀹岀粨浜嬩欢
+ protected void btn_Submit_Sheji(object sender, EventArgs e)
+ {
+ OA_CorporateClientsSheji m_OA_CorporateClientsSheji = new OA_CorporateClientsSheji();
+
+
+ try
+ {
+ Guid Keyid = Request["Keyid"].ToGuid2();
+
+
+
+
+ if (Request["Keyid"] != null)
+ {
+
+
+ }
+ else
+ {
+ JavaScript.MessageBox("璇峰厛淇濆瓨瀹㈡埛", this);
+ return;
+ }
+
+ if (this.txtShejiTime.Value == "")
+ {
+ JavaScript.MessageBox("璇烽�夋嫨鏃ユ湡", this);
+ return;
+
+ }
+
+ if (this.txtYinjianName.Value.Trim() == "")
+ {
+ JavaScript.MessageBox("璇峰～鍐欏嵃浠跺悕绉�", this);
+ return;
+
+ }
+
+ if (this.txtJiaogaoCount.Value.Trim() == "")
+ {
+ JavaScript.MessageBox("璇峰～鍐欐牎绋挎鏁�", this);
+ return;
+
+ }
+
+ if (this.txtShejiRemark.Value.Trim() == "")
+ {
+ JavaScript.MessageBox("璇峰～鍐欑淮鎶よ褰�", this);
+ return;
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+ m_OA_CorporateClientsSheji.Keyid = Guid.NewGuid();
+
+
+ m_OA_CorporateClientsSheji.CorporateClientsid = Keyid;
+
+ m_OA_CorporateClientsSheji.ShejiTime = this.txtShejiTime.Value.ToDateTime2();
+ m_OA_CorporateClientsSheji.YinjianName = this.txtYinjianName.Value.Trim();
+ m_OA_CorporateClientsSheji.JiaogaoCount = this.txtJiaogaoCount.Value.Trim().ToInt32();
+
+ m_OA_CorporateClientsSheji.Remark = this.txtShejiRemark.Value.Trim();
+ m_OA_CorporateClientsSheji.Creater = CurrentUser.TrueMemberId;
+ m_OA_CorporateClientsSheji.CreateTime = DateTime.Now;
+ m_OA_CorporateClientsSheji.Updater = CurrentUser.TrueMemberId;
+ m_OA_CorporateClientsSheji.LastUpdateTime = DateTime.Now;
+
+
+ #region 娣诲姞鎴栫紪杈�
+
+
+ bool result = bll_OA_CorporateClientsBLL.InsertModelSheji(m_OA_CorporateClientsSheji);//鏇存柊淇℃伅
+
+ if (result)
+ {
+
+ this.txtShejiTime.Value = "";
+ this.txtShejiRemark.Value = "";
+ this.txtYinjianName.Value = "";
+ this.txtJiaogaoCount.Value = "";
+ //JavaScript.MessageBox("缁存姢淇濆瓨鎴愬姛", this, false, false);
+ JavaScript.MessageBoxandhideLoadingIndicator("淇濆瓨鎴愬姛", this);
+
+
+
+
+ }
+
+ else
+ JavaScript.MessageBox("缁存姢淇濆瓨澶辫触", this);
+ this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.SelectShejiListByCorId(Request["Keyid"].ToGuid2());
+ this.RepClientList.DataBind();
+
+ #endregion
+
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("鎿嶄綔澶辫触", this);
+
+ }
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.designer.cs
new file mode 100644
index 0000000..e2b41a6
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsSheji.aspx.designer.cs
@@ -0,0 +1,125 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class CorporateClientsSheji
+ {
+
+ /// <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>
+ /// txtShejiTime 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtShejiTime;
+
+ /// <summary>
+ /// txtYinjianName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtYinjianName;
+
+ /// <summary>
+ /// txtJiaogaoCount 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtJiaogaoCount;
+
+ /// <summary>
+ /// txtShejiRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiRemark;
+
+ /// <summary>
+ /// Button1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Button Button1;
+
+ /// <summary>
+ /// spanCompanyName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCompanyName;
+
+ /// <summary>
+ /// spanBusinessManagerId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanBusinessManagerId;
+
+ /// <summary>
+ /// spanprintdate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanprintdate;
+
+ /// <summary>
+ /// RepClientList 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater RepClientList;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx
index 09c4022..66bbbb9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx
@@ -81,9 +81,10 @@
<table class="tableStyle" width="100%">
<tr>
<td class="ali01 " style="width:10%;">缁存姢鏃ユ湡锛�</td>
<td style="width:20%;" ><input id="txtVisitTime" type="text" runat="server" maxlength="50" class="date w90px" datefmt="yyyy-MM-dd" /></td>
<td class="ali03 " style="width:10%;">缁存姢璁板綍锛�</td>
<td colspan="2" style="width:60%;" ><textarea runat="server" id="txtvisitRemark" style=" width:92%; height:30px;" maxlength="2000"></textarea></td>
</tr>
<tr>
- <td class="ali03" colspan="2">
+ <td class="ali01 " style="width:10%;">涓婁紶闄勪欢锛�</td>
+ <td style="width:20%;" >
<input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true" multiple="multiple" runat="server" text="璇烽�夋嫨鏂囦欢" /></td>
- <td>
<td ><asp:Button ID="Button1" Text="娣诲姞缁存姢璁板綍" OnClientClick="return checkSelFile()" runat="server" OnClick="btn_Submit_Visit" ToolTip="璇ヨ褰曚細娓呴櫎璇ュ鎴风殑渚嬭缁存姢鎻愰啋"/><asp:Button ID="btn_Submit" Text="娣诲姞鍋囨棩缁存姢璁板綍" runat="server" ToolTip="璇ヨ褰曚細娓呴櫎璇ュ鎴风殑鍋囨棩缁存姢鎻愰啋" OnClick="btn_Submit_Visit_jiari"/></td>
<div id="loading" class="toast-message" style="display: none;">淇濆瓨涓紒</div>
</tr>
+
<td colspan="2" ><asp:Button ID="Button1" Text="娣诲姞缁存姢璁板綍" OnClientClick="return checkSelFile()" runat="server" OnClick="btn_Submit_Visit" ToolTip="璇ヨ褰曚細娓呴櫎璇ュ鎴风殑渚嬭缁存姢鎻愰啋"/><asp:Button ID="btn_Submit" Text="娣诲姞鍋囨棩缁存姢璁板綍" runat="server" ToolTip="璇ヨ褰曚細娓呴櫎璇ュ鎴风殑鍋囨棩缁存姢鎻愰啋" OnClick="btn_Submit_Visit_jiari"/></td>
<div id="loading" class="toast-message" style="display: none;">淇濆瓨涓紒</div>
</tr>
</table>
<%-- <asp:Repeater ID="RepClientList" runat="server">
<HeaderTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
index b952329..b66a70c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/OrderFinancial.aspx
@@ -276,7 +276,7 @@
</asp:Repeater>
</tbody>
<tr class="StatisticsMoney">
- <td colspan="9" class="ali03">
+ <td colspan="8" class="ali03">
褰撳墠椤电粺璁★細
</td>
<td>
@@ -292,7 +292,7 @@
</td>
</tr>
<tr class="StatisticsMoney">
- <td colspan="9" class="ali03">
+ <td colspan="8" class="ali03">
鏌ヨ椤圭粺璁★細
</td>
<td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx
new file mode 100644
index 0000000..321b492
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx
@@ -0,0 +1,72 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MyShejiDetail.aspx.cs" Inherits="CY.WebForm.Pages.work.MyShejiDetail" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>鎶ラ攢鏄庣粏</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <style type="text/css">
+ .w70px { width: 70px; }
+ fieldset { padding: 3px; margin: 5px auto; }
+ </style>
+</head>
+<body>
+ <form id="form1" class="form2" runat="server">
+ <div>
+ <fieldset>
+ <legend>璁捐娌熼�氫俊鎭�</legend>
+ <table style="margin: 0px auto;" border="1" cellpadding="0" cellspacing="0" width="99%">
+ <tr>
+ <td class="ali03" colspan="3" style="width:10%; ">
+ 鏃ユ湡锛�
+ </td>
+ <td style="width:90%; ">
+ <span id="spanDepart" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03" colspan="3">
+ 鍗颁欢鍚嶇О锛�
+ </td>
+ <td>
+ <span id="spanYinjianName" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03" colspan="3">
+ 璁捐甯堬細
+ </td>
+ <td>
+ <span id="spanPlanPeople" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03" colspan="3">
+ 鏍＄娆℃暟锛�
+ </td>
+ <td>
+ <span id="spanJiaogaoCount" runat="server"></span>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 娌熼�氬唴瀹癸細
+ </td>
+ <td>
+ <span id="spanPlanContent" runat="server"></span>
+ </td>
+ </tr>
+
+
+
+
+
+
+ </table>
+ </fieldset>
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.cs
new file mode 100644
index 0000000..fb565b8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.cs
@@ -0,0 +1,68 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using System.Data;
+using System.Data.SqlClient;
+using CY.Model;
+using CY.BLL;
+using CY.Infrastructure.Common;
+using CY.BLL.Sys;
+using CY.BLL.EC;
+using CY.Infrastructure.DESEncrypt;
+using CY.Infrastructure.Query;
+
+namespace CY.WebForm.Pages.work
+{
+ //鍚磋緣
+ //璇风ず鏄庣粏
+ public partial class MyShejiDetail : BasePage
+ {
+
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ OA_StaffBLL staffBLL = null;
+ public MyShejiDetail()
+ {
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ staffBLL = new OA_StaffBLL();
+ }
+
+ //椤甸潰鍔犺浇
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ InitData();
+ }
+ }
+
+ //鏁版嵁鍔犺浇
+ public void InitData()
+ {
+ var keyid = Request["keyid"].ToGuid2() ;
+ var oA_CorporateClientsSheji = bll_OA_CorporateClientsBLL.SelectShejiByKeyid(keyid);
+ if (oA_CorporateClientsSheji != null)
+ {
+ var oA_Staff = staffBLL.GetModelByMemberId(oA_CorporateClientsSheji.Creater.Value);
+ if (oA_Staff != null)
+ {
+ spanPlanPeople.InnerText = oA_Staff.Name;
+ }
+ spanYinjianName.InnerHtml = oA_CorporateClientsSheji.YinjianName;
+ spanJiaogaoCount.InnerHtml = oA_CorporateClientsSheji.JiaogaoCount.HasValue? oA_CorporateClientsSheji.JiaogaoCount.Value.ToString():"";
+ spanPlanContent.InnerHtml = oA_CorporateClientsSheji.Remark;
+ spanDepart.InnerText = oA_CorporateClientsSheji.ShejiTime.Value.ToString("yyyy-MM-dd");
+
+ }
+
+
+
+
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.designer.cs
new file mode 100644
index 0000000..7b3df62
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyShejiDetail.aspx.designer.cs
@@ -0,0 +1,89 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyShejiDetail
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanDepart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDepart;
+
+ /// <summary>
+ /// spanYinjianName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanYinjianName;
+
+ /// <summary>
+ /// spanPlanPeople 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
+
+ /// <summary>
+ /// spanJiaogaoCount 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanJiaogaoCount;
+
+ /// <summary>
+ /// spanPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx
index 1a1ff12..1e1060d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx
@@ -26,7 +26,7 @@
鎵ц鏃堕棿锛�
</td>
<td>
- <input id="txtPlanRunTime" type="text" class="date" datefmt="yyyy-MM-dd HH:mm:00" runat="server" style=" width:180px;"/>
+ <input id="txtPlanRunTime" type="text" class="date" datefmt="yyyy-MM-dd HH:mm" runat="server" style=" width:180px;"/>
</td>
</tr>
<tr>
@@ -51,7 +51,7 @@
瀵瑰彛鍗曚綅锛�
</td>
<td colspan="3">
- <input id="txtPlanComplany" style=" width:400px;" type="text" class="req" runat="server" msg="璇疯緭鍏ュ鍙ｅ崟浣�"/>
+ <input id="txtPlanComplany" style=" width:400px;" type="text" runat="server" msg="璇疯緭鍏ュ鍙ｅ崟浣�"/>
</td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx.designer.cs
index 94a65da..9f33bbd 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanAdd.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.work {
-
-
- public partial class WorkPlanAdd {
-
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class WorkPlanAdd
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// selPlanDataType 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanDataType;
-
+
/// <summary>
/// txtPlanRunTime 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanRunTime;
-
+
/// <summary>
/// selDepartmentId 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList selDepartmentId;
-
+
/// <summary>
/// selStaff 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selStaff;
-
+
/// <summary>
/// txtPlanComplany 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanComplany;
-
+
/// <summary>
/// txtPlanTitle 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanTitle;
-
+
/// <summary>
/// txtPlanContent 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanContent;
-
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs
index 73d8425..8efdf9e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkPlanDetail.aspx.cs
@@ -43,11 +43,11 @@
if (m_OA_WorkPlan != null)
{
this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString();
- this.spanPlanRunTime.InnerText = m_OA_WorkPlan.PlanRunTime.ToString();
+ this.spanPlanRunTime.InnerText = m_OA_WorkPlan.PlanRunTime.HasValue ? m_OA_WorkPlan.PlanRunTime.Value.ToString("yyyy-MM-dd HH:mm") : "";
this.spanDepartName.InnerText = m_OA_WorkPlan.DepartName.ToString();
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
this.spanSentStaffName.InnerText = m_OA_WorkPlan.SentStaffName.ToString();
- this.spanPlanStartTime.InnerText = m_OA_WorkPlan.PlanStartTime.ToString();
+ this.spanPlanStartTime.InnerText = m_OA_WorkPlan.PlanStartTime.HasValue ? m_OA_WorkPlan.PlanStartTime.Value.ToString("yyyy-MM-dd HH:mm") : "";
this.spanPlanComplany.InnerText = m_OA_WorkPlan.PlanComplany.ToString();
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.cs
index b8bc84d..24debe7 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/WorkScoreAdd.aspx.cs
@@ -50,11 +50,11 @@
if (m_OA_WorkPlan != null)
{
this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString();
- this.spanPlanRunTime.InnerText = m_OA_WorkPlan.PlanRunTime.ToString();
+ this.spanPlanRunTime.InnerText = m_OA_WorkPlan.PlanRunTime.HasValue? m_OA_WorkPlan.PlanRunTime.Value.ToString("yyyy-MM-dd HH:mm"):"";
this.spanDepartName.InnerText = m_OA_WorkPlan.DepartName.ToString();
this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString();
this.spanSentStaffName.InnerText = m_OA_WorkPlan.SentStaffName.ToString();
- this.spanPlanStartTime.InnerText = m_OA_WorkPlan.PlanStartTime.ToString();
+ this.spanPlanStartTime.InnerText = m_OA_WorkPlan.PlanStartTime.HasValue ? m_OA_WorkPlan.PlanStartTime.Value.ToString("yyyy-MM-dd HH:mm") : "";
this.spanPlanComplany.InnerText = m_OA_WorkPlan.PlanComplany.ToString();
this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString();
this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString();
--
Gitblit v1.9.1