chuanyin-group-project.git

parent: 40eacc41 | 补丁 | 提交 | ignore whitespace

username@email.com

2025-10-20 b2b2180addea72699fce43197e6ecbd93cc280de

 外协付款审批查看详情 完成

6个文件已修改

	CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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  >

 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 " >

 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)
                {

 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 " >

 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)
                {

 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 () {

			@@ -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 >

			@@ -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 " >

			@@ -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)
			{

			@@ -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 " >

			@@ -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)
			{

			@@ -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 () {