From 176e74cbf392ded987a200845c423b965e05c4f3 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 28 八月 2025 08:50:51 +0800
Subject: [PATCH] 采购增加采购人
---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx.designer.cs | 40 +++---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx.designer.cs | 48 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx | 11 +
CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs | 28 ++++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx | 2
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs | 9 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.designer.cs | 48 ++++---
CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx | 53 ++++++++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs | 8 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx | 52 ++++++++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 12 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs | 30 +++++
12 files changed, 266 insertions(+), 75 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
index 47efd42..06d8ea9 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
@@ -433,6 +433,22 @@
get; set;
}
+ /// <summary>
+ /// 閲囪喘浜�
+ /// </summary>
+ public int? CaigourenId
+ {
+ get; set;
+ }
+
+ /// <summary>
+ /// 閲囪喘浜�
+ /// </summary>
+ public string Caigouren
+ {
+ get; set;
+ }
+
#endregion Model
#region Visiter
@@ -595,7 +611,17 @@
this.WarehouseName = isChange ? MyConvert.ConvertToString(value) : WarehouseName;
theValue = this.WarehouseName;
}
-
+ else if ("Caigouren".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+ {
+ this.Caigouren = isChange ? MyConvert.ConvertToString(value) : Caigouren;
+ theValue = this.Caigouren;
+ }
+ else if ("CaigourenId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 28)
+ {
+ this.CaigourenId = isChange ? MyConvert.ConvertToInt32(value) : CaigourenId;
+ theValue = this.CaigourenId;
+ }
+
return theValue;
}
#endregion
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index a9e3969..bc6c627 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -68,7 +68,9 @@
new SqlParameter("@ReceiveMoney",decimal.Parse("0")),
new SqlParameter("@Commodityid",trueModel.Commodityid),
new SqlParameter("@orderId",trueModel.orderId.HasValue?trueModel.orderId.Value:0),
- new SqlParameter("@DocumentName",string.IsNullOrEmpty(trueModel.DocumentName)?"":trueModel.DocumentName)
+ new SqlParameter("@DocumentName",string.IsNullOrEmpty(trueModel.DocumentName)?"":trueModel.DocumentName),
+ new SqlParameter("@CaigourenId",trueModel.CaigourenId.HasValue?trueModel.CaigourenId.Value:0),
+ new SqlParameter("@Caigouren",string.IsNullOrEmpty(trueModel.Caigouren)?"":trueModel.Caigouren),
};
try
{
@@ -125,6 +127,8 @@
new SqlParameter("@ReceiveMoney",trueModel.ReceiveMoney),
new SqlParameter("@Commodityid",trueModel.Commodityid),
new SqlParameter("@WarehouseName",string.IsNullOrEmpty(trueModel.WarehouseName)?"":trueModel.WarehouseName),
+ new SqlParameter("@CaigourenId",trueModel.CaigourenId.HasValue?trueModel.CaigourenId.Value:0),
+ new SqlParameter("@Caigouren",string.IsNullOrEmpty(trueModel.Caigouren)?"":trueModel.Caigouren),
};
try
{
@@ -210,7 +214,7 @@
}
if (!string.IsNullOrEmpty(Operator))
{
- Condition += string.Format(" and Operator='{0}'", Operator);
+ Condition += string.Format(" and Caigouren like '%{0}%'", Operator);
}
if (!string.IsNullOrEmpty(ClearingStatusId))
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx
index 18a3bc5..92a2c58 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx
@@ -13,7 +13,7 @@
//鎵归噺鍏ュ簱
function addModelList() {
- top.Dialog.open({ URL: "/Pages/procurement/StorageVolume.aspx?Keyid='0'", Title: "鎵归噺鍏ュ簱", Width: 1000, Height: 500 });
+ top.Dialog.open({ URL: "/Pages/procurement/StorageVolume.aspx?Keyid='0'", Title: "鎵归噺鍏ュ簱", Width: 1200, Height: 500 });
}
//鎵撳嵃鏄庣粏
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.designer.cs
index 6a410fb..6d35e1e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/InventoryList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.procurement {
-
-
- public partial class InventoryList {
-
+namespace CY.WebForm.Pages.procurement
+{
+
+
+ public partial class InventoryList
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selWarehouseId 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selWarehouseId;
-
+
/// <summary>
/// dwCommity 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwCommity;
-
+
/// <summary>
/// dwGoodsList 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwGoodsList;
-
+
/// <summary>
/// selOpretor 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText selOpretor;
-
+
/// <summary>
/// dwBrand 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwBrand;
-
+
/// <summary>
/// dwSpecification 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwSpecification;
-
+
/// <summary>
/// trWeight 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlTableCell trWeight;
-
+
/// <summary>
/// dwPaperWeight 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwPaperWeight;
-
+
/// <summary>
/// btn_Register 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Register;
-
+
/// <summary>
/// ReInventoryList 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater ReInventoryList;
-
+
/// <summary>
/// NowPageAllMoney 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl NowPageAllMoney;
-
+
/// <summary>
/// AllMoney 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl AllMoney;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx
index b5f9268..4f394f1 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx
@@ -43,7 +43,7 @@
渚涘簲鍟嗭細
</td>
<td>
- <select id="selSuppliers" runat="server" class="Sreq" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="渚涘簲鍟嗕笉鑳戒负绌�">
+ <select id="selSuppliers" runat="server" datatextfield="Name" keepdefaultstyle="true" datavaluefield="Keyid" msg="渚涘簲鍟嗕笉鑳戒负绌�" selinputhtml="True" class="Sreq w122px">
</select>
</td>
<td class="ali03 ">
@@ -106,6 +106,50 @@
</table>
</form>
<script type="text/javascript">
+
+
+ //涓篠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);
+ });
+ });
+ }
+
$(function () {
$("#dwCommity option").each(function (ii, vv) {
$(this).html($(this).html().replace(/[.]/g, " "));
@@ -175,7 +219,14 @@
$("#txtAllMoney").val(eda);
}
}
+
+
+ SelectAddSearch();
});
+
+
+
+
</script>
</body>
</html>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx.designer.cs
index 8d75ff0..446119a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/OutOfStorageEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.procurement {
-
-
- public partial class OutOfStorageEdit {
-
+namespace CY.WebForm.Pages.procurement
+{
+
+
+ public partial class OutOfStorageEdit
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// dwWarehouse 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwWarehouse;
-
+
/// <summary>
/// dwCommity 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwCommity;
-
+
/// <summary>
/// dwGoodsList 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwGoodsList;
-
+
/// <summary>
/// div_none 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_none;
-
+
/// <summary>
/// selSuppliers 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
-
+
/// <summary>
/// dwBrand 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwBrand;
-
+
/// <summary>
/// dwSpecification 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwSpecification;
-
+
/// <summary>
/// div_td 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_td;
-
+
/// <summary>
/// dwPaperWeight 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwPaperWeight;
-
+
/// <summary>
/// txtQuantity 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtQuantity;
-
+
/// <summary>
/// txtPrice 鎺т欢銆�
/// </summary>
@@ -128,7 +130,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrice;
-
+
/// <summary>
/// div_tanPrice 鎺т欢銆�
/// </summary>
@@ -137,7 +139,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_tanPrice;
-
+
/// <summary>
/// txtTenPrice 鎺т欢銆�
/// </summary>
@@ -146,7 +148,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtTenPrice;
-
+
/// <summary>
/// txtAllMoney 鎺т欢銆�
/// </summary>
@@ -155,7 +157,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtAllMoney;
-
+
/// <summary>
/// btn_config 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
index 9918b2a..3ca7ef5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx
@@ -94,7 +94,18 @@
</td>
<asp:Panel ID="tanDiv1" runat="server">
</asp:Panel>
+
+
</tr>
+ <tr>
+ <td class="ali03 ">
+ 閲囪喘浜猴細
+ </td>
+ <td colspan="5" >
+ <select id='selCaigouren' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
+ </select>
+ </td>
+ </tr>
<tr>
<td class="ali03">
澶囨敞锛�
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs
index 1244d8d..23b80a5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.cs
@@ -26,6 +26,7 @@
OA_BrandBLL _OA_BrandBLL = null;
OA_PaperWeightBLL _OA_PaperWeightBLL = null;
string Keyid = string.Empty;
+ BLL.OA_StaffBLL oA_StaffBLL = null;
public ProcurementEdit()
{
@@ -39,6 +40,7 @@
_OA_GoodsInfoBLL = new OA_GoodsInfoBLL();
GoodsInfo = new OA_GoodsInfo();
bll_Sys_DictionaryBLL = new Sys_DictionaryBLL();
+ oA_StaffBLL = new BLL.OA_StaffBLL();
}
protected void Page_Load(object sender, EventArgs e)
@@ -72,6 +74,12 @@
selSuppliers.DataSource = _OA_SuppliersBLL.getSupplierTable(CurrentUser.MemberId);
selSuppliers.DataBind();
selSuppliers.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
+
+
+ this.selCaigouren.DataSource = oA_StaffBLL.SelectListByFirmId(CurrentUser.MemberId, false, false);
+ this.selCaigouren.DataBind();
+ this.selCaigouren.Items.Insert(0, new ListItem("鏃�", "0"));
+
///浜у搧绫诲埆
///
dwCommity.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
@@ -118,6 +126,7 @@
this.txtTenPrice.Value = procurementModel.TanPrice.ToString();
this.txtAllMoney.Value = procurementModel.AllMoney.ToString();
this.txtRemark.Value = procurementModel.Remark;
+ this.selCaigouren.Value = (procurementModel.CaigourenId ?? 0).ToString(); ;
}
@@ -311,6 +320,17 @@
procurement.PurchaseStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(0, "閲囪喘鐘舵��"); ///閲囪喘鐘舵��
procurement.ClearingStatusId = bll_Sys_DictionaryBLL.GetKeyIdByKeyid(0, "缁撹处鐘舵��"); ///缁撶畻鐘舵��
procurement.PurchaseTime = DateTime.Now;
+ procurement.CaigourenId = this.selCaigouren.Value.ToInt32();
+ if(procurement.CaigourenId.HasValue && procurement.CaigourenId.Value > 0)
+ {
+ var oA_Staff = oA_StaffBLL.GetModelByKeyid(procurement.CaigourenId.Value);
+ if (oA_Staff != null)
+ {
+ procurement.Caigouren = oA_Staff.Name;
+ }
+
+ }
+
if (Request["Keyid"].ToInt32() > 0)
{
OA_Procurement procurementModel = new OA_Procurement();
@@ -329,6 +349,16 @@
procurementModel.LastUpdateTime = DateTime.Now;
procurementModel.Operator = CurrentUser.ShortName;
procurementModel.Remark = this.txtRemark.Value;
+ procurementModel.CaigourenId = this.selCaigouren.Value.ToInt32();
+ if (procurementModel.CaigourenId.HasValue && procurementModel.CaigourenId.Value > 0)
+ {
+ var oA_Staff = oA_StaffBLL.GetModelByKeyid(procurementModel.CaigourenId.Value);
+ if (oA_Staff != null)
+ {
+ procurementModel.Caigouren = oA_Staff.Name;
+ }
+
+ }
if (_OA_ProcurementBLL.UpdateModel(procurementModel))
{
JavaScript.RefreshDIVOpener(this);
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 7cb3e8c..d23e110 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementEdit.aspx.designer.cs
@@ -168,6 +168,15 @@
protected global::System.Web.UI.WebControls.Panel tanDiv1;
/// <summary>
+ /// selCaigouren 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlSelect selCaigouren;
+
+ /// <summary>
/// txtRemark 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index 9fed4c9..0648178 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -8,7 +8,7 @@
<script type="text/javascript">
//娣诲姞
function addModel() {
- dialog.open({ URL: "/Pages/procurement/ProcurementEdit.aspx?Keyid='0'", Title: "鏂板閲囪喘", Width: 650, Height: 250 });
+ dialog.open({ URL: "/Pages/procurement/ProcurementEdit.aspx?Keyid='0'", Title: "鏂板閲囪喘", Width: 800, Height: 250 });
}
//鎵撳嵃閲囪喘淇℃伅
@@ -23,7 +23,7 @@
//淇敼
function onEdit(keyid) {
- dialog.open({ URL: "/Pages/procurement/ProcurementEdit.aspx?Keyid=" + keyid, Title: "淇敼閲囪喘淇℃伅", Width: 650, Height: 250 });
+ dialog.open({ URL: "/Pages/procurement/ProcurementEdit.aspx?Keyid=" + keyid, Title: "淇敼閲囪喘淇℃伅", Width: 800, Height: 250 });
}
//鍒犻櫎
@@ -165,7 +165,7 @@
渚涘簲鍟嗭細
</td>
<td>
- <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' selinputhtml="True" class="Sreq w122px">
+ <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' selinputhtml="True" class="w122px">
</select>
</td>
<td class="ali03 ">
@@ -301,6 +301,9 @@
<th>
閲囪喘鏃堕棿
</th>
+ <th>
+ 閲囪喘浜�
+ </th>
<th width="150">
鎿嶄綔
</th>
@@ -363,6 +366,9 @@
<td>
<%#Eval("PurchaseTime")%>
</td>
+ <td>
+ <%#Eval("Caigouren")%>
+ </td>
<td class="Operate">
<span menu_member_case_id="case_onView" menu_member_case_name="鏌ョ湅" onclick="onView(<%#Eval("Keyid")%>)">鏌ョ湅</span> <span menu_member_case_id="case_onEdit" menu_member_case_name="淇敼" onclick="onEdit('<%#Eval("Keyid")%>')">淇敼</span> <span menu_member_case_id="case_onDelete" menu_member_case_name="鍒犻櫎" onclick="onDelete(<%#Eval("Keyid")%>)">鍒犻櫎</span>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx
index b28bc09..db8595c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx
@@ -31,6 +31,54 @@
window.location = location;
}
+ //涓篠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);
+ });
+ });
+ }
+
+ $(function () {
+
+
+ SelectAddSearch();
+ });
+
</script>
</head>
@@ -49,8 +97,8 @@
<td class="ali03">
渚涘簲鍟嗭細
</td>
- <td>
- <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true'>
+ <td style="width: 315px" >
+ <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' selinputhtml="True" class="w122px" >
</select>
</td>
<td class="ali03">
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx.designer.cs
index 371ca33..ea97d84 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/StorageVolume.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.procurement {
-
-
- public partial class StorageVolume {
-
+namespace CY.WebForm.Pages.procurement
+{
+
+
+ public partial class StorageVolume
+ {
+
/// <summary>
/// CMSHead1 鎺т欢銆�
/// </summary>
@@ -20,7 +22,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
-
+
/// <summary>
/// form1 鎺т欢銆�
/// </summary>
@@ -29,7 +31,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
/// <summary>
/// txtRegTimeStart 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeStart;
-
+
/// <summary>
/// txtRegTimeEnd 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtRegTimeEnd;
-
+
/// <summary>
/// selSuppliers 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliers;
-
+
/// <summary>
/// dwCommity 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList dwCommity;
-
+
/// <summary>
/// selGoodsName 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selGoodsName;
-
+
/// <summary>
/// selOpretor 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText selOpretor;
-
+
/// <summary>
/// selPurchaseStatus 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selPurchaseStatus;
-
+
/// <summary>
/// selClearingStatus 鎺т欢銆�
/// </summary>
@@ -101,7 +103,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selClearingStatus;
-
+
/// <summary>
/// btn_Register 鎺т欢銆�
/// </summary>
@@ -110,7 +112,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Register;
-
+
/// <summary>
/// ReProcurentList 鎺т欢銆�
/// </summary>
@@ -119,7 +121,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater ReProcurentList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
--
Gitblit v1.9.1