CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx

@@ -79,7 +79,9 @@
          <fieldset  id="weihujilu">

               <legend>添加维护记录</legend>

                <table class="tableStyle" width="100%">

               <tr>
                    <td class="ali01 ">维护日期：</td>
                    <td   ><input id="txtVisitTime" type="text" runat="server"  maxlength="50" class="date w90px" datefmt="yyyy-MM-dd"  /></td>  
                   <td class="ali03 ">维护记录：</td>
                    <td colspan="2"  ><textarea runat="server" id="txtvisitRemark" style=" width:92%; height:30px;"  maxlength="2000"></textarea></td>  
                    <td class="ali03">

               <tr>
                    <td class="ali01 " style="width:10%;">维护日期：</td>
                    <td  style="width:20%;" ><input id="txtVisitTime" type="text" runat="server"  maxlength="50" class="date w90px" datefmt="yyyy-MM-dd"  /></td>  
                   <td class="ali03 " style="width:10%;">维护记录：</td>
                    <td colspan="2" style="width:60%;" ><textarea runat="server" id="txtvisitRemark" style=" width:92%; height:30px;"  maxlength="2000"></textarea></td>  
                    </tr> 
                     <tr>

                   <td class="ali03" colspan="2">

                        <input type="file" id="filesel" name="__hetongFile" keepdefaultstyle="true"  multiple="multiple" runat="server" text="请选择文件" /></td>

                    <td>
                    <td   ><asp:Button ID="Button1" Text="添加维护记录" OnClientClick="return checkSelFile()" runat="server" OnClick="btn_Submit_Visit"  ToolTip="该记录会清除该客户的例行维护提醒"/><asp:Button ID="btn_Submit" Text="添加假日维护记录" runat="server"  ToolTip="该记录会清除该客户的假日维护提醒" OnClick="btn_Submit_Visit_jiari"/></td> 
                  <div id="loading" class="toast-message" style="display: none;">保存中！</div>
                </tr> 

               </table>


 CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsVisit.aspx.cs

@@ -49,43 +49,46 @@
        //页面加载
        protected void Page_Load(object sender, EventArgs e)
        {

            if (Request["Keyid"] != null || Request["MemberId"] != null)
            if (!IsPostBack)
            {
                OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModelDetail(Request["Keyid"].ToGuid2());
                this.spanCompanyName.InnerText = m_OA_CorporateClients.CompanyName;
                this.spanBusinessManagerId.InnerText = m_OA_CorporateClients.BusinessmanagerName;
                this.spanprintdate.InnerText = DateTime.Now.ToString("yyyy-MM-dd");
                client = bll_OA_CorporateClientsBLL.GetModel(Request["Keyid"].ToGuid2());
                IsNeedJiejiaRi = client.JieJiaRiWiHu==true;
                NeedWeihu = client.NeedWiHu == true;
                this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.SelectVisitListByCorId(Request["Keyid"].ToGuid2());

                this.RepClientList.DataBind();
                if (IsNeedJiejiaRi)
                    this.btn_Submit.Enabled = true;
                else
                    this.btn_Submit.Enabled = false;


                //判决是否是节假日维护弹窗 这个弹窗添加维护记录后会关闭窗口
                var x = Request["JIeriCount"];
                if (x != "undefined"&&x!=null)
                if (Request["Keyid"] != null || Request["MemberId"] != null)
                {
                    this.Button1.Enabled = false;
                    this.txtvisitRemark.Value = x;
                    OA_CorporateClients m_OA_CorporateClients = bll_OA_CorporateClientsBLL.GetModelDetail(Request["Keyid"].ToGuid2());
                    this.spanCompanyName.InnerText = m_OA_CorporateClients.CompanyName;
                    this.spanBusinessManagerId.InnerText = m_OA_CorporateClients.BusinessmanagerName;
                    this.spanprintdate.InnerText = DateTime.Now.ToString("yyyy-MM-dd");
                    client = bll_OA_CorporateClientsBLL.GetModel(Request["Keyid"].ToGuid2());
                    IsNeedJiejiaRi = client.JieJiaRiWiHu == true;
                    NeedWeihu = client.NeedWiHu == true;
                    this.RepClientList.DataSource = bll_OA_CorporateClientsBLL.SelectVisitListByCorId(Request["Keyid"].ToGuid2());

                    this.RepClientList.DataBind();
                    if (IsNeedJiejiaRi)
                        this.btn_Submit.Enabled = true;
                    else
                        this.btn_Submit.Enabled = false;


                    //判决是否是节假日维护弹窗 这个弹窗添加维护记录后会关闭窗口
                    var x = Request["JIeriCount"];
                    if (x != "undefined" && x != null)
                    {
                        this.Button1.Enabled = false;
                        this.txtvisitRemark.Value = x;
                    }

                    this.txtVisitTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
                    //判决是否是提醒弹窗  这个弹窗添加维护记录后会关闭窗口
                    var y = Request["tixingweihu"];
                    if (y != null && y == "1")
                    {
                        IsWeihuTixingUrl = true;
                    }


                }

                this.txtVisitTime.Value = DateTime.Now.ToString("yyyy-MM-dd");
                //判决是否是提醒弹窗  这个弹窗添加维护记录后会关闭窗口
                var y = Request["tixingweihu"];
                if ( y != null&& y=="1")
                {
                    IsWeihuTixingUrl = true;
                }


            }
              


        }
@@ -212,7 +215,7 @@
                    }
                    this.txtVisitTime.Value = "";
                    this.txtvisitRemark.Value = "";
                    // JavaScript.MessageBox("维护保存成功", this, false, false);
                    //JavaScript.MessageBox("维护保存成功", this, false, false);
                    JavaScript.MessageBoxandhideLoadingIndicator("保存成功", this);
                    if (NeedWeihu)
                    {

 CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx.cs

@@ -783,7 +783,7 @@
                        {
                            if (opType == "撤单")
                            {
                                if (orderState == 4 || orderState == 5)
                                if (orderState == 3 || orderState == 4 || orderState == 5)
                                {
                                    isCan = false;
                                }

 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx

@@ -64,6 +64,15 @@
                            <option value="12">其他</option>
                        </select>
                    </td>

                     <td class="ali03">
                        姓名：
                    </td>
                    <td >
                        <input id="txtPlanPeople" type="text" class=" w90px"  runat="server" /> 
                    </td>


                    <td class="ali03">
                        是否批复：
                    </td>

 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.cs

@@ -44,7 +44,7 @@
            DateTime? endTime = null;
            pa.PageSize = UCPager1.AspNetPager.PageSize;
            pa.PageIndex = UCPager1.AspNetPager.CurrentPageIndex;
            this.RepClientList.DataSource = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, null, this.selRemenderType.Value.ToInt32(), "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value), "", this.selPlanStatus.Value.ToInt32(), this.selApprovalStatus.Value.ToInt32(), null, null);
            this.RepClientList.DataSource = bll_OA_WorkPlanBll.SelectModelPage(pa, CurrentUser.MemberId, Guid.Empty, Guid.Empty, 3, this.selRemenderType.Value.ToInt32(), "", null, null, string.IsNullOrEmpty(this.txtRegTimeStart.Value) ? beginTime : Convert.ToDateTime(this.txtRegTimeStart.Value), string.IsNullOrEmpty(this.txtRegTimeEnd.Value) ? endTime : Convert.ToDateTime(this.txtRegTimeEnd.Value),this.txtPlanPeople.Value.Trim(), this.selPlanStatus.Value.ToInt32(), this.selApprovalStatus.Value.ToInt32(), null, null);
            this.RepClientList.DataBind();
            UCPager1.AspNetPager.RecordCount = pa.RecordCount;
        }

 CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyList.aspx.designer.cs

@@ -69,6 +69,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selRemenderType;

        /// <summary>
        /// txtPlanPeople 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtPlanPeople;

        /// <summary>
        /// selPlanStatus 控件。
        /// </summary>
        /// <remarks>