SCP
/
SCPFWBTL
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of https://gitee.com/zxyabc/COMONE

master
lvzb 4 years ago
parent
f6c889879f 2aac6db908
commit
a7844a7095
4 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      SCP/Views/BasicData/Part.aspx
  2. 2
      SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
  3. 6
      SCP/Views/SupplierData/SCP_QUALITY.aspx
  4. 2
      SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx

2
SCP/Views/BasicData/Part.aspx
View File

@ -10,7 +10,7 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager runat="server" AutoSizePanelID="Panel1" /> <f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True"> <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items> <Items>
<f:Form runat="server"> <f:Form runat="server">
<Toolbars> <Toolbars>

2
SCP/Views/PlanData/SCP_INCOMPLETE_ASK.aspx
View File

@ -10,7 +10,7 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager runat="server" AutoSizePanelID="Panel1" /> <f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True"> <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items> <Items>
<f:Form runat="server"> <f:Form runat="server">
<Toolbars> <Toolbars>

6
SCP/Views/SupplierData/SCP_QUALITY.aspx
View File

@ -10,7 +10,7 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager runat="server" AutoSizePanelID="Panel1" /> <f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True"> <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items> <Items>
<f:Form runat="server"> <f:Form runat="server">
<Toolbars> <Toolbars>
@ -70,7 +70,7 @@
EnableCollapse = "true" EnableCollapse = "true"
ShowBorder = "true" ShowBorder = "true"
ShowHeader = "true" ShowHeader = "true"
BoxFlex="1"
runat ="server" runat ="server"
EnableCheckBoxSelect = "true" EnableCheckBoxSelect = "true"
DataKeyNames = "UID,Type,Barcode,Loccode,Pobillnum,Poline,Inspecttype,Partcode,Batch,ReceiveQty,SampleQty,Inspqty,Passqty,Failqty,Crackqty,Inspresult,Failreason,Vendid,Vendbatch,state,Billtime,Domain,Site,By1,By2,By3,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,UserInAddress,UserInVendIds,BillStateList" DataKeyNames = "UID,Type,Barcode,Loccode,Pobillnum,Poline,Inspecttype,Partcode,Batch,ReceiveQty,SampleQty,Inspqty,Passqty,Failqty,Crackqty,Inspresult,Failreason,Vendid,Vendbatch,state,Billtime,Domain,Site,By1,By2,By3,CreateTime,CreateUser,UpdateTime,UpdateUser,UpdateInfo,IsDeleted,GUID,UserInAddress,UserInVendIds,BillStateList"
@ -78,7 +78,7 @@
IsDatabasePaging="true" AllowPaging="true" IsDatabasePaging="true" AllowPaging="true"
AutoScroll="True" AutoScroll="True"
SortDirection="DESC" SortField="Billtime" SortDirection="DESC" SortField="Billtime"
OnPageIndexChange="Grid_TB_QUALITY_PageIndexChange" OnPageIndexChange="Grid_TB_QUALITY_PageIndexChange"
> >
<PageItems> <PageItems>

2
SCP/Views/WarehouseData/SCP_INVOICE_RECVICE.aspx
View File

@ -11,7 +11,7 @@
<body> <body>
<form id="form1" runat="server"> <form id="form1" runat="server">
<f:PageManager runat="server" AutoSizePanelID="Panel1" /> <f:PageManager runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True"> <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True" Layout="VBox">
<Items> <Items>
<f:Form runat="server" Title=""> <f:Form runat="server" Title="">
<Items> <Items>

Write Preview
Loading…
Cancel
Save