From a0d38325a97957b37dd755bf732b63f6f7e2a5ff Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 24 十二月 2024 08:40:48 +0800
Subject: [PATCH] 修改外协付款
---
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs | 348 ++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx | 74 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx | 172 +++++
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 8
CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs | 8
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx | 40 +
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs | 42
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.cs | 176 ++++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.designer.cs | 80 ++
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx | 203 +++++++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs | 18
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs | 13
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs | 10
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx | 66 ++
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx | 24
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs | 9
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj | 16
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx | 13
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs | 54 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx | 15
CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs | 72 +-
CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs | 152 +++++
CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx | 11
34 files changed, 1,546 insertions(+), 149 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
index ea7b5a8..18388a4 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_FukuanshenqingBLL.cs
@@ -140,7 +140,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_Fukuanshenqing> SelectModelPage(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
- string Creater, string SupplierName,string shifoufukuan)
+ string Creater, string SupplierName,string shifoufukuan,string selFukuanyongtu)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 ";
@@ -157,6 +157,8 @@
Condition += " and ok.SupplierName like '%" + SupplierName + "%' ";
if (!string.IsNullOrEmpty(shifoufukuan))
Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
+ if (!string.IsNullOrEmpty(selFukuanyongtu))
+ Condition += " and ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
@@ -176,7 +178,7 @@
/// <param name="pa"></param>
/// <returns></returns>
public IEnumerable<OA_Fukuanshenqing> SelectModelPageweikaipiao(Pagination pa, Guid FirmId, string CreateTimeStart, string CreateTimeEnd,
- string Creater, string SupplierName, string shifoufukuan)
+ string Creater, string SupplierName, string shifoufukuan, string selFukuanyongtu)
{
string Condition = " and ok.FirmId ='" + FirmId + "' and ok.ApprovalStatus = 1 and ok.Youwufapiao !=2 and ok.FukuanStatus = 2 ";
@@ -193,6 +195,8 @@
Condition += " and ok.SupplierName like '%" + SupplierName + "%' ";
if (!string.IsNullOrEmpty(shifoufukuan))
Condition += " and ok.FukuanStatus = '" + shifoufukuan + "'";
+ if (!string.IsNullOrEmpty(selFukuanyongtu))
+ Condition += " and ok.[Fukuanyongtu] = '" + selFukuanyongtu + "'";
Query query = new Query();
IList<Criterion> criterias = new List<Criterion>()
diff --git a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
index df7cbed..5e5e08c 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/OA_OutOfStorageBLL.cs
@@ -93,7 +93,7 @@
return outOfStorageDAL.getModelList(pa, FirmId, Operator, InfoType, SuppliersId, GoodsNameId, WarehouseId, beginTime, endTime, BrandName, SpeceicationName, PaperWeightName, GoodsTypeId);
}
- public bool InsertModelList(string[] Keys, int? WarehouseId)
+ public bool InsertModelList(string[] Keys, int? WarehouseId, string WarehouseName )
{
try
{
@@ -102,6 +102,7 @@
{
foreach (var Keyid in Keys)
{
+
OA_Procurement m_OA_Procurement = new OA_Procurement();
OA_Inventory m_OA_Inventory = new OA_Inventory();
OA_OutOfStorage m_OA_OutOfStorage = new OA_OutOfStorage();
@@ -113,40 +114,43 @@
m_OA_Procurement = _OA_ProcurementBLL.SelectSingleModel(Keyid);
m_OA_Procurement.PurchaseStatusId = 201;
m_OA_Procurement.Remark = m_OA_WarehouseInfo.WarehouseName;
+ if (!WarehouseName.Equals("涓婃満浣跨敤"))
+ {
+ //搴撳瓨琛ㄥ璞�
+ m_OA_Inventory.CargoSpaceId = 0;
+ m_OA_Inventory.FirmId = m_OA_Procurement.FirmId;
+ m_OA_Inventory.GoodsId = m_OA_Procurement.GoodsId;
+ m_OA_Inventory.InventoryCount = m_OA_Procurement.Quantity;
+ m_OA_Inventory.LastUpdateTime = DateTime.Now;
+ m_OA_Inventory.Operator = m_OA_Procurement.Operator;
+ m_OA_Inventory.Remark = "";
+ m_OA_Inventory.WarehouseId = WarehouseId;
+ m_OA_Inventory.BrandId = m_OA_Procurement.BrandId;
+ m_OA_Inventory.SpecificationId = m_OA_Procurement.SpecificationId;
+ m_OA_Inventory.PaperWeightId = m_OA_Procurement.PaperWeightId;
+ m_OA_Inventory.UnitPrice = m_OA_Procurement.Price ?? 0;
+ m_OA_Inventory.TotalPrice = m_OA_Procurement.AllMoney ?? 0;
- //搴撳瓨琛ㄥ璞�
- m_OA_Inventory.CargoSpaceId = 0;
- m_OA_Inventory.FirmId = m_OA_Procurement.FirmId;
- m_OA_Inventory.GoodsId = m_OA_Procurement.GoodsId;
- m_OA_Inventory.InventoryCount = m_OA_Procurement.Quantity;
- m_OA_Inventory.LastUpdateTime = DateTime.Now;
- m_OA_Inventory.Operator = m_OA_Procurement.Operator;
- m_OA_Inventory.Remark = "";
- m_OA_Inventory.WarehouseId = WarehouseId;
- m_OA_Inventory.BrandId = m_OA_Procurement.BrandId;
- m_OA_Inventory.SpecificationId = m_OA_Procurement.SpecificationId;
- m_OA_Inventory.PaperWeightId = m_OA_Procurement.PaperWeightId;
- m_OA_Inventory.UnitPrice = m_OA_Procurement.Price ?? 0;
- m_OA_Inventory.TotalPrice = m_OA_Procurement.AllMoney ?? 0;
-
- //鍑哄叆搴撲俊鎭〃瀵硅薄
- m_OA_OutOfStorage.FirmId = m_OA_Procurement.FirmId;
- m_OA_OutOfStorage.GoodsId = m_OA_Procurement.GoodsId;
- m_OA_OutOfStorage.CargoSpaceId = 0;
- m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
- m_OA_OutOfStorage.Operator = m_OA_Procurement.Operator;
- m_OA_OutOfStorage.Remark = "";
- m_OA_OutOfStorage.WarehouseId = WarehouseId;
- m_OA_OutOfStorage.SuppliersId = m_OA_Procurement.SuppliersId;
- m_OA_OutOfStorage.AllMoney = m_OA_Procurement.AllMoney;
- m_OA_OutOfStorage.InfoType = "鍏ュ簱";
- m_OA_OutOfStorage.Price = m_OA_Procurement.Price;
- m_OA_OutOfStorage.Quantity = m_OA_Procurement.Quantity;
- m_OA_OutOfStorage.BrandId = m_OA_Procurement.BrandId;
- m_OA_OutOfStorage.SpecificationId = m_OA_Procurement.SpecificationId;
- m_OA_OutOfStorage.PaperWeightId = m_OA_Procurement.PaperWeightId;
- m_OA_OutOfStorage.TanPrice = m_OA_Procurement.TanPrice ?? 0;
- isSuccess = InsertModel(m_OA_Inventory, m_OA_OutOfStorage);
+ //鍑哄叆搴撲俊鎭〃瀵硅薄
+ m_OA_OutOfStorage.FirmId = m_OA_Procurement.FirmId;
+ m_OA_OutOfStorage.GoodsId = m_OA_Procurement.GoodsId;
+ m_OA_OutOfStorage.CargoSpaceId = 0;
+ m_OA_OutOfStorage.LastUpdateTime = DateTime.Now;
+ m_OA_OutOfStorage.Operator = m_OA_Procurement.Operator;
+ m_OA_OutOfStorage.Remark = "";
+ m_OA_OutOfStorage.WarehouseId = WarehouseId;
+ m_OA_OutOfStorage.SuppliersId = m_OA_Procurement.SuppliersId;
+ m_OA_OutOfStorage.AllMoney = m_OA_Procurement.AllMoney;
+ m_OA_OutOfStorage.InfoType = "鍏ュ簱";
+ m_OA_OutOfStorage.Price = m_OA_Procurement.Price;
+ m_OA_OutOfStorage.Quantity = m_OA_Procurement.Quantity;
+ m_OA_OutOfStorage.BrandId = m_OA_Procurement.BrandId;
+ m_OA_OutOfStorage.SpecificationId = m_OA_Procurement.SpecificationId;
+ m_OA_OutOfStorage.PaperWeightId = m_OA_Procurement.PaperWeightId;
+ m_OA_OutOfStorage.TanPrice = m_OA_Procurement.TanPrice ?? 0;
+ isSuccess = InsertModel(m_OA_Inventory, m_OA_OutOfStorage);
+ }
+
if (isSuccess)
{
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index eb206e8..8cc520c 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -1028,7 +1028,9 @@
new SqlParameter("@businessManager",DBNull.Value){SqlDbType=SqlDbType.Int},
new SqlParameter("@payType",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
new SqlParameter("@returnvisit",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
- new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20}
+ new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
+ new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500}
+
};
/*
@@ -1095,9 +1097,9 @@
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[19].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[21].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
diff --git a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
index 3794d34..7e6d851 100644
--- a/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
+++ b/CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1883,6 +1883,7 @@
<Content Include="Pages\business\BackVisitNoteEdit.aspx" />
<Content Include="Pages\business\BargainPrice.aspx" />
<Content Include="Pages\business\BargainPriceByFirm.aspx" />
+ <Content Include="Pages\business\WaixieOrderPrint.aspx" />
<Content Include="Pages\business\Waixiefukuanweikaipiao.aspx" />
<Content Include="Pages\business\Waixiefukuanfukuan.aspx" />
<Content Include="Pages\business\InvoicingWeiquerenshouru.aspx" />
@@ -2042,6 +2043,7 @@
<Content Include="Pages\common\U_Login.ascx" />
<Content Include="Pages\financial\DepositsCustomershouruqueren.aspx" />
<Content Include="Pages\financial\DepositsCustomerFapiao.aspx" />
+ <Content Include="Pages\financial\NewWaixieExpenses.aspx" />
<Content Include="Pages\financial\OutsourcePiliangPayMoney.aspx" />
<Content Include="Pages\financial\WaixieExpenses.aspx" />
<Content Include="Pages\financial\FirmAccountPrint.aspx" />
@@ -3302,6 +3304,13 @@
<Compile Include="Pages\business\BargainPriceByFirm.aspx.designer.cs">
<DependentUpon>BargainPriceByFirm.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\business\WaixieOrderPrint.aspx.cs">
+ <DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\business\WaixieOrderPrint.aspx.designer.cs">
+ <DependentUpon>WaixieOrderPrint.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\business\Waixiefukuanweikaipiao.aspx.cs">
<DependentUpon>Waixiefukuanweikaipiao.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -4415,6 +4424,13 @@
<Compile Include="Pages\financial\DepositsCustomerFapiao.aspx.designer.cs">
<DependentUpon>DepositsCustomerFapiao.aspx</DependentUpon>
</Compile>
+ <Compile Include="Pages\financial\NewWaixieExpenses.aspx.cs">
+ <DependentUpon>NewWaixieExpenses.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="Pages\financial\NewWaixieExpenses.aspx.designer.cs">
+ <DependentUpon>NewWaixieExpenses.aspx</DependentUpon>
+ </Compile>
<Compile Include="Pages\financial\OutsourcePiliangPayMoney.aspx.cs">
<DependentUpon>OutsourcePiliangPayMoney.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
index 765002d..3b62621 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -29,6 +29,69 @@
$(vv).remove();
});
});
+
+
+
+ /*
+纭鎵归噺寮�绁ㄧ敵璇�
+*/
+ function ToWaixieFukuan() {
+
+ var ids = '';
+ var ordernos = '';
+ var cks = $("input[name='ckId']:checked");
+ if (cks.length == 0) {
+ alertMsg('娌℃湁閫変腑浠讳綍椤癸紒');
+ return;
+ }
+ else {
+ }
+ var SellerId = '';
+ var i = 0;
+
+
+ cks.each(
+ function () {
+
+ var ckVal = $(this).val();
+
+ var ckValJson = eval('(' + ckVal + ')');
+ if (i == 0) {
+ SellerId = ckValJson.SellerId;
+ i += 1;
+ } else {
+ if (SellerId != ckValJson.SellerId) {
+ SellerId = ''
+
+ }
+ }
+ ids = ids + ',' + ckValJson.id;
+ ordernos = ordernos + ',' + ckValJson.orderId;
+
+
+ }
+ );
+
+
+ if (SellerId == '') {
+
+ alertMsg('蹇呴』閫夋嫨鍚屼竴涓鍗忓巶鍟嗭紒');
+ return;
+ }
+
+
+
+ kaipiaoConfirm(ids, ordernos);
+ //var msg = ('纭寮�绁ㄧ敵璇峰悧?');
+ //top.Dialog.confirm(msg, function () {
+ // DoAcceptAll3(ids);
+ //});
+
+ }
+ function kaipiaoConfirm(orderId, orderno) {
+ var url = "/Pages/business/Waixiefukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
+ top.Dialog.open({ URL: url, Title: "澶栧崗浠樻鐢宠", Height: 600, Width: 580 });
+ }
</script>
</head>
<body>
@@ -94,6 +157,10 @@
<div class="left">
<div class="right">
<div class="padding_top5 padding_left10">
+
+ <a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>
+ <div class="box_tool_line">
+ </div>
<a style="color: #666; cursor: inherit;">(濡傛灉澶栧崗缁欑嚎涓婂巶鍟嗙殑璁㈠崟琚彈鐞嗭紝閭ｄ箞姝ゅ鍗忚鍗曚笉鍙啀淇敼锛屼篃涓嶅彲鍒犻櫎銆�)</a>
</div>
</div>
@@ -154,7 +221,12 @@
<ItemTemplate>
<tr>
<td>
- <input type="checkbox" name='ckId' value='<%#Eval("Keyid")%>' id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
+ <input type="checkbox" name='ckId' value_keyid="<%#Eval("Keyid")%>" value="{
+ id:<%#Eval("Keyid")%>,
+ buyerId:'<%#Eval("BuyerId")%>',
+ SellerId:'<%#Eval("SellerId")%>',
+ orderId:'<%#Eval("SellerOrderId")%>'
+ }" id='ckBox<%#Container.ItemIndex%>' class='ckBox' />
</td>
<td>
<%#Container.ItemIndex + (UCPager1.PageSize *( UCPager1.PageIndex-1)+1)%>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
index 1e077e3..c9d5ecf 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.business {
-
-
- public partial class AgOutsourcSingleAllList {
-
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class AgOutsourcSingleAllList
+ {
+
/// <summary>
/// Head1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
-
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtStartCreatTime 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartCreatTime;
-
+
/// <summary>
/// txtEndCreatTime 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndCreatTime;
-
+
/// <summary>
/// txtCreater 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreater;
-
+
/// <summary>
/// selOutFirm 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selOutFirm;
-
+
/// <summary>
/// selWorkStates 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selWorkStates;
-
+
/// <summary>
/// txtStartReturnTime 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtStartReturnTime;
-
+
/// <summary>
/// txtEndReturnTime 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndReturnTime;
-
+
/// <summary>
/// txtOutOrderId 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtOutOrderId;
-
+
/// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Search;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
index e8ee857..9479e8d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingConfirmEdit.aspx
@@ -56,7 +56,7 @@
</td>
</tr>
<tr >
- <td class="contentLeft" colspan='2' >鍙戠エ鍙风爜锛�<input id='txtFapiaohao' runat="server" maxlength='50' /></td>
+ <td class="contentLeft" colspan='2' >鍙戠エ鍙风爜锛�<input id='txtFapiaohao' runat="server" maxlength='50' style="width:80%;" /></td>
</tr>
<tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
index 749db9b..fe66071 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/InvoicingWeiquerenshouru.aspx
@@ -285,9 +285,9 @@
- <td>
+ <td >
- <a href='javascript:void(0)' title='浠樻鐧昏' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 鍒犻櫎 </a>
+ <a href='javascript:void(0)' menu_member_case_id="case_delete" menu_member_case_name="鍒犻櫎" title='鍒犻櫎' class='a_under' onclick='ViewFukuan("<%#Eval("Keyid")%>")'> 鍒犻櫎 </a>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
index 8d0f91a..10f5d13 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -347,9 +347,9 @@
<div class="box_tool_line">
</div>
<a href="javascript:;" menu_member_case_id="case_ToPrintAwbOrder" menu_member_case_name="鎵撳嵃閫佽揣鍗�" onclick="ToPrintAwbOrder()"><span class="icon_edit">鎵撳嵃閫佽揣鍗�</span></a>
- <div class="box_tool_line">
+ <%-- <div class="box_tool_line">
</div>
- <a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>
+ <a href="javascript:;" onclick="ToWaixieFukuan()"><span class="icon_edit">澶栧崗浠樻鐢宠</span></a>--%>
<div class="clear">
</div>
</div>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
index 47593b9..f440667 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx
@@ -195,6 +195,12 @@
<td style="width: 215px">
<input id="txtBeginData" type="text" runat="server" class='date w80px' maxlength='10' />-<input id="txtEndDate" type="text" runat="server" class='date w80px' maxlength='10' />
</td>
+ <td class="ali03">
+ 瀹㈡埛鍚嶇О锛�
+ </td>
+ <td>
+ <input id='txtCustormerName' runat="server" maxlength='50' />
+ </td>
<td class="ali03">
璁㈠崟缂栧彿锛�
</td>
@@ -221,12 +227,7 @@
<td>
<input id='txtCreaterName' runat="server" maxlength='50' />
</td>
- <td class="ali03">
- 瀹㈡埛鍚嶇О锛�
- </td>
- <td>
- <input id='txtCustormerName' runat="server" maxlength='50' />
- </td>
+
</tr>
<tr style="padding-left: 50px">
<%--<td class="ali03">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
index 6f5ea9d..169e00e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderListBatchKaipiao.aspx.designer.cs
@@ -60,6 +60,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtEndDate;
/// <summary>
+ /// txtCustormerName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
+
+ /// <summary>
/// txtOrderId 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -76,15 +85,6 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreaterName;
-
- /// <summary>
- /// txtCustormerName 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlInputText txtCustormerName;
/// <summary>
/// selCustormerManager 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx
new file mode 100644
index 0000000..f28c646
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx
@@ -0,0 +1,172 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="WaixieOrderPrint.aspx.cs" Inherits="CY.WebForm.Pages.business.WaixieOrderPrint" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>寮�绁ㄨ鍗曟墦鍗�</title>
+ <script src="../../js/utils/jquery-1.5.1.min.js" type="text/javascript"></script>
+ <script src="../../js/common/util.js" type="text/javascript"></script>
+ <script src="../../js/common/KeyBehaviorHook.js" type="text/javascript"></script>
+ <script src="../../js/common/Printter.js?v=14" type="text/javascript"></script>
+ <script src="../../js/common/LodopFuncs.js" type="text/javascript"></script>
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <!--鍓嶅彴椤甸潰start-->
+ <style type="text/css">
+ .dbody { margin: 0; margin-left: auto; margin-right: auto; }
+ .dtitle { text-align: center; font-size: 19px; font-weight: bold; margin-top: 10px; margin-bottom: 10px; }
+ .dbody table { width: 100%; border: 1px solid #dddddd; font-size: 12px; margin-top: 5px; border-top: 1px #999999 solid;}
+ .dbody table th, .dbody table td { font-weight: normal; height: 20px; line-height: 20px; vertical-align: middle; border: 1px solid #999999; border-top: 0; }
+ .dbody table th { background-color: #E0EDF6; font-weight: bold; }
+ .dbody table td { border-left: 0; padding-left:2px; }
+ .left {text-align: right; }
+ #div_tool { text-align: center; }
+ </style>
+ <script type="text/javascript">
+ window.printBeginCallBack = function () {
+ document.getElementById('fram_operate').style.display = 'none';
+ };
+ window.printOverCallBack = function () {
+ document.getElementById('fram_operate').style.display = '';
+ };
+
+
+ </script>
+</head>
+<body style='padding: 0; margin: 0;' onbeforeprint="OnPrint()" onafterprint="OnPrintOver()">
+ <form id="form1" runat="server">
+ <input type="hidden" runat="server" id="hideOrderId" />
+ <div class='dbody'>
+ <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width="0" height="0">
+ <embed id="LODOP_EM" type="application/x-print-lodop" width="0" height="0" pluginspage="/Pages/common/install_lodop32.exe"></embed>
+ </object>
+ <div id='div_tool' >
+ </div>
+
+
+
+
+
+ <table border="1" cellpadding="0" cellspacing="0" style="border: 0;margin-bottom:10px;margin-top:10px;">
+ <thead>
+ <tr>
+
+ <th width='25px'>
+ 缂栧彿
+ </th>
+ <th class='w80px'>
+ 澶栧崗鏃堕棿
+ </th>
+ <th class='w80px'>
+ 澶栧崗璁㈠崟鍙�
+ </th>
+ <th>
+ 鍘熻鍗曞彿
+ </th>
+ <th>
+ 澶栧崗鍘傚晢
+ </th>
+ <th class='w50px'>
+ 鍗板埛绫诲埆
+ </th>
+ <th class='w50px'>
+ 璁㈠崟鐘舵��
+ </th>
+ <th class='w50px'>
+ 鏀粯鐘舵��
+ </th>
+ <th class='w50px'>
+ 璁㈠崟绫诲瀷
+ </th>
+ <th class='w80px'>
+ 鍗板埛鏁伴噺
+ </th>
+ <th class='w80px'>
+ 閲戦
+ </th>
+ <th class='w80px'>
+ 宸蹭粯娆�
+ </th>
+ <th class='w80px'>
+ 鏈粯娆�
+ </th>
+
+ </tr>
+ </thead>
+ <tbody>
+ <asp:Repeater runat="server" ID='rptOrder'>
+ <ItemTemplate>
+ <tr>
+
+
+ <td>
+ <%#Container.ItemIndex +1%>
+ </td>
+ <td>
+ <%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
+ </td>
+ <td>
+ <%-- <a href='javascript:void(0)' class='a_under' onclick='ShowOrder(<%#Eval("Keyid") %>)'></a>--%>
+ <%#Eval("SellerOrderId")%>
+ </td>
+ <td>
+ <%-- <a href='javascript:void(0)' class='a_under' onclick='ShowOrder(<%#Eval("OldOrderId") %>)'></a>--%>
+ <%#Eval("OldOrderSellerId")%>
+ </td>
+ <td>
+ <%#Eval("SellerName")%>
+ </td>
+ <td>
+ <%#Eval("PrintType.PrintName")%>
+ </td>
+ <td>
+ <%#Eval("OrderStateObj.Name")%>
+ </td>
+ <td>
+ <%#Eval("PayStateObj.Name")%>
+ </td>
+ <td>
+ <%#Eval("OrderType.Name")%>
+ </td>
+ <td>
+ <%#Eval("OrderExtend.PrintNum")%>
+ </td>
+ <td class="OrderAllMoney">
+ <%#Eval("SumPrice", "{0:F}")%>
+ </td>
+ <td class="OrderAlreadyMoney">
+ <%#Eval("TradingSingle.PayedMoney", "{0:F}")%>
+ </td>
+ <td class='OrderNoMoney <%#Eval("UnPayedMoney","{0:F}")=="0.00"?"":"red"%>'>
+ <%#Eval("UnPayedMoney","{0:F}")%>
+ </td>
+
+
+ </tr>
+ </itemtemplate>
+ </asp:repeater>
+ <tr>
+ <td colspan="10">
+ 鍚堣
+</td>
+ <td >
+ <span id="Spanjineheji" runat="server" ></span>
+</td>
+ <td >
+ <span id="Spanyishou" runat="server" ></span>
+</td>
+ <td >
+ <span id="Spanweishou" runat="server" ></span>
+</td>
+ </tr>
+ </tbody>
+ </table>
+
+
+
+
+
+
+ </div>
+ </form>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.cs
new file mode 100644
index 0000000..27fdceb
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.cs
@@ -0,0 +1,176 @@
+锘�/**
+* OrderDeatil.aspx.cs
+*
+* 鍔� 鑳斤細 璁㈠崟璇︽儏
+* 绫� 鍚嶏細 OrderDeatil
+*
+* Ver 鍙樻洿鏃ユ湡 璐熻矗浜� 鍙樻洿鍐呭
+* 鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�鈹�
+* V0.01 2013-4-24 13:25 鍚村磶鍧� 鍒濈増
+* V0.02 2013-5-15 18:23 鍚村磶鍧� 缂栬緫鐣岄潰鏍峰紡
+* V0.03 2013-5-15 15:58 鍚村磶鍧� 瀹屾垚鏁版嵁鑾峰彇
+* V0.04 2013-5-21 14:38 鍚村磶鍧� 澧炲姞璁㈠崟杩涘害
+* V0.05 2013-5-23 9:33 鍚村磶鍧� 淇敼缁ф壙绫讳负榛樿绫籔age浣挎樉绀轰俊鎭笉鍙楃櫥褰曟帶鍒�
+*
+*
+*
+*
+*
+*
+*/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL;
+using CY.Model.Inquiry;
+using CY.BLL.Sys;
+using CY.Infrastructure.Query;
+
+namespace CY.WebForm.Pages.business
+{
+ public partial class WaixieOrderPrint : BasePage
+ {
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ OA_KaipiaoshenqingBLL oA_KaipiaoshenqingBLL = new OA_KaipiaoshenqingBLL();
+ public static string SellerOrderId = "";
+ public static string PrintType = "";
+ /// <summary>
+ /// 椤甸潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ try
+ {
+ switch (Request["Target"])
+ {
+ case "GetCommunication":
+ break;
+ case "print":
+ break;
+ default:
+ Page_Load_Default();
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ }
+
+ /// <summary>
+ /// 榛樿鍔犺浇浜嬩欢鏂规硶
+ /// </summary>
+ private void Page_Load_Default()
+ {
+ LoadOrderInfo();
+ }
+
+ /// <summary>
+ /// 鍔犺浇璁㈠崟淇℃伅
+ /// </summary>
+ private bool LoadOrderInfo()
+ {
+ string KaipiaoshenqingId = Request["Keyid"] == null ? "" : Request["Keyid"];
+
+
+
+ string orderids = Request["SellerOrderId"] == null ? "" : Request["SellerOrderId"];
+
+
+
+
+ Dictionary<int, object> searchParam = new Dictionary<int, object>();
+
+ SetParamValue(searchParam, 0, CurrentUser.MemberId);
+
+ SetParamValue(searchParam, 17, orderids);
+
+ SearchParam = searchParam;
+ Infrastructure.Query.Pagination pagination = new Infrastructure.Query.Pagination()
+ {
+ PageSize = 1000,// UCPager1.AspNetPager.PageSize,
+ PageIndex = 1// UCPager1.AspNetPager.CurrentPageIndex
+ };
+
+ //this.RepClientList.DataSource =
+ IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPage_Outsource(pagination, SearchParam);
+ rptOrder.DataSource = result;
+ rptOrder.DataBind();
+
+ this.Spanjineheji.InnerText = string.Format("{0:F2}", result.Sum(x => x.SumPrice));
+ this.Spanyishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.TradingSingle.PayedMoney));
+ this.Spanweishou.InnerText = string.Format("{0:F2}", result.Sum(x => x.UnPayedMoney));
+
+
+
+ return true;
+ }
+
+ /// <summary>
+ /// 璁剧疆鏌ヨ鍙傛暟鏂规硶
+ /// </summary>
+ /// <param name="target">璁剧疆鐩爣</param>
+ /// <param name="key">閿�</param>
+ /// <param name="value">鍊�</param>
+ private static void SetParamValue(Dictionary<int, object> target, int key, object value)
+ {
+ if (string.IsNullOrEmpty(string.Format("{0}", value)))
+ return;
+ else
+ {
+ }
+
+ if (target.ContainsKey(key))
+ {
+ target[key] = value;
+ }
+ else
+ {
+ target.Add(key, value);
+ }
+ }
+
+ /// <summary>
+ /// 鏌ヨ鍙傛暟
+ /// </summary>
+ private Dictionary<int, object> SearchParam
+ {
+ get
+ {
+ return ViewState["SearchParam"] as Dictionary<int, object>;
+ }
+ set
+ {
+ ViewState["SearchParam"] = value;
+ }
+ }
+
+
+ /// <summary>
+ /// 鏄惁宸茬粡鎿嶄綔
+ /// </summary>
+ /// <param name="keyid"></param>
+ /// <param name="orderState"></param>
+ /// <param name="opType"></param>
+ /// <returns></returns>
+ public bool IsOpearted(object keyidObj, object orderStateObj, object opTypeObj)
+ {
+ int keyid = (int)keyidObj;
+ int orderState = (int)orderStateObj;
+ string opType = (string)opTypeObj;
+ return _eC_OrderBasicBLL.IsOpearted(keyid, orderState, opType);
+ }
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.designer.cs
new file mode 100644
index 0000000..6430165
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/WaixieOrderPrint.aspx.designer.cs
@@ -0,0 +1,80 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.business
+{
+
+
+ public partial class WaixieOrderPrint
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// hideOrderId 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden hideOrderId;
+
+ /// <summary>
+ /// rptOrder 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.Repeater rptOrder;
+
+ /// <summary>
+ /// Spanjineheji 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanjineheji;
+
+ /// <summary>
+ /// Spanyishou 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanyishou;
+
+ /// <summary>
+ /// Spanweishou 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl Spanweishou;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
index da51a97..67ef283 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx
@@ -89,9 +89,13 @@
top.Dialog.open({ URL: "/Pages/business/InvoicingCuishou.aspx?id=" + personId, Title: "鍌", Width: 600, Height: 800 });
}
//澶栧崗浠樻
- function ViewShoukuan(personId) {
-
- top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
+ function ViewShoukuan(personId, yongtu, supplierId) {
+ if (yongtu == "澶栧崗鍔犲伐璐�" && supplierId.length > 10) {
+ top.Dialog.open({ URL: "/Pages/financial/NewWaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
+ } else {
+ top.Dialog.open({ URL: "/Pages/financial/WaixieExpenses.aspx?id=" + personId, Title: "澶栧崗浠樻", Width: 600, Height: 800 });
+ }
+
}
@@ -113,13 +117,21 @@
//鏌ョ湅瀹㈡埛璧勬枡
- function Viewkaipiao(Keyid, SellerOrderId) {
- //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
- top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ function Viewkaipiao(Keyid, SellerOrderId, yongtu, supplierId) {
+
+ if (yongtu == "澶栧崗鍔犲伐璐�") {
+ if (supplierId.length > 10) {
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ } else {
+ top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ }
+
+ }
+
}
//鏌ョ湅
function onView(keyid, yongtu) {
- if (yongtu !="鍏朵粬浠樻") {
+ if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�") {
top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
}
@@ -177,6 +189,16 @@
</td>
<td>
<input id='txtCreatorName' runat="server" maxlength='50' />
+ </td>
+ <td class="ali03">
+ 浠樻鐢ㄩ�旓細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selFukuanyongtu' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="澶栧崗鍔犲伐璐�">澶栧崗鍔犲伐璐�</option>
+ <option value="鍏朵粬浠樻">鍏朵粬浠樻</option>
+ </select>
</td>
<td class="ali03">
鏄惁浠樻锛�
@@ -331,7 +353,7 @@
<td>
- <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\",\""+Eval("SupplierId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %> <%--<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao("<%#Eval("Keyid")%>","<%#Eval("DindanId")%>")'> 鏌ョ湅璁㈠崟 </a>--%>
</td>
@@ -342,7 +364,7 @@
<td>
- <a href='javascript:void(0)' title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>")'> 浠樻 </a>
+ <a href='javascript:void(0)' title='浠樻' class='a_under' onclick='ViewShoukuan("<%#Eval("Keyid")%>","<%#Eval("Fukuanyongtu")%>","<%#Eval("SupplierId")%>")'> 浠樻 </a>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
index f95e59f..23a4ea2 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.cs
@@ -557,7 +557,7 @@
PageSize = UCPager1.AspNetPager.PageSize,
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
- IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value);
+ IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPage(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,this.selPayStates.Value, this.selFukuanyongtu.Value);
rptData.DataSource = result;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs
index 86d7ac3..0416509 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanfukuan.aspx.designer.cs
@@ -78,6 +78,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatorName;
/// <summary>
+ /// selFukuanyongtu 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selFukuanyongtu;
+
+ /// <summary>
/// selPayStates 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
index 5615a60..8b6c694 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx
@@ -12,12 +12,15 @@
<tr>
<td class="ali03">鏀舵鍗曚綅锛�</td>
- <td> <select keepdefaultstyle='true' id='selSuppliers' runat="server" datatextfield='Name' datavaluefield='Keyid' onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
- </select></td>
+ <td> <%--<select keepdefaultstyle='true' id='selSuppliers' runat="server" datatextfield='Name' datavaluefield='Keyid' onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
+ </select>--%>
+ <input id='txtSupplierName' runat="server" maxlength='50' placeholder="璇疯緭鍏ユ敹娆惧崟浣�" style="width:200px;" readonly="readonly" />
+ <input type="hidden" id='selSuppliersss' runat="server" />
+ </td>
</tr>
<tr>
<td class="ali03">閲戦锛�</td>
- <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ラ噾棰�" /></td>
+ <td> <input id='txtZengjianmoney' runat="server" maxlength='18' onblur="validateAmount(event)" placeholder="璇疯緭鍏ラ噾棰�" readonly="readonly" /></td>
</tr>
<tr>
<td class="ali03">鎴峰悕锛�</td>
@@ -35,7 +38,7 @@
<td class="ali03">璁㈠崟锛�</td>
<td> <span id="ordernos" runat="server" ></span></td>
</tr>
- <tr>
+ <tr style="display:none;">
<td class="ali03">璁㈠崟閲戦锛�</td>
<td> <span id="ordernjine" runat="server" ></span></td>
</tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
index 2ddde12..4d6fe82 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.cs
@@ -78,10 +78,10 @@
if (!string.IsNullOrEmpty(orderIdStr))
{
this.ordernos.InnerText = orderNoStr.Trim(',');
- //渚涘簲鍟�
- this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
- this.selSuppliers.DataBind();
- this.selSuppliers.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+ ////渚涘簲鍟�
+ //this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
+ //this.selSuppliers.DataBind();
+ //this.selSuppliers.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
decimal total = 0;
@@ -89,9 +89,24 @@
string[] idsArray = orderIdStr.Split(',');
if (idsArray != null && idsArray.Length > 0)
{
-
-
+
+
var models = _eC_OrderBLL.GetOrderByIds(orderIdStr).ToList();
+ if (models.Count > 0)
+ {
+ var corporateClients = _oA_CorporateClientsBLL.GetModel(models[0].SellerId);
+ this.txtSupplierName.Value = corporateClients.OutVendorName;
+ this.selSuppliersss.Value = corporateClients.Keyid.ToString();
+
+ var sss = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId).Select("Name = '"+ corporateClients.OutVendorName + "'");
+ if (sss.Length > 0)
+ {
+ this.txtHuming.Value = sss[0]["Huming"].ToString();
+ this.txtBank.Value = sss[0]["Bank"].ToString();
+ this.txtAccountID.Value = sss[0]["AccountID"].ToString();
+ }
+ }
+
total = models.Sum(x => x.SumPrice) ?? 0;
@@ -99,6 +114,7 @@
ordernjine.InnerText = total.ToString("0.00");
+ this.txtZengjianmoney.Value = total.ToString("0.00");
//khname.InnerText = name;
//Dingdanshu.InnerText = orderIdStr.Split(',').Length +"涓�";
}
@@ -141,11 +157,11 @@
public void AcceptAll3()
{
- if (string.IsNullOrEmpty(this.selSuppliers.Value))
- {
- JavaScript.MessageBox("璇烽�夋嫨鏀舵鍗曚綅锛�", this);
- return;
- }
+ //if (string.IsNullOrEmpty(this.selSuppliers.Value))
+ //{
+ // JavaScript.MessageBox("璇烽�夋嫨鏀舵鍗曚綅锛�", this);
+ // return;
+ //}
if (this.txtZengjianmoney.Value.ToDecimal2()<=0)
{
@@ -178,7 +194,7 @@
oA_Fukuanshenqing.FirmId = CurrentUser.MemberId;
- oA_Fukuanshenqing.SupplierId = this.selSuppliers.Value;
+ oA_Fukuanshenqing.SupplierId = this.selSuppliersss.Value;
oA_Fukuanshenqing.Fukuanshenqingstatus = 0;
oA_Fukuanshenqing.ApprovalStatus = 0;
oA_Fukuanshenqing.Fukuanmoney = this.txtZengjianmoney.Value.ToDecimal2();
@@ -200,12 +216,14 @@
oA_Fukuanshenqing.CreateTime = DateTime.Now;
oA_Fukuanshenqing.Updater = CurrentUser.ShortName;
oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
- var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
- var _SupplierName = "";
- if (oA_Suppliers != null)
- {
- _SupplierName = oA_Suppliers.Name;
- }
+ //var oA_Suppliers = _OA_SuppliersBLL.getSingleSupplier(this.selSuppliers.Value);
+ //var _SupplierName = "";
+ //if (oA_Suppliers != null)
+ //{
+ // _SupplierName = oA_Suppliers.Name;
+ //}
+
+ var _SupplierName = this.txtSupplierName.Value;
oA_Fukuanshenqing.SupplierName = _SupplierName;
var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
index 39ac8e0..2c36242 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanshenqing.aspx.designer.cs
@@ -24,13 +24,22 @@
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
/// <summary>
- /// selSuppliers 鎺т欢銆�
+ /// txtSupplierName 鎺т欢銆�
/// </summary>
/// <remarks>
/// 鑷姩鐢熸垚鐨勫瓧娈点��
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtSupplierName;
+
+ /// <summary>
+ /// selSuppliersss 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden selSuppliersss;
/// <summary>
/// txtZengjianmoney 鎺т欢銆�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
index b068c46..d3e916a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx
@@ -115,13 +115,16 @@
//鏌ョ湅瀹㈡埛璧勬枡
- function Viewkaipiao(Keyid, SellerOrderId) {
- // window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
- top.Dialog.open({ URL: "/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ function Viewkaipiao(Keyid, SellerOrderId, yongtu) {
+ //window.open("/Pages/business/InvoicingOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, '', '');
+ if (yongtu == "澶栧崗鍔犲伐璐�") {
+ top.Dialog.open({ URL: "/Pages/business/WaixieOrderPrint.aspx?Keyid=&SellerOrderId=" + SellerOrderId, Title: "鏌ョ湅璁㈠崟", Width: 1080, Height: 650 });
+ }
+
}
//鏌ョ湅
function onView(keyid, yongtu) {
- if (yongtu != "鍏朵粬浠樻") {
+ if (yongtu != "鍏朵粬浠樻" && yongtu != "澶栧崗鍔犲伐璐�") {
top.Dialog.open({ URL: "/Pages/procurement/SuppliersDetail.aspx?Keyid=" + keyid, Title: "鏌ョ湅渚涘簲鍟�", Width: 950, Height: 650 });
}
@@ -181,7 +184,16 @@
<input id='txtCreatorName' runat="server" maxlength='50' />
</td>
-
+ <td class="ali03">
+ 浠樻鐢ㄩ�旓細
+ </td>
+ <td>
+ <select keepdefaultstyle='true' id='selFukuanyongtu' runat="server" >
+ <option value="">鍏ㄩ儴</option>
+ <option value="澶栧崗鍔犲伐璐�">澶栧崗鍔犲伐璐�</option>
+ <option value="鍏朵粬浠樻">鍏朵粬浠樻</option>
+ </select>
+ </td>
@@ -318,7 +330,7 @@
<td>
- <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\")'> 鏌ョ湅璁㈠崟 </a>" %>
+ <%#Eval("Fukuanyongtu").ToString().Equals("鍏朵粬浠樻")?"":"<a href='javascript:void(0)' title='鏌ョ湅璁㈠崟' class='a_under' onclick='Viewkaipiao(\""+Eval("Keyid") +"\",\""+Eval("DindanId")+"\",\""+Eval("Fukuanyongtu")+"\")'> 鏌ョ湅璁㈠崟 </a>" %>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
index f1d18ff..d1868a9 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.cs
@@ -557,7 +557,7 @@
PageSize = UCPager1.AspNetPager.PageSize,
PageIndex = UCPager1.AspNetPager.CurrentPageIndex
};
- IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPageweikaipiao(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,"");
+ IEnumerable<OA_Fukuanshenqing> result = oA_FukuanshenqingBLL.SelectModelPageweikaipiao(pagination, CurrentUser.MemberId, this.txtSQBeginDate.Value, this.txtSQEndDate.Value, this.txtCreatorName.Value, this.txtCustormerName.Value,"", this.selFukuanyongtu.Value);
rptData.DataSource = result;
rptData.DataBind();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs
index 2b48420..206d4c0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/Waixiefukuanweikaipiao.aspx.designer.cs
@@ -78,6 +78,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCreatorName;
/// <summary>
+ /// selFukuanyongtu 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selFukuanyongtu;
+
+ /// <summary>
/// btn_Search 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
new file mode 100644
index 0000000..75fbcd8
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx
@@ -0,0 +1,203 @@
+锘�<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewWaixieExpenses.aspx.cs" Inherits="CY.WebForm.Pages.financial.NewWaixieExpenses" %>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head id="Head1" runat="server">
+ <title>澶栧崗浠樻</title>
+ <uc:CMSHead ID="CMSHead1" runat="server" />
+ <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
+ <style type="text/css">
+ .table2 td{ text-align:left; padding:3px 2px;}
+ </style>
+ <script type="text/javascript">
+
+ var accountsTypes = false;
+ var accounts = false;
+
+ $(function () {
+ if ('1' == document.getElementById('txtResult').value) {
+ CloseOpenWindow(true);
+ return;
+ } else;
+ document.getElementById('txtReceiveDate').value = new Date().ToString("yyyy-MM-dd HH:mm");
+ //document.getElementById('txtReceiveMoney').value = document.getElementById('txtReciveMoney').value;
+ /* document.getElementById('txtReceiveMoney').focus();*/
+ accountsTypes = '<%=Request.RequestContext.RouteData.DataTokens["accountsTypes"] %>';
+ accounts = '<%=Request.RequestContext.RouteData.DataTokens["accounts"] %>';
+
+ try {
+ accountsTypes = eval(accountsTypes);
+ accounts = eval(accounts)[0];
+ } catch (e) {
+ accountsTypes = 'object' == typeof (accountsTypes) ? accountsTypes : [];
+ accounts = [];
+ }
+
+ });
+
+ /*
+ 楠岃瘉杈撳叆浠锋牸
+ */
+ function ValidateInputPrice(txt) {
+ if (!ValidateDecimal(txt)) return; else;
+ try {
+ var inputPrice = parseFloat(txt.value);
+ var unPayed = parseFloat(document.getElementById('txtReciveMoney').value);
+ txt.value = isNaN(inputPrice) || isNaN(unPayed) ? 0 : txt.value;
+ if (inputPrice > unPayed) { alertMsg(' 鏈鏀舵閲戦澶т簬璁㈠崟鏈粯娆�!<br/>涓轰簡鎮ㄧ殑璐﹀姟姝ｇ‘鎬ц閲嶆柊澶嶆煡锛�'); }
+ } catch (e) {
+
+ }
+ }
+ </script>
+</head>
+<body style='margin: 0; padding: 0;'>
+ <form id="form1" runat="server" onsubmit="if(false)return false;">
+ <input type="hidden" id='txtResult' value='<%=Request.RequestContext.RouteData.DataTokens["IsWin"] %>'>
+ <table class="tableStyle" style="margin: 5px 0;">
+ <tr>
+ <td class="ali03 ">
+ 澶栧崗鍗曟暟锛�
+ </td>
+ <td>
+ <span class="moneystyle" id="spanCountRe" runat="server"></span>
+ <input type="hidden" id="Keyid" runat="server" />
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鎬婚噾棰濓細
+ </td>
+ <td>
+ <span class="moneystyle" id="spanAllMoney" runat="server">锟�</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏈粯閲戦锛�
+ </td>
+ <td>
+ <span class="moneystyle" id="spanReceiveMoney" runat="server">锟�</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏀跺彇閲戦锛�
+ </td>
+ <td >
+ <asp:TextBox TextMode="SingleLine" id="txtReciveMoney" runat="server" class="req float" min="0" ReadOnly="true" ></asp:TextBox>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 鏈夋棤鍙戠エ锛�
+ </td>
+ <td>
+ <input runat="server" id="txtYouwufapiao" type="text" style="width: 259px" readonly="readonly" />
+ </td>
+ </tr>
+
+
+ <tr>
+ <%-- <td style=" text-align:right;">
+ 浠樻鏂瑰紡锛�
+ </td>
+ <td colspan="5">
+ <input type="radio" name='rdoReceiveWay' id='rdoReceiveWay0' value='0' checked="checked" /><label for='rdoReceiveWay0'>棰勪粯娆�</label>
+ (鍓╀綑棰勪粯娆撅細<span id="nowCustomMoney" runat="server" class="moneystyle"></span>)
+ </td>--%>
+ <td class="ali03 ">
+ 璐︽埛绫诲瀷锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selAcoountType" runat="server" datatextfield="Name" datavaluefield="Name" onchange="ChangeThisType(this);" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛绫诲瀷">
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 璐︽埛鍚嶇О锛�
+ </td>
+ <td>
+ <select class="Sreq" id="selAccountName" runat="server" datatextfield="AccountName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨璐︽埛鍚嶇О">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td class="ali03 ">
+ 绉戠洰鍚嶇О锛�
+ </td>
+ <td>
+ <select id="selSubject" runat="server" datatextfield="SubjectName" datavaluefield="Keyid" keepdefaultstyle="true" msg="璇烽�夋嫨绉戠洰鍚嶇О">
+ </select>
+ </td>
+ </tr>
+ <tr>
+
+ <td class="ali03 ">
+ 鏈夋棤鍙戠エ锛�
+ </td>
+ <td>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2' /><label for='rdoReceiveQuannbu0'>鏈�</label>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1' checked="checked" /><label for='rdoReceiveQuannbu1'>鏃�</label>
+ </td>
+ </tr>
+ <tr>
+ <td style=" text-align:right; vertical-align: top;">
+ 浠樻鏃ユ湡锛�
+ </td>
+ <td align="left">
+ <input class='date' id="txtReceiveDate" runat="server" maxlength='20' datefmt="yyyy-MM-dd HH:mm" />
+ </td>
+ </tr>
+ <tr>
+ <td style=" text-align:right;">
+ 浠樻澶囨敞锛�
+ </td>
+ <td align="left">
+ <textarea id='txtRemark' runat="server" onblur='Restrict(this,200)' class='remark' style='height: 30px; width: 440px;'></textarea>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ </td>
+ <td align="left">
+ <input type="button" value="纭浠樻" runat="server" id='btnSubmit' />
+ </td>
+ </tr>
+ </table>
+ </form>
+ <script language="javascript" type="text/javascript">
+ function ChangeThisType(obj) {
+ $("#selAccountName").html("<option value=''>璇烽�夋嫨</option>");
+ $.ajax({
+ url: "/Pages/financial/NewWaixieExpenses.aspx",
+ type: "POST",
+ dataType: "html",
+ data: { TypeName: $(obj).val(), DataType: "change" },
+ global: false,
+ cache: false,
+ success: function (data) {
+ var myobj = eval('(' + data + ')');
+ if (myobj != null && myobj.length > 0) {
+ for (var i = 0; i < myobj.length; i++) {
+ var city_keyid = myobj[i].Keyid;
+ var city_name = myobj[i].AccountName + "-" + myobj[i].UserName;
+ var option = "";
+ option = "<option value = '" + city_keyid + "'>" + city_name + "</option>";
+ $(option).appendTo($("#selAccountName"));
+ }
+ }
+ }
+ });
+ }
+
+ </script>
+ <script type="text/javascript">
+ $(function () {
+ ChangeThisType("#selAcoountType");
+ });
+ </script>
+</body>
+</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
new file mode 100644
index 0000000..a369a66
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.cs
@@ -0,0 +1,348 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using CY.BLL.EC;
+using CY.Infrastructure.Common;
+using CY.Model;
+using CY.BLL.OA;
+using CY.BLL.Sys;
+using System.Text;
+using CY.BLL;
+using System.Data;
+using System.Transactions;
+
+namespace CY.WebForm.Pages.financial
+{
+ //鍚磋緣
+ //澶栧崗棰勪粯娆�
+ public partial class NewWaixieExpenses : BasePage
+ {
+ private EC_OrderBasicBLL _eC_OrderBasicBLL = null;
+ private OA_CorporateClientsBLL bll_OA_CorporateClientsBLL = null;
+ OA_FirmAccountBLL _OA_FirmAccountBLL = null;
+ OA_FirmAccountRecordBLL _OA_FirmAccountRecordBLL = null;
+ OA_FirmAccountRecord firmAccountRecord = null;
+ OA_FirmAccount firmAccount = null;
+ OA_FukuanshenqingBLL _fukuanshenqingBLL = null;
+ string orderNo = string.Empty;
+
+ decimal? AllMoney = 0;
+ decimal? ReceiveMoney = 0;
+
+ /// <summary>
+ /// 鍒濆鍖栨瀯閫�
+ /// </summary>
+ public NewWaixieExpenses()
+ {
+ bll_OA_CorporateClientsBLL = new OA_CorporateClientsBLL();
+ _OA_FirmAccountBLL = new OA_FirmAccountBLL();
+ firmAccountRecord = new OA_FirmAccountRecord();
+ _OA_FirmAccountRecordBLL = new OA_FirmAccountRecordBLL();
+ _fukuanshenqingBLL = new OA_FukuanshenqingBLL();
+ }
+
+ /// <summary>
+ /// 鐣岄潰鍔犺浇浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ btnSubmit.ServerClick += new EventHandler(btnSubmit_ServerClick);
+ try
+ {
+ switch (Request["DataType"])
+ {
+ case "change":
+ Response.Write(reLoadAccountName(Request["TypeName"].ToString2()));
+ break;
+ default://涓�鑸儏鍐典笉澶勭悊
+ if (IsPostBack || IsCallback)
+ return;
+ else
+ {
+ LoadOrder();
+ InitialData();
+ }
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ Response.Clear();
+ Response.Write("-1");
+ }
+ Response.End();
+ InitPage();
+
+ }
+ protected void InitialData()
+ {
+ //绉戠洰鍚嶇О
+ Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();
+ selSubject.DataSource = _OA_SubjectSetBLL.getAllSubject(CurrentUser.MemberId, "璐�");
+ selSubject.DataBind();
+ selSubject.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+ ///璐︽埛绫诲瀷
+
+ selAcoountType.DataSource = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷");
+
+ selAcoountType.DataBind();
+
+ //selAcoountType_SelectedIndexChanged(null, null);
+
+ }
+ protected string reLoadAccountName(string selAcoountType)
+ {
+ return JsonHelper.GetJsonStringByObject(_OA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, selAcoountType));
+ }
+ /// <summary>
+ /// 鎻愪氦鎸夐挳鐐瑰嚮浜嬩欢
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ void btnSubmit_ServerClick(object sender, EventArgs e)
+ {
+
+
+
+ //_orderBasic = new EC_OrderBasic();
+ _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ //_orderBasic = _eC_OrderBasicBLL.SelectModelById(orderId.Value);
+ //string orderno = "";
+ //string sellerName = "";
+ if(string.IsNullOrEmpty(Request["selAccountName"]))
+ {
+ JavaScript.MessageBox("璇烽�夋嫨璐︽埛", this);
+ return;
+ }
+ firmAccount = _OA_FirmAccountBLL.getSingleSubject(Request["selAccountName"].ToInt32());
+ var money = this.txtReciveMoney.Text.ToDecimal2();
+ if (this.txtReciveMoney.Text.ToDecimal2() > 0 && firmAccount.Balance < this.txtReciveMoney.Text.ToDecimal2())
+ {
+ JavaScript.MessageBox("璐︽埛浣欓涓嶈冻", this);
+ return;
+ }
+
+ var ssss = false;
+
+ var id = this.Keyid.Value.ToInt32().Value;
+ var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id);
+ var Youwufapiao = Request["rdoReceiveQuannbu"];
+ if (fukuanshenqing.Youwufapiao == 2 && Youwufapiao == "1")
+ {
+ JavaScript.MessageBox("宸茬粡淇濆瓨涓烘湁鍙戠エ锛屾棤娉曚慨鏀逛负鏃犲彂绁紒", this);
+ return;
+ }
+ string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
+ using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
+ new TransactionOptions
+ {
+ IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
+ Timeout = TransactionManager.MaximumTimeout
+ }
+ ))
+ {
+ try
+ {
+
+ var yishoumoney = fukuanshenqing.Yishoumoney.HasValue ? fukuanshenqing.Yishoumoney.Value : 0;
+ fukuanshenqing.Yishoumoney = yishoumoney + money;
+ if (money >= (fukuanshenqing.Fukuanmoney - fukuanshenqing.Yishoumoney))
+ {
+ fukuanshenqing.FukuanStatus = 2;
+ }
+ fukuanshenqing.Updater = CurrentUser.ShortName;
+ fukuanshenqing.LastUpdateTime = DateTime.Now;
+ fukuanshenqing.Youwufapiao = Youwufapiao.ToInt32();
+ ssss = _fukuanshenqingBLL.UpdateModel(fukuanshenqing);
+ if(this.txtReciveMoney.Text.ToDecimal2() > 0)
+ {
+ foreach (var item in Keys)
+ {
+ if (!string.IsNullOrEmpty(item))
+ {
+ var orderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+ if (orderBasic != null)
+ {
+ firmAccountRecord.AccountId = Request["selAccountName"].ToInt32();
+ firmAccountRecord.LastUpdateTime = DateTime.Now;
+ firmAccountRecord.Money = orderBasic.UnPayedMoney;
+ orderNo = orderBasic.SellerOrderId;
+ firmAccountRecord.OperationalMatters = "澶栧崗浠樻" + "(" + orderNo + ")";
+ firmAccountRecord.Operator = CurrentUser.ShortName;
+ firmAccountRecord.PaymentUnit = orderBasic.SellerName;
+ firmAccountRecord.RecordTypeId = 2;//鏀嚭
+ firmAccountRecord.Remark = this.txtRemark.Value;
+ firmAccountRecord.SubjectId = this.selSubject.Value.ToInt32();
+ firmAccountRecord.ResidualAmount = firmAccount.Balance - orderBasic.UnPayedMoney; ;
+
+ firmAccount.AllExpenses = orderBasic.UnPayedMoney + firmAccount.AllExpenses;
+ firmAccount.Balance = firmAccount.Balance - orderBasic.UnPayedMoney;
+ ssss = _OA_FirmAccountRecordBLL.AddModel(firmAccountRecord, firmAccount);
+ if (ssss)
+ {
+ UsePrepare(orderBasic);
+
+
+ }
+ else
+ {
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ return;
+ }
+
+ }
+
+ }
+ }
+ }
+
+
+
+
+
+
+ if (ssss)
+ {
+
+ scope.Complete();
+ JavaScript.MessageBox("浠樻鎴愬姛", this, "top.frmright.ReLoad();top.Dialog.close();");
+ }
+ else
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ JavaScript.MessageBox("娣诲姞澶辫触", this);
+ }
+ finally
+ {
+ scope.Dispose();
+ }
+
+
+ }
+
+
+
+
+
+ }
+
+ /// <summary>
+ /// 鍔犺浇椤甸潰鏁版嵁
+ /// </summary>
+ private void InitPage()
+ {
+ try
+ {
+ Sys_DictionaryBLL _Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ //OA_SubjectSetBLL _OA_SubjectSetBLL = new OA_SubjectSetBLL();
+ OA_FirmAccountBLL oA_FirmAccountBLL = new OA_FirmAccountBLL();
+
+ int i = -1;
+ //璐︽埛绫诲瀷
+ List<Sys_Dictionary> accountsType = _Sys_DictionaryBLL.GetDataByType("璐︽埛绫诲瀷") as List<Sys_Dictionary>;
+ Request.RequestContext.RouteData.DataTokens.Add("accountsTypes", null == accountsType || accountsType.Count == 0 ? "[]" : JsonHelper.GetJsonStringByObject(accountsType));
+
+ List<OA_FirmAccount> firmAccounts = oA_FirmAccountBLL.getAllSubject(CurrentUser.MemberId, "") as List<OA_FirmAccount>;
+
+ const string ACCOUNTSJSONKEY = "accounts";
+ if (null == firmAccounts)
+ {
+ Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, "[]");
+ return;
+ }
+
+ IEnumerable<IGrouping<string, OA_FirmAccount>> groupings = firmAccounts.GroupBy(fa => fa.AccountType);
+ StringBuilder builder = new StringBuilder();
+
+ foreach (IGrouping<string, OA_FirmAccount> groupitem in groupings)
+ {
+ OA_FirmAccount[] items = groupitem.ToArray();
+ builder.AppendFormat("{0}\"{2}\":{3}{1}", ",", "", groupitem.Key, JsonHelper.GetJsonStringByObject(items));
+ }
+ builder.Append("}]");
+ builder.Replace(",", "[{", 0, 1);
+
+ Request.RequestContext.RouteData.DataTokens.Add(ACCOUNTSJSONKEY, null == firmAccounts ? "[]" : builder.ToString());
+
+ }
+ catch (Exception ex)
+ {
+ PAGEHandleException(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍔犺浇璁㈠崟
+ /// </summary>
+ private void LoadOrder()
+ {
+ var id = Request["id"];
+ var fukuanshenqing = _fukuanshenqingBLL.GetModelByKeyid(id.ToInt32().Value);
+ if (fukuanshenqing != null)
+ {
+ this.Keyid.Value = id;
+ this.txtYouwufapiao.Value = fukuanshenqing.YouwufapiaoName;
+ string[] Keys = fukuanshenqing.DindanId.Trim(',').Split(',');
+ foreach (var item in Keys)
+ {
+ if (!string.IsNullOrEmpty(item))
+ {
+ var orderBasic = _eC_OrderBasicBLL.SelectModelById(item.ToInt32().Value);
+ if (orderBasic != null)
+ {
+ var sumPrice = orderBasic.SumPrice ?? 0;
+ AllMoney += sumPrice;
+ ReceiveMoney += orderBasic.UnPayedMoney;
+ }
+ }
+ }
+
+
+
+ this.spanAllMoney.InnerText = "锟�" + AllMoney.Value.ToString("0.00");
+ this.spanReceiveMoney.InnerText = "锟�" + ReceiveMoney.Value.ToString("0.00");
+ this.txtReciveMoney.Text = ReceiveMoney.Value.ToString("0.00");
+ this.spanCountRe.InnerHtml = Keys.Count().ToString2() + " 鍗�";
+ }
+
+
+
+
+ }
+
+ /// <summary>
+ /// 浣跨敤棰勪粯娆�(浠樻銆佹敹娆�)
+ /// </summary>
+ /// <returns></returns>
+ private bool UsePrepare(EC_OrderBasic orderBasic)
+ {
+
+ int operatTypeId = 3;
+ string subject = "璁㈠崟浠樻";
+ switch (Request["outsourceType"])
+ {
+ case "1":
+ operatTypeId = 2;
+ subject = "澶栧崗浠樻";
+ break;
+ default:
+ break;
+ }
+ return _eC_OrderBasicBLL.ReceiveMoney(orderBasic.SellerId, orderBasic.BuyerId, orderBasic.Keyid.Value, orderBasic.UnPayedMoney, operatTypeId, subject, CurrentUser.ShortName); ;// _eC_OrderBasicBLL.ReceiveMoney(_orderBasic.SellerId, _orderBasic.BuyerId, _orderBasic.Keyid.Value, money.Value, operatTypeId, subject, CurrentUser.ShortName);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs
new file mode 100644
index 0000000..5b6fcf3
--- /dev/null
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/NewWaixieExpenses.aspx.designer.cs
@@ -0,0 +1,152 @@
+锘�//------------------------------------------------------------------------------
+// <鑷姩鐢熸垚>
+// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
+//
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
+// </鑷姩鐢熸垚>
+//------------------------------------------------------------------------------
+
+namespace CY.WebForm.Pages.financial
+{
+
+
+ public partial class NewWaixieExpenses
+ {
+
+ /// <summary>
+ /// Head1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
+
+ /// <summary>
+ /// CMSHead1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
+
+ /// <summary>
+ /// form1 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ /// <summary>
+ /// spanCountRe 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanCountRe;
+
+ /// <summary>
+ /// Keyid 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputHidden Keyid;
+
+ /// <summary>
+ /// spanAllMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanAllMoney;
+
+ /// <summary>
+ /// spanReceiveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanReceiveMoney;
+
+ /// <summary>
+ /// txtReciveMoney 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.WebControls.TextBox txtReciveMoney;
+
+ /// <summary>
+ /// txtYouwufapiao 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtYouwufapiao;
+
+ /// <summary>
+ /// selAcoountType 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAcoountType;
+
+ /// <summary>
+ /// selAccountName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selAccountName;
+
+ /// <summary>
+ /// selSubject 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSubject;
+
+ /// <summary>
+ /// txtReceiveDate 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveDate;
+
+ /// <summary>
+ /// txtRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtRemark;
+
+ /// <summary>
+ /// btnSubmit 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlInputButton btnSubmit;
+ }
+}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
index accd5eb..5e5dfeb 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/financial/WaixieExpenses.aspx
@@ -78,8 +78,8 @@
鏈夋棤鍙戠エ锛�
</td>
<td>
- <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2' checked="checked" /><label for='rdoReceiveQuannbu0'>鏈�</label>
- <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1' /><label for='rdoReceiveQuannbu1'>鏃�</label>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu0' value='2' /><label for='rdoReceiveQuannbu0'>鏈�</label>
+ <input type="radio" name='rdoReceiveQuannbu' id='rdoReceiveQuannbu1' value='1' checked="checked" /><label for='rdoReceiveQuannbu1'>鏃�</label>
</td>
</tr>
<tr style="display: none">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs
index 39d210c..1760648 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ChoseWarehouse.aspx.cs
@@ -36,17 +36,26 @@
protected void InitialData()
{
+
+ var ssss = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId);
//浠撳簱
- dwWarehouse.DataSource = _OA_WarehouseInfoBLL.getAllWarehouseInfo(CurrentUser.MemberId);
+ dwWarehouse.DataSource = ssss;
dwWarehouse.DataValueField = "Keyid";
dwWarehouse.DataTextField = "WarehouseName";
dwWarehouse.DataBind();
dwWarehouse.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+ var aaa = ssss.FirstOrDefault(x => x.WarehouseName == "涓婃満浣跨敤");
+ if (aaa != null)
+ {
+ dwWarehouse.SelectedValue = aaa.Keyid.Value.ToString();
+ }
+
}
protected void btn_config_Click(object sender, EventArgs e)
{
string[] Keys = Request["Keyid"].ToString2().Trim('|').Split('|');
- if (bll_OA_OutOfStorageBLL.InsertModelList(Keys, dwWarehouse.SelectedValue.ToInt32()))
+ var name = dwWarehouse.SelectedItem.Text;
+ if (bll_OA_OutOfStorageBLL.InsertModelList(Keys, dwWarehouse.SelectedValue.ToInt32(), name))
{
JavaScript.MessageBox("鎿嶄綔鎴愬姛", this, "Refreshss();top.Dialog.close();");
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
index c0b58d6..ff64381 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
@@ -11,19 +11,20 @@
<table class="tableStyle1" style=" width:98%;">
<tr>
<td class="ali03 w100px">
- 渚涘簲鍟嗭細
- </td>
- <td>
- <select id="selSuppliers" runat="server" class="w120px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="璇烽�夋嫨渚涘簲鍟�">
- </select>
- </td>
- <td class="ali03 w100px">
璐у搧绫诲埆锛�
</td>
<td>
<asp:DropDownList runat="server" ID="dwCommity" class="Sreq w120px" AutoPostBack="true" keepDefaultStyle="true" OnSelectedIndexChanged="dwCommity_SelectedIndexChanged" msg="璇烽�夋嫨璐у搧绫诲埆">
</asp:DropDownList>
</td>
+ <td class="ali03 w100px">
+ 渚涘簲鍟嗭細
+ </td>
+ <td>
+ <select id="selSuppliers" runat="server" class="w160px" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="璇烽�夋嫨渚涘簲鍟�">
+ </select>
+ </td>
+
</tr>
<tr>
<td class="ali03 w100px">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
index 8e0b148..7cb3e8c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
@@ -33,15 +33,6 @@
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
- /// selSuppliers 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
-
- /// <summary>
/// dwCommity 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -51,6 +42,15 @@
protected global::System.Web.UI.WebControls.DropDownList dwCommity;
/// <summary>
+ /// selSuppliers 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
+
+ /// <summary>
/// dwGoodsList 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
index bf942b5..60d2278 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx
@@ -18,10 +18,10 @@
}
if ($(this).val() == "15") {
- $("#trShoukuandanwei").css("display", "table-row");
+ $(".trShoukuandanwei").css("display", "table-row");
} else {
- $("#trShoukuandanwei").css("display", "none");
+ $(".trShoukuandanwei").css("display", "none");
}
@@ -36,12 +36,63 @@
}
if ($("#selPlanDataType").val() == "15") {
- $("#trShoukuandanwei").css("display", "table-row");
+ $(".trShoukuandanwei").css("display", "table-row");
} else {
- $("#trShoukuandanwei").css("display", "none");
+ $(".trShoukuandanwei").css("display", "none");
}
+
+ SelectAddSearch();
});
+
+
+ function custormerChange(sel) {
+ // var selectedValue = $('#selectId').val();
+ var selectedText = $('#selSuppliers option:selected').text();
+ $("#txtShoukuandanwei").val(selectedText);
+ }
+
+ //涓篠elect鏂板杩囨护鍔熻兘
+ function SelectAddSearch() {
+ $("select[SelInputHtml='True']").each(function (i, v) {
+ $(this).unbind("blur");
+ var old = $(this).html();
+ var oldObject = $(this).clone();
+ var sign = "selectS" + i;
+ $(v).attr("sign", sign);
+
+ var inputClass = "input_" + sign;
+ var html = "<span style='margin-left:10px'>杩囨护锛�</span><input type='text' class='" + inputClass + "' style='width:80px;height:18px;line-height:18px;'/>";//<span onclick='showCustomer()' style=\"padding-left:10px;\" class=\"a_under\">鏂板渚涘簲鍟�</span>
+ $(v).after(html);
+ $("." + inputClass).blur(function () {
+ var nowval = $(this).val().trim();
+ var output = "";
+ if (nowval == "" || nowval == null) {
+ output = old;
+ } else {
+ output += "<option value=''>璇烽�夋嫨</option>";
+ var valueArr = new Array();
+ oldObject.find("option").each(function (ii, vv) {
+
+ var value = $.trim($(vv).attr("value"));
+ var text = $.trim($(vv).text());
+
+ if (text.indexOf(nowval) >= 0)
+ valueArr.push(value + "|||" + text);
+ });
+ for (var ss in valueArr) {
+ var s = valueArr[ss];
+ if (s.split("|||").length == 2) {
+ var value1 = s.split("|||")[0];
+ var text1 = s.split("|||")[1];
+ output += "<option value='" + value1 + "'>" + text1 + "</option>";
+ }
+ }
+ }
+ $(v).html(output);
+ });
+ });
+ }
</script>
</head>
<body>
@@ -88,7 +139,7 @@
<select id="selPlanTitle" runat="server" keepdefaultstyle="true" style=" width:100px;"></select>
</td>
</tr>
- <tr id="trShoukuandanwei" style=" display:none;">
+ <tr class="trShoukuandanwei" style=" display:none;">
<td class="ali03">
鏀舵鍗曚綅锛�
</td>
@@ -96,6 +147,11 @@
<input id="txtShoukuandanwei" type="text" style=" width:400px;" class="" runat="server" msg="璇疯緭鍏ユ敹娆惧崟浣�" maxlength="50" />
</td>
</tr>
+ <tr class="trShoukuandanwei" style=" display:none;">
+ <td class="ali03">閫夋嫨渚涘簲鍟嗭細</td>
+ <td colspan="3"> <select keepdefaultstyle='true' id='selSuppliers' runat="server" datatextfield='Name' datavaluefield='Keyid' onchange='custormerChange(this)' class='Sreq' sign="" selinputhtml="True" style=" width:183px;" >
+ </select></td>
+ </tr>
<tr>
<td class="ali03">
璇风ず鍐呭锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
index 61b09ef..bbbf045 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.cs
@@ -13,6 +13,7 @@
using CY.BLL.EC;
using CY.Infrastructure.DESEncrypt;
using CY.Infrastructure.Query;
+using CY.BLL.OA;
namespace CY.WebForm.Pages.work
{
@@ -26,7 +27,7 @@
Sys_DictionaryBLL bll_Sys_DictionaryBLL = null;
OA_WorkPlanBll oA_WorkReminderBll = null;
OA_CarDictionaryBLL bll_OA_CarDictionaryBLL = null;
-
+ OA_SuppliersBLL _OA_SuppliersBLL = null;
public MyRequestAdd()
{
departmentBll = new OA_DepartmentBll();
@@ -34,6 +35,7 @@
oA_WorkReminderBll = new OA_WorkPlanBll();
oA_StaffBLL = new OA_StaffBLL();
bll_OA_CarDictionaryBLL = new OA_CarDictionaryBLL();
+ _OA_SuppliersBLL = new OA_SuppliersBLL();
}
//椤甸潰鍔犺浇
@@ -46,6 +48,12 @@
this.selPlanTitle.DataTextField = "ParName";
this.selPlanTitle.DataBind();
this.selPlanTitle.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
+ //渚涘簲鍟�
+ this.selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
+ this.selSuppliers.DataBind();
+ this.selSuppliers.Items.Insert(0, new ListItem("鍏ㄩ儴", ""));
+
InitData();
}
}
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
index 914dd83..6a0473e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestAdd.aspx.designer.cs
@@ -87,6 +87,15 @@
protected global::System.Web.UI.HtmlControls.HtmlInputText txtShoukuandanwei;
/// <summary>
+ /// selSuppliers 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
+
+ /// <summary>
/// txtPlanContent 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
index bc57ce2..d1f9517 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/MyRequestList.aspx
@@ -13,12 +13,12 @@
//娣诲姞
function addModel() {
- top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx", Title: "鏂板璇风ず", Width: 550, Height: 260 });
+ top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx", Title: "鏂板璇风ず", Width: 550, Height: 360 });
}
//淇敼
function onEdit(keyid) {
- top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx?keyid=" + keyid, Title: "淇敼璇风ず", Width: 550, Height: 260 });
+ top.Dialog.open({ URL: "/Pages/work/MyRequestAdd.aspx?keyid=" + keyid, Title: "淇敼璇风ず", Width: 550, Height: 360 });
}
//鍒犻櫎
--
Gitblit v1.9.1