From a3da87fe38e2026acc5a567c08545d5798933ed1 Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Thu, 20 Aug 2020 15:19:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SCP/Admin/online.aspx.designer.cs | 36 ++++++++++---------
SCP/Views/PlanData/SCP_ASK.aspx | 1 +
SCP/Views/PlanData/SCP_ASK.aspx.cs | 1 +
SCP/Views/PlanData/SCP_ASN_DETAIL_View.aspx | 4 +--
SCP/Views/PlanData/SCP_PART_LIFE.aspx | 2 +-
SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs | 2 ++
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx | 7 ++--
SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx.cs | 4 +--
.../SCP_PO_CREATE_ASK.aspx.designer.cs | 4 +--
SCP/Views/PlanData/SCP_PO_DETAIL_OUT.aspx | 2 +-
SCP/Views/PlanData/SCP_PO_EXTEND.aspx | 2 +-
SCP/Views/SupplierData/SCP_ASK.aspx | 2 +-
SCP/Views/SupplierData/SCP_CLAIM.aspx.cs | 1 +
SCP/Views/SupplierData/SCP_INVOICE.aspx | 2 +-
SCP/Views/WarehouseData/SCP_INVOICE.aspx | 2 +-
15 files changed, 40 insertions(+), 32 deletions(-)
diff --git a/SCP/Admin/online.aspx.designer.cs b/SCP/Admin/online.aspx.designer.cs
index 8e19d34..d464aca 100644
--- a/SCP/Admin/online.aspx.designer.cs
+++ b/SCP/Admin/online.aspx.designer.cs
@@ -2,16 +2,18 @@
// <自动生成>
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为,并且如果
-// 重新生成代码,这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
// 自动生成>
//------------------------------------------------------------------------------
-namespace SCP.admin {
-
-
- public partial class online {
-
+namespace SCP.admin
+{
+
+
+ public partial class online
+ {
+
///
/// form1 控件。
///
@@ -20,7 +22,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -29,7 +31,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.PageManager PageManager1;
-
+
///
/// Panel1 控件。
///
@@ -38,7 +40,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.Panel Panel1;
-
+
///
/// Form2 控件。
///
@@ -47,7 +49,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.Form Form2;
-
+
///
/// FormRow1 控件。
///
@@ -56,7 +58,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.FormRow FormRow1;
-
+
///
/// ttbSearchMessage 控件。
///
@@ -65,7 +67,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.TwinTriggerBox ttbSearchMessage;
-
+
///
/// Grid1 控件。
///
@@ -74,7 +76,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.Grid Grid1;
-
+
///
/// ToolbarSeparator3 控件。
///
@@ -83,7 +85,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.ToolbarSeparator ToolbarSeparator3;
-
+
///
/// ToolbarText1 控件。
///
@@ -92,7 +94,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.ToolbarText ToolbarText1;
-
+
///
/// ddlGridPageSize 控件。
///
@@ -101,7 +103,7 @@ namespace SCP.admin {
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUI.DropDownList ddlGridPageSize;
-
+
///
/// Window1 控件。
///
diff --git a/SCP/Views/PlanData/SCP_ASK.aspx b/SCP/Views/PlanData/SCP_ASK.aspx
index 2776c52..4535e71 100644
--- a/SCP/Views/PlanData/SCP_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_ASK.aspx
@@ -115,6 +115,7 @@
-
-
+
diff --git a/SCP/Views/PlanData/SCP_PART_LIFE.aspx b/SCP/Views/PlanData/SCP_PART_LIFE.aspx
index 6441840..287b8fd 100644
--- a/SCP/Views/PlanData/SCP_PART_LIFE.aspx
+++ b/SCP/Views/PlanData/SCP_PART_LIFE.aspx
@@ -45,7 +45,7 @@
DataKeyNames = "UID,PoBillNum,PoLine,PartCode,PlanQty,ShippedQty,ReceivedQty,RejectQty,BeginTime,EndTime,PoUnit,LocUnit,Price,Currency,PackQty,UnConv,DockCode,State,Remark,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,PartDesc1,CurrencyDesc,ErpBillNum,ModType,Contacter,Site,Buyer,BuyerPhone,VendName,PartDesc2,TempQty,PublishQty"
SortField="PoBillNum"
AllowPaging="True" EnableRowDoubleClickEvent="true"
- IsDatabasePaging="true" PageSize="200" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange" OnRowSelect="Grid_V_TB_PO_DETAIL_RowSelect" OnRowDoubleClick="Grid_V_TB_PO_DETAIL_RowDoubleClick"
+ IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid_V_TB_PO_DETAIL_PageIndexChange" OnRowSelect="Grid_V_TB_PO_DETAIL_RowSelect" OnRowDoubleClick="Grid_V_TB_PO_DETAIL_RowDoubleClick"
>
diff --git a/SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs b/SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs
index 3b6130a..819ccdd 100644
--- a/SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs
+++ b/SCP/Views/PlanData/SCP_PART_LIFE.aspx.cs
@@ -68,6 +68,7 @@ namespace SCP.Views.PlanData
protected void Grid_V_TB_PO_DETAIL_PageIndexChange(object sender, GridPageEventArgs e)
{
+
BindData();
}
@@ -88,6 +89,7 @@ namespace SCP.Views.PlanData
protected void ddlGridPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
+ Grid_V_TB_PO_DETAIL.PageSize = Convert.ToInt32(ddlGridPageSize.SelectedValue);
BindData();
}
diff --git a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
index 074befd..bf799c9 100644
--- a/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
+++ b/SCP/Views/PlanData/SCP_PO_CREATE_ASK.aspx
@@ -43,7 +43,8 @@
-
+
+
@@ -56,7 +57,7 @@
- <%--
+ <%--
--%>
-
diff --git a/SCP/Views/SupplierData/SCP_ASK.aspx b/SCP/Views/SupplierData/SCP_ASK.aspx
index bb644aa..2fb7623 100644
--- a/SCP/Views/SupplierData/SCP_ASK.aspx
+++ b/SCP/Views/SupplierData/SCP_ASK.aspx
@@ -95,7 +95,7 @@
-
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE.aspx b/SCP/Views/WarehouseData/SCP_INVOICE.aspx
index 2ec0c53..9753837 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE.aspx
@@ -72,7 +72,7 @@
From 97cb2e3f3c39ca846f3c61f959daaff2f7c86d91 Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Fri, 21 Aug 2020 10:15:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BB=A3=E5=BC=80=E7=A5=A8=E5=88=86?=
=?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx | 2 +-
SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
index 37fd93f..a42245f 100644
--- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
+++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx
@@ -121,7 +121,7 @@
-
diff --git a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
index c9b1323..30dff4f 100644
--- a/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
+++ b/SCP/Views/SupplierData/SCP_RECEIVE_LIST.aspx.cs
@@ -73,9 +73,9 @@ namespace SCP.SupplierData
public void LoadData()
{
// 每页记录数
- Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
- ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
- BindData();
+ //Grid_V_TB_RECEIVE_LIST.PageSize = ConfigHelper.PageSize;
+ //ddlGridPageSize.SelectedValue = ConfigHelper.PageSize.ToString();
+ //BindData();
}
private void SearchData(Action> p_action)
{