From be3b255bbe328d793ff20011683dca5aee1668a1 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 23 七月 2025 09:05:29 +0800
Subject: [PATCH] 20250722 川印系统客户访问增加长度，增加附件何查看 20250721 川印系统修改 完成
---
CY_ECommercePlatform/CY.Model/CY.Model.csproj | 1
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs | 41 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx | 65 ++++
CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs | 26 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.cs | 78 +++++
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx | 12
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiOrder.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx | 73 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.cs | 68 +++++
CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsVisit.cs | 6
CY_ECommercePlatform/CY.Model/OA/OA_attachment.cs | 174 +++++++++++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs | 72 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.designer.cs | 80 ++++++
17 files changed, 714 insertions(+), 24 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
index 8231c31..74d9ec5 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
@@ -1185,5 +1185,46 @@
{
return _IOA_CorporateClientsDal.SelectVisitListByBuzAndTime(BusinessManagerId, chaxuntime);
}
+
+
+ /// <summary>
+ /// 娣诲姞闄勪欢
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ public bool Insertattachment(OA_attachment a_Attachment)
+ {
+ try
+ {
+ _IOA_CorporateClientsDal.Insertattachment(a_Attachment);
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇闄勪欢
+ /// </summary>
+ /// <param name="Keyid">涓婚敭id</param>
+ /// <returns></returns>
+ public IEnumerable<OA_attachment> GetattachmentlList(string OA_Id)
+ {
+
+ return _IOA_CorporateClientsDal.GetattachmentlList(OA_Id);
+ }
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ璁块棶
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_CorporateClientsVisit SelectVisitByKeyid(Guid Keyid)
+ {
+ return _IOA_CorporateClientsDal.SelectVisitByKeyid(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 4ddd496..894127e 100644
--- a/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
+++ b/CY_ECommercePlatform/CY.IDAL/OA/IOA_CorporateClientsDAL.cs
@@ -363,5 +363,31 @@
/// <returns></returns>
IEnumerable<OA_CorporateClientsVisit> SelectVisitListByBuzAndTime(int? BusinessManagerId,string chaxuntime);
+
+
+ /// <summary>
+ /// 鏂板闄勪欢
+ /// </summary>
+ /// <param name="rType"></param>
+ /// <returns></returns>
+ bool Insertattachment(OA_attachment a_Attachment);
+
+
+ /// <summary>
+ /// 鏍规嵁鍘傚晢缂栧彿鏌ヨ鍏ㄩ儴澶栧崗鍘傚晢
+ /// </summary>
+ /// <param name="MemberId">缂栧彿</param>
+ /// <returns></returns>
+ IEnumerable<OA_attachment> GetattachmentlList(string OA_Id);
+
+
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ璁块棶
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ OA_CorporateClientsVisit SelectVisitByKeyid(Guid Keyid);
+
}
}
diff --git a/CY_ECommercePlatform/CY.Model/CY.Model.csproj b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
index 44c09d6..8325c3e 100644
--- a/CY_ECommercePlatform/CY.Model/CY.Model.csproj
+++ b/CY_ECommercePlatform/CY.Model/CY.Model.csproj
@@ -205,6 +205,7 @@
<Compile Include="OA\CoreCmsPlanOrderItem.cs" />
<Compile Include="OA\CoreDeliverOrderItem.cs" />
<Compile Include="OA\EC_OrderLiuyang.cs" />
+ <Compile Include="OA\OA_attachment.cs" />
<Compile Include="OA\OA_Baozhengjin.cs" />
<Compile Include="OA\OA_Baozhengjincuishou.cs" />
<Compile Include="OA\OA_CarDictionary.cs" />
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsVisit.cs b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsVisit.cs
index 4dfab0d..15ff269 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsVisit.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_CorporateClientsVisit.cs
@@ -110,7 +110,11 @@
get;
set;
}
-
+ public System.Collections.Generic.List<OA_attachment> attachments
+ {
+ get;
+ set;
+ }
#endregion Model
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_attachment.cs b/CY_ECommercePlatform/CY.Model/OA/OA_attachment.cs
new file mode 100644
index 0000000..8234dae
--- /dev/null
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_attachment.cs
@@ -0,0 +1,174 @@
+锘�/**
+*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_attachment : IAggregateRoot
+ {
+ #region Model
+ /// <summary>
+ /// Keyid
+ /// </summary>
+ public int Keyid { get; set; }
+ /// <summary>
+ /// OA_Id
+ /// </summary>
+ public Guid OA_Id { get; set; }
+
+
+ /// <summary>
+ /// PlanAttachment
+ /// </summary>
+ public string PlanAttachment
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// AttachmentType 1鍙戠エ 2 闄勪欢 3
+ /// </summary>
+ public int? AttachmentType
+ {
+ get;
+ set;
+ }
+
+
+ /// <summary>
+ /// AttachmentName
+ /// </summary>
+ public string AttachmentName
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// AttachmentHouzhui
+ /// </summary>
+ public string AttachmentHouzhui
+ {
+ get;
+ set;
+ }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ get;
+ set;
+ }
+
+
+
+
+
+
+
+
+
+ /// <summary>
+ /// Operator
+ /// </summary>
+ public string Operator
+ {
+ get;
+ set;
+ }
+
+ #endregion Model
+
+ #region Visiter
+
+ /// <summary>
+ /// 灞炴�ц闂櫒
+ /// </summary>
+ /// <param name="name">灞炴�у悕</param>
+ /// <param name="index">绱㈠紩</param>
+ /// <param name="isChange">鏄惁灏嗘寚瀹氬睘鎬ц缃负浼犲叆鍊�</param>
+ /// <param name="value">闇�瑕佽祴浜堢殑鍊�</param>
+ /// <returns>涓庡悕绉板搴旂殑灞炴�у��</returns>
+ public object Visiter(string name, int? index = -1, bool isChange = false, object value = null)
+ {
+ object theValue = null;
+
+
+ if ("Keyid".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 1)
+ {
+ this.Keyid = isChange ? MyConvert.ConvertToInt32(value).Value : Keyid;
+ theValue = this.Keyid;
+ }
+ else if ("OA_WorkPlanId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 2)
+ {
+ this.OA_Id = isChange ? MyConvert.ConvertToGuid(value) : OA_Id;
+ theValue = this.OA_Id;
+ }
+
+
+
+
+ else if ("PlanAttachment".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 3)
+ {
+ this.PlanAttachment = isChange ? MyConvert.ConvertToString(value) : PlanAttachment;
+ theValue = this.PlanAttachment;
+ }
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 4)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+ else if ("AttachmentType".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 5)
+ {
+ this.AttachmentType = isChange ? MyConvert.ConvertToInt32(value) : AttachmentType;
+ theValue = this.AttachmentType;
+ }
+ else if ("Operator".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 6)
+ {
+ this.Operator = isChange ? MyConvert.ConvertToString(value) : Operator;
+ theValue = this.Operator;
+ }
+
+ else if ("AttachmentName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 7)
+ {
+ this.AttachmentName = isChange ? MyConvert.ConvertToString(value) : AttachmentName;
+ theValue = this.AttachmentName;
+ }
+
+ else if ("AttachmentHouzhui".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 8)
+ {
+ this.AttachmentHouzhui = isChange ? MyConvert.ConvertToString(value) : AttachmentHouzhui;
+ theValue = this.AttachmentHouzhui;
+ }
+
+
+ return theValue;
+ }
+
+ #endregion
+ }
+}
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
index 50d5f9f..cc7171c 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CorporateClientsDAL.cs
@@ -1505,5 +1505,77 @@
}
}
+
+ /// <summary>
+ /// 鏂板
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool Insertattachment(OA_attachment model)
+ {
+ Model.OA_attachment trueModel = model as Model.OA_attachment;
+ if (trueModel == null)
+ {
+ return false;
+ }
+
+
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@OA_Id",trueModel.OA_Id),
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
+ new SqlParameter("@PlanAttachment",trueModel.PlanAttachment),
+ new SqlParameter("@AttachmentType",trueModel.AttachmentType),
+ new SqlParameter("@Operator",string.IsNullOrWhiteSpace(trueModel.Operator)?"":trueModel.Operator),
+ new SqlParameter("@AttachmentHouzhui",string.IsNullOrWhiteSpace(trueModel.AttachmentHouzhui)?"":trueModel.AttachmentHouzhui),
+ new SqlParameter("@AttachmentName",string.IsNullOrWhiteSpace(trueModel.AttachmentName)?"":trueModel.AttachmentName ),
+
+
+ };
+ string sql = "Insert Into OA_attachment ( [OA_Id] , [PlanAttachment],[AttachmentType],[CreateTime],[Operator],[AttachmentHouzhui],[AttachmentName] )"
+ + " Values ( @OA_Id, @PlanAttachment,@AttachmentType,@CreateTime,@Operator,@AttachmentHouzhui,@AttachmentName )";
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鍘傚晢缂栧彿鏌ヨ鍏ㄩ儴澶栧崗鍘傚晢
+ /// </summary>
+ /// <param name="MemberId">缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<OA_attachment> GetattachmentlList(string OA_Id)
+ {
+ if (OA_Id == null)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_attachment> result = _dataBase.SelectModel<OA_attachment>("*", "OA_attachment", string.Format(" OA_Id='{0}' ORDER BY CreateTime DESC", OA_Id)) as IList<OA_attachment>;//鎵ц鏌ヨ
+
+ return result;//杩斿洖缁撴灉
+ }
+
+
+ /// <summary>
+ /// 鍗曚釜鏌ヨ璁块棶
+ /// </summary>
+ /// <param name="Keyid">缂栧彿</param>
+ /// <returns></returns>
+ public OA_CorporateClientsVisit SelectVisitByKeyid(Guid Keyid)
+ {
+ if (Keyid == null)
+ return null;//閿欒鏁版嵁杩斾細绌�
+
+ IList<OA_CorporateClientsVisit> result = _dataBase.SelectModel<OA_CorporateClientsVisit>(" a.* ", " OA_CorporateClientsVisit a ", string.Format(" a.Keyid='{0}'", Keyid)) as IList<OA_CorporateClientsVisit>;//鎵ц鏌ヨ
+
+ 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 d19cdcc..e7b0e57 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -2804,6 +2804,7 @@
<Content Include="Pages\work\BaoxiaoFukuanList.aspx" />
<Content Include="Pages\work\BaoxiaoPiliangReply.aspx" />
<Content Include="Pages\work\BaoxiaoReplyList.aspx" />
+ <Content Include="Pages\work\MyvisitDetail.aspx" />
<Content Include="Pages\work\MyPlanAdd.aspx" />
<Content Include="Pages\work\MyPlanList.aspx" />
<Content Include="Pages\work\MyBaoxiaoAdd.aspx" />
@@ -9207,6 +9208,13 @@
<Compile Include="Pages\work\BaoxiaoReplyList.aspx.designer.cs">
<DependentUpon>BaoxiaoReplyList.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\work\MyvisitDetail.aspx.cs">
+ <DependentUpon>MyvisitDetail.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\work\MyvisitDetail.aspx.designer.cs">
+ <DependentUpon>MyvisitDetail.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\work\MyPlanAdd.aspx.cs">
<DependentUpon>MyPlanAdd.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
index 73a4c06..bab9e7f 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOrderProduction.aspx.cs
@@ -172,7 +172,15 @@
/// <param name="e"></param>
private void AspNetPager_PageChanged(object sender, EventArgs e)
{
- UCPager1.AspNetPager.PageSize = 25;
+ if(this.selOrderStates.Value == "2")
+ {
+ UCPager1.AspNetPager.PageSize = 1000;
+ }
+ else
+ {
+ UCPager1.AspNetPager.PageSize = 25;
+ }
+
Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs
index bb6ab26..6649c6c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Baozhengjinfukuan.aspx.cs
@@ -475,8 +475,8 @@
selAccountName.DataBind();
selAccountName.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
- this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
- this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
+ //this.txtSQBeginDate.Value = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
+ //this.txtSQEndDate.Value = DateTime.Now.ToString("yyyy-MM-dd");
this.TuikuanStatus.Value = "1";
//鍒濇鏁版嵁鍔犺浇
btn_Search_Click(btn_Search, new EventArgs());
@@ -572,6 +572,15 @@
private void AspNetPager_PageChanged(object sender, EventArgs e)
{
// UCPager1.AspNetPager.PageSize = 3;
+ if (this.TuikuanStatus.Value == "1")
+ {
+ UCPager1.AspNetPager.PageSize = 1000;
+ }
+ else
+ {
+ UCPager1.AspNetPager.PageSize = 25;
+ }
+
Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx
index d425ced..49d6614 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx
@@ -19,8 +19,48 @@
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 onViewvisit(keyid) {
+ top.Dialog.open({ URL: "/Pages/work/MyvisitDetail.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">
@@ -39,7 +79,9 @@
<fieldset id="weihujilu">
<legend>娣诲姞缁存姢璁板綍</legend>
<table class="tableStyle" width="100%">
- <tr>
<td class="ali01 ">缁存姢鏃ユ湡锛�</td>
<td ><input id="txtVisitTime" type="text" runat="server" maxlength="50" class="date w90px" datefmt="yyyy-MM-dd" /></td>
<td class="ali03 ">缁存姢璁板綍锛�</td>
<td colspan="2" ><textarea runat="server" id="txtvisitRemark" style=" width:92%; height:30px;" maxlength="200"></textarea></td>
<td ><asp:Button ID="Button1" Text="娣诲姞缁存姢璁板綍" runat="server" OnClick="btn_Submit_Visit" ToolTip="璇ヨ褰曚細娓呴櫎璇ュ鎴风殑渚嬭缁存姢鎻愰啋"/><asp:Button ID="btn_Submit" Text="娣诲姞鍋囨棩缁存姢璁板綍" runat="server" ToolTip="璇ヨ褰曚細娓呴櫎璇ュ鎴风殑鍋囨棩缁存姢鎻愰啋" OnClick="btn_Submit_Visit_jiari"/></td>
</tr>
+ <tr>
<td class="ali01 ">缁存姢鏃ユ湡锛�</td>
<td ><input id="txtVisitTime" type="text" runat="server" maxlength="50" class="date w90px" datefmt="yyyy-MM-dd" /></td>
<td class="ali03 ">缁存姢璁板綍锛�</td>
<td colspan="2" ><textarea runat="server" id="txtvisitRemark" style=" width:92%; height:30px;" maxlength="2000"></textarea></td>
<td class="ali03">
+ <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>
</table>
<%-- <asp:Repeater ID="RepClientList" runat="server">
<HeaderTemplate>
@@ -87,7 +129,7 @@
<fieldset>
<legend>缁存姢璁板綍</legend>
<!--startprint-->
- <table class="tableStyle" style="margin-bottom:10px;">
+ <table class="tableStyle" style="margin-bottom:10px;" width="100%;">
<tr>
@@ -102,21 +144,23 @@
<asp:Repeater ID="RepClientList" runat="server">
<HeaderTemplate>
- <table class="tableStyle" useclick="false" usecheckbox="true" sortmode="true" border="1" cellspacing="0" cellpadding="0" style="text-align: center;">
+ <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;">
+ <th style="text-align: center;width:10%;">
缁存姢鏃ユ湡
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;width:70%;">
缁存姢璁板綍
</th>
- <th style="text-align: center;">
+ <th style="text-align: center;width:10%;">
缁存姢浜�
</th>
-
+ <th style="text-align: center;width:10%;">
+ 璇︽儏
+ </th>
</tr>
</HeaderTemplate>
<ItemTemplate>
@@ -128,12 +172,15 @@
<td>
<%#Eval("VisitTime", "{0:yyyy-MM-dd}")%>
</td>
- <td>
+ <td class="truncate" title="<%#Eval("Remark")%>" >
<%#Eval("Remark")%>
</td>
<td>
<%#Eval("CreaterName")%>
</td>
+ <td>
+ <span onclick="onViewvisit('<%#Eval("Keyid")%>')">璇︽儏</span>
+ </td>
</tr>
</ItemTemplate>
<FooterTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.cs
index 3c51962..20d0954 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.cs
@@ -13,6 +13,7 @@
using CY.SQLDAL;
using System.Data.SqlClient;
using CY.Infrastructure.Logging;
+using CY.WebForm.Helper;
namespace CY.WebForm.Pages.business
{
@@ -109,18 +110,67 @@
else
{
JavaScript.MessageBox("璇峰厛淇濆瓨瀹㈡埛", this);
+ return;
}
if (this.txtVisitTime.Value == "")
{
JavaScript.MessageBox("璇烽�夋嫨鏃ユ湡", this);
+ return;
}
if (this.txtVisitTime.Value == "")
{
JavaScript.MessageBox("璇峰～鍐欑淮鎶よ褰�", this);
+ return;
}
+ if (this.txtvisitRemark.Value.Trim() == "")
+ {
+ JavaScript.MessageBox("璇峰～鍐欑淮鎶よ褰�", this);
+ return;
+
+ }
+
+ var files = Request.Files;
+ List<HttpPostedFile> fileList = new List<HttpPostedFile>();
+ if (files.Count > 0)
+ {
+ HttpPostedFile postedFile;
+
+
+
+ for (int i = 0; i < files.Count; i++)
+ {
+
+ if (files.Keys[i] == "filesel")
+ {
+ postedFile = files[i];
+ if (postedFile.ContentLength == 0)
+ continue;
+ if (postedFile.ContentLength > 2 * 1024 * 1024)
+ {
+ JavaScript.MessageBox("涓婁紶鏂囦欢澶у皬蹇呴』灏忎簬2M", this);
+ return;
+ }
+
+
+
+ fileList.Add(postedFile);
+ }
+
+ }
+ }
+
+
+
+
+
+
+
+
+
+
m_OA_CorporateClientsVisit.Keyid = Guid.NewGuid();
@@ -129,7 +179,7 @@
m_OA_CorporateClientsVisit.VisitTime = this.txtVisitTime.Value.ToDateTime2();
- m_OA_CorporateClientsVisit.Remark = this.txtvisitRemark.Value.ToString2();
+ m_OA_CorporateClientsVisit.Remark = this.txtvisitRemark.Value.Trim();
m_OA_CorporateClientsVisit.Creater = CurrentUser.TrueMemberId;
m_OA_CorporateClientsVisit.CreateTime = DateTime.Now;
m_OA_CorporateClientsVisit.Updater = CurrentUser.TrueMemberId;
@@ -143,11 +193,27 @@
if (result)
{
- //this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.SelectVisitListByCorId(Keyid);
- //this.RepClientList.DataBind();
+ if (fileList.Count > 0)
+ {
+ upLoadContractFile uploadContract = new upLoadContractFile();
+ foreach (var file in fileList)
+ {
+ var re = uploadContract.UploadFile(file, "ClientVisit", file.FileName);
+ var oa_Attachment = new OA_attachment();
+ oa_Attachment.OA_Id = m_OA_CorporateClientsVisit.Keyid;
+ oa_Attachment.AttachmentType = 99;
+ oa_Attachment.PlanAttachment = re;
+ oa_Attachment.CreateTime = DateTime.Now;
+ oa_Attachment.Operator = CurrentUser.TrueName;
+ oa_Attachment.AttachmentName = file.FileName;
+ oa_Attachment.AttachmentHouzhui = System.IO.Path.GetExtension(file.FileName).ToLower();
+ bll_OA_CorporateClientsBLL.Insertattachment(oa_Attachment);
+ }
+ }
this.txtVisitTime.Value = "";
this.txtvisitRemark.Value = "";
- JavaScript.MessageBox("缁存姢淇濆瓨鎴愬姛", this, false, false);
+ // JavaScript.MessageBox("缁存姢淇濆瓨鎴愬姛", this, false, false);
+ JavaScript.MessageBoxandhideLoadingIndicator("淇濆瓨鎴愬姛", this);
if (NeedWeihu)
{
@@ -189,10 +255,6 @@
JavaScript.MessageBox("缁存姢淇濆瓨澶辫触", this);
this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.SelectVisitListByCorId(Request["Keyid"].ToGuid2());
this.RepClientList.DataBind();
- //Province = CurrentUser.Province;
- //City = CurrentUser.City;
- //County = CurrentUser.County;
- //BindData();
if (IsWeihuTixingUrl)
JavaScript.RefreshDIVOpener(this);
#endregion
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.designer.cs
index 137ec2f..98dc012 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.designer.cs
@@ -60,6 +60,15 @@
protected global::System.Web.UI.HtmlControls.HtmlTextArea txtvisitRemark;
/// <summary>
+ /// filesel 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputFile filesel;
+
+ /// <summary>
/// Button1 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiOrder.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiOrder.aspx.cs
index 0bdaa0a..a786db2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiOrder.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanWentiOrder.aspx.cs
@@ -140,7 +140,7 @@
if (SaveOrder())
{
//鎿嶄綔鎴愬姛
- JavaScript.CloseWindowAlert("鎿嶄綔鎴愬姛", this);
+ JavaScript.CloseWindow(this);
}
else
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
index 1107822..77028e3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDeatil.aspx
@@ -223,8 +223,16 @@
<td class='left'>
鎺ヤ欢鏃堕棿锛�
</td>
- <td colspan="3">
-
+ <td colspan="3">
+
+ </td>
+ <tr>
+ </tr>
+ <td class='left'>
+ 瀵瑰簲鍚堝悓搴忓彿锛�
+ </td>
+ <td colspan="7">
+ <%#Eval("Duiyinghetongbianhao")%>
</td>
</tr>
</ItemTemplate>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx
new file mode 100644
index 0000000..0fda488
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx
@@ -0,0 +1,73 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MyvisitDetail.aspx.cs" Inherits="CY.WebForm.Pages.work.MyvisitDetail" %>
+
+<!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="spanPlanPeople" runat="server"></span>
+ </td>
+ </tr>
+
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 鎽樿锛�
+ </td>
+ <td>
+ <span id="spanPlanContent" runat="server"></span>
+ </td>
+ </tr>
+
+
+ <tr>
+
+ <td class="ali03 " colspan="3">
+ 闄勪欢锛�
+ </td>
+ <td>
+ <asp:Repeater ID="Repeater1" runat="server">
+ <ItemTemplate>
+
+ <a title="鏌ョ湅闄勪欢" target="view_window" href="<%#Eval("PlanAttachment")%>">
+ <%#Eval("AttachmentName")%>
+ </a>
+
+ </ItemTemplate>
+ </asp:Repeater>
+ </td>
+ </tr>
+
+
+
+ </table>
+ </fieldset>
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.cs
new file mode 100644
index 0000000..e3f3afe
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.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 MyvisitDetail : BasePage
+ {
+
+ OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ OA_StaffBLL staffBLL = null;
+ public MyvisitDetail()
+ {
+ 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_CorporateClientsVisit = bll_OA_CorporateClientsBLL.SelectVisitByKeyid(keyid);
+ if (oA_CorporateClientsVisit != null)
+ {
+ var oA_Staff = staffBLL.GetModelByMemberId(oA_CorporateClientsVisit.Creater.Value);
+ if (oA_Staff != null)
+ {
+ spanPlanPeople.InnerText = oA_Staff.Name;
+ }
+
+ spanPlanContent.InnerHtml = oA_CorporateClientsVisit.Remark;
+ spanDepart.InnerText = oA_CorporateClientsVisit.VisitTime.Value.ToString("yyyy-MM-dd");
+ this.Repeater1.DataSource = bll_OA_CorporateClientsBLL.GetattachmentlList(Request["keyid"]);
+ this.Repeater1.DataBind();
+ }
+
+
+
+
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.designer.cs
new file mode 100644
index 0000000..8f91d92
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyvisitDetail.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.work
+{
+
+
+ public partial class MyvisitDetail
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanDepart 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanDepart;
+
+ /// <summary>
+ /// spanPlanPeople 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople;
+
+ /// <summary>
+ /// spanPlanContent 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent;
+
+ /// <summary>
+ /// Repeater1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater Repeater1;
+ }
+}
--
Gitblit v1.9.1