From dda8e53e4a134bfc8ac344f91a022e6f0f797218 Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Thu, 17 Sep 2020 16:13:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E7=A5=A8=EF=BC=88=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=EF=BC=89=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SCP_INVOICE_CONFIRM_DETAIL.aspx              | 16 ++++++++--------
 SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx | 14 +++++++-------
 SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx    |  8 ++++----
 .../WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx   |  8 ++++----
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
index 9de361e..74bbfcb 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
@@ -47,7 +47,7 @@
                                 </f:FormRow>
                                 <f:FormRow runat="server" ColumnWidths="20% 20% 20% 20% 20%">
                                     <Items>
-                                        <f:TextBox ID="txtAmount" runat="server" Label="税前金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
+                                        <f:TextBox ID="txtAmount" runat="server" Label="税前金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  DataFormatString = "{0:F}"/>
                                       <%--  <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" >
                                         </f:TextBox>--%>
 
@@ -56,9 +56,9 @@
                                              <f:ListItem Text="0.13" Value="0.13" />
                                              <f:ListItem Text="0" Value="0" />
                                           </f:DropDownList> 
-                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false">
+                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
+                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  DataFormatString = "{0:F}"/>
                                          <f:Label runat="server" ID="Label2" />
                                          
                                     </Items>
@@ -69,9 +69,9 @@
                                         </f:TextBox>
                                         <f:TextBox ID="txtExpressNumber" runat="server" Label="快递单号" Text="" MaxLength="100" Readonly="true">
                                         </f:TextBox>
-                                         <f:NumberBox ID="txtDiscountPrice" runat="server" Label="折扣金额"   />
-                                        <f:TextBox ID="txtContractPrice1" runat="server" Label="索赔金额" Text="0" MaxLength="100" />
-                                        <f:TextBox ID="txtBlancePrice1" runat="server" Label="调整税额" Text="0" MaxLength="100" />
+                                         <f:NumberBox ID="txtDiscountPrice" runat="server" Label="折扣金额"  DataFormatString = "{0:F}" />
+                                        <f:TextBox ID="txtContractPrice1" runat="server" Label="索赔金额" Text="0" MaxLength="100" DataFormatString = "{0:F}"/>
+                                        <f:TextBox ID="txtBlancePrice1" runat="server" Label="调整税额" Text="0" MaxLength="100" DataFormatString = "{0:F}"/>
                                       
                                     </Items>
                                 </f:FormRow>
@@ -129,8 +129,8 @@
 
 
                         
-                        <f:BoundField runat="server" HeaderText="采购金额(不含税)" ColumnID="" DataField="PurCost" />
-                        <f:BoundField runat="server" HeaderText="成本金额(不含税)" ColumnID="" DataField="StdCost" />
+                        <f:BoundField runat="server" HeaderText="采购金额(不含税)" ColumnID="" DataField="PurCost" DataFormatString = "{0:F}"/>
+                        <f:BoundField runat="server" HeaderText="成本金额(不含税)" ColumnID="" DataField="StdCost" DataFormatString = "{0:F}"/>
                         <f:BoundField SortField="UpdateTime" runat="server" HeaderText="收货日期"  ColumnID="" DataField="UpdateTime" />
                         <f:BoundField SortField="Qty" DataField="Qty" HeaderText="开票数量" ColumnID="OpenQty" Width="80px" />
                      
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx
index 206a502..5456bee 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx
@@ -43,12 +43,12 @@
                                 </f:FormRow>
                                 <f:FormRow runat="server" ColumnWidths="20% 20% 20% 20% 20%">
                                     <Items>
-                                        <f:TextBox ID="txtAmount" runat="server" Label="金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
-                                        <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" Readonly="true" Enabled="false">
+                                        <f:TextBox ID="txtAmount" runat="server" Label="金额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}" />
+                                        <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false">
+                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
+                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  DataFormatString = "{0:F}"/>
                                          <f:Label runat="server" ID="Label2" />
                                     </Items>
                                 </f:FormRow>
@@ -56,9 +56,9 @@
                                     <Items>                                        
                                         <f:TextBox ID="txtInvoiceNumber" runat="server" Label="金税票号" Text="" MaxLength="100" Readonly="true">
                                         </f:TextBox>
-                                        <f:NumberBox ID="txtDiscountPrice"  runat="server" Label="折扣金额" Readonly="true"  />
-                                        <f:NumberBox ID="txtContractPrice1" runat="server" Label="索赔金额" Readonly="true"  />
-                                        <f:NumberBox ID="txtBlancePrice1" runat="server" Label="调整税额"  MaxValue="1"  />
+                                        <f:NumberBox ID="txtDiscountPrice"  runat="server" Label="折扣金额" Readonly="true"  DataFormatString = "{0:F}"/>
+                                        <f:NumberBox ID="txtContractPrice1" runat="server" Label="索赔金额" Readonly="true"  DataFormatString = "{0:F}"/>
+                                        <f:NumberBox ID="txtBlancePrice1" runat="server" Label="调整税额"  MaxValue="1"  DataFormatString = "{0:F}"/>
                                         <f:Label runat="server" ID="Label1" />
                                     </Items>
                                 </f:FormRow>
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx
index decdd0c..24a8a0c 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx
@@ -98,11 +98,11 @@
                             <f:BoundField runat="server" HeaderText="快递单号" ColumnID="ExpressNum" DataField="ExpressNum" />
                             <f:BoundField runat="server" HeaderText="供应商" ColumnID="VendName" DataField="VendName" />
                             <f:BoundField runat="server" HeaderText="供应商编码" ColumnID="VendId" DataField="VendId" />
-                            <f:BoundField runat="server" HeaderText="金额" ColumnID="Amount" DataField="Amount" />
-                            <f:BoundField runat="server" HeaderText="税率" ColumnID="Tax" DataField="Tax" />
-                            <f:BoundField runat="server" HeaderText="税额" ColumnID="TaxAmount" DataField="TaxAmount" />                         
+                            <f:BoundField runat="server" HeaderText="金额" ColumnID="Amount" DataField="Amount" DataFormatString = "{0:F}"/>
+                            <f:BoundField runat="server" HeaderText="税率" ColumnID="Tax" DataField="Tax" DataFormatString = "{0:F}"/>
+                            <f:BoundField runat="server" HeaderText="税额" ColumnID="TaxAmount" DataField="TaxAmount" DataFormatString = "{0:F}"/>                         
                             <f:BoundField runat="server" HeaderText="合同价格" ColumnID="ContractPrice" DataField="ContractPrice" />
-                            <f:BoundField runat="server" HeaderText="合同差额" ColumnID="BlancePrice" DataField="BlancePrice" /> 
+                            <f:BoundField runat="server" HeaderText="合同差额" ColumnID="BlancePrice" DataField="BlancePrice"/> 
                             <%--<f:BoundField runat="server" HeaderText="开票金额" ColumnID="" DataField="Total" />--%>
                              <f:TemplateField  HeaderText="开票金额" Width="120px">
                                  <ItemTemplate>
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx
index 6eaaa8f..ff65f99 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx
@@ -50,16 +50,16 @@
                                 </f:FormRow>
                                 <f:FormRow runat="server" ColumnWidths="33% 33% 33%">
                                     <Items>
-                                        <f:TextBox ID="txtAmount" runat="server" Label="金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
-                                        <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" Readonly="true" Enabled="false">
+                                        <f:TextBox ID="txtAmount" runat="server" Label="金额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}"/>
+                                        <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false">
+                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
                                         </f:TextBox>
                                     </Items>
                                 </f:FormRow>
                                 <f:FormRow runat="server" ColumnWidths="33% 33% 33%">
                                     <Items>
-                                        <f:TextBox ID="txtTotal" runat="server" Label="开票金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
+                                        <f:TextBox ID="txtTotal" runat="server" Label="开票金额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}"/>
                                         <f:TextBox ID="txtMemo" runat="server" Label="备注" Text="" MaxLength="100">
                                         </f:TextBox>
                                         <f:Label ID="TextBox2" runat="server" Text="">