From a001acc104e149c73f375638e1ba8224d0d28462 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 16 七月 2025 11:24:49 +0800
Subject: [PATCH] 采购数据 货品名称和类型反了，调下顺序 完成
---
CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs | 1
CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs | 15 +++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx | 3
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx | 6 +
CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx.designer.cs | 32 +++---
CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx | 10 +
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs | 18 +-
CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.designer.cs | 43 +++++---
CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs | 3
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 2
CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.designer.cs | 34 +++---
CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.cs | 8 +
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 4
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 55 ++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx | 8 +
16 files changed, 179 insertions(+), 66 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs
index 6975314..e0cfe5a 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Suppliers.cs
@@ -292,6 +292,14 @@
get { return _lastupdatetime; }
}
/// <summary>
+ /// 鏈�鍚庝慨鏀规椂闂�
+ /// </summary>
+ public DateTime? CreateTime
+ {
+ set;
+ get;
+ }
+ /// <summary>
/// 鎿嶄綔浜�
/// </summary>
public string Operator
@@ -525,6 +533,13 @@
this.OrderNum = isChange ? MyConvert.ConvertToInt32(value) : OrderNum;
theValue = this.OrderNum;
}
+ else if ("CreateTime".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 35)
+ {
+ this.CreateTime = isChange ? MyConvert.ConvertToDateTime(value) : CreateTime;
+ theValue = this.CreateTime;
+ }
+
+
#endregion
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs
index 1ab3933..f9b9415 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_SuppliersDAL.cs
@@ -69,6 +69,7 @@
new SqlParameter("@AccountID",string.IsNullOrEmpty(trueModel.AccountID)?"":trueModel.AccountID) ,
new SqlParameter("@Huming",string.IsNullOrEmpty(trueModel.Huming)?"":trueModel.Huming) ,
+ new SqlParameter("@CreateTime",trueModel.CreateTime),
};
try
{
@@ -234,7 +235,7 @@
- return _dataBase.SelectModelPage<Model.OA_Suppliers>(pa, selectTarget, fromSource, "a.OrderNum ");
+ return _dataBase.SelectModelPage<Model.OA_Suppliers>(pa, selectTarget, fromSource, "a.CreateTime desc ");
}
/// <summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx
index 40249b5..7c1cebc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx
@@ -102,6 +102,14 @@
</td>
</tr>
<tr>
+ <td class="ali03">
+ 棰嗗彇浜猴細
+ </td>
+ <td >
+ <textarea id="txtPlanRemark" runat="server" style="width: 200px; height: 50px;" MaxLength="500" ></textarea>
+ </td>
+ </tr>
+ <tr>
<td colspan="2" style="text-align: center;">
<asp:Button ID="btn_submit" runat="server" OnClick="btn_submit_form" OnClientClick="if(CheckStaff())return true;else return false; " Text="鎻愪氦" />
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.cs
index e1b937d..1de749d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.cs
@@ -55,6 +55,8 @@
this.txtPrice.Value = m_OA_PropertyManage.Price.Value.ToString("0.00");
this.txtAllNum.Value = m_OA_PropertyManage.AllNum.ToString2();
this.txtReceiveNum.Value = m_OA_PropertyManage.ReceiveNum.ToString2();
+ this.txtPlanRemark.Value = m_OA_PropertyManage.Remark;
+ this.selStatus.Value = m_OA_PropertyManage.Status.HasValue? m_OA_PropertyManage.Status.ToString():"1";
}
}
@@ -81,9 +83,10 @@
{
m_OA_PropertyManage = new OA_PropertyManage();
m_OA_PropertyManage.MemberId = CurrentUser.MemberId;
- m_OA_PropertyManage.Status = 1;
- m_OA_PropertyManage.Remark = "";
+
+
}
+ m_OA_PropertyManage.Status = this.selStatus.Value.ToInt32();
m_OA_PropertyManage.CateId = this.selCateId.Value.ToInt32();
m_OA_PropertyManage.AllNum = this.txtAllNum.Value.ToInt32();
m_OA_PropertyManage.Name = this.txtCarNumber.Value;
@@ -91,6 +94,7 @@
m_OA_PropertyManage.Price = this.txtPrice.Value.ToDecimal2();
m_OA_PropertyManage.Operator = CurrentUser.ShortName;
m_OA_PropertyManage.LastUpdateTime = nowTime;
+ m_OA_PropertyManage.Remark = this.txtPlanRemark.Value.Trim();
if (Request["keyid"].ToInt32() > 0)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.designer.cs
index 0ae1e63..9c34d89 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyEdit.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.Property {
-
-
- public partial class PropertyEdit {
-
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class PropertyEdit
+ {
+
/// <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>
/// selCateId 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;
-
+
/// <summary>
/// txtCarNumber 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtCarNumber;
-
+
/// <summary>
/// txtPrice 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtPrice;
-
+
/// <summary>
/// selStatus 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
-
+
/// <summary>
/// txtAllNum 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtAllNum;
-
+
/// <summary>
/// txtReceiveNum 鎺т欢銆�
/// </summary>
@@ -92,7 +94,16 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtReceiveNum;
-
+
+ /// <summary>
+ /// txtPlanRemark 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlTextArea txtPlanRemark;
+
/// <summary>
/// btn_submit 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx
index c6e317f..f733563 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx
@@ -8,12 +8,12 @@
<script type="text/javascript">
//淇敼
function onEdit(keyid) {
- top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx?keyid=" + keyid, Title: "鐗╁搧淇敼", Width: 400, Height: 230 });
+ top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx?keyid=" + keyid, Title: "鐗╁搧淇敼", Width: 500, Height: 430 });
}
//娣诲姞
function addModel() {
- top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx", Title: "鏂板鐗╁搧", Width: 400, Height: 230 });
+ top.Dialog.open({ URL: "/Pages/Property/PropertyEdit.aspx", Title: "鏂板鐗╁搧", Width: 500, Height: 430 });
}
//鍒犻櫎
@@ -147,6 +147,9 @@
<th style="text-align: center">
宸查鍙�
</th>
+ <th style="text-align: center">
+ 棰嗗彇浜�
+ </th>
<th style="text-align: center">
鐘舵��
</th>
@@ -181,6 +184,9 @@
<td style="text-align: center">
<%#Eval("ReceiveNum")%>
</td>
+ <td style="text-align: center">
+ <%#Eval("Remark")%>
+ </td>
<td style="text-align: center">
<%#Eval("Status").ToString()=="1"?"鍚敤":"绂佺敤"%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx.designer.cs
index 3c005b7..21cfd55 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/Property/PropertyList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.Property {
-
-
- public partial class PropertyList {
-
+namespace CY.WebForm.Pages.Property
+{
+
+
+ public partial class PropertyList
+ {
+
/// <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>
/// selCateId 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCateId;
-
+
/// <summary>
/// txtName 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
-
+
/// <summary>
/// selStatus 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selStatus;
-
+
/// <summary>
/// btn_Submit 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Submit;
-
+
/// <summary>
/// RepClientList 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepClientList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index d65a555..cb0728e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -1311,13 +1311,13 @@
$("select[name='PSF_Typesettinghide'][value_ppwaerid='" + value_SelWaerId + "']").hide();
$(".lbCTPCount[value_ppwaerid='" + value_SelWaerId + "']").show();
$("input[name='CTPCount'][value_ppwaerid='" + value_SelWaerId + "']").show();
- $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
+ // $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("870");
}
else if ($(vv).val().indexOf('杞浆') >= 0) {
$("select[name='PSF_OpenSpecifications'][value_selspec='" + value_SelWaerId + "']").hide();
$(".xialap[value_ppwaerid='" + value_SelWaerId + "']").show();
- $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
+ // $("input[name='PSF_OpenWidthName'][value_ppwaerid='" + value_SelWaerId + "']").val("755");
$("p[name='PSF_OpenSpecificationsspan'][value_selspecspan='" + value_SelWaerId + "']").hide();
$("p[name='PSF_OpenWidthspan'][value_openwidthspan='" + value_SelWaerId + "']").hide();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index c50de43..3c1d0f5 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -507,7 +507,7 @@
//}
m_EC_SpecialForums.PSF_BigPaperCount = 0;
m_EC_SpecialForums.PSF_OpenSpecifications = PSF_OpenSpecifications[i].ToString2().Replace("锛�+-+锛�", ",");
- if (PSF_PressesDesk[i].IndexOf("杞浆")>=0)
+ if (PSF_PressesDesk[i].IndexOf("杞浆")>=0 || PSF_PressesDesk[i].IndexOf("榛戠櫧") >= 0)
{
if (PSF_OpenWidthName[i].ToInt32() == null)
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
index d0fd7b6..8b5d12a 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx
@@ -14,8 +14,9 @@
<table class="tableStyle">
<tr> <td class="ali03 w120px">渚涘簲鍟嗭細</td><td><span id="spanSuppliers" runat="server" ></span></td></tr>
+ <tr> <td class="ali03 w100px">璐у搧绫诲瀷锛�</td><td><span id="spanGoodsType" runat="server" ></span></td></tr>
<tr> <td class="ali03 w120px">璐у搧鍚嶇О锛�</td><td><span id="spanGoodsName" runat="server" ></span></td></tr>
- <tr> <td class="ali03 w100px">璐у搧绫诲瀷锛�</td><td><span id="spanGoodsType" runat="server" ></span></td></tr>
+
<tr> <td class="ali03 w100px">鍝佺墝锛�</td><td><span id="spanBrandName" runat="server" ></span></td></tr>
<tr> <td class="ali03 w100px">瑙勬牸锛�</td><td><span id="spanSpecificationName" runat="server" ></span></td></tr>
<tr runat="server" id="TrPaperWeight"> <td class="ali03 w100px">鍏嬮噸锛�</td><td><span id="spanPaperWeight" runat="server" ></span></td></tr>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
index 64a24c3..4f88c65 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementDetail.aspx.designer.cs
@@ -42,15 +42,6 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanSuppliers;
/// <summary>
- /// spanGoodsName 鎺т欢銆�
- /// </summary>
- /// <remarks>
- /// 鑷姩鐢熸垚鐨勫瓧娈点��
- /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
- /// </remarks>
- protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsName;
-
- /// <summary>
/// spanGoodsType 鎺т欢銆�
/// </summary>
/// <remarks>
@@ -60,6 +51,15 @@
protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsType;
/// <summary>
+ /// spanGoodsName 鎺т欢銆�
+ /// </summary>
+ /// <remarks>
+ /// 鑷姩鐢熸垚鐨勫瓧娈点��
+ /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
+ /// </remarks>
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl spanGoodsName;
+
+ /// <summary>
/// spanBrandName 鎺т欢銆�
/// </summary>
/// <remarks>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index 85c04d5..437e783 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -35,6 +35,48 @@
+ //涓篠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);
+ });
+ });
+ }
+
/*
纭鎵归噺寮�绁ㄧ敵璇�
*/
@@ -100,6 +142,11 @@
var url = "/Pages/business/Caigoufukuanshenqing.aspx?id=" + orderId + "&&orderno=" + orderno;
top.Dialog.open({ URL: url, Title: "閲囪喘浠樻鐢宠", Height: 600, Width: 580 });
}
+ $(function () {
+
+
+ SelectAddSearch();
+ });
</script>
</head>
<body>
@@ -118,7 +165,7 @@
渚涘簲鍟嗭細
</td>
<td>
- <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' class="Sreq w122px">
+ <select id="selSuppliers" runat="server" datatextfield="Name" datavaluefield="Keyid" keepdefaultstyle='true' selinputhtml="True" class="Sreq w122px">
</select>
</td>
<td class="ali03 ">
@@ -230,6 +277,9 @@
<th>
鍗曚环
</th>
+ <th>
+ 鍚ㄤ环
+ </th>
<th>
鏁伴噺
</th>
@@ -289,6 +339,9 @@
<td>
<%#Eval("Price", "{0:F2}")%>
</td>
+ <td>
+ <%#Eval("tanPrice", "{0:F2}")%>
+ </td>
<td>
<%#Eval("Quantity", "{0:F0}")%>
</td>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs
index 00f3b7f..317a942 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersEdit.aspx.cs
@@ -402,6 +402,7 @@
supplier.FirmId = CurrentUser.MemberId;
supplier.Operator = CurrentUser.ShortName;
supplier.LastUpdateTime = System.DateTime.Now;
+ supplier.CreateTime = System.DateTime.Now;
if (_OA_SuppliersBLL.InsertModel(supplier))
{
if (!string.IsNullOrEmpty(Request["flasss"]))
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx
index 41eb69d..81eef98 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx
@@ -114,6 +114,9 @@
<th>
鍚堜綔鐘舵��
</th>
+ <th>
+ 鍒涘缓鏃堕棿
+ </th>
<th width="80">
鎿嶄綔
</th>
@@ -142,6 +145,9 @@
<td>
<%#Eval("CooperativeState.Name")%>
</td>
+ <td>
+ <%#Eval("CreateTime", "{0:yyyy-MM-dd}")%>
+ </td>
<td class="Operate w120px">
<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>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.designer.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.designer.cs
index 308f4bf..738a00b 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.designer.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/SuppliersList.aspx.designer.cs
@@ -2,16 +2,18 @@
// <鑷姩鐢熸垚>
// 姝や唬鐮佺敱宸ュ叿鐢熸垚銆�
//
-// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳戒細瀵艰嚧涓嶆纭殑琛屼负锛屽苟涓斿鏋�
-// 閲嶆柊鐢熸垚浠ｇ爜锛岃繖浜涙洿鏀瑰皢浼氫涪澶便��
+// 瀵规鏂囦欢鐨勬洿鏀瑰彲鑳藉鑷翠笉姝ｇ‘鐨勮涓猴紝濡傛灉
+// 閲嶆柊鐢熸垚浠ｇ爜锛屽垯鎵�鍋氭洿鏀瑰皢涓㈠け銆�
// </鑷姩鐢熸垚>
//------------------------------------------------------------------------------
-namespace CY.WebForm.Pages.procurement {
-
-
- public partial class SuppliersList {
-
+namespace CY.WebForm.Pages.procurement
+{
+
+
+ public partial class SuppliersList
+ {
+
/// <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>
/// selSuppliersTypeId 鎺т欢銆�
/// </summary>
@@ -38,7 +40,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliersTypeId;
-
+
/// <summary>
/// selSuppliersLevelId 鎺т欢銆�
/// </summary>
@@ -47,7 +49,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selSuppliersLevelId;
-
+
/// <summary>
/// selCooperativeStateId 鎺т欢銆�
/// </summary>
@@ -56,7 +58,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlSelect selCooperativeStateId;
-
+
/// <summary>
/// txtName 鎺т欢銆�
/// </summary>
@@ -65,7 +67,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtName;
-
+
/// <summary>
/// txtBusinessScope 鎺т欢銆�
/// </summary>
@@ -74,7 +76,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlInputText txtBusinessScope;
-
+
/// <summary>
/// btn_Register 鎺т欢銆�
/// </summary>
@@ -83,7 +85,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Button btn_Register;
-
+
/// <summary>
/// RepSupplierList 鎺т欢銆�
/// </summary>
@@ -92,7 +94,7 @@
/// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲��
/// </remarks>
protected global::System.Web.UI.WebControls.Repeater RepSupplierList;
-
+
/// <summary>
/// UCPager1 鎺т欢銆�
/// </summary>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
index e342fc6..3344372 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/work/RequestReplyAdd.aspx.cs
@@ -165,6 +165,9 @@
oA_Fukuanshenqing.LastUpdateTime = DateTime.Now;
var id = _oA_FukuanshenqingBLL.InsertModel(oA_Fukuanshenqing);
+
+ //鍏朵粬浠樻id瀛樺湪RewardType杩欎釜瀛楁
+ m_OA_WorkPlan.RewardType = id;
}
if (Request["keyid"].ToInt32() > 0)
--
Gitblit v1.9.1