商邀资料修改

DAL/InvitationOfficialActivityDataService.cs

@@ -233,7 +233,7 @@ namespace DAL
         {
             string sql = "insert into InvitationOfficialActivityData values(@Country,@City,@UnitName,@UnitWeb,@Field,@Address,@UnitInfo,"
             + "@Contact,@Job,@Tel,@Email,@WeChat,@FaceBook,@Ins,@Delegation,@FileName,@FilePath,@SndFileName,@SndFilePath,@OtherInformation,"
-            + "@Fax,@Operator,@OperatorDate,@IsDel)";
+            + "@Fax,@Operator,@OperatorDate,@IsDel,@Backdrop)";
 
             SqlParameter[] parameter = new SqlParameter[]{
                 new SqlParameter("@Country",ctggd.Country),
@@ -260,6 +260,7 @@ namespace DAL
                 new SqlParameter("@Operator",ctggd.Operators),
                 new SqlParameter("@OperatorDate",ctggd.OperatorsDate),
                 new SqlParameter("@IsDel",ctggd.IsDel),
+                new SqlParameter("@Backdrop",ctggd.Backdrop)
             };
 
             if (SqlHelper.ExecuteNonQuery(sql, CommandType.Text, parameter) > 0)
@@ -277,7 +278,7 @@ namespace DAL
             string sql = "update InvitationOfficialActivityData set Country=@Country,City=@City,UnitName=@UnitName,UnitWeb=@UnitWeb,"
             + "Field=@Field,Address=@Address,UnitInfo=@UnitInfo,Contact=@Contact,Job=@Job,Tel=@Tel,Email=@Email,WeChat=@WeChat,"
             + "FaceBook=@FaceBook,Ins=@Ins,Delegation=@Delegation,FileName=@FileName,FilePath=@FilePath,SndFileName=@SndFileName,SndFilePath=@SndFilePath,OtherInformation=@OtherInformation,Fax=@Fax,Operator=@Operator,"
-            + "OperatorDate=@OperatorDate,IsDel=@IsDel where Id = @Id";
+            + "OperatorDate=@OperatorDate,IsDel=@IsDel,Backdrop=@Backdrop where Id = @Id";
 
             SqlParameter[] parameter = new SqlParameter[]{
                 new SqlParameter("@Country",ctggd.Country),
@@ -304,7 +305,8 @@ namespace DAL
                 new SqlParameter("@Operator",ctggd.Operators),
                 new SqlParameter("@OperatorDate",ctggd.OperatorsDate),
                 new SqlParameter("@IsDel",ctggd.IsDel),
-                new SqlParameter("@Id",ctggd.Id)
+                new SqlParameter("@Id",ctggd.Id),
+                new SqlParameter("@Backdrop",ctggd.Backdrop)
             };
 
             if (SqlHelper.ExecuteNonQuery(sql, CommandType.Text, parameter) > 0)

DAL/ServiceBase.cs

@@ -268,6 +268,7 @@ namespace DAL
                                 (t as InvitationOfficialActivityData).Operators = Convert.ToInt32(dr["Operator"]);
                                 (t as InvitationOfficialActivityData).OperatorsDate = dr["OperatorDate"].ToString();
                                 (t as InvitationOfficialActivityData).IsDel = Convert.ToInt32(dr["IsDel"]);
+                                (t as InvitationOfficialActivityData).Backdrop = dr["Backdrop"].ToString();
                                 break;
                             case "DelegationInfo":
                                 (t as DelegationInfo).Id = Convert.ToInt32(dr["Id"]);

Models/InvitationOfficialActivityData.cs

@@ -277,5 +277,9 @@ namespace Models
             get { return isDel; }
             set { isDel = value; }
         }
+        /// <summary>
+        /// 背景
+        /// </summary>
+        public string Backdrop { get; set; }
     }
 }

OA2021/data/addInvitationOfficialActivityData.aspx

@@ -119,7 +119,7 @@
                                 <td style="text-align: left; width: 125px; white-space: nowrap;">
                                     <asp:TextBox ID="txtFax" runat="server" Width="120" Style="border: 1px solid #b3b3b3;" />
                                 </td>
-                                <td style="text-align: right; width: 75px; white-space: nowrap;">团组名称：
+                                <td style="text-align: right; width: 75px; white-space: nowrap;">关联团组：
                                 </td>
                                  <td style="text-align: left; width: 125px; white-space: nowrap;">
                                     <asp:TextBox ID="txtDelegation" runat="server" Width="120" Style="border: 1px solid #b3b3b3;" />
@@ -150,6 +150,14 @@
                                 <td style="text-align: left"></td>
                                 <td></td>
                                 <td></td>
+                            </tr>
+                             <tr>
+                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">背景：
+                                </td>
+                                <td style="text-align: left; width: 125px; white-space: nowrap;" colspan="7">
+                                    <asp:TextBox ID="txtBackdrop" runat="server" TextMode="MultiLine" Width="805"
+                                        Height="100" Style="border: 1px solid #b3b3b3;" />
+                                </td>
                             </tr>
                             <tr>
                                 <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">其他信息：

OA2021/data/addInvitationOfficialActivityData.aspx.cs

@@ -58,6 +58,7 @@ namespace OA2014.data
             ioad.Ins = txtIns.Text;
             ioad.Delegation = txtDelegation.Text;
             ioad.Fax = txtFax.Text;
+            ioad.Backdrop = txtBackdrop.Text;
             //上传文件
             if (FU1.HasFile)
             {
@@ -94,10 +95,10 @@ namespace OA2014.data
                 {
                     string filePath = Server.MapPath("~/DeleFiles/YaoQingHan/");
                     string fileName = new UsersService().GetAll().Find(U => U.Id == UserId).CnName + "-"
-                    + FU1.PostedFile.FileName;
+                    + FU2.PostedFile.FileName;
                     ioad.SndFileName = fileName;
                     ioad.SndFilePath = filePath;
-                    FU1.SaveAs(filePath + fileName);
+                    FU2.SaveAs(filePath + fileName);
                 }
             }
             else
@@ -115,6 +116,7 @@ namespace OA2014.data
             if (ioads.GetInvitationOfficialActivityData(ioad.Country, ioad.UnitName,ioad.Delegation) == null)
             {
                 ioads.AddInvitationOfficialActivityData(ioad);
+                Response.Write("<script>alert('温馨提示：添加成功!');location.href='InvitationOfficialActivityData.aspx';</script>");
             }
             else
             {

OA2021/data/addInvitationOfficialActivityData.aspx.designer.cs

@@ -221,6 +221,15 @@ namespace OA2014.data
         /// </remarks>
         protected global::System.Web.UI.WebControls.FileUpload FU2;
 
+        /// <summary>
+        /// txtBackdrop 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtBackdrop;
+
         /// <summary>
         /// txtOtherInformation 控件。
         /// </summary>

OA2021/data/editInvitationOfficialActivityData.aspx

@@ -152,7 +152,7 @@
                                 <td style="text-align: left; width: 125px; white-space: nowrap;">
                                     <asp:TextBox ID="txtFax" runat="server" Width="120" Style="border: 1px solid #b3b3b3;" />
                                 </td>
-                                <td style="text-align: right; width: 75px; white-space: nowrap;">团组名称：
+                                <td style="text-align: right; width: 75px; white-space: nowrap;">关联团组：
                                 </td>
                                 <td style="text-align: left; width: 125px; white-space: nowrap;" rowspan="2">
                                     <asp:TextBox ID="txtDelegation" runat="server" Width="120" Height="60" TextMode="MultiLine" Style="border: 1px solid #b3b3b3;" />
@@ -189,6 +189,14 @@
                                 </td>
                                 <td></td>
                             </tr>
+                            <tr>
+                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">背景：
+                                </td>
+                                <td style="text-align: left; width: 125px; white-space: nowrap;" colspan="7">
+                                    <asp:TextBox ID="txtBackdrop" runat="server" TextMode="MultiLine" Width="805"
+                                        Height="100" Style="border: 1px solid #b3b3b3;" />
+                                </td>
+                            </tr>
                             <tr>
                                 <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">其他信息：
                                 </td>

OA2021/data/editInvitationOfficialActivityData.aspx.cs

@@ -70,6 +70,7 @@ namespace OA2014.data
             lblFJ1.Text = ioad.FileName;
             lblFJ2.Text = ioad.SndFileName;
             txtOtherInformation.Text = ioad.OtherInformation;
+            txtBackdrop.Text = ioad.Backdrop;
         }
 
         /// <summary>
@@ -106,6 +107,46 @@ namespace OA2014.data
             ioad.Delegation = txtDelegation.Text;
             ioad.OtherInformation = txtOtherInformation.Text;
             ioad.IsDel = 0;
+            ioad.Backdrop = txtBackdrop.Text;
+
+            //上传文件
+            if (FU1.HasFile)
+            {
+                string[] str = FU1.PostedFile.FileName.Split('.');
+                if (str.Length > 2)
+                {
+                    PublicCode.GetAlertMsg(this, GetType(), "文件名不能包含英文句点“.”");
+                }
+                else
+                {
+                    string filePath = Server.MapPath("~/DeleFiles/YaoQingHan/");
+                    string fileName = new UsersService().GetAll().Find(U => U.Id == UserId).CnName + "-"
+                    + FU1.PostedFile.FileName;
+                    ioad.FileName = fileName;
+                    ioad.FilePath = filePath;
+                    FU1.SaveAs(filePath + fileName);
+                }
+            }
+           
+            //上传文件
+            if (FU2.HasFile)
+            {
+                string[] str = FU2.PostedFile.FileName.Split('.');
+                if (str.Length > 2)
+                {
+                    PublicCode.GetAlertMsg(this, GetType(), "文件名不能包含英文句点“.”");
+                }
+                else
+                {
+                    string filePath = Server.MapPath("~/DeleFiles/YaoQingHan/");
+                    string fileName = new UsersService().GetAll().Find(U => U.Id == UserId).CnName + "-"
+                    + FU2.PostedFile.FileName;
+                    ioad.SndFileName = fileName;
+                    ioad.SndFilePath = filePath;
+                    FU2.SaveAs(filePath + fileName);
+                }
+            }
+            
 
             if (ioads.EditInvitationOfficialActivityData(ioad))
                 PublicCode.GetAlertMsgGo(this, GetType(), "保存成功", "InvitationOfficialActivityData.aspx?Page=" + page + "&Country=" + UnitArea

OA2021/data/editInvitationOfficialActivityData.aspx.designer.cs

@@ -302,6 +302,15 @@ namespace OA2014.data
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button btnDel2;
 
+        /// <summary>
+        /// txtBackdrop 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox txtBackdrop;
+
         /// <summary>
         /// txtOtherInformation 控件。
         /// </summary>

OA2021/finance/dailyFeePayment.aspx

@@ -71,6 +71,7 @@
                         <td class="td">公司 </td>
                         <td class="td" style="width: 200px;">费用说明 </td>
                         <td class="td">合 计 </td>
+                         <td class="td">是否付款 </td>
                         <td class="td">
                             <a runat="server" style="color: white;" id="AMan">申请人</a>
                         </td>
@@ -92,10 +93,16 @@
                                 <td class="td" style="width: 200px;">
                                     <%#Eval("Instructions")%>
                                 </td>
+                               
                                 <td class="td">
                                     <%#Eval("SumPrice").ToString()%>RMB
                                <%-- <asp:Label ID="lblSumPrice" runat="server" Text="">RMB</asp:Label>--%>
                                 </td>
+                                 <td class="td"> 
+      <asp:Label ID="lblIsPayVal" runat="server" Text='<%#Eval("IsPay") %>' Visible="false" />
+      <asp:Label ID="lblIsPay" runat="server" />
+
+  </td>
                                 <td class="td">
                                     <asp:Label ID="lblOperatorsVal" runat="server" Visible="false" Text='<%#Eval("Operators") %>' />
                                     <asp:Label ID="lblOperators" runat="server" />

OA2021/finance/dailyFeePayment.aspx.cs

@@ -289,6 +289,11 @@ namespace OA2014.finance
             if (maudit == "2")
                 (e.Item.FindControl("lblMAudit") as Label).Text = "未通过";
 
+            string lblIsPayVal = (e.Item.FindControl("lblIsPayVal") as Label).Text;
+            if (maudit == "0")
+                (e.Item.FindControl("lblIsPay") as Label).Text = "未付款";
+            if (maudit == "1")
+                (e.Item.FindControl("lblIsPay") as Label).Text = "已付款";
 
             int id = Convert.ToInt32((e.Item.FindControl("lblAuditOperator") as Label).Text);
             if (id == 0)

OA2021/groups/addInvitationOfficialActivities.aspx.cs

@@ -221,6 +221,7 @@ namespace OA2014.groups
                         ioad.FilePath = "";
                         ioad.SndFileName = "";
                         ioad.SndFilePath = "";
+                        ioad.Backdrop = "";
                         ioads.AddInvitationOfficialActivityData(ioad);
                     }