From d5574b3631e7a9667d43fdf6e73a1d876e37c365 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 九月 2024 14:42:58 +0800
Subject: [PATCH] 客户增加合同查询
---
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs | 2
CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs | 16 +++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs | 9 ++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 31 +++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx | 9 ++++
5 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
index 0320225..17e5c72 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_CorporateClientsBLL.cs
+++ b/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);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index 38ff274..c9ec715 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/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();
@@ -480,6 +484,17 @@
$("#selPaytime").change(function () {
if ($(this).val() != "7") {
$("#txtPaydays").attr("disabled", "disabled");
$("#txtPaydays").val("");
} else {
$("#txtPaydays").removeAttr("disabled");
}
});
$("#selPaytime").change();
$("#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();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
index fdb11ab..af1a26e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -216,7 +216,14 @@
<option value="">鏈畬缁�</option>
</select>
</td>
- <td class="ali03" colspan="3"> </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="閲嶇疆" />
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
index aed7ac1..cef76c4 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.cs
+++ b/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;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
index 36d0f6e..05f6ade 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx.designer.cs
+++ b/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>
--
Gitblit v1.9.1