username@email.com
2024-09-26 d5574b3631e7a9667d43fdf6e73a1d876e37c365
客户增加合同查询
5个文件已修改
67 ■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
@@ -252,7 +252,7 @@
        public IEnumerable<OA_CorporateClients> GetModelPageList(Pagination pa, Guid FirmId, string UserName, DateTime? beginTime,
DateTime? endTime, string AccountManagerId, string BusinessManagerId, string CustomerIndustriesId, string CustomerTypeId, string DegreeImportanId,string LastOrderTime, string selOrderCount, string selOrderMoney, string SourcesInfoId, string TurnoverIntentionId,
string OrderCount, string OrderMoney, string UserNum, string selLastOrderTime, string Province, string City, string County, bool IsStaff, Guid StaffMemberId,int? StaffId,string Shifouwanjie=null,
bool? NeedWeifu=null,bool?NeedJiejiaRiWeiFu=null)
bool? NeedWeifu=null,bool?NeedJiejiaRiWeiFu=null, string selHetongshangchuan = null)
        {
            string Condition = " and a.FirmId ='" + FirmId + "'";
@@ -310,6 +310,20 @@
            if (!string.IsNullOrEmpty(selOrderMoney) && !string.IsNullOrEmpty(OrderMoney))
                Condition += string.Format(" and OrderMoney{0}'{1}'", selOrderMoney, OrderMoney);
            if (!string.IsNullOrEmpty(selHetongshangchuan))
            {
                if (selHetongshangchuan == "1")
                {
                    Condition += string.Format(" and EXISTS   ( select  CorporateClientsid  from [dbo].[OA_CorporateClientContract] where CorporateClientsid=a.Keyid ) ");
                }
                else
                {
                    Condition += string.Format(" and NOT  EXISTS   ( select  CorporateClientsid  from [dbo].[OA_CorporateClientContract] where CorporateClientsid=a.Keyid ) ");
                }
            }
            if (!string.IsNullOrEmpty(selLastOrderTime) && !string.IsNullOrEmpty(LastOrderTime))
                Condition += string.Format(" and CAST(LastOrderTime AS DATE) {0} CAST(getdate()-{1} AS date)", LastOrderTime, selLastOrderTime);
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -125,16 +125,16 @@
                   <td class="ali03 ">客户信誉:</td>
                   <td><select id="selCreditId" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
                </tr>
                <tr>                     <td class="ali03 ">中标单位:</td>                     <td   ><select id="selBiddingcompany" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class="req w190px"></select><span  style="color:red;">*</span></td>                                         <td   class="ali03 "><asp:Button ID="Button3" Text="其他中标单位" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /> </td>                       <td ><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" /> </td>                     <td colspan="2"   ></td>                   </tr>
                <tr>                                          <td class="ali03 ">合同金额:</td>                     <td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class="req w120px"></select><span  style="color:red;">*</span></td>                        <td ><input id="txtContractmoney" type="text" runat="server"  maxlength="50"  class="req float w70px" value="0" min="0"    />元</td>                     <td class="ali03 ">到期时间:</td>                     <td ><select id="selExpiretype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>                       <td ><input id="txtExpireTime" type="text" runat="server"  maxlength="50" class="date w90px" datefmt="yyyy-MM-dd"  /></td>                 </tr>
                <tr>                     <td class="ali03 ">中标单位:</td>                     <td   ><select id="selBiddingcompany" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' style=" width:220px;"  class="req w220px"></select><span  style="color:red;">*</span></td>                                         <td   class="ali03 "><asp:Button ID="Button3" Text="其他中标单位" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config"   /> </td>                       <td colspan="2"   ><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" style=" width:220px;"  /> </td>                     <td  ></td>                   </tr>
                <tr>                                          <td class="ali03 ">合同金额:</td>                     <td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class="req w120px"></select><span  style="color:red;">*</span><input id="txtContractmoney" type="text" runat="server"  maxlength="50"  class="req float w70px" value="0" min="0"    />元</td>                        <td class="ali03 " >到期时间:</td>                     <td><select id="selExpiretype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>                     <td ><input id="txtExpireTime" type="text" runat="server"  maxlength="50" class="date w90px" datefmt="yyyy-MM-dd"  /></td>                       <td ></td>                 </tr>
               
                <tr id="ReceiptT_Html">
                     <td class="ali03 " >开通登录:</td>
                     <td><select id="selIsLoginCorporateWeb" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true'  class=" w120px"><option value="False">关闭</option><option value="True">开通</option></select>
                    </td>
                    <td class="ali03 ">登录帐号:</td>
                    <td class="ali03 " id="txtLoginPhone11" >登录帐号:</td>
                    <td><input id="txtLoginPhone" type="text" runat="server" maxlength="20" /></td>
                    <td class="ali03 ">密码:</td>
                    <td class="ali03 " id="txtPassWord11">密码:</td>
                    <td><input id="txtPassWord" type="text" runat="server" maxlength="20"/></td>
                </tr>
                <tr>
@@ -468,11 +468,15 @@
        setInterval("ChangeAddress()", 200);
        $("#selIsLoginCorporateWeb").change(function () {
            if ($(this).val() == "False") {
                $("#txtLoginPhone").attr("disabled", "disabled");
                $("#txtPassWord").attr("disabled", "disabled");
                $("#txtLoginPhone").css('visibility', 'hidden');
                $("#txtLoginPhone11").css('visibility', 'hidden');
                $("#txtPassWord").css('visibility', 'hidden');
                $("#txtPassWord11").css('visibility', 'hidden');
            } else {
                $("#txtLoginPhone").removeAttr("disabled");
                $("#txtPassWord").removeAttr("disabled");
                $("#txtLoginPhone").css('visibility', 'visible');
                $("#txtLoginPhone11").css('visibility', 'visible');
                $("#txtPassWord").css('visibility', 'visible');
                $("#txtPassWord11").css('visibility', 'visible');
            }
        });
        $("#selIsLoginCorporateWeb").change();
@@ -482,6 +486,17 @@
        $("#txtCompanyPhone").change(function () {             if ($("#AccepterPhone_OnBehalfOfCargo").val() == "") {                                 $("#AccepterPhone_OnBehalfOfCargo").val($("#txtCompanyPhone").val());             }             if ($("#AccepterPhone_HomeDelivery").val() == "") {                 $("#AccepterPhone_HomeDelivery").val($("#txtCompanyPhone").val());                                 }             if ($("#AccepterPhone_OfficialFreightForwarder").val() == "") {                 $("#AccepterPhone_OfficialFreightForwarder").val($("#txtCompanyPhone").val());             }             if ($("#txtManagersMobile").val() == "") {                 $("#txtManagersMobile").val($("#txtCompanyPhone").val());             }                      });         $("#txtCompanyPhone").change();
        
        $("#Accepter_HomeDelivery").change(function () {                          $("#txtBusinessManagers").val($("#Accepter_HomeDelivery").val());                      });
        $("#txtBusinessManagers").change(function () {             $("#Accepter_HomeDelivery").val($("#txtBusinessManagers").val());         });
        $("#AccepterPhone_HomeDelivery").change(function () {             $("#txtManagersMobile").val($("#AccepterPhone_HomeDelivery").val());         });
        $("#txtManagersMobile").change(function () {             $("#AccepterPhone_HomeDelivery").val($("#txtManagersMobile").val());         });
        $("#selContracttype").change(function () {             if ($(this).val() != "1") {                 $("#txtContractmoney").attr("disabled", "disabled");                 $("#txtContractmoney").val("");             } else {                 $("#txtContractmoney").removeAttr("disabled");             }         });         $("#selContracttype").change();
        $("#selExpiretype").change(function () {             if ($(this).val() != "1") {                 $("#txtExpireTime").attr("disabled", "disabled");                 $("#txtExpireTime").val("");             } else {                 $("#txtExpireTime").removeAttr("disabled");             }         });         $("#selExpiretype").change();
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -216,7 +216,14 @@
                                <option value="">未完结</option>
                            </select>
                        </td>
                        <td class="ali03" colspan="3">&nbsp;</td>
                        <td class="ali03" >合同上传:</td>
                        <td>
                            <select id="selHetongshangchuan" runat="server" keepdefaultstyle='true'>
                                <option value="">全部</option>
                                 <option value="1">是</option>
                                 <option value="0">否</option>
                            </select>
                        </td>
                        <td>
                            <asp:Button CssClass="button" ID="btn_Search" Text="查询" runat="server" padding="0px" OnClick="btn_Search_Click" />
                            <input type="button" onclick="resetSearch()" value="重置" />
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
@@ -150,7 +150,7 @@
                (CurrentUser.TrueType == "员工"),
                CurrentUser.TrueMemberId,
                CurrentUser.StaffId,
                this.selShifouwanjie.Value);
                this.selShifouwanjie.Value,null,null, this.selHetongshangchuan.Value);
            foreach (var item in this.RepClientList.DataSource as IEnumerable<OA_CorporateClients>)
            {
                item.LessOrderMoneyProperty = item.Contractmoney-item.OrderMoney;
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
@@ -222,6 +222,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect selShifouwanjie;
        /// <summary>
        /// selHetongshangchuan 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect selHetongshangchuan;
        /// <summary>
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>