Home Esplora Aiuto
Registrati Accedi
XinXiBu
/
OA2021
Segui 2
Vota 0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

修改商邀新增绑定团组列表

wangh 1 anno fa
parent
77763e3e5f
commit
341e6ee9a4
9 ha cambiato i file con 82 aggiunte e 7 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 2 2
      DAL/ServiceBase.cs
  2. 8 0
      OA2021/OA2021.csproj
  3. 6 2
      OA2021/finance/CommissionWeb.aspx.cs
  4. 17 0
      OA2021/finance/Royalty.aspx
  5. 17 0
      OA2021/finance/Royalty.aspx.cs
  6. 26 0
      OA2021/finance/Royalty.aspx.designer.cs
  7. 4 1
      OA2021/groups/addInvitationOfficialActivities.aspx.cs
  8. 1 1
      OA2021/groups/editInvitationOfficialActivities.aspx.cs
  9. 1 1
      OA2021/groups/invitationOfficialActivities.aspx.cs

+ 2 - 2
DAL/ServiceBase.cs
Vedi File 

@@ -429,8 +429,8 @@ namespace DAL
 
                                 (t as InvitationOfficialActivities).Operators = Convert.ToInt32(dr["Operator"]);
 
                                 (t as InvitationOfficialActivities).OperatorsDate = dr["OperatorDate"].ToString();
 
                                 (t as InvitationOfficialActivities).IsDel = Convert.ToInt32(dr["IsDel"]);
 
-                                (t as InvitationOfficialActivities).EventsCost = float.Parse(dr["EventsCost"].ToString());
 
-                                (t as InvitationOfficialActivities).TranslateCost = float.Parse(dr["TranslateCost"].ToString());
 
+                                (t as InvitationOfficialActivities).EventsCost = string.IsNullOrWhiteSpace(dr["EventsCost"].ToString()) ? 0.00F : float.Parse(dr["EventsCost"].ToString());
 
+                                (t as InvitationOfficialActivities).TranslateCost = string.IsNullOrWhiteSpace(dr["TranslateCost"].ToString()) ? 0.00F : float.Parse(dr["TranslateCost"].ToString());
 
                                 break;
 
                             case "CarTouristGuideGroundReservations":
 
                                 (t as CarTouristGuideGroundReservations).Id = Convert.ToInt32(dr["Id"]);

+ 8 - 0
OA2021/OA2021.csproj
Vedi File 

@@ -324,6 +324,7 @@
 
     <Content Include="finance\CreditCardBill.aspx" />
 
     <Content Include="finance\DayPrice.aspx" />
 
     <Content Include="finance\PaymentConfirm.aspx" />
 
+    <Content Include="finance\Royalty.aspx" />
 
     <Content Include="finance\TeamAttachment.aspx" />
 
     <Content Include="finance\TeamCommissionOverview.aspx" />
 
     <Content Include="finance\UauditedExpense.aspx" />
 
@@ -1172,6 +1173,13 @@
 
     <Compile Include="finance\PaymentConfirm.aspx.designer.cs">
 
       <DependentUpon>PaymentConfirm.aspx</DependentUpon>
 
     </Compile>
 
+    <Compile Include="finance\Royalty.aspx.cs">
 
+      <DependentUpon>Royalty.aspx</DependentUpon>
 
+      <SubType>ASPXCodeBehind</SubType>
 
+    </Compile>
 
+    <Compile Include="finance\Royalty.aspx.designer.cs">
 
+      <DependentUpon>Royalty.aspx</DependentUpon>
 
+    </Compile>
 
     <Compile Include="finance\TeamAttachment.aspx.cs">
 
       <DependentUpon>TeamAttachment.aspx</DependentUpon>
 
       <SubType>ASPXCodeBehind</SubType>

+ 6 - 2
OA2021/finance/CommissionWeb.aspx.cs
Vedi File 

@@ -376,10 +376,14 @@ namespace OA2014.finance
 
             //已收费用数据
 
             ProceedsReceivedService prs = new ProceedsReceivedService();
 
             List<ProceedsReceived> prList = prs.GetAllByDIId(dele.Id);
 
-            foreach (ProceedsReceived fr in prList)
 
+            if (prList.Count != 0)
 
             {
 
-                sumPr += (float)fr.Price;
 
+                foreach (ProceedsReceived fr in prList)
 
+                {
 
+                    sumPr += (float)fr.Price;
 
+                }
 
             }
 
+            
 
             //收款退还费用数据
 
             ViewOhterPriceOPService vopp = new ViewOhterPriceOPService();

+ 17 - 0
OA2021/finance/Royalty.aspx
Vedi File 

@@ -0,0 +1,17 @@
 
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Royalty.aspx.cs" Inherits="OA2021.finance.Royalty" %>
 
+
 
+<!DOCTYPE html>
 
+
 
+<html xmlns="http://www.w3.org/1999/xhtml">
 
+<head runat="server">
 
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
+    <title></title>
 
+</head>
 
+<body>
 
+    <form id="form1" runat="server">
 
+        <div>
 
+            提成结算
 
+        </div>
 
+    </form>
 
+</body>
 
+</html>

+ 17 - 0
OA2021/finance/Royalty.aspx.cs
Vedi File 

@@ -0,0 +1,17 @@
 
+using System;
 
+using System.Collections.Generic;
 
+using System.Linq;
 
+using System.Web;
 
+using System.Web.UI;
 
+using System.Web.UI.WebControls;
 
+
 
+namespace OA2021.finance
 
+{
 
+    public partial class Royalty : System.Web.UI.Page
 
+    {
 
+        protected void Page_Load(object sender, EventArgs e)
 
+        {
 
+
 
+        }
 
+    }
 
+}

+ 26 - 0
OA2021/finance/Royalty.aspx.designer.cs
Vedi File 

@@ -0,0 +1,26 @@
 
+//------------------------------------------------------------------------------
 
+// <自动生成>
 
+//     此代码由工具生成。
 
+//
 
+//     对此文件的更改可能导致不正确的行为，如果
 
+//     重新生成代码，则所做更改将丢失。
 
+// </自动生成>
 
+//------------------------------------------------------------------------------
 
+
 
+namespace OA2021.finance
 
+{
 
+
 
+
 
+    public partial class Royalty
 
+    {
 
+
 
+        /// <summary>
 
+        /// form1 控件。
 
+        /// </summary>
 
+        /// <remarks>
 
+        /// 自动生成的字段。
 
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
 
+        /// </remarks>
 
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
 
+    }
 
+}

+ 4 - 1
OA2021/groups/addInvitationOfficialActivities.aspx.cs
Vedi File 

@@ -58,6 +58,9 @@ namespace OA2014.groups
 
             ddlTourCode.DataTextField = "TeamName";
 
             ddlTourCode.DataValueField = "Id";
 
             ddlTourCode.DataBind();
 
+            string Diid = Request.QueryString["tourCode"].ToString();
 
+            ddlTourCode.SelectedIndex = -1;
 
+            ddlTourCode.Items.FindByValue(Diid).Selected = true;
 
 
             SetDataService sds = new SetDataService();
 
             ddlInviteCostsCurrency.DataSource = sds.GetAll(13);
 
@@ -315,7 +318,7 @@ namespace OA2014.groups
 
         /// <param name="e"></param>
 
         protected void btnBack_Click(object sender, EventArgs e)
 
         {
 
-            Response.Redirect("invitationOfficialActivities.aspx");
 
+            Response.Redirect("invitationOfficialActivities.aspx?tourCode=" + ddlTourCode.SelectedValue);
 
         }
 
     }
 
 }

+ 1 - 1
OA2021/groups/editInvitationOfficialActivities.aspx.cs
Vedi File 

@@ -368,7 +368,7 @@ namespace OA2014.groups
 
         /// <param name="e"></param>
 
         protected void btnBack_Click(object sender, EventArgs e)
 
         {
 
-            Response.Redirect("invitationOfficialActivities.aspx");
 
+            Response.Redirect("invitationOfficialActivities.aspx?tourCode=" + ddlTourCode.SelectedValue);
 
         }
 
     }
 
 }

+ 1 - 1
OA2021/groups/invitationOfficialActivities.aspx.cs
Vedi File 

@@ -140,7 +140,7 @@ namespace OA2014.groups
 
         /// <param name="e"></param>
 
         protected void btnAdd_Click(object sender, EventArgs e)
 
         {
 
-            Response.Redirect("addInvitationOfficialActivities.aspx");
 
+            Response.Redirect("addInvitationOfficialActivities.aspx?tourCode=" + ddlTourCode.SelectedValue);
 
         }
 
 
         /// <summary>