From ffff469272d3223f572947799015c11c3b5da7b1 Mon Sep 17 00:00:00 2001
From: lvzb <35200379@qq.com>
Date: Fri, 9 Oct 2020 15:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SupplierData/SCP_INVOICE_EDIT.aspx        |  6 +++---
 .../SupplierData/SCP_INVOICE_EDIT.aspx.cs     | 19 +++++++++++++++----
 .../WarehouseData/SCP_INVOICE_DELTAIL.aspx    |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
index 9ad6a99..b992ebc 100644
--- a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
+++ b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx
@@ -66,9 +66,9 @@
                                 </f:FormRow>
                                 <f:FormRow runat="server" ColumnWidths="25% 25% 25% 25%" ID="FormRow_3">
                                     <Items> 
-                                          <f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" />    
-                                          <f:NumberBox ID="txtExtend2" runat="server" Label="实际税额"  />      
-                                        <f:NumberBox ID="txtContractPrice1" runat="server" Label="折扣金额"   />                                                                             
+                                          <f:NumberBox ID="txtExtend1" runat="server" Label="实际税前金额" Readonly="true" Enabled="false"/>    
+                                          <f:NumberBox ID="txtExtend2" runat="server" Label="实际税额"  Readonly="true" Enabled="false"/>      
+                                        <f:NumberBox ID="txtContractPrice1" runat="server" Label="折扣金额"   Readonly="true" Enabled="false"/>                                                                             
                                         <f:NumberBox ID="txtBlancePrice1" runat="server" Label="调整税额"  MaxValue="1" Hidden="true"  />
                                          <f:TextBox ID="txtRealTotal" runat="server" Label="开票金额" Text="" Readonly="true" Enabled="false" />                                                       
                                     </Items>
diff --git a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
index c9b69d5..1be817f 100644
--- a/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
+++ b/SCP/Views/锦州锦恒/SupplierData/SCP_INVOICE_EDIT.aspx.cs
@@ -214,11 +214,14 @@ namespace SCP.Views.锦州锦恒.SupplierData
                             txtInvoiceNumber.Required = true;
                             txtExpressNumber.Readonly = false;
                             txtContractPrice1.Readonly = false;
-                            txtContractPrice1.Required = false;
+                            txtContractPrice1.Required = true;
+                            txtContractPrice1.Enabled = true;
                             txtExtend1.Readonly = false;
-                            txtExtend1.Required = false;
+                            txtExtend1.Required = true;
+                            txtExtend1.Enabled = true;
                             txtExtend2.Readonly = false;
                             txtExtend2.Required = false;
+                            txtExtend2.Enabled = true;
                             txtBlancePrice1.Readonly = false;
                             txtBlancePrice1.Required = false;
                             this.btnMail.Hidden = false;
@@ -515,8 +518,16 @@ namespace SCP.Views.锦州锦恒.SupplierData
                         Alert.Show("发票时间必须填写,时间为纸质发票开票时间");
                         return;
                     }
-
-
+                    if (_Invoice.Extend1 == 0)
+                    {
+                        Alert.Show("发票实际税前金额(纸质发票税前金额)必须填写!");
+                        return;
+                    }
+                    if (_Invoice.Extend2 == 0)
+                    {
+                        Alert.Show("发票实际税额(纸质发票税额)必须填写!");
+                        return;
+                    }
                 }
 
                 var ret = SCP_INVOICE_CONTROLLER.SAVE_TB_INVOICE_STATE(_Invoice, p_state, CurrentUser.ChineseName);
diff --git a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
index d47d8c7..77e33ba 100644
--- a/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
+++ b/SCP/Views/锦州锦恒/WarehouseData/SCP_INVOICE_DELTAIL.aspx
@@ -10,11 +10,11 @@
 <body>
     <form id="form1" runat="server">
         <f:PageManager runat="server" AutoSizePanelID="Panel1" />
-        <f:Panel ID="Panel1" runat="server" Title="" AutoScroll="True">
+        <f:Panel ID="Panel1" runat="server" Title="" Layout="VBox"  BoxConfigAlign="Stretch" BoxConfigPosition="Start">
             <Toolbars>
                 <f:Toolbar ID="Toolbar2" runat="server">
                     <Items>
-                        <f:Button ID="btnEdit" runat="server" Text="修改数据" Enabled="true" OnClientClick="if(!confirm('是否要修改备注?'))return false;" Icon="ScriptSave" OnClick="btnEdit_OnClick">
+                        <f:Button ID="btnEdit" runat="server" Text="修改数据" Enabled="true" OnClientClick="if(!confirm('是否要修改数据?'))return false;" Icon="ScriptSave" OnClick="btnEdit_OnClick">
                         </f:Button>
                         <f:Button ID="btnInvoiceFail" runat="server" Text="财务退回" Icon="BulletCross" OnClick="btnInvoiceFail_OnClick">
                         </f:Button>