From b2b2180addea72699fce43197e6ecbd93cc280de Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 20 十月 2025 12:42:12 +0800
Subject: [PATCH] 外协付款审批查看详情 完成
---
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 6 +++
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx | 19 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs | 9 ++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx | 19 +++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx | 11 +----
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx | 6 +-
6 files changed, 58 insertions(+), 12 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx
index f28c646..677ac7e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx
@@ -59,9 +59,7 @@
<th class='w80px'>
澶栧崗璁㈠崟鍙�
</th>
- <th>
- 鍘熻鍗曞彿
- </th>
+
<th>
澶栧崗鍘傚晢
</th>
@@ -108,10 +106,7 @@
<%-- <a href='javascript:void(0)' class='a_under' onclick='ShowOrder(<%#Eval("Keyid") %>)'></a>--%>
<%#Eval("SellerOrderId")%>
</td>
- <td>
- <%-- <a href='javascript:void(0)' class='a_under' onclick='ShowOrder(<%#Eval("OldOrderId") %>)'></a>--%>
- <%#Eval("OldOrderSellerId")%>
- </td>
+
<td>
<%#Eval("SellerName")%>
</td>
@@ -145,7 +140,7 @@
</itemtemplate>
</asp:repeater>
<tr>
- <td colspan="10">
+ <td colspan="9">
鍚堣
</td>
<td >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
index 946ef59..0552541 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
@@ -4,7 +4,17 @@
<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 Viewkaipiao(SellerOrderId) {
+
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅澶栧崗璁㈠崟", Width: 1080, Height: 650 });
+
+ }
+ </script>
<style type="text/css">
.w70px { width: 70px; }
fieldset { padding: 3px; margin: 5px auto; }
@@ -69,6 +79,7 @@
</div>
</td>
</tr>
+
<tr>
<td class="ali03">
澶囨敞锛�
@@ -78,6 +89,14 @@
</div>
</td>
</tr>
+ <tr style='<%=planDataType=="14"?"":"display:none;" %>'>
+ <td class="ali03">
+ 璁㈠崟璇︽儏锛�
+ </td>
+ <td colspan="3">
+ <a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao( "<%=DindanId %>")'> 鏌ョ湅璁㈠崟 </a>
+ </td>
+ </tr>
<tr style='<%=planDataType=="14"||planDataType=="15"?"":"display:none;" %>' >
<td class="ali03 " >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
index 94d0f6d..a74bd8e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
@@ -23,10 +23,13 @@
OA_WorkPlanBll oA_WorkReminderBll = null;
public string planDataType = "";
OA_WorkPlan_attachmentBLL oA_WorkPlan_AttachmentBLL = null;
+ OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null;
+ public string DindanId = "";
public MyRequestDetail()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
oA_WorkPlan_AttachmentBLL = new OA_WorkPlan_attachmentBLL();
+ _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL();
}
//椤甸潰鍔犺浇
@@ -58,6 +61,12 @@
{
this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
this.RepClientList.DataBind();
+
+ var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ if (fukuanshenqing != null)
+ {
+ DindanId = fukuanshenqing.DindanId;
+ }
}
else if (m_OA_WorkPlan.PlanDataType == 15)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
index 3c6d487..68e087d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -5,7 +5,16 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
<title>鎵瑰璇风ず</title>
- <uc:CMSHead ID="CMSHead1" runat="server" />
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <script type="text/javascript">
+
+ //鏌ョ湅瀹㈡埛璧勬枡
+ function Viewkaipiao(SellerOrderId) {
+
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅澶栧崗璁㈠崟", Width: 1080, Height: 650 });
+
+ }
+ </script>
<style type="text/css">
.w70px{ width:70px;}
.wx100px{ width:100px;}
@@ -80,6 +89,14 @@
</div>
</td>
</tr>
+ <tr style='<%=planDataType=="14"?"":"display:none;" %>'>
+ <td class="ali03">
+ 璁㈠崟璇︽儏锛�
+ </td>
+ <td colspan="3">
+ <a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao( "<%=DindanId %>")'> 鏌ョ湅璁㈠崟 </a>
+ </td>
+ </tr>
<tr style='<%=planDataType=="14"||planDataType=="15"?"":"display:none;" %>' >
<td class="ali03 " >
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index a3c62a5..7da22f6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -30,6 +30,7 @@
OA_StaffBLL oA_StaffBLL = null;
OA_ShebeiWeixiuBLL oA_ShebeiWeixiuBLL = null;
OA_WageAwardPunishBLL bll_OA_WageAwardPunishBLL = null;
+ public string DindanId = "";
public RequestReplyAdd()
{
oA_WorkReminderBll = new OA_WorkPlanBll();
@@ -77,6 +78,11 @@
{
this.RepClientList.DataSource = oA_WorkPlan_AttachmentBLL.GetModelByKaipiaoIdandType(Request["keyid"].ToInt32().Value, 14);
this.RepClientList.DataBind();
+ var fukuanshenqing = _oA_FukuanshenqingBLL.GetModelByKeyid(m_OA_WorkPlan.PlanComplany.ToInt32().Value);
+ if (fukuanshenqing != null)
+ {
+ DindanId = fukuanshenqing.DindanId;
+ }
}
else if (m_OA_WorkPlan.PlanDataType == 15)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
index 1f27199..bf4e443 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -9,15 +9,15 @@
//璇风ず鏄庣粏
function onView(keyid, value_PlanTyle) {
if (value_PlanTyle == "3") {
- top.Dialog.open({ URL: "/Pages/work/MyRequestDetail.aspx?keyid=" + keyid, Title: "璇风ず鏄庣粏", Width: 620, Height: 360 });
+ top.Dialog.open({ URL: "/Pages/work/MyRequestDetail.aspx?keyid=" + keyid, Title: "璇风ず鏄庣粏", Width: 620, Height: 560 });
} else {
- top.Dialog.open({ URL: "/Pages/work/WorkPlanDetail.aspx?keyid=" + keyid, Title: "宸ヤ綔鏄庣粏", Width: 620, Height: 460 });
+ top.Dialog.open({ URL: "/Pages/work/WorkPlanDetail.aspx?keyid=" + keyid, Title: "宸ヤ綔鏄庣粏", Width: 620, Height: 560 });
}
}
//鎵瑰璇风ず
function onEdit(keyid) {
- top.Dialog.open({ URL: "/Pages/work/RequestReplyAdd.aspx?keyid=" + keyid, Title: "鎵瑰璇风ず", Width: 620, Height: 360 });
+ top.Dialog.open({ URL: "/Pages/work/RequestReplyAdd.aspx?keyid=" + keyid, Title: "鎵瑰璇风ず", Width: 620, Height: 560 });
}
$(function () {
--
Gitblit v1.9.1