diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM.aspx
index 430b228..85758ef 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM.aspx
@@ -102,7 +102,7 @@
                         <f:BoundField runat="server" HeaderText="金额(不含税)" ColumnID="" DataField="Amount" DataFormatString = "{0:F}"/>
                          <f:BoundField runat="server" HeaderText="采购金额(不含税)" ColumnID="" DataField="PurCost" DataFormatString = "{0:F}"/>
                         <f:BoundField runat="server" HeaderText="成本金额(不含税)" ColumnID="" DataField="StdCost" DataFormatString = "{0:F}"/>
-                        <f:BoundField runat="server" HeaderText="税率" ColumnID="" DataField="Tax" DataFormatString = "{0:F}"/>
+                        <f:BoundField runat="server" HeaderText="税率" ColumnID="" DataField="Tax" DataFormatString = "{0:F}" />
                         <f:BoundField runat="server" HeaderText="税额" ColumnID="" DataField="TaxAmount" DataFormatString = "{0:F}"/>
                         <f:BoundField runat="server" HeaderText="税后金额" ColumnID="" DataField="Total" DataFormatString = "{0:F}"/>
                         <f:BoundField runat="server" HeaderText="折扣金额" ColumnID="" DataField="DiscountPrice" DataFormatString = "{0:F}"/>
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_CONFIRM_DETAIL.aspx
index 74bbfcb..b3cdaa2 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"  DataFormatString = "{0:F}"/>
+                                        <f:TextBox ID="txtAmount" runat="server" Label="税前金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  />
                                       <%--  <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" DataFormatString = "{0:F}">
+                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" >
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  DataFormatString = "{0:F}"/>
+                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  />
                                          <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="折扣金额"  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}"/>
+                                         <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" />
                                       
                                     </Items>
                                 </f:FormRow>
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_DELTAIL.aspx
index 5456bee..1cf1df3 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" DataFormatString = "{0:F}" />
-                                        <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
+                                        <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>
-                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
+                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" >
                                         </f:TextBox>
-                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false"  DataFormatString = "{0:F}"/>
+                                        <f:TextBox ID="txtTotal" runat="server" Label="税后金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
                                          <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"  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: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:Label runat="server" ID="Label1" />
                                     </Items>
                                 </f:FormRow>
@@ -66,7 +66,7 @@
                                     <Items> 
                                          <f:TextBox ID="txtExpressNumber" runat="server" Label="快递单号" Text="" MaxLength="100" Readonly="true">
                                         </f:TextBox>
-                                        <f:Label runat="server" ID="txtTAXOLD"  Label="ERP税额"></f:Label>
+                                        <f:Label runat="server" ID="txtTAXOLD"  Label="ERP税额" ></f:Label>
                                      <%--   <f:Label runat="server" ID ="txtTAXDIS" Label="税金差额" ShowRedStar="true"></f:Label>--%>
                                         <f:DatePicker runat="server" ID ="dpUpdateTime" Label="发票时间"></f:DatePicker>
                                         <f:TextBox ID="txtMemo" runat="server" Label="备注" Text="" MaxLength="100">
@@ -105,8 +105,8 @@
                          </f:RenderField>
                        <%-- <f:BoundField SortField="Price" DataField="Price" HeaderText="单价" ColumnID="PlanQty" Width="80px" />--%>
 
-                        <f:BoundField SortField="PurCost" runat="server" HeaderText="采购价格(未含税)" ColumnID="PurCost" DataField="PurCost" />
-                        <f:BoundField SortField="StdCost" runat="server" HeaderText="成本价格(未含税)"  ColumnID="StdCost" DataField="StdCost" />
+                        <f:BoundField SortField="PurCost" runat="server" HeaderText="采购价格(未含税)" ColumnID="PurCost" DataField="PurCost" DataFormatString = "{0:F}"/>
+                        <f:BoundField SortField="StdCost" runat="server" HeaderText="成本价格(未含税)"  ColumnID="StdCost" 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_VIEW.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx
index 24a8a0c..5f519e1 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW.aspx
@@ -101,10 +101,10 @@
                             <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="ContractPrice" DataField="ContractPrice" DataFormatString = "{0:F}"/>
+                            <f:BoundField runat="server" HeaderText="合同差额" ColumnID="BlancePrice" DataField="BlancePrice" DataFormatString = "{0:F}"/> 
                             <%--<f:BoundField runat="server" HeaderText="开票金额" ColumnID="" DataField="Total" />--%>
-                             <f:TemplateField  HeaderText="开票金额" Width="120px">
+                             <f:TemplateField  HeaderText="开票金额" Width="120px" >
                                  <ItemTemplate>
                                      <input type="hidden" class="price" runat="server" value='<%# Eval("Total") %>' />
                                      <asp:Label runat="server" DataField="Total" Text='<%# Eval("Total") %>'></asp:Label>
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx
index ff65f99..0d41f52 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" DataFormatString = "{0:F}"/>
-                                        <f:TextBox ID="txtTax" runat="server" Label="税率" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
+                                        <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>
-                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" DataFormatString = "{0:F}">
+                                        <f:TextBox ID="txtTaxAmount" runat="server" Label="税额" Text="" MaxLength="100" Readonly="true" Enabled="false" >
                                         </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" DataFormatString = "{0:F}"/>
+                                        <f:TextBox ID="txtTotal" runat="server" Label="开票金额" Text="" MaxLength="100" Readonly="true" Enabled="false" />
                                         <f:TextBox ID="txtMemo" runat="server" Label="备注" Text="" MaxLength="100">
                                         </f:TextBox>
                                         <f:Label ID="TextBox2" runat="server" Text="">
@@ -83,8 +83,8 @@
                         <f:BoundField SortField="PartDesc1" DataField="PartDesc1" HeaderText="零件名称" ColumnID="CurrencyCode" Width="200px" />
                         <f:BoundField SortField="Currency" DataField="Currency" HeaderText="币种" ColumnID="Price" Width="80px" />
                         <f:BoundField SortField="Price" DataField="Price" HeaderText="单价" ColumnID="PlanQty" Width="80px" />
-                        <f:BoundField SortField="ContractPrice" runat="server" HeaderText="合同价格" Hidden="true" ColumnID="" DataField="ContractPrice" />
-                        <f:BoundField SortField="BlancePrice" runat="server" HeaderText="合同差额" Hidden="true" ColumnID="" DataField="BlancePrice" />
+                        <f:BoundField SortField="ContractPrice" runat="server" HeaderText="合同价格" Hidden="true" ColumnID="" DataField="ContractPrice" DataFormatString = "{0:F}"/>
+                        <f:BoundField SortField="BlancePrice" runat="server" HeaderText="合同差额" Hidden="true" ColumnID="" DataField="BlancePrice" DataFormatString = "{0:F}"/>
                         <f:BoundField SortField="BeginTime" runat="server" HeaderText="要货日期" Hidden="true" ColumnID="" DataField="BeginTime" />
                         <f:BoundField SortField="Qty" DataField="Qty" HeaderText="开票数量" ColumnID="OpenQty" Width="80px" />
                      
diff --git a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx.designer.cs b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx.designer.cs
index c9daa2f..84f06f5 100644
--- a/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx.designer.cs
+++ b/SCP/Views/WarehouseData/SCP_INVOICE_VIEW_DETAIL.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace SCP.WarehouseData {
-    
-    
-    public partial class SCP_INVOICE_VIEW_DETAIL {
-        
+namespace SCP.WarehouseData
+{
+
+
+    public partial class SCP_INVOICE_VIEW_DETAIL
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Panel Panel1;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// ToolbarSeparator3 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.ToolbarSeparator ToolbarSeparator3;
-        
+
         /// <summary>
         /// btnEdit 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Button btnEdit;
-        
+
         /// <summary>
         /// btnOutput 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Button btnOutput;
-        
+
         /// <summary>
         /// gp1 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.GroupPanel gp1;
-        
+
         /// <summary>
         /// txtBillNo 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtBillNo;
-        
+
         /// <summary>
         /// txtState 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtState;
-        
+
         /// <summary>
         /// txtBillTime 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtBillTime;
-        
+
         /// <summary>
         /// txtSupplierName 控件。
         /// </summary>
@@ -110,7 +112,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtSupplierName;
-        
+
         /// <summary>
         /// txtInvoiceNumber 控件。
         /// </summary>
@@ -119,7 +121,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtInvoiceNumber;
-        
+
         /// <summary>
         /// txtExpressNumber 控件。
         /// </summary>
@@ -128,7 +130,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtExpressNumber;
-        
+
         /// <summary>
         /// txtAmount 控件。
         /// </summary>
@@ -137,7 +139,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtAmount;
-        
+
         /// <summary>
         /// txtTax 控件。
         /// </summary>
@@ -146,7 +148,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtTax;
-        
+
         /// <summary>
         /// txtTaxAmount 控件。
         /// </summary>
@@ -155,7 +157,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtTaxAmount;
-        
+
         /// <summary>
         /// txtTotal 控件。
         /// </summary>
@@ -164,7 +166,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtTotal;
-        
+
         /// <summary>
         /// txtMemo 控件。
         /// </summary>
@@ -173,7 +175,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.TextBox txtMemo;
-        
+
         /// <summary>
         /// TextBox2 控件。
         /// </summary>
@@ -182,7 +184,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Label TextBox2;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -191,7 +193,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Grid Grid1;
-        
+
         /// <summary>
         /// txtLineMemo 控件。
         /// </summary>
@@ -200,7 +202,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox txtLineMemo;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -209,7 +211,7 @@ namespace SCP.WarehouseData {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUI.Window Window1;
-        
+
         /// <summary>
         /// WindowUpload 控件。
         /// </summary>