CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
@@ -154,7 +154,7 @@ Condition += " and ok.Creater like '%" + Creater + "%'"; if (!string.IsNullOrEmpty(SupplierName)) Condition += " and oe.Name like '%" + SupplierName + "%'"; Condition += " and (ok.Huming like '%" + SupplierName + "%' or oe.Name like '%" + SupplierName + "%' ) "; if (!string.IsNullOrEmpty(shifoufukuan)) Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'"; @@ -190,7 +190,7 @@ Condition += " and ok.Creater like '%" + Creater + "%'"; if (!string.IsNullOrEmpty(SupplierName)) Condition += " and oe.Name like '%" + SupplierName + "%'"; Condition += " and (ok.Huming like '%" + SupplierName + "%' or oe.Name like '%" + SupplierName + "%' ) "; if (!string.IsNullOrEmpty(shifoufukuan)) Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
@@ -161,11 +161,11 @@ { if (HuikuanStates == "2") { Condition += " and ok.Huikuanmoney >0 "; Condition += " and ok.Huikuanmoney >= kpmoney "; } else if (HuikuanStates == "1") { Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney <=0) "; Condition += " and ( ok.Huikuanmoney is null or ok.Huikuanmoney < kpmoney ) "; } } if (!string.IsNullOrEmpty(PayStates)) CY_ECommercePlatform/CY.Infrastructure/Query/Pagination.cs
@@ -26,6 +26,14 @@ /// 总记录数 /// </summary> public int RecordCount { get; set; } public decimal? heji1 { get; set; } public decimal? heji2 { get; set; } public decimal? heji3 { get; set; } /// <summary> /// 创建一个新的分页对象 /// </summary> CY_ECommercePlatform/CY.SQLDAL/OA/OA_FukuanshenqingDAL.cs
@@ -25,7 +25,7 @@ /// </summary> const string FROMSOUCEBEFORE = " ( select distinct ok.*, " + " oe.Name as SupplierName " + " from [OA_Fukuanshenqing] ok inner join [OA_Suppliers] oe on oe.Keyid = ok.[SupplierId] " + " from [OA_Fukuanshenqing] ok left join [OA_Suppliers] oe on oe.Keyid = ok.[SupplierId] " + " where 0=0 "; CY_ECommercePlatform/CY.SQLDAL/OA/OA_KipiaoshenqingDAL.cs
@@ -274,6 +274,27 @@ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1]; } string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE, query.Criteria[0].Value, FROMSOUCEEND);//拼装条件 /// <summary> /// 查询来源 /// </summary> string fromss = " [OA_Kaipiaoshenqing] ok inner join [OA_CorporateClients] oe on oe.Keyid = ok.[BuyerId] " + " where 0=0 "+ query.Criteria[0].Value; var ssss = _dataBase.SelectModel<Model.OA_Kaipiaoshenqing>(" sum(ok.kpmoney) as kpmoney,sum(ok.Huikuanmoney) as Huikuanmoney,sum(ok.Zengjianmoney) as Zengjianmoney ", fromss); if (ssss.Count>0) { var aaaaa = ssss.First(); pagination.heji1 = aaaaa.kpmoney; pagination.heji2 = aaaaa.Zengjianmoney; pagination.heji3 = aaaaa.Huikuanmoney; } return _dataBase.SelectModelPage<Model.OA_Kaipiaoshenqing>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy); }
@@ -36,10 +36,21 @@ { return false; } SqlParameter SuppliersId = null; if (trueModel.SuppliersId.HasValue) { SuppliersId = new SqlParameter("@SuppliersId", trueModel.SuppliersId); } else { SuppliersId = new SqlParameter("@SuppliersId", DBNull.Value); } IList<SqlParameter> sqlParms = new List<SqlParameter>() { new SqlParameter("@FirmId",trueModel.FirmId), new SqlParameter("@SuppliersId",trueModel.SuppliersId), SuppliersId, new SqlParameter("@GoodsId",trueModel.GoodsId), new SqlParameter("@ClearingStatusId",trueModel.ClearingStatusId), new SqlParameter("@Price",trueModel.Price), CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx
@@ -158,7 +158,29 @@ }); } $(function () { var value_NowPageAllMoney = 0; $(".OrderAllMoney").each(function (ii, vv) { value_NowPageAllMoney += parseFloat($(vv).text()); }); $("#NowPageAllMoney").html(value_NowPageAllMoney.toFixed(2)); var value_NowPageZengMoney = 0; $(".OrderZengMoney").each(function (ii, vv) { value_NowPageZengMoney += parseFloat($(vv).text()); }); $("#NowPageZengMoney").html(value_NowPageZengMoney.toFixed(2)); var value_NowPageHuiMoney = 0; $(".OrderHuiMoney").each(function (ii, vv) { value_NowPageHuiMoney += parseFloat($(vv).text()); }); $("#NowPageHuiMoney").html(value_NowPageHuiMoney.toFixed(2)); }); </script> <style type="text/css"> .tableStyleXS th { padding: 1px 0 1px 3px; background-image:none; border-bottom:1px solid #CCC; } @@ -185,6 +207,8 @@ cursor: pointer; width: 26px; } .StatisticsMoney td { color: #FF5500; } .StatisticsMoney span { color: #FF5500; font-weight: bold; } </style> </head> <body> @@ -312,16 +336,16 @@ <th width="36"> 订单数量 </th> <th width="60"> <th width="60" > 金额 </th> <th width="60"> <th width="60" > 增减金额 </th> <th width="60"> 签单回执 </th> <th width="60"> <th width="60" > 回款金额 </th> <th width="60"> @@ -381,10 +405,10 @@ </td> <td> <td class="OrderAllMoney"> <%#Eval("kpmoney", "{0:F}")%> </td> <td> <td class="OrderZengMoney"> <%#Eval("Zengjianmoney", "{0:F}")%> </td> <td> @@ -394,7 +418,7 @@ </td> <td> <td class="OrderHuiMoney"> <%#Eval("Huikuanmoney", "{0:F}")%> </td> <td> @@ -423,6 +447,42 @@ </tr> </itemtemplate> </asp:repeater> <tr class="StatisticsMoney"> <td colspan="7" class="ali03"> 当前页统计： </td> <td class="ali01"> <span id="NowPageAllMoney" runat="server"></span> </td> <td class="ali01"> <span id="NowPageZengMoney" runat="server"></span> </td> <td class="ali01"> </td> <td class="ali01"> <span id="NowPageHuiMoney" runat="server"></span> </td> <td class="ali01" colspan="3"> </td> </tr> <tr class="StatisticsMoney"> <td colspan="7" class="ali03"> 查询项统计： </td> <td class="ali01"> <span id="AllMoney" runat="server"></span> </td> <td class="ali01"> <span id="ZengMoney" runat="server"></span> </td> <td class="ali01"> </td> <td class="ali01"> <span id="HuiMoney" runat="server"></span> </td> <td class="ali01" colspan="3"> </td> </tr> </tbody> </table> <uc:ucpager id="UCPager1" runat="server" /> CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirm.aspx.cs
@@ -579,7 +579,7 @@ //this.selKaipiaoshenqing.Value = "1"; //this.selPayStates.Value = "1"; //this.selHuikuanStates.Value = "1"; this.selHuikuanStates.Value = "1"; @@ -690,6 +690,33 @@ rptData.DataSource = result; rptData.DataBind(); if (pagination.heji1.HasValue) { this.AllMoney.InnerText = pagination.heji1.Value.ToString("0.00"); } else { this.AllMoney.InnerText = 0.ToString("0.00"); } if (pagination.heji2.HasValue) { this.ZengMoney.InnerText = pagination.heji2.Value.ToString("0.00"); } else { this.ZengMoney.InnerText = 0.ToString("0.00"); } if (pagination.heji3.HasValue) { this.HuiMoney.InnerText = pagination.heji3.Value.ToString("0.00"); } else { this.HuiMoney.InnerText = 0.ToString("0.00"); } UCPager1.AspNetPager.RecordCount = pagination.RecordCount; }
@@ -132,6 +132,60 @@ protected global::System.Web.UI.WebControls.Repeater rptData; /// <summary> /// NowPageAllMoney 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney; /// <summary> /// NowPageZengMoney 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageZengMoney; /// <summary> /// NowPageHuiMoney 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageHuiMoney; /// <summary> /// AllMoney 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney; /// <summary> /// ZengMoney 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl ZengMoney; /// <summary> /// HuiMoney 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl HuiMoney; /// <summary> /// UCPager1 控件。 /// </summary> /// <remarks> CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -328,7 +328,7 @@ <td> <a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 查看订单 </a> <%#Eval("Fukuanyongtu").ToString().Equals("其他付款")?"":"<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 查看订单 </a>" %> <%--<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 查看订单 </a>--%> </td> @@ -348,7 +348,7 @@ </asp:repeater> </tbody> <tr> <td colspan="5"> <td colspan="8"> 合计 </td>
@@ -228,6 +228,15 @@ 收款单位 </th> <th style="text-align: center;" width="70"> 户名 </th> <th style="text-align: center;" width="70"> 开户行 </th> <th style="text-align: center;" width="70"> 账号 </th> <th style="text-align: center;" width="70"> 付款用途 </th> <th width="60"> @@ -272,6 +281,21 @@ <a href='javascript:void(0)' title='点击查看 <%#Eval("SupplierName").ToString()%> 资料' class='a_under' onclick='onView("<%#Eval("SupplierId")%>")'><%#Eval("SupplierName") %></a> </td> <td style="text-align: center;"> <%#Eval("Huming")%> </td> <td style="text-align: center;"> <%#Eval("Bank")%> </td> <td style="text-align: center;"> <%#Eval("AccountID")%> </td> <td style="text-align: center;"> <%#Eval("Fukuanyongtu")%> @@ -291,7 +315,7 @@ <td> <a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 查看订单 </a> <%#Eval("Fukuanyongtu").ToString().Equals("其他付款")?"":"<a href='javascript:void(0)' title='查看订单' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 查看订单 </a>" %> </td> CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx.cs
@@ -81,11 +81,28 @@ var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id.ToInt32().Value); if (fukuanshenqing != null) { var oA_Suppliers = oA_SuppliersBLL.getSingleSupplier(fukuanshenqing.SupplierId.ToString()); this.txtPaymentUnit.Value = oA_Suppliers.Name; if (!string.IsNullOrWhiteSpace(fukuanshenqing.Huming)) { this.txtPaymentUnit.Value = fukuanshenqing.Huming; } else { if (fukuanshenqing.SupplierId > 0) { var oA_Suppliers = oA_SuppliersBLL.getSingleSupplier(fukuanshenqing.SupplierId.ToString()); if (oA_Suppliers != null) { this.txtPaymentUnit.Value = oA_Suppliers.Name; this.txtSupplierId.Value = oA_Suppliers.Keyid.ToString(); } } } this.Keyid.Value = id; this.txtSupplierId.Value = oA_Suppliers.Keyid.ToString(); this.txtYouwufapiao.Value = fukuanshenqing.YouwufapiaoName;
@@ -14,7 +14,7 @@ 供应商： </td> <td> <select id="selSuppliers" runat="server" class="Sreq w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="请选择供应商"> <select id="selSuppliers" runat="server" class=" w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="请选择供应商"> </select> </td> <td class="ali03 w100px"> CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
@@ -67,22 +67,90 @@ /// </summary> protected void InitialData() { var dataTable = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId); var sss = dataTable.Select(" SuppliersTypeId ='182' "); DataTable dtNew2 = dataTable.Clone(); //复制结构 for (int i = 0; i < sss.Length; i++) { dtNew2.ImportRow(sss[i]); //ImportRow 是复制 } ///供应商 selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId); selSuppliers.DataSource = dtNew2;//.Select(" SuppliersTypeId='200' ") selSuppliers.DataBind(); //selSuppliers.Items.Insert(0, new ListItem("请选择", "0")); selSuppliers.Items.Insert(0, new ListItem("请选择", "")); ///产品类别 /// dwCommity.Items.Insert(0, new ListItem("请选择", "")); DataTable ds = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true"); GetDataByLevel(dwCommity, ds, 0, 0); DataTable dss = _OA_CommodityBLL.SelectModelPage(CurrentUser.MemberId, "", "true"); GetDataByLevel(dwCommity, dss, 0, 0); if (Request["Keyid"].ToInt32() > 0) { Keyid = Request["Keyid"].ToString(); ShowProcurementData(); } else { dwCommity.SelectedValue = "4"; DataTable ds = _OA_GoodsInfoBLL.SlectModleByCommity(dwCommity.SelectedValue, CurrentUser.MemberId); if (ds.Rows.Count > 0) { dwGoodsList.DataSource = ds; dwGoodsList.DataTextField = "GoodsName"; dwGoodsList.DataValueField = "Keyid"; dwGoodsList.DataBind(); dwGoodsList.Items.Insert(0, new ListItem("请选择", "")); dwBrand.Items.Clear(); dwBrand.Items.Insert(0, new ListItem("请选择", "")); dwSpecification.Items.Clear(); dwSpecification.Items.Insert(0, new ListItem("请选择", "")); dwPaperWeight.Items.Clear(); dwPaperWeight.Items.Insert(0, new ListItem("请选择", "")); if (dwCommity.SelectedItem.Text == "纸张") { this.dwPaperWeight.Visible = true; this.trWeight.Visible = true; this.tanDiv.Visible = true; this.tanDiv1.Visible = false; this.div_td.Visible = true; this.div_td1.Visible = false; } else { this.dwPaperWeight.Visible = false; this.trWeight.Visible = false; this.tanDiv.Visible = false; this.tanDiv1.Visible = true; this.div_td.Visible = false; this.div_td1.Visible = true; } } else { dwGoodsList.Items.Clear(); dwGoodsList.Items.Insert(0, new ListItem("请选择", "")); dwBrand.Items.Clear(); dwBrand.Items.Insert(0, new ListItem("请选择", "")); dwSpecification.Items.Clear(); dwSpecification.Items.Insert(0, new ListItem("请选择", "")); dwPaperWeight.Items.Clear(); dwPaperWeight.Items.Insert(0, new ListItem("请选择", "")); } } @@ -301,7 +369,15 @@ procurement.Price = this.txtPrice.Value.ToDecimal2(); procurement.LastUpdateTime = DateTime.Now; procurement.Operator = CurrentUser.ShortName; procurement.SuppliersId = this.selSuppliers.Value.ToInt32(); if (string.IsNullOrEmpty(this.selSuppliers.Value)) { procurement.SuppliersId = null; } else { procurement.SuppliersId = this.selSuppliers.Value.ToInt32(); } procurement.FirmId = CurrentUser.MemberId; procurement.GoodsId = this.dwGoodsList.SelectedValue.ToInt32(); procurement.Remark = ""; CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -16,7 +16,31 @@ $("#trCarNo").css("display", "table-row"); $("#trCarYes").css("display", "none"); } if ($(this).val() == "15") { $("#trShoukuandanwei").css("display", "table-row"); } else { $("#trShoukuandanwei").css("display", "none"); } }); if ($("#selPlanDataType").val() == "7") { $("#trCarNo").css("display", "none"); $("#trCarYes").css("display", "table-row"); } else { $("#trCarNo").css("display", "table-row"); $("#trCarYes").css("display", "none"); } if ($("#selPlanDataType").val() == "15") { $("#trShoukuandanwei").css("display", "table-row"); } else { $("#trShoukuandanwei").css("display", "none"); } }); </script> </head> @@ -37,7 +61,7 @@ <option value="7">用车</option> <option value="10">业务经费</option> <option value="11">客户联谊</option> <%-- <option value="13">开票申请</option>--%> <option value="15">付款申请</option> <option value="12">其他</option> </select> </td> @@ -64,6 +88,14 @@ <select id="selPlanTitle" runat="server" keepdefaultstyle="true" style=" width:100px;"></select> </td> </tr> <tr id="trShoukuandanwei" style=" display:none;"> <td class="ali03"> 收款单位： </td> <td colspan="3"> <input id="txtShoukuandanwei" type="text" style=" width:400px;" class="" runat="server" msg="请输入收款单位" maxlength="50" /> </td> </tr> <tr> <td class="ali03"> 请示内容： CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -72,6 +72,14 @@ { this.txtPlanTitle.Value = m_OA_WorkPlan.PlanTitle.ToString(); } if (m_OA_WorkPlan.PlanDataType == 15) { this.txtShoukuandanwei.Value = m_OA_WorkPlan.PlanComplany; } else { this.txtShoukuandanwei.Value = ""; } this.txtPlanContent.Value = m_OA_WorkPlan.PlanContent.ToString(); } } @@ -121,7 +129,25 @@ } m_OA_WorkPlan.Operator = CurrentUser.ShortName; m_OA_WorkPlan.PlanComplany = ""; if (this.selPlanDataType.Value == "15") { if (!this.txtPlanMoney.Value.Trim().ToDecimal2().HasValue || this.txtPlanMoney.Value.Trim().ToDecimal2().Value <= 0) { JavaScript.MessageBox("付款申请请填写申请费用！", this); return; } if (string.IsNullOrWhiteSpace(this.txtShoukuandanwei.Value)) { JavaScript.MessageBox("付款申请请填写收款单位！", this); return; } m_OA_WorkPlan.PlanComplany = this.txtShoukuandanwei.Value; } else { m_OA_WorkPlan.PlanComplany = ""; } m_OA_WorkPlan.PlanContent = this.txtPlanContent.Value.Trim(); m_OA_WorkPlan.PlanDataType = this.selPlanDataType.Value.ToInt32(); m_OA_WorkPlan.PlanMoney = this.txtPlanMoney.Value.Trim().ToDecimal2()??0; CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -78,6 +78,15 @@ protected global::System.Web.UI.HtmlControls.HtmlSelect selPlanTitle; /// <summary> /// txtShoukuandanwei 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlInputText txtShoukuandanwei; /// <summary> /// txtPlanContent 控件。 /// </summary> /// <remarks> CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx
@@ -52,6 +52,14 @@ <span id="spanPlanTitle" runat="server"></span> </td> </tr> <tr style='<%=planDataType=="15"?"":"display:none;" %>'> <td class="ali03"> 收款单位： </td> <td colspan="3"> <span id="spanShoukuandanwei" runat="server"></span> </td> </tr> <tr> <td class="ali03"> 详细内容： CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.cs
@@ -21,7 +21,7 @@ public partial class MyRequestDetail : BasePage { OA_WorkPlanBll oA_WorkReminderBll = null; public string planDataType = ""; public MyRequestDetail() { oA_WorkReminderBll = new OA_WorkPlanBll(); @@ -42,6 +42,7 @@ OA_WorkPlan m_OA_WorkPlan = oA_WorkReminderBll.GetModelByKeyid(Request["keyid"].ToInt32()); if (m_OA_WorkPlan != null) { planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString(); this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString(); this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00"); this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString(); @@ -49,7 +50,7 @@ this.spanPlanRemark.InnerText = m_OA_WorkPlan.PlanRemark.ToString(); this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString(); this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString(); this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany; if (m_OA_WorkPlan.PlanStatus == 1) { this.panelApprovalNo.Visible = true; CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestDetail.aspx.designer.cs
@@ -2,16 +2,18 @@ // <自动生成> // 此代码由工具生成。 // // 对此文件的更改可能会导致不正确的行为，并且如果 // 重新生成代码，这些更改将会丢失。 // 对此文件的更改可能导致不正确的行为，如果 // 重新生成代码，则所做更改将丢失。 // </自动生成> //------------------------------------------------------------------------------ namespace CY.WebForm.Pages.work { public partial class MyRequestDetail { namespace CY.WebForm.Pages.work { public partial class MyRequestDetail { /// <summary> /// Head1 控件。 /// </summary> @@ -20,7 +22,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlHead Head1; /// <summary> /// CMSHead1 控件。 /// </summary> @@ -29,7 +31,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::CY.WebForm.Pages.common.CMSHead CMSHead1; /// <summary> /// form1 控件。 /// </summary> @@ -38,7 +40,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlForm form1; /// <summary> /// spanPlanDataType 控件。 /// </summary> @@ -47,7 +49,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanDataType; /// <summary> /// spanPlanMoney 控件。 /// </summary> @@ -56,7 +58,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanMoney; /// <summary> /// spanPlanPeople 控件。 /// </summary> @@ -65,7 +67,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanPeople; /// <summary> /// spanPlanStartTime 控件。 /// </summary> @@ -74,7 +76,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStartTime; /// <summary> /// spanPlanTitle 控件。 /// </summary> @@ -83,7 +85,16 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle; /// <summary> /// spanShoukuandanwei 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShoukuandanwei; /// <summary> /// spanPlanContent 控件。 /// </summary> @@ -92,7 +103,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanContent; /// <summary> /// spanPlanRemark 控件。 /// </summary> @@ -101,7 +112,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanRemark; /// <summary> /// panelApprovalNo 控件。 /// </summary> @@ -110,7 +121,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl panelApprovalNo; /// <summary> /// spanPlanStatus 控件。 /// </summary> @@ -119,7 +130,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStatus; /// <summary> /// panelApprovalYes 控件。 /// </summary> @@ -128,7 +139,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl panelApprovalYes; /// <summary> /// spanApprovalStaffName 控件。 /// </summary> @@ -137,7 +148,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalStaffName; /// <summary> /// spanApprovalTime 控件。 /// </summary> @@ -146,7 +157,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalTime; /// <summary> /// spanPlanStatus1 控件。 /// </summary> @@ -155,7 +166,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanStatus1; /// <summary> /// spanApprovalStatus 控件。 /// </summary> @@ -164,7 +175,7 @@ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanApprovalStatus; /// <summary> /// spanApprovalContent 控件。 /// </summary> CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -85,6 +85,7 @@ <option value="11">客户联谊</option> <option value="13">开票申请</option> <option value="14">外协付款申请</option> <option value="15">付款申请</option> <option value="12">其他</option> </select> </td> CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx
@@ -54,6 +54,14 @@ <span id="spanPlanTitle" runat="server"></span> </td> </tr> <tr style='<%=planDataType=="15"?"":"display:none;" %>'> <td class="ali03"> 收款单位： </td> <td colspan="3"> <span id="spanShoukuandanwei" runat="server"></span> </td> </tr> <tr> <td class="ali03"> 详细内容： CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -24,12 +24,15 @@ OA_KaipiaoshenqingBLL _oA_KaipiaoshenqingBLL = null; EC_OrderBLL _eC_OrderBLL = null; OA_FukuanshenqingBLL _oA_FukuanshenqingBLL = null; EC_MemberBasicBLL _eC_MemberBasicBLL = null; public string planDataType = ""; public RequestReplyAdd() { oA_WorkReminderBll = new OA_WorkPlanBll(); _oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL(); _eC_OrderBLL = new EC_OrderBLL(); _oA_FukuanshenqingBLL = new OA_FukuanshenqingBLL(); _eC_MemberBasicBLL = new EC_MemberBasicBLL(); } //页面加载 @@ -52,6 +55,7 @@ } if (m_OA_WorkPlan != null) { planDataType = m_OA_WorkPlan.PlanDataType.Value.ToString(); this.spanPlanDataType.InnerText = m_OA_WorkPlan.PlanDataTypeName.ToString(); this.spanPlanMoney.InnerText = m_OA_WorkPlan.PlanMoney.Value.ToString("0.00"); this.spanPlanPeople.InnerText = m_OA_WorkPlan.PlanPeople.ToString(); @@ -59,6 +63,7 @@ this.spanPlanRemark.InnerText = m_OA_WorkPlan.PlanRemark.ToString(); this.spanPlanTitle.InnerText = m_OA_WorkPlan.PlanTitle.ToString(); this.spanPlanContent.InnerText = m_OA_WorkPlan.PlanContent.ToString(); this.spanShoukuandanwei.InnerText = m_OA_WorkPlan.PlanComplany; } } @@ -105,6 +110,49 @@ _oA_FukuanshenqingBLL.UpdateModel(fukuanshenqing); } if (m_OA_WorkPlan.ApprovalStatus == 1 && m_OA_WorkPlan.PlanDataType == 15) {//批准新增付款申请 OA_Fukuanshenqing oA_Fukuanshenqing = new OA_Fukuanshenqing(); oA_Fukuanshenqing.FirmId = CurrentUser.MemberId; oA_Fukuanshenqing.SupplierId = 0; oA_Fukuanshenqing.Fukuanshenqingstatus = 0; oA_Fukuanshenqing.ApprovalStatus = 1; oA_Fukuanshenqing.Fukuanmoney = m_OA_WorkPlan.PlanMoney; oA_Fukuanshenqing.Bank = ""; oA_Fukuanshenqing.Huming = m_OA_WorkPlan.PlanComplany; oA_Fukuanshenqing.AccountID = ""; oA_Fukuanshenqing.Yishoumoney = 0; oA_Fukuanshenqing.Youwufapiao = 0; oA_Fukuanshenqing.Fukuanyongtu = "其他付款"; oA_Fukuanshenqing.FukuanStatus = 1; oA_Fukuanshenqing.remark = ""; oA_Fukuanshenqing.DindanId = ""; var eC_MemberBasic = _eC_MemberBasicBLL.GetMemberByMemberId(m_OA_WorkPlan.SentStaffId); if (eC_MemberBasic != null) { oA_Fukuanshenqing.Creater = CurrentUser.ShortName; oA_Fukuanshenqing.Updater = CurrentUser.ShortName; } else { oA_Fukuanshenqing.Creater = ""; oA_Fukuanshenqing.Updater = ""; } oA_Fukuanshenqing.CreateTime = DateTime.Now; oA_Fukuanshenqing.LastUpdateTime = DateTime.Now; var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing); } if (Request["keyid"].ToInt32() > 0) { if (oA_WorkReminderBll.UpdateModel(m_OA_WorkPlan)) CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.designer.cs
@@ -87,6 +87,15 @@ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanPlanTitle; /// <summary> /// spanShoukuandanwei 控件。 /// </summary> /// <remarks> /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// </remarks> protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanShoukuandanwei; /// <summary> /// spanPlanContent 控件。 /// </summary> /// <remarks> CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx
@@ -59,6 +59,7 @@ <option value="11">客户联谊</option> <option value="13">开票申请</option> <option value="14">外协付款申请</option> <option value="15">付款申请</option> <option value="12">其他</option> </select> </td>
