From ed362a4ba76884eb0a356fe29f490139e8de6f6d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 17 三月 2025 12:23:50 +0800
Subject: [PATCH] 后面还是没有司机的名字呢 完成 所有地方都要同步修改 完成
---
CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs | 18 +++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs | 11 +++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx | 68 ++++++++++++----------
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs | 15 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs | 14 ----
5 files changed, 81 insertions(+), 45 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs
index ba52e73..baf8787 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_CarManageBLL.cs
@@ -94,7 +94,23 @@
/// <returns></returns>
public IEnumerable<Model.OA_CarManage> SelectListByFirmId(Guid FirmId)
{
- return iOA_CarManageDAL.SelectListByFirmId(FirmId);
+ var oA_CarManages = iOA_CarManageDAL.SelectListByFirmId(FirmId);
+ OA_StaffBLL _OA_StaffBLL = new OA_StaffBLL();
+ foreach (var oA_CarManage in oA_CarManages)
+ {
+ if (oA_CarManage.StaffID.HasValue)
+ {
+ var oA_Staff = _OA_StaffBLL.GetModelByKeyid(oA_CarManage.StaffID);
+ if (oA_Staff != null)
+ {
+ oA_CarManage.CarNumber = oA_CarManage.CarNumber + "(" + oA_Staff.Name + ")";
+ }
+ }
+
+
+ }
+
+ return oA_CarManages;
}
}
}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
index f274868..06c85df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanList.aspx.cs
@@ -310,7 +310,20 @@
this.txtCustormerName.Value.Trim(),
this.selBusinessManager.Value,this.selPaiche.Value
);
-
+
+ foreach (var oA_DeliverPlan in oA_DeliverPlans)
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua = oA_DeliverPlan.Dizhi;
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Lianxiren))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鑱旂郴浜猴細" + oA_DeliverPlan.Lianxiren;
+ }
+
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Dianhua))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鐢佃瘽锛�" + oA_DeliverPlan.Dianhua;
+ }
+ }
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
index 81a37fa..9a60bea 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheEdit.aspx.cs
@@ -110,19 +110,7 @@
this.selBuyerId.DataBind();
this.selBuyerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
var oA_CarManages = _OA_CarManageBll.SelectListByFirmId(CurrentUser.MemberId);
- foreach (var oA_CarManage in oA_CarManages)
- {
- if (oA_CarManage.StaffID.HasValue)
- {
- var oA_Staff = _OA_StaffBLL.GetModelByKeyid(oA_CarManage.StaffID);
- if (oA_Staff != null)
- {
- oA_CarManage.CarNumber = oA_CarManage.CarNumber + "(" + oA_Staff.Name + ")";
- }
- }
-
-
- }
+
this.selCarId.DataSource = oA_CarManages;
this.selCarId.DataTextField = "CarNumber";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx
index 6ed30f2..b07c19c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx
@@ -531,15 +531,15 @@
閫佽揣鍗曞彿
</th>--%>
<th style="text-align: center;" width="70">
- 瑕佹眰鍒拌揪鏃堕棿
+ 瑕佹眰鏃堕棿
</th>
- <th style="text-align: center;"width="100">
- 瀹為檯鍒拌揪鏃堕棿
+ <th width="60">
+ 杞﹁締
</th>
- <th width="70">
- 涓氬姟缁忕悊
- </th>
- <th width="100">
+ <th width="60">
+ 椹鹃┒鍛�
+ </th>
+ <th width="100">
瀹㈡埛鍗曚綅
</th>
<th style="text-align: center;"width="200">
@@ -550,23 +550,28 @@
<th width="60">
閫佽揣鍗曞崟鏁�
</th>
- <th width="60">
- 杞﹁締
+ <th width="70">
+ 涓氬姟缁忕悊
</th>
- <%-- <th width="60">
- 椹鹃┒鍛�
- </th>--%>
+ <th width="200">
+ 娉ㄦ剰浜嬮」
+ </th>
+ <th style="text-align: center;"width="100">
+ 鍒拌揪鏃堕棿
+ </th>
+ <th width="200">
+ 宸ヤ綔鑰冭瘎
+ </th>
+
+
+
<%-- <th width="200">
闂鍙嶉 </th>
--%>
- <th width="200">
- 娉ㄦ剰浜嬮」
- </th>
- <th width="200">
- 宸ヤ綔鑰冭瘎
- </th>
+
+
<th width="60">
@@ -604,12 +609,13 @@
<td>
<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>
</td>
- <td>
- <%#Eval("DeliveredTime", "{0:yyyy-MM-dd HH:mm}")%>
+ <td>
+ <%#Eval("CarName")%>
</td>
<td>
- <%#Eval("BusinessManager")%>
- </td>
+ <%#Eval("DriverName")%>
+ </td>
+
<td>
<%#Eval("CompanyName")%>
</td>
@@ -620,18 +626,20 @@
<td>
<%#Eval("shuliang")%>
</td>
- <td>
- <%#Eval("CarName")%>
+
+ <td>
+ <%#Eval("BusinessManager")%>
</td>
- <%--<td>
- <%#Eval("DriverName")%>
- </td>--%>
- <%-- <td>
- <%#Eval("wentifankui")%>
- </td>--%>
<td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼娉ㄦ剰浜嬮」' class='a_under' onclick='ViewZhuyishixiang("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")'> <%#Eval("Remark").ToString()==""?"淇敼娉ㄦ剰浜嬮」":Eval("Remark")%> </a>
</td>
+ <td>
+ <%#Eval("DeliveredTime", "{0:yyyy-MM-dd HH:mm}")%>
+ </td>
+ <%-- <td>
+ <%#Eval("wentifankui")%>
+ </td>--%>
+
<td>
<a href='javascript:void(0)' title='鐐瑰嚮淇敼宸ヤ綔鑰冭瘎' class='a_under' onclick='ViewGongzuokaoping("<%#Eval("Keyid")%>","<%#Eval("BuyerId")%>","<%#Eval("DeliverTime", "{0:yyyy-MM-dd}")%>")' ><%#Eval("Gongzuokaoping").ToString()==""?"淇敼宸ヤ綔鑰冭瘎":Eval("Gongzuokaoping")%> </a>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs
index f3b44c4..163a6db 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/DeliverPlanPaicheList.aspx.cs
@@ -328,6 +328,17 @@
List<OA_CorporateClientsContract> fileDataList = null;
foreach (var oA_DeliverPlan in oA_DeliverPlans)
{
+ oA_DeliverPlan.DizhiLianxirenDianhua = oA_DeliverPlan.Dizhi;
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Lianxiren))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鑱旂郴浜猴細" + oA_DeliverPlan.Lianxiren;
+ }
+
+ if (!string.IsNullOrEmpty(oA_DeliverPlan.Dianhua))
+ {
+ oA_DeliverPlan.DizhiLianxirenDianhua += " 鐢佃瘽锛�" + oA_DeliverPlan.Dianhua;
+ }
+
oA_DeliverPlan.SonghuodanTupian = "鏆傛棤";
string sqlStr = string.Format(@" select * from [dbo].[OA_attachment] where [OA_Id]='{0}' and [AttachmentType]=3 order by [CreateTime] ", oA_DeliverPlan.Keyid);
--
Gitblit v1.9.1