接团信息添加字段，修复部分小bug,添加公务出发子表。

DAL/ApprovalTravelDetailsService.cs

@@ -0,0 +1,73 @@
+using Models;
+using System;
+using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Collections;
+
+namespace DAL
+{
+    /// <summary>
+    /// 公务出访详情
+    /// </summary>
+    public class ApprovalTravelDetailsService
+    {
+
+        List<ApprovalTravelDetails> excuteSql(string sql, params SqlParameter[] param)
+        {
+            return ServiceBase<ApprovalTravelDetails>.excuteSql(new ApprovalTravelDetails(), "ApprovalTravelDetails", sql, CommandType.Text, param);
+        }
+
+        ApprovalTravelDetails excuteType(string sql, params SqlParameter[] param)
+        {
+            //查询结果放入对象集合
+            List<ApprovalTravelDetails> hdList = excuteSql(sql, param);
+            ApprovalTravelDetails air = new ApprovalTravelDetails();
+
+            //判断集合是否为空
+            if (hdList == null || hdList.Count == 0)
+            {
+                return air;
+            }
+            //返回单个对象
+            return hdList[0];
+        }
+
+        public List<ApprovalTravelDetails> GetByParentID(int ParentID)
+        {
+            return excuteSql($"select * from ApprovalTravelDetails where ParentId= {ParentID} and isdel = 0");
+        }
+
+        public int AddList(List<ApprovalTravelDetails> list)
+        {
+            int rows = 0;
+
+            SqlCommand cmd = SqlHelper.createCon().CreateCommand();
+
+            cmd.Connection.Open();
+            SqlTransaction trans = cmd.Connection.BeginTransaction();
+            try
+            {
+                foreach (var item in list)
+                {
+                    //{0} 占位符
+                    string sql = string.Format("");
+                    cmd.CommandText = sql;
+                    rows += cmd.ExecuteNonQuery();
+                }
+                trans.Commit();
+                cmd.Connection.Close();
+                return rows;
+            }
+            catch
+            {
+                trans.Rollback();
+                cmd.Connection.Close();
+                return rows;
+            }
+        }
+    }
+}

DAL/DAL.csproj

@@ -73,6 +73,7 @@
     <Compile Include="AirTicketAgentService.cs" />
     <Compile Include="AirTicketBlackCodeService.cs" />
     <Compile Include="AirTicketReservationsService.cs" />
+    <Compile Include="ApprovalTravelDetailsService.cs" />
     <Compile Include="ApprovalTravelService.cs" />
     <Compile Include="AskDataService.cs" />
     <Compile Include="AttendanceAuditService.cs" />

DAL/DelegationInfoService.cs

@@ -240,11 +240,11 @@ namespace DAL
             string sql = "insert into DelegationInfo"
                 + "(SalesQuoteNo,SalesDate,ClientName,ClientUnit,TeamName,TeamDid,VisitDate,VisitCountry,"
                 + "VisitPurpose,VisitDays,VisitPNumber,SpecialNeeds,OtherNeeds,Remark,IsState,JietuanOperator,JietuanTime,IsDel,BudgetCost,TellPhone,"
-                + "TeamLev,HotelComplain,OPComplain,VisaComplain,OAComplain,AirComplain,Director,TontractTime,PaymentMoney,PayDay,CGRWSPBMMC,CGRWSPWH,ZZSCBMMC,ZZSCSPWH) "
+                + "TeamLev,HotelComplain,OPComplain,VisaComplain,OAComplain,AirComplain,Director,TontractTime,PaymentMoney,PayDay,CGRWSPBMMC,CGRWSPWH,ZZSCBMMC,ZZSCSPWH,WeChat) "
                 + "values("
                 + "@SalesQuoteNo,@SalesDate,@ClientName,@ClientUnit,@TeamName,@TeamDid,@VisitDate,@VisitCountry,"
                 + "@VisitPurpose,@VisitDays,@VisitPNumber,@SpecialNeeds,@OtherNeeds,@Remark,@IsState,@JietuanOperator,@JietuanTime,@IsDel,@BudgetCost,@TellPhone,"
-                + "@TeamLev,@HotelComplain,@OPComplain,@VisaComplain,@OAComplain,@AirComplain,@Director,@TontractTime,@PaymentMoney,@PayDay,@CGRWSPBMMC,@CGRWSPWH,@ZZSCBMMC,@ZZSCSPWH)";
+                + "@TeamLev,@HotelComplain,@OPComplain,@VisaComplain,@OAComplain,@AirComplain,@Director,@TontractTime,@PaymentMoney,@PayDay,@CGRWSPBMMC,@CGRWSPWH,@ZZSCBMMC,@ZZSCSPWH,@WeChat)";
 
             SqlParameter[] parameter = new SqlParameter[]{
                 new SqlParameter("@SalesQuoteNo",di.SalesQuoteNo),
@@ -281,7 +281,8 @@ namespace DAL
                  new SqlParameter("@CGRWSPBMMC",di.CGRWSPBMMC),
                  new SqlParameter("@CGRWSPWH",di.CGRWSPWH),
                  new SqlParameter("@ZZSCBMMC",di.ZZSCBMMC),
-                 new SqlParameter("@ZZSCSPWH",di.ZZSCSPWH)
+                 new SqlParameter("@ZZSCSPWH",di.ZZSCSPWH),
+                 new SqlParameter("@WeChat",di.WeChat)
             };
 
             if (SqlHelper.ExecuteNonQuery(sql, CommandType.Text, parameter) > 0)
@@ -302,7 +303,7 @@ namespace DAL
                 + "VisitPurpose = @VisitPurpose,VisitDays = @VisitDays,VisitPNumber = @VisitPNumber,SpecialNeeds = @SpecialNeeds,OtherNeeds = @OtherNeeds,"
                 + "Remark = @Remark,JietuanOperator = @JietuanOperator,JietuanTime = @JietuanTime,BudgetCost = @BudgetCost,TellPhone = @TellPhone,"
                 + "TeamLev = @TeamLev,HotelComplain = @HotelComplain,OPComplain = @OPComplain,VisaComplain = @VisaComplain,OAComplain = @OAComplain,AirComplain = @AirComplain,"
-                + "Director = @Director,TontractTime = @TontractTime,PaymentMoney = @PaymentMoney,PayDay=@PayDay,CGRWSPBMMC=@CGRWSPBMMC,CGRWSPWH=@CGRWSPWH,ZZSCBMMC=@ZZSCBMMC,ZZSCSPWH=@ZZSCSPWH  where Id = @Id";
+                + "Director = @Director,TontractTime = @TontractTime,PaymentMoney = @PaymentMoney,PayDay=@PayDay,CGRWSPBMMC=@CGRWSPBMMC,CGRWSPWH=@CGRWSPWH,ZZSCBMMC=@ZZSCBMMC,ZZSCSPWH=@ZZSCSPWH,WeChat=@WeChat  where Id = @Id";
 
             SqlParameter[] parameter = new SqlParameter[] {
                 new SqlParameter("@ClientName",di.ClientName),
@@ -338,7 +339,8 @@ namespace DAL
                  new SqlParameter("@CGRWSPBMMC",di.CGRWSPBMMC),
                  new SqlParameter("@CGRWSPWH",di.CGRWSPWH),
                  new SqlParameter("@ZZSCBMMC",di.ZZSCBMMC),
-                 new SqlParameter("@ZZSCSPWH",di.ZZSCSPWH)
+                 new SqlParameter("@ZZSCSPWH",di.ZZSCSPWH),
+                 new SqlParameter("@WeChat",di.WeChat)
             };
 
             if (SqlHelper.ExecuteNonQuery(sql, CommandType.Text, parameter) > 0)

DAL/ServiceBase.cs

@@ -308,6 +308,7 @@ namespace DAL
                                 (t as DelegationInfo).TontractTime =dr["TontractTime"].ToString();
                                 (t as DelegationInfo).PaymentMoney = dr["PaymentMoney"].ToString();
                                 (t as DelegationInfo).PayDay = dr["PayDay"].ToString();
+                                (t as DelegationInfo).WeChat = dr["WeChat"].ToString();
                                 #region 新添加字段
                                 (t as DelegationInfo).CGRWSPBMMC = dr["CGRWSPBMMC"].ToString();
                                 (t as DelegationInfo).CGRWSPWH = dr["CGRWSPWH"].ToString();
@@ -2356,6 +2357,13 @@ namespace DAL
                                 (t as Position).SetDataId = int.Parse(dr["SetDataId"].ToString());
                                 (t as Position).IsDel = int.Parse(dr["IsDel"].ToString());
                                 break;
+                            case "ApprovalTravelDetails":
+                                (t as ApprovalTravelDetails).Id = int.Parse(dr["id"].ToString());
+                                (t as ApprovalTravelDetails).Time = dr["Time"].ToString();
+                                (t as ApprovalTravelDetails).ParentId =int.Parse(dr["parentId"].ToString());
+                                (t as ApprovalTravelDetails).Details = dr["Details"].ToString();
+                                (t as ApprovalTravelDetails).IsDel = int.Parse(dr["isdel"].ToString());
+                                break;
                         }
                         tList.Add(t);
                     }

Models/ApprovalTravelDetails.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Models
+{
+    //公务出访详细表
+    public class ApprovalTravelDetails
+    {
+        public int Id { get; set; }
+
+        public string Time { get; set; }
+
+        public int ParentId { get; set; }
+
+        public string Details { get; set; }
+
+        public int IsDel { get; set; }
+
+    }
+}

Models/DelegationInfo.cs

@@ -385,5 +385,11 @@ namespace Models
 
         #endregion
 
+
+        /// <summary>
+        /// 微信号
+        /// </summary>
+        public string WeChat { get; set; }
+
     }
 }

Models/Models.csproj

@@ -68,6 +68,7 @@
     <Compile Include="AirTicketBlackCode.cs" />
     <Compile Include="AirTicketReservations.cs" />
     <Compile Include="ApprovalTravel.cs" />
+    <Compile Include="ApprovalTravelDetails.cs" />
     <Compile Include="AskData.cs" />
     <Compile Include="AssociationGroup.cs" />
     <Compile Include="Attachment.cs" />

OA2021/finance/PriceAuditContent.aspx.cs

@@ -1037,8 +1037,50 @@ namespace OA2014.finance
                     CreditCardPaymentService ccps = new CreditCardPaymentService();
                     DelegationInfoService dgis = new DelegationInfoService();
 
-                    if (ccps.UpdateCreditCardPaymentIsAudit(id, UserId, DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")) == false)
-                        result = false;
+                    using (TransactionScope scope = new TransactionScope())
+                    {
+                        if (ccps.UpdateCreditCardPaymentIsAudit(id, UserId, DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss")))
+                        {
+                            var ccpObj =  ccps.GetListByID(id).First();
+                            //通过的增减款项费用添加到收款账单中
+                            if (ccpObj.CTable == 98)
+                            {
+                                List<ForeignReceivables> List_fr = new List<ForeignReceivables>();
+                                ForeignReceivablesService frs = new ForeignReceivablesService();
+                                GroupsDecreasePaymentsService gdps = new GroupsDecreasePaymentsService();
+                                var gdpbObj =  gdps.GetGroupsDecreasePaymentsByID(ccpObj.CId);
+
+                                ForeignReceivables fr = new ForeignReceivables
+                                {
+                                    Id = frs.GetMaxID() + 1,
+                                    DIId = ccpObj.DIId,
+                                    PriceName = "(团组增减款项费用)" + (gdpbObj != null ? gdpbObj.PriceName : ""),
+                                    Price = decimal.Parse(ccpObj.PayMoney.ToString("F3")),//单人报价
+                                    Count = 1, 
+                                    Unit = "笔",
+                                    Currency = "RMB",
+                                    Rate = 1,
+                                    ItemSumPrice = decimal.Parse(ccpObj.PayMoney.ToString("F3")), //总报价
+                                    To = " ",
+                                    ToTel = " ",
+                                    PayDate = " ",
+                                    Attention = " ",
+                                    Operators = UserId,
+                                    OperatorsDate = DateTime.Now.ToString(),
+                                    IsDel = 0,
+                                    AddingWay = 2
+                                };
+                                List_fr.Add(fr);
+                                result =  frs.AddUpCardAuditContent(List_fr);
+                            }
+                            scope.Complete();
+                        }
+                        else
+                        {
+                            scope.Dispose();
+                            result = false;
+                        }
+                    }
 
                     //SetDataService sds = new SetDataService();
                     //CreditCardPayment ccp = ccps.GetCreditCardPaymentByID(id, 0);

OA2021/finance/foreignReceivables.aspx.cs

@@ -187,8 +187,9 @@ namespace OA2014.finance
                             int addingway = 0; // 默认账单页面添加
                             if ((item.FindControl("lblAddingWay") as Label).Text == "预算成本模块")
                                 addingway = 1;  // 预算成本页面添加
-                            else if ((item.FindControl("lblAddingWay") as Label).Text == "预算成本模块")
-                                addingway = 0;
+                            else if ((item.FindControl("lblAddingWay") as Label).Text == "团组增减款项模块")
+                                addingway = 2;
+
                             fr.AddingWay = addingway;  //账单页面添加
                             list.Add(fr);
                         }
@@ -270,7 +271,8 @@ namespace OA2014.finance
                 str = "账单模块";
             if (AddingWay == "1")
                 str = "预算成本模块";
-            
+            if (AddingWay == "2")
+                str = "团组增减款项模块";
 
             return str;
         }

OA2021/groups/ApprovalTravel.aspx

@@ -44,7 +44,7 @@
             </div>
 
             <table cellpadding="2" cellspacing="2" border="1" style="width: 100%">
-                <asp:Repeater ID="rpData" runat="server">
+                <asp:Repeater ID="rpData" runat="server" OnItemDataBound="rpData_ItemDataBound">
                     <ItemTemplate>
                         <tr>
                             <td style="width: 100%; text-align: left" colspan="2">
@@ -53,16 +53,21 @@
                                     Style="font-family: 'Microsoft YaHei'; width: 20%; text-align: center" />
                             </td>
                         </tr>
-                        <tr>
-                            <td style="width: 22%">
-                                <asp:TextBox runat="server" ID="txtTime" Text='<%#Eval("Time")%>'
-                                    Style="font-family: 'Microsoft YaHei'; width: 80%; height: 70px; margin-top: 1%" TextMode="MultiLine"/>
-                            </td>
-                            <td style="width: 78%; text-align: start">
-                                <asp:TextBox runat="server" ID="txtDetail" Text='<%#Eval("Detail")%>'
-                                    Style="font-family: 'Microsoft YaHei'; width: 95%; height: 120px; text-align: start" TextMode="MultiLine" />
-                            </td>
-                        </tr>
+                        <%-- 渲染子行 --%>
+                        <asp:Repeater ID="ChildrpData" runat="server">
+                            <ItemTemplate>
+                                <tr>
+                                    <td style="width: 22%">
+                                        <asp:TextBox runat="server" ID="txtTime" Text='<%#Eval("Time")%>'
+                                            Style="font-family: 'Microsoft YaHei'; width: 80%; height: 50px; margin-top: 1%" TextMode="MultiLine" />
+                                    </td>
+                                    <td style="width: 78%; text-align: start">
+                                        <asp:TextBox runat="server" ID="txtDetail" Text='<%#Eval("Details")%>'
+                                            Style="font-family: 'Microsoft YaHei'; width: 95%; height: 50px; text-align: start" TextMode="MultiLine" />
+                                    </td>
+                                </tr>
+                            </ItemTemplate>
+                        </asp:Repeater>
                     </ItemTemplate>
                 </asp:Repeater>
             </table>

OA2021/groups/ApprovalTravel.aspx.cs

@@ -3,6 +3,7 @@ using DAL;
 using Models;
 using OA2014.publicCode;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -11,6 +12,8 @@ using System.Text.RegularExpressions;
 using System.Web;
 using System.Web.UI;
 using System.Web.UI.WebControls;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
+
 
 namespace OA2014.groups
 {
@@ -25,6 +28,8 @@ namespace OA2014.groups
         AirTicketReservationsService airs = new AirTicketReservationsService();
         //商邀行程DAL
         ApprovalTravelService aptls = new ApprovalTravelService();
+        //公务出访详细
+        ApprovalTravelDetailsService atds = new ApprovalTravelDetailsService();
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -113,7 +118,6 @@ namespace OA2014.groups
             {
                 //根据黑屏代码生成团组日期范围
                 List<string> timeList = PublicCode.GetTimeListByDataTable(dt);
-
                 //三字码实例
                 ThreeCode three = null;
                 //日期转换星期
@@ -413,6 +417,7 @@ namespace OA2014.groups
                             //修改
                             for (int i = 0; i < timeList.Count; i++)
                             {
+
                                 //日期转换星期
                                 string weekday = weekdays[(int)new DateTime(
                                    Convert.ToInt32(timeList[i].Split('-')[0]),
@@ -678,6 +683,13 @@ namespace OA2014.groups
 
                 Response.Redirect("ApprovalTravel.aspx?tourCode=" + ddlTourCode.SelectedValue);
             }
+
+
+
+            //生成每天
+            //获取每天的详细
+
+
         }
 
         /// <summary>
@@ -927,5 +939,56 @@ namespace OA2014.groups
                 PublicCode.GetAlertMsgGo(this, GetType(), "已删除", "ApprovalTravel.aspx?tourCode=" + ddlTourCode.SelectedValue);
             }
         }
+
+        protected void rpData_ItemDataBound(object sender, RepeaterItemEventArgs e)
+        {
+            if (e.Item.ItemType == ListItemType.Item || e.Item.ItemType == ListItemType.AlternatingItem)
+            {
+                //商邀行程数据
+                var id = ((HiddenField)e.Item.FindControl("hdid")).Value;
+                var txtDate = ((TextBox)e.Item.FindControl("txtDate")).Text;
+                var list = atds.GetByParentID(int.Parse(id));
+
+                if (list.Count < 5)
+                {
+                    var poor = 5 - list.Count;
+                    for (int i = 0; i < poor; i++)
+                    {
+                        list.Add(new ApprovalTravelDetails());
+                    }
+                }
+
+                Repeater repeater = (Repeater)e.Item.FindControl("ChildrpData");//找到要绑定数据的Repeater
+
+                if (repeater != null)
+                {
+                    repeater.DataSource = list;
+                    repeater.DataBind();
+                }
+            }
+        }
+
+        public string intToString(int numberVal)
+        {
+            string numberval = numberVal.ToString();
+            Dictionary<char, string> Number = new Dictionary<char, string>();
+            Number.Add('1', "壹");
+            Number.Add('2', "贰");
+            Number.Add('3', "叁");
+            Number.Add('4', "肆");
+            Number.Add('5', "伍");
+            Number.Add('6', "陆");
+            Number.Add('7', "柒");
+            Number.Add('8', "捌");
+            Number.Add('9', "玖");
+            Number.Add('0', "零");
+            string stringNumberVal = string.Empty;
+            for (int i = 0; i < numberval.Length; i++)
+            {
+                stringNumberVal += Number[numberval[i]];
+            }
+
+            return stringNumberVal;
+        }
     }
 }

OA2021/groups/GroupCostView.aspx.cs

@@ -3565,7 +3565,12 @@ namespace OA2014.groups
                 mark.Text = PaymentMoney.ToString("#0.00");
             }
 
-
+            //添加微信号书签
+            if (di.WeChat != null && di.WeChat != "")
+            {
+                Bookmark mark = doc.Range.Bookmarks["WeChat"];
+                mark.Text = di.WeChat;
+            }
 
             float sumPrice = 0;
             double countCost = 0;

OA2021/groups/InvitationLetter.aspx.cs

@@ -179,7 +179,7 @@ namespace OA2021.groups
                         tableOne.Rows.RemoveAt(list.Count + 1);
                     }
 
-                    string filename = "邀请函"+ DateTime.Now.ToString("yyyy-hh-dd") + ".doc";
+                    string filename = "邀请函"+ DateTime.Now.ToString("yyyy-MM-dd") + ".doc";
                     doc.Save(HttpUtility.UrlEncode(filename, Encoding.UTF8), Aspose.Words.SaveFormat.Doc, Aspose.Words.SaveType.OpenInWord, Response);
                 }
                 catch (Exception ex)

OA2021/groups/addMeetInformation.aspx

@@ -176,10 +176,16 @@
                                 </td>
                             </tr>
                             <tr>
-                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">手机号： </td>
+                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">微信号：<span style="color:red">*&nbsp;</span> </td>
                                 <td style="text-align: left; width: 1006px; white-space: nowrap;" colspan="7">
-                                    <asp:TextBox Text="（请按照 姓名:手机号;姓名:手机号;格式来填写该项）...." ID="txtTellPhone" runat="server" TextMode="MultiLine" Width="1006" Height="100"
-                                        Style="border: 1px solid #b3b3b3;" />
+                                    <asp:TextBox ID="weChat"  runat="server" Width="1006" Height="50" TextMode="MultiLine"  Style="border: 1px solid #b3b3b3;" />
+                                </td>
+                            </tr>
+                            <tr>
+                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">客户手机号：<span style="color:red">*&nbsp;</span> </td>
+                                <td style="text-align: left; width: 1006px; white-space: nowrap;" colspan="7">
+                                    <asp:TextBox  ID="txtTellPhone" runat="server" TextMode="MultiLine" Width="1006" Height="100"
+                                        Style="border: 1px solid #b3b3b3;"  placeholder="（请按照 姓名:手机号;姓名:手机号;格式来填写该项）...." />
                                 </td>
                             </tr>
                         </table>

OA2021/groups/addMeetInformation.aspx.cs

@@ -10,6 +10,7 @@ using Models;
 using System.Transactions;
 using System.Web.Services;
 using Newtonsoft.Json;
+using OA2021.data;
 
 namespace OA2014.groups
 {
@@ -66,6 +67,13 @@ namespace OA2014.groups
                 return;
             }
 
+            
+            if (string.IsNullOrEmpty(txtTellPhone.Text) || string.IsNullOrEmpty(weChat.Text) )
+            {
+                PublicCode.GetAlertMsg(this, GetType(),"电话或微信未完善!");
+                return;
+            }
+
             di.SalesQuoteNo = txtSalesQuoteNo.Text;
             di.SalesDate = PublicCode.GetBeijingTime().ToString("yyyy-MM-dd HH:mm:ss");
             di.TeamLev = ddlTeamLev.SelectedValue;
@@ -76,6 +84,7 @@ namespace OA2014.groups
             di.VisitDate = txtVisitDate.Text;
             di.VisitCountry = txtVisitCountry.Text;
             di.VisitPurpose = txtVisitPurpose.Text;
+            di.WeChat = weChat.Text;
 
             if (!string.IsNullOrEmpty(txtVisitDays.Text))
             {

OA2021/groups/addMeetInformation.aspx.designer.cs

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

OA2021/groups/editMeetInformation.aspx

@@ -184,9 +184,15 @@
                                     <asp:TextBox ID="txtRemark" runat="server" TextMode="MultiLine" Width="1006" Height="100"
                                         Style="border: 1px solid #b3b3b3;" />
                                 </td>
+                            </tr>
+                             <tr>
+                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">微信号：<span style="color:red">*&nbsp;</span> </td>
+                                <td style="text-align: left; width: 1006px; white-space: nowrap;" colspan="7">
+                                    <asp:TextBox ID="weChat"  runat="server" Width="1006" Height="50" TextMode="MultiLine"  Style="border: 1px solid #b3b3b3;" />
+                                </td>
                             </tr>
                             <tr>
-                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">手机号：
+                                <td style="text-align: right; width: 75px; white-space: nowrap;" valign="top">手机号： <span style="color:red">*&nbsp;</span>
                                 </td>
                                 <td style="text-align: left; width: 1006px; white-space: nowrap;" colspan="7">
                                     <asp:TextBox Text="（请按照 姓名:手机号;姓名:手机号;格式来填写该项）" ID="txtTellPhone" runat="server" TextMode="MultiLine" Width="1006" Height="100"

OA2021/groups/editMeetInformation.aspx.cs

@@ -91,6 +91,7 @@ namespace OA2014.groups
             txtRemark.Text = di.Remark;
             txtTellPhone.Text = di.TellPhone;
             txtPayDay.Text = di.PayDay.ToString();
+            weChat.Text = di.WeChat;
 
             if (!string.IsNullOrEmpty(di.TontractTime))
                 txtTontractTime.Text = Convert.ToDateTime(di.TontractTime).ToString("yyyy-MM-dd");
@@ -142,6 +143,12 @@ namespace OA2014.groups
                 return;
             }
 
+            if (string.IsNullOrEmpty(txtTellPhone.Text) || string.IsNullOrEmpty(weChat.Text))
+            {
+                PublicCode.GetAlertMsg(this, GetType(), "电话或微信未完善!");
+                return;
+            }
+
             if (Request.QueryString["id"] != null)
                 di.Id = Convert.ToInt32(Request.QueryString["id"]);
             di.TeamLev = ddlTeamLev.SelectedValue;
@@ -208,6 +215,8 @@ namespace OA2014.groups
             di.TontractTime = txtTontractTime.Text;
             di.PaymentMoney  =float.Parse(txtPaymentMoney.Text).ToString("#0.00");
             di.PayDay = txtPayDay.Text;
+            di.WeChat = weChat.Text;
+
             using (TransactionScope scope = new TransactionScope())
             {
                 if (dis.EditDelegationInfo(di))

OA2021/groups/editMeetInformation.aspx.designer.cs

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

OA2021/officeTemplates/收款账单(四川)模板.docx

@@ -6,12 +6,14 @@ LIAISON:
 
 FROM:
 泛美国际财务部
+WeChat:
+
 TEL:
 +86 28 85283333
 
+
 FAX:
 +86 28 85283228
-
 EMAIL:
 finance@pan-american-intl.com
 DATE: