From 6442fbe375c6b7abdc4b4b1dda7b990685bd02db Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 25 九月 2024 16:31:37 +0800
Subject: [PATCH] 逾期发票张数
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 19 ++
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx | 10
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiPrint.aspx | 6 +
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs | 54 ++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs | 6
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs | 50 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx | 175 +++++++++++++++++++++++++----
CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiList.aspx | 7 +
10 files changed, 273 insertions(+), 66 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
index 40a4952..c0ba89d 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -63,7 +63,9 @@
public int? shuliang { get; set; }
-
+ public int? fapiaoshuliang { get; set; }
+
+
/// <summary>
/// 瑕佹眰鍒拌揪鏃堕棿
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
index 4f5b643..62147cb 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs
@@ -1352,7 +1352,7 @@
fromSouce += @"
- select occ.Province+occ.City+occ.County as quyu ,oc.CompanyName as BuyerName,os.Name as BusinessManager,oc.CreateTime,contracttype.Name as ContracttypeName,oc.Contractmoney
+ select occ.City+occ.County as quyu ,oc.CompanyName as BuyerName,os.Name as BusinessManager,oc.CreateTime,contracttype.Name as ContracttypeName,oc.Contractmoney
,expiretype.Name as ExpiretypeName,oc.ExpireTime,ob.SumPrice, ob.PayedMoney,oc.CustomerId
@@ -1423,6 +1423,54 @@
fromSouce += " )as t ";
var result = _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, selectTarget, fromSouce, " DepartmentId ASC");//鎵ц鏌ヨ
+
+ foreach(var oA_DeliverPlan in result)
+ {
+ StringBuilder from = new StringBuilder();
+ var datetimenow = DateTime.Now.ToString("yyyy-MM-dd");
+ from.Append(" ( ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =1 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 and DATEDIFF(MONTH,ob.CreateTime,'"+ datetimenow + "') > 0 ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+ from.Append(" UNION ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =2 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 and DATENAME(year, ob.CreateTime) +'绗�'+DATENAME(quarter, ob.CreateTime) <DATENAME(year, '"+ datetimenow + "') +'绗�'+DATENAME(quarter, '"+ datetimenow + "') ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+ from.Append(" UNION ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =3 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 and DATENAME(year, ob.CreateTime) +'绗�'+CONVERT(varchar,(month(ob.CreateTime)+5)/6)+'鍗婂勾'<DATENAME(year,'"+ datetimenow + "') +'绗�'+CONVERT(varchar,(month('"+ datetimenow + "')+5)/6)+'鍗婂勾' ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+ from.Append(" UNION ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =4 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 and DATENAME(year, ob.CreateTime)+'骞�' <DATENAME(year, '"+ datetimenow + "')+'骞�' ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+ from.Append(" UNION ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =6 and oc.Shifouwanjie=1 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+ from.Append(" UNION ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =7 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 and DATEDIFF(day,ob.CreateTime,GETDATE()) > oc.Paydays ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+ from.Append(" UNION ");
+ from.Append(" select ob.* from OA_Staff os inner join [OA_CorporateClients] oc on oc.BusinessManagerId = os.Keyid and os.Keyid="+ oA_DeliverPlan.BusinessManagerId + " and oc.Paytime =5 ");
+ from.Append(" inner join EC_OrderBasic ob on ob.BuyerId =oc.Keyid and ob.OrderState !=0 and ob.OrderState !=-2 and DATEDIFF(MONTH,ob.CreateTime,'" + chaxuntime + "')=0 and ");
+ from.Append(" case when DATEDIFF(day,ob.CreateTime,DATENAME(year, ob.CreateTime)+'-03-01')>0 then CONVERT(varchar,YEAR(ob.CreateTime)-1)+'鑷�'+CONVERT(varchar,YEAR(ob.CreateTime))+ '1瀛︽湡' ");
+ from.Append(" when DATEDIFF(day,ob.CreateTime,DATENAME(year, ob.CreateTime)+'-09-01')<=0 then CONVERT(varchar,YEAR(ob.CreateTime))+'鑷�'+CONVERT(varchar,YEAR(ob.CreateTime)+1)+ '1瀛︽湡' ");
+ from.Append(" else CONVERT(varchar,YEAR(ob.CreateTime)-1)+'鑷�'+CONVERT(varchar,YEAR(ob.CreateTime))+'2瀛︽湡' end < ");
+ from.Append(" case when DATEDIFF(day,'"+ datetimenow + "',DATENAME(year, '"+ datetimenow + "')+'-03-01')>0 then CONVERT(varchar,YEAR('"+ datetimenow + "')-1)+'鑷�'+CONVERT(varchar,YEAR('"+ datetimenow + "'))+ '1瀛︽湡' ");
+ from.Append(" when DATEDIFF(day,'"+ datetimenow + "',DATENAME(year, '"+ datetimenow + "')+'-09-01')<=0 then CONVERT(varchar,YEAR('"+ datetimenow + "'))+'鑷�'+CONVERT(varchar,YEAR('"+ datetimenow + "')+1)+ '1瀛︽湡' ");
+ from.Append(" else CONVERT(varchar,YEAR('"+ datetimenow + "')-1)+'鑷�'+CONVERT(varchar,YEAR('"+ datetimenow + "'))+'2瀛︽湡' end ");
+ from.Append(" inner join EC_OrderExtend oe on ob.Keyid=oe.Keyid and oe.KaipiaoshenqingId is null ");
+
+
+ from.Append(" ) as t ");
+
+
+ var eC_OrderBasics = _dataBase.SelectModel<Model.EC_OrderBasic>(" t.* ", from.ToString());
+ oA_DeliverPlan.fapiaoshuliang = eC_OrderBasics.Count;
+ }
+
return null == result ? null : result;//杩斿洖缁撴灉
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx
index 7a02b40..a5949e8 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsDetail.aspx
@@ -49,7 +49,7 @@
<tr>
<td class="ali03 ">閭紪锛�</td><td><span id="spanPostcode" runat="server" ></span></td>
<td class="ali03 ">鐭俊鎵嬫満锛�</td><td><span id="spanMobile" runat="server" ></span></td>
- <td class="ali03 ">浼犵湡锛�</td><td><span id="spanFax" runat="server" ></span></td>
+ <td class="ali03 ">寰俊鍙风爜锛�</td><td><span id="spanFax" runat="server" ></span></td>
</tr>
<tr>
<td class="ali03 ">浼佷笟缃戝潃锛�</td><td><span id="spanCorporateWebsite" runat="server" ></span></td>
@@ -59,7 +59,7 @@
<tr>
<td class="ali03 ">瀹㈡埛绾у埆锛�</td><td><span id="spanDegreeImportanId" runat="server" ></span></td>
<td class="ali03 ">涓氬姟鍒嗘瀽閲忥細</td><td><span id="spanBusinessAnalysisId" runat="server" ></span></td>
- <td class="ali03 ">鎺堜俊棰濆害锛�</td><td><span id="spanCredit" runat="server" ></span></td>
+ <td class="ali03 "></td><td><span id="spanCredit" runat="server" style="visibility:hidden;" ></span></td>
</tr>
<tr>
<td class="ali03 ">涓爣鍗曚綅锛�</td>
<td ><span id="spanBiddingcompanyName" runat="server" ></span></td>
<td class="ali03 "></td>
<td ></td>
<td class="ali03 "></td>
<td ></td>
</tr>
<tr>
<td class="ali03 ">鍚堝悓閲戦锛�</td>
<td><span id="spanContracttypeName" runat="server" ></span></td>
<td ><span id="spanContractmoney" runat="server" ></span>鍏�</td>
<td class="ali03 ">鍒版湡鏃堕棿锛�</td>
<td ><span id="spanExpiretypeName" runat="server" ></span></td>
<td ><span id="spanExpireTime" runat="server" ></span></td>
</tr>
@@ -82,7 +82,7 @@
<td class="ali03 "></td>
<td></td>
</tr>
- <tr>
+ <tr style="display:none;">
<td class="ali03 ">寮�绁ㄨ祫鏂欙細</td>
<td colspan="5"><span id="spanKaipiaoziliao" runat="server" ></span></td>
</tr>
@@ -96,8 +96,8 @@
<td class="ali03 ">鎵嬫満锛�</td><td><span id="spanLegalMobile" runat="server" ></span></td>
<td class="ali03 ">寰俊锛�</td><td><span id="spanLegalQQ" runat="server" ></span></td>
</tr>
- <tr style="display:none">
- <td class="ali03 ">涓氬姟缁忓姙浜猴細</td><td><span id="spanBusinessManagers" runat="server" ></span></td>
+ <tr>
+ <td class="ali03 ">涓氬姟鑱旂郴浜猴細</td><td><span id="spanBusinessManagers" runat="server" ></span></td>
<td class="ali03 ">鎵嬫満锛�</td><td><span id="spanManagersMobile" runat="server" ></span></td>
<td class="ali03 ">寰俊锛�</td><td><span id="spanManagersQQ" runat="server" ></span></td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
index c26c512..38ff274 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx
@@ -77,38 +77,41 @@
<legend>瀹㈡埛璧勬枡</legend>
<table class="tableStyle" width="100%">
<tr>
- <td class="ali03">瀹㈡埛鍚嶇О锛�</td>
+ <td class="ali03 w100px">瀹㈡埛鍚嶇О锛�</td>
<td class="w300px" >
- <input id="txtCompanyName" type="text" runat="server" class="req customcompany" style=" width:300px;" maxlength="20" AUTOCOMPLETE="OFF" />
+ <input id="txtCompanyName" type="text" runat="server" class="req customcompany" style=" width:280px;" maxlength="20" AUTOCOMPLETE="OFF" /><span style="color:red;">*</span>
<input id="txtHideMemberId" type="hidden" runat="server"/>
<input id="txtHideMemberType" type="hidden" runat="server"/>
<div class="ShowCustormDIV"><ul id="ShowCustormList"></ul></div>
</td>
- <td class="ali03 " >鎺堜俊棰濆害锛�</td>
- <td class=""><input id="txtCredit" type="text" readonly="readonly" runat="server" class="req float " value="0" min="0" /></td>
+ <td class="ali03 w100px" >鏈烘瀯浠ｇ爜锛�</td>
+ <td class="w150px"><input id="txtJigoudaima" type="text" runat="server" class="req" maxlength="50" style=" width:130px;" /><span style="color:red;">*</span></td>
- <td class="ali03 " > </td>
- <td class=""> </td>
+ <td class="ali03 w100px" > </td>
+ <td class=""><input id="txtCredit" type="text" readonly="readonly" runat="server" class="req float " value="0" min="0" style="visibility:hidden;" /> </td>
</tr>
<tr>
<td class="ali03 ">璇︾粏鍦板潃锛�</td>
- <td colspan="3"><span id="spanAddressNew"></span><input id="txtDetailedAddress" type="text" runat="server" class="" maxlength="50" style=" width:190px;" /></td>
+ <td ><span id="spanAddressNew"></span><input id="txtDetailedAddress" type="text" runat="server" class="req" maxlength="50" style=" width:170px;" /><span style="color:red;">*</span></td>
<td class="ali03 w100px">閭斂缂栫爜锛�</td>
- <td class="w300px"><input id="txtPostcode" type="text" runat="server" class="postnum" maxlength="15" /></td>
+ <td class=""><input id="txtPostcode" type="text" runat="server" class="postnum" maxlength="15" /></td>
+ <td class="ali03 " > </td>
+ <td class=""></td>
+ </tr>
</tr>
<tr>
<td class="ali03 " >鑱旂郴鐢佃瘽锛�</td>
- <td><input id="txtCompanyPhone" type="text" runat="server" class="" maxlength="15" /></td>
+ <td><input id="txtCompanyPhone" type="text" runat="server" class="req" maxlength="15" /><span style="color:red;">*</span></td>
<td class="ali03 w100px">鐭俊鎵嬫満锛�</td>
<td class="w150px"><input id="txtMobile" type="text" runat="server" class="phone" maxlength="15"/></td>
<td class="ali03 ">QQ锛�</td>
<td><input id="txtQQ" type="text" runat="server" class="int" maxlength="15" /></td>
</tr>
<tr>
- <td class="ali03 ">浼犵湡鍙风爜锛�</td>
- <td><input id="txtFax" type="text" runat="server" maxlength="15"/></td>
+ <td class="ali03 ">寰俊鍙风爜锛�</td>
+ <td><input id="txtFax" type="text" runat="server" maxlength="20"/></td>
<td class="ali03 ">鐢靛瓙閭欢锛�</td>
<td><input id="txtEmail" type="text" runat="server" class="" maxlength="50" /></td>
<td class="ali03 w100px">浼佷笟缃戝潃锛�</td>
@@ -122,8 +125,8 @@
<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=" w200px"></select></td>
<td class="ali03 "><input id="txtBiddingcompany" type="text" runat="server" class="" maxlength="50" /> </td>
<td ><asp:Button ID="Button3" Text="鏂板涓爣鍗曚綅" runat="server" OnClick="btn_SubmitClientsBiddingcompany_Config" /></td>
<td colspan="2" ></td>
</tr>
- <tr>
<td class="ali03 ">鍚堝悓閲戦锛�</td>
<td><select id="selContracttype" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
<td ><input id="txtContractmoney" type="text" runat="server" maxlength="50" class="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' 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 id="ReceiptT_Html">
<td class="ali03 " >寮�閫氱櫥褰曪細</td>
@@ -142,20 +145,20 @@
<td class="ali03 ">绋庡彿锛�</td>
<td><input id="txtTaxID" type="text" runat="server" maxlength="50" /></td>
</tr>
- <tr>
- <td class="ali03 ">鏈烘瀯浠ｇ爜锛�</td>
- <td><input id="txtJigoudaima" type="text" runat="server" maxlength="50" style=" width:300px;" /></td>
- <td class="ali03 ">绁ㄦ嵁锛�</td>
- <td><select id="selPiaoju" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
+ <%-- <tr>
<td class="ali03 "></td>
<td></td>
- </tr>
- <tr>
+ <td class="ali03 "></td>
+ <td></td>
+ <td class="ali03 "></td>
+ <td></td>
+ </tr>--%>
+ <tr style="display:none;">
<td class="ali03 ">寮�绁ㄨ祫鏂欙細</td>
<td colspan="5"><input id="txtKaipiaoziliao" type="text" runat="server" maxlength="200" style=" width:92%; " /></td>
</tr>
- <tr>
<td class="ali03 ">浠樻鏃堕棿锛�</td>
<td><select id="selPaytime" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
<td class="ali03 ">澶╋細</td>
<td ><input id="txtPaydays" type="text" runat="server" maxlength="50" class="positiveint" /></td>
<td class="ali03 "></td>
<td></td>
</tr>
+ <tr>
<td class="ali03 ">浠樻鏃堕棿锛�</td>
<td><select id="selPaytime" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class="req w120px"></select><span style="color:red;">*</span></td>
<td class="ali03 ">澶╋細</td>
<td ><input id="txtPaydays" type="text" runat="server" maxlength="50" class="positiveint" /><span style="color:red;">*</span></td>
<td class="ali03 ">鏀舵绁ㄦ嵁锛�</td>
<td><select id="selPiaoju" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px"></select></td>
</tr>
<tr>
<td class="ali03 ">娉曞畾浠ｈ〃浜猴細</td>
<td><input id="txtLegalRepresentative" type="text" runat="server" maxlength="20" /></td>
@@ -164,8 +167,8 @@
<td class="ali03 ">寰俊锛�</td>
<td ><input id="txtLegalQQ" type="text" runat="server" class="int" maxlength="20" /></td>
</tr>
- <tr style="display:none">
- <td class="ali03 ">涓氬姟缁忓姙浜猴細</td>
+ <tr>
+ <td class="ali03 ">涓氬姟鑱旂郴浜猴細</td>
<td><input id="txtBusinessManagers" type="text" runat="server" maxlength="20" /></td>
<td class="ali03 ">鎵嬫満锛�</td>
<td><input id="txtManagersMobile" type="text" runat="server" class="phone" maxlength="20" /></td>
@@ -188,7 +191,7 @@
<td class="ali03 ">澶囨敞锛�</td>
<td colspan="5"><textarea runat="server" id="txtRemark" style=" width:92%; height:30px;" maxlength="200"></textarea></td>
</tr>
- <tr>
<td class="ali03 ">瀹岀粨鐘舵�侊細</td>
<td ><select id="selShifouwanjie" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px" disabled="disabled"></select></td>
<td class="ali03 "></td>
<td ></td>
<td class="ali03 "></td>
<td ><button id="Buttonupload" onclick="onViewuplod('<%= GetKeyID()%>');return false;" >涓婁紶鍚堝悓</button></td>
</tr>
+ <tr>
<td class="ali03 ">瀹岀粨鐘舵�侊細</td>
<td ><select id="selShifouwanjie" runat="server" datatextfield="PrintName" datavaluefield="Keyid" keepDefaultStyle='true' class=" w120px" disabled="disabled"></select></td>
<td class="ali03 "></td>
<td ></td>
<td class="ali03 "></td>
<td ><button id="Buttonupload" style="visibility:hidden;" onclick="onViewuplod('<%= GetKeyID()%>');return false;" >涓婁紶鍚堝悓</button></td>
</tr>
<tr>
@@ -322,21 +325,140 @@
</body>
<script type="text/javascript">
PCAC('<%=Province %>', '<%=City %>', '<%=County %>', "Name"); //鍩庡競鏁版嵁瀛樺悕绉扮敤Name,瀛樼紪鍙峰垯绌哄瓧绗�
- ReceiptT('customer', '<%=Targetid %>', 6, 120);
+
+
+ /*
+鍙傛暟锛氭敹璐ф柟寮忔潵婧愮被鍨�(order,member,customer)锛屾暟鎹潵婧愮紪鍙�(璁㈠崟鍙凤紝鍟嗗缂栧彿锛屽鎴风紪鍙�)
+*/
+ function ReceiptT11(rt_datetype, targetid, rows, inputWidth) {
+ var ReceiptTHtml = "";
+ if (rows == 4) {
+ ReceiptTHtml = "<tr id='ReceiptTOld'><td class='ali03 alignR w100px'>鏀惰揣鏂瑰紡锛�</td><td class=''><select name='AcceptTypeId' id='AcceptTypeId' keepdefaultstyle='true' class='Sreq' ></select></td><td class='ali03 alignR '> </td><td> </td></tr><tr class='rt_OnBehalfOfCargo hide'><td class='ali03 alignR'>鍩庡競锛�</td><td><input type='text' name='City_OnBehalfOfCargo' id='City_OnBehalfOfCargo' style='width:" + 185 + "px;'/></td><td class='ali03 alignR'>鏀惰揣浜猴細</td><td><input type='text' name='Accepter_OnBehalfOfCargo' id='Accepter_OnBehalfOfCargo' style='width:" + inputWidth + "px;'/>鐢佃瘽锛�<input type='text' name='AccepterPhone_OnBehalfOfCargo' id='AccepterPhone_OnBehalfOfCargo' style='width:" + inputWidth + "px;'/> </td></tr><tr class='rt_HomeDelivery hide'><td class='ali03 alignR'>鍩庡競锛�</td><td><input type='text' name='City_HomeDelivery' id='City_HomeDelivery' style='width:" + 185 + "px;'/></td><td class='ali03 alignR'>鏀惰揣浜猴細</td><td><input type='text' name='Accepter_HomeDelivery' id='Accepter_HomeDelivery' style='width:" + inputWidth + "px;'/>鐢佃瘽锛�<input type='text' name='AccepterPhone_HomeDelivery' id='AccepterPhone_HomeDelivery' style='width:" + inputWidth + "px;'/> </td></tr><tr class='rt_HomeDelivery hide'><td class='ali03 alignR'>鏀惰揣鍦板潃锛�</td><td colspan='3'><input type='text' name='AccepterAddress_HomeDelivery' id='AccepterAddress_HomeDelivery' style='width:80%;max-width:700px;' /></td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鍩庡競锛�</td><td><input type='text' name='City_OfficialFreightForwarder' id='City_OfficialFreightForwarder' style='width:" + 185 + "px;'/></td><td class='ali03 alignR'> 鏀惰揣浜猴細</td><td><input type='text' name='Accepter_OfficialFreightForwarder' id='Accepter_OfficialFreightForwarder' style='width:" + inputWidth + "px;'/> 鐢佃瘽锛�<input type='text' name='AccepterPhone_OfficialFreightForwarder' id='AccepterPhone_OfficialFreightForwarder' style='width:" + inputWidth + "px;'/> </td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鎸囧畾璐ц繍鍏徃锛�</td><td colspan='3'><input type='text' name='AppointCourierCompany' id='AppointCourierCompany' style='width:" + 185 + "px;'/></td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鏀惰揣鐐瑰湴鍧�锛�</td><td><input type='text' name='AccepterAddress' id='AccepterAddress' style='width:" + 185 + "px;'/></td><td class='ali03 alignR'>鑱旂郴浜猴細</td><td><input type='text' name='AcceptContacts' id='AcceptContacts' style='width:" + inputWidth + "px;'/> 鐢佃瘽锛�<input type='text' name='AccepterPhoneNum' id='AccepterPhoneNum' style='width:" + inputWidth + "px;'/> </td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鍙栬揣鐐瑰湴鍧�锛�</td><td><input type='text' name='FetchAddress' id='FetchAddress' style='width:" + 185 + "px;'/></td><td class='ali03 alignR'>鑱旂郴浜猴細</td><td><input type='text' name='FetchContacts' id='FetchContacts' style='width:" + inputWidth + "px;'/> 鐢佃瘽锛�<input type='text' name='FetchPhoneNum' id='FetchPhoneNum' style='width:" + inputWidth + "px;'/> </td></tr><tr style='display:none;'><td class='ali03 alignR'>澶囨敞锛�</td><td colspan='3'><textarea name='Remark' id='Remark' style=' width:400px;height:50px;'></textarea></td></tr>";
+ } else if (rows == 6) {
+ ReceiptTHtml = "<tr id='ReceiptTOld'><td class='ali03 alignR w100px'>鏀惰揣鏂瑰紡锛�</td><td class=''><select name='AcceptTypeId' id='AcceptTypeId' keepdefaultstyle='true' class='Sreq'></select></td><td class='ali03 alignR '> </td><td colspan='3'></select></td></tr><tr class='rt_OnBehalfOfCargo hide'><td class='ali03 alignR'>鍩庡競锛�</td><td><input type='text' name='City_OnBehalfOfCargo' id='City_OnBehalfOfCargo' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鏀惰揣浜猴細</td><td><input type='text' name='Accepter_OnBehalfOfCargo' id='Accepter_OnBehalfOfCargo' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鐢佃瘽锛�</td><td><input type='text' name='AccepterPhone_OnBehalfOfCargo' id='AccepterPhone_OnBehalfOfCargo' style='width:" + inputWidth + "px;'/></td></tr><tr class='rt_HomeDelivery hide'><td class='ali03 alignR'>鍩庡競锛�</td><td><input type='text' name='City_HomeDelivery' id='City_HomeDelivery' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鏀惰揣浜猴細</td><td><input type='text' name='Accepter_HomeDelivery' id='Accepter_HomeDelivery' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鐢佃瘽锛�</td><td><input type='text' name='AccepterPhone_HomeDelivery' id='AccepterPhone_HomeDelivery' style='width:" + inputWidth + "px;'/></td></tr><tr class='rt_HomeDelivery hide'><td class='ali03 alignR'>鏀惰揣鍦板潃锛�</td><td colspan='5'><input type='text' name='AccepterAddress_HomeDelivery' id='AccepterAddress_HomeDelivery' style='width:80%;max-width:700px;' /></td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鍩庡競锛�</td><td><input type='text' name='City_OfficialFreightForwarder' id='City_OfficialFreightForwarder' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鏀惰揣浜猴細</td><td><input type='text' name='Accepter_OfficialFreightForwarder' id='Accepter_OfficialFreightForwarder' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鐢佃瘽锛�</td><td><input type='text' name='AccepterPhone_OfficialFreightForwarder' id='AccepterPhone_OfficialFreightForwarder' style='width:" + inputWidth + "px;'/></td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鎸囧畾璐ц繍鍏徃锛�</td><td colspan='5'><input type='text' name='AppointCourierCompany' id='AppointCourierCompany' style='width:" + inputWidth + "px;'/></td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鏀惰揣鐐瑰湴鍧�锛�</td><td><input type='text' name='AccepterAddress' id='AccepterAddress' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鑱旂郴浜猴細</td><td><input type='text' name='AcceptContacts' id='AcceptContacts' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鐢佃瘽锛�</td><td><input type='text' name='AccepterPhoneNum' id='AccepterPhoneNum' style='width:" + inputWidth + "px;'/></td></tr><tr class='rt_OfficialFreightForwarder hide'><td class='ali03 alignR'>鍙栬揣鐐瑰湴鍧�锛�</td><td><input type='text' name='FetchAddress' id='FetchAddress' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鑱旂郴浜猴細</td><td><input type='text' name='FetchContacts' id='FetchContacts' style='width:" + inputWidth + "px;'/></td><td class='ali03 alignR'>鐢佃瘽锛�</td><td><input type='text' name='FetchPhoneNum' id='FetchPhoneNum' style='width:" + inputWidth + "px;'/></td></tr><tr style='display:none;'><td class='ali03 alignR'>澶囨敞锛�</td><td colspan='5'><textarea name='Remark' id='Remark' style=' width:400px;height:50px;'></textarea></td></tr>";
+ }
+ var oldhtml = $("#ReceiptTOld").html();
+ if (oldhtml == "" || oldhtml == undefined) {
+ $("#ReceiptT_Html").after(ReceiptTHtml);
+ }
+
+ $("#AcceptTypeId").html('<option value="104">鑷彁</option><option value="105">浠ｅ彂璐ц繍</option><option value="106" selected >閫佽揣涓婇棬</option><option value="107">鎸囧畾璐ц繍鍏徃</option>');
+ $(".rt_HomeDelivery").css("display", "");
+ $(".rt_HomeDelivery").removeClass("hide");
+
+
+
+ //鏀惰揣鏂瑰紡鏀瑰彉鏃惰Е鍙�
+ $("#AcceptTypeId").live("change", function () {
+ var rt_type = $(this).find("option:selected").text();
+ switch (rt_type) {
+ case "鑷彁":
+ $(".rt_OnBehalfOfCargo").css("display", "none");
+ $(".rt_HomeDelivery").css("display", "none");
+ $(".rt_OfficialFreightForwarder").css("display", "none");
+ break;
+ case "浠ｅ彂璐ц繍":
+ $(".rt_HomeDelivery").css("display", "none");
+ $(".rt_OfficialFreightForwarder").css("display", "none");
+ $(".rt_OnBehalfOfCargo").css("display", "");
+ $(".rt_OnBehalfOfCargo").removeClass("hide");
+ break;
+ case "閫佽揣涓婇棬":
+ $(".rt_OnBehalfOfCargo").css("display", "none");
+ $(".rt_OfficialFreightForwarder").css("display", "none");
+ $(".rt_HomeDelivery").css("display", "");
+ $(".rt_HomeDelivery").removeClass("hide");
+ break;
+ case "鎸囧畾璐ц繍鍏徃":
+ $(".rt_OnBehalfOfCargo").css("display", "none");
+ $(".rt_HomeDelivery").css("display", "none");
+ $(".rt_OfficialFreightForwarder").css("display", "");
+ $(".rt_OfficialFreightForwarder").removeClass("hide");
+ break;
+ default:
+ alert(1);
+ $(".rt_OnBehalfOfCargo").css("display", "none");
+ $(".rt_HomeDelivery").css("display", "none");
+ $(".rt_OfficialFreightForwarder").css("display", "none");
+ break;
+ }
+ });
+
+ //鍔犺浇鏁版嵁
+ if (targetid != null && targetid != "") {
+ $.ajax({
+ url: "/Pages/common/CommonAjax.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { rt_datetype: rt_datetype, targetid: targetid },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var jnone = [];
+ if (data == null || data == "" || data == undefined) {
+ } else {
+ eval("jnone=" + data);
+ $("#AcceptTypeId").val(jnone.AcceptTypeId);
+ if (jnone.InvoiceDemand != "") {
+ $("#InvoiceId").val(jnone.InvoiceDemand);
+ }
+ $("#City_OnBehalfOfCargo").val(jnone.City);
+ $("#City_OfficialFreightForwarder").val(jnone.City);
+ $("#City_HomeDelivery").val(jnone.City);
+
+ $("#AccepterPhone_OnBehalfOfCargo").val(jnone.AccepterPhone);
+ $("#AccepterPhone_HomeDelivery").val(jnone.AccepterPhone);
+ $("#AccepterPhone_OfficialFreightForwarder").val(jnone.AccepterPhone);
+
+ $("#Accepter_OnBehalfOfCargo").val(jnone.Accepter);
+ $("#Accepter_HomeDelivery").val(jnone.Accepter);
+ $("#Accepter_OfficialFreightForwarder").val(jnone.Accepter);
+
+ $("#AccepterAddress_HomeDelivery").val(jnone.AccepterAddress);
+
+ $("#AppointCourierCompany").val(jnone.AppointCourierCompany);
+ $("#AccepterAddress").val(jnone.AccepterAddress);
+ $("#AccepterPhoneNum").val(jnone.AccepterPhoneNum);
+ $("#AcceptContacts").val(jnone.AcceptContacts);
+ $("#FetchAddress").val(jnone.FetchAddress);
+ $("#FetchPhoneNum").val(jnone.FetchPhoneNum);
+ $("#FetchContacts").val(jnone.FetchContacts);
+ $("#Remark").text(jnone.Remark);
+ }
+ $("#AcceptTypeId").change();
+ var txtTheAwb = document.getElementById('txtTheAwb');
+ if (txtTheAwb && undefined != txtTheAwb.value && undefined != jnone && undefined != jnone.TheAwb) { txtTheAwb.value = jnone.TheAwb; } else { }
+ }
+ });
+ }
+ }
+
+
+ ReceiptT11('customer', '<%=Targetid %>', 6, 120);
var address = "<%=Province %>" + "<%=City %>" + "<%=County %>";
var oldAddress = address;
function ChangeAddress() {
address = $("#spanAddressNew").text();
var newAddress = $("#selectProvince").val() + $("#selectCity").val() + $("#selectCounty").val();
+ var newAddresssss = $("#selectCity").val() + $("#selectCounty").val();
if (newAddress == address || "" == address || oldAddress == address) {
if ($("#selectCity").val().indexOf($("#selectProvince").val()) >= 0) {
newAddress = ($("#selectCity").val().indexOf("鍏朵粬") >= 0 ? "" : $("#selectCity").val()) + ($("#selectCounty").val().indexOf("鍏朵粬") >= 0 ? "" : $("#selectCounty").val());
} else {
newAddress = $("#selectProvince").val() + ($("#selectCity").val().indexOf("鍏朵粬") >= 0 ? "" : $("#selectCity").val()) + ($("#selectCounty").val().indexOf("鍏朵粬") >= 0 ? "" : $("#selectCounty").val());
+ newAddresssss = ($("#selectCity").val().indexOf("鍏朵粬") >= 0 ? "" : $("#selectCity").val()) + ($("#selectCounty").val().indexOf("鍏朵粬") >= 0 ? "" : $("#selectCounty").val());
}
$("#spanAddressNew").text(newAddress);
+ if ($("#HideKeyid").val() == "") {
+ $("#City_HomeDelivery").val(newAddresssss);
+ $("#City_OfficialFreightForwarder").val(newAddresssss);
+ $("#City_HomeDelivery").val(newAddresssss);
+ }
+
+
+
address = $("#spanAddressNew").text();
oldAddress = newAddress;
}
@@ -357,6 +479,9 @@
$("#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();
+
+
$("#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();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
index ef803a0..a555040 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.cs
@@ -471,7 +471,7 @@
this.selCustomerIndustriesId.DataTextField = "Name";
this.selCustomerIndustriesId.DataBind();
- this.selCustomerIndustriesId.Value = "454";
+ this.selCustomerIndustriesId.Value = "69";
this.selCustomerTypeId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("瀹㈡埛绫诲瀷");
this.selCustomerTypeId.DataValueField = "Keyid";
@@ -484,12 +484,16 @@
this.selBusinessManagerId.DataBind();
this.selBusinessManagerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ this.selBusinessManagerId.Value = CurrentUser.StaffId.Value.ToString();
+
this.selAccountManagerId.DataSource = bll_OA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, true);
this.selAccountManagerId.DataTextField = "Name";
this.selAccountManagerId.DataValueField = "Keyid";
this.selAccountManagerId.DataBind();
this.selAccountManagerId.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ this.selAccountManagerId.Value = CurrentUser.StaffId.Value.ToString();
+
this.selCreditId.DataSource = bll_Sys_DictionaryBLL.GetDataByType("瀹㈡埛淇¤獕");
this.selCreditId.DataValueField = "Keyid";
this.selCreditId.DataTextField = "Name";
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs
index 6ebc540..aff51d3 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsEdit.aspx.designer.cs
@@ -105,6 +105,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputHidden txtHideMemberType;
/// <summary>
+ /// txtJigoudaima 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtJigoudaima;
+
+ /// <summary>
/// txtCredit 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -222,15 +231,6 @@
protected global::System.Web.UI.HtmlControls.HtmlSelect selBiddingcompany;
/// <summary>
- /// txtBiddingcompany 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtBiddingcompany;
-
- /// <summary>
/// Button3 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -238,6 +238,15 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button Button3;
+
+ /// <summary>
+ /// txtBiddingcompany 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtBiddingcompany;
/// <summary>
/// selContracttype 鎺т欢銆�
@@ -330,24 +339,6 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtTaxID;
/// <summary>
- /// txtJigoudaima 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtJigoudaima;
-
- /// <summary>
- /// selPiaoju 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selPiaoju;
-
- /// <summary>
/// txtKaipiaoziliao 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -375,6 +366,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPaydays;
/// <summary>
+ /// selPiaoju 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selPiaoju;
+
+ /// <summary>
/// txtLegalRepresentative 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
index 0d4f535..fdb11ab 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/CorporateClientsList.aspx
@@ -22,16 +22,16 @@
//鏌ョ湅
function onView(keyid) {
- top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛", Width: 900, Height: 750 });
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛", Width: 1200, Height: 900 });
}
//鏌ョ湅
function onViewWeihu(keyid) {
- top.Dialog.open({ URL: "/Pages/business/CorporateClientsVisit.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛缁存姢璁板綍", Width: 900, Height: 750 });
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsVisit.aspx?Keyid=" + keyid, Title: "鏌ョ湅瀹㈡埛缁存姢璁板綍", Width: 1200, Height: 900 });
}
//淇敼
function onEdit(keyid) {
- top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?Keyid=" + keyid, Title: "淇敼瀹㈡埛", Width: 900, Height: 750 });
+ top.Dialog.open({ URL: "/Pages/business/CorporateClientsEdit.aspx?Keyid=" + keyid, Title: "淇敼瀹㈡埛", Width: 1200, Height: 900 });
}
//鍒犻櫎
@@ -358,7 +358,7 @@
<span menu_member_case_id="case_orderapplyCorporateClients" menu_member_case_name="璁㈠崟鍏宠仈" onclick="onChange('<%#Eval("Keyid")%>')" title="绾夸笅瀹㈡埛杞崲涓虹嚎涓婂鎴�" style="display: <%#Eval("Keyid").ToString() == Eval("MemberId").ToString() ? "inline" : "none"%>;">璁㈠崟鍏宠仈</span>
<span onclick="onViewWeihu('<%#Eval("Keyid")%>')">缁存姢璁板綍</span>
- <span onclick="onViewuplod('<%#Eval("Keyid")%>')" <%#Eval("ContractCount").ToString() == "0" ? "hidden" : ""%>>鏌ョ湅鍚堝悓</span>
+ <span onclick="onViewuplod('<%#Eval("Keyid")%>')" > <%#Eval("ContractCount").ToString() == "0" ? "涓婁紶鍚堝悓" : "鏌ョ湅鍚堝悓"%></span>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 776cee6..50ce4e6 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -389,7 +389,15 @@
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
_inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
- _inquiryCommonModel.PrintDemand = /*Request["printSizeName"].ToString() + "锛�" +*/ Request["txtPrintDemand"].ToString();
+ if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+ {
+ _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+ }
+ else
+ {
+ _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ }
+
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
@@ -569,7 +577,14 @@
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
_inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
- _inquiryCommonModel.PrintDemand = /*Request["printSizeName"].ToString() + "锛�" +*/ Request["txtPrintDemand"].ToString();
+ if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+ {
+ _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+ }
+ else
+ {
+ _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ }
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiList.aspx
index 2a12c16..ea891c9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiList.aspx
@@ -126,6 +126,10 @@
鍥炴閲戦
</th>
<th style="text-align: center;">
+ 閫炬湡鍙戠エ寮犳暟
+ </th>
+
+ <th style="text-align: center;">
鏈敹娆鹃噾棰�
</th>
@@ -180,6 +184,9 @@
<%#Eval("PayedMoney", "{0:F2}")%>
</td>
<td>
+ <%#Eval("fapiaoshuliang")%>
+ </td>
+ <td>
<%#Eval("UnPayedMoney", "{0:F2}")%>
</td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiPrint.aspx
index 94598e4..d2272df 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiPrint.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/xiaoshouyejiPrint.aspx
@@ -89,6 +89,9 @@
<th style="text-align: center;">
鍥炴閲戦
</th>
+ <th style="text-align: center;">
+ 閫炬湡鍙戠エ寮犳暟
+ </th>
<th style="text-align: center;">
鏈敹娆鹃噾棰�
</th>
@@ -136,6 +139,9 @@
<td>
<%#Eval("PayedMoney", "{0:F2}")%>
</td>
+ <td>
+ <%#Eval("fapiaoshuliang")%>
+ </td>
<td>
<%#Eval("UnPayedMoney", "{0:F2}")%>
</td>
--
Gitblit v1.9.1