From 82bf7e479e61c54de46784a160363b2c32adc3af Mon Sep 17 00:00:00 2001
From: TML <1448969505@qq.com>
Date: Wed, 3 Mar 2021 12:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E7=BB=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SCP/{Default1.aspx => Default_FW.aspx}        | 19 +++++++++----------
 SCP/{Default1.aspx.cs => Default_FW.aspx.cs}  | 12 ++++++------
 ...esigner.cs => Default_FW.aspx.designer.cs} |  9 +++++++++
 SCP/SCP.csproj                                | 10 +++++-----
 .../SCP_PO_EXTEND_DETAIL.aspx.cs              |  2 +-
 SCP/Web.config                                |  2 +-
 6 files changed, 31 insertions(+), 23 deletions(-)
 rename SCP/{Default1.aspx => Default_FW.aspx} (90%)
 rename SCP/{Default1.aspx.cs => Default_FW.aspx.cs} (94%)
 rename SCP/{Default1.aspx.designer.cs => Default_FW.aspx.designer.cs} (92%)
diff --git a/SCP/Default1.aspx b/SCP/Default_FW.aspx
similarity index 90%
rename from SCP/Default1.aspx
rename to SCP/Default_FW.aspx
index 6f24b76..1d5e7fa 100644
--- a/SCP/Default1.aspx
+++ b/SCP/Default_FW.aspx
@@ -1,4 +1,4 @@
-﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default1.aspx.cs" Inherits="SCP.Default1"   ValidateRequest="true" %>
+﻿<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Default_FW.aspx.cs" Inherits="SCP.Default1"   ValidateRequest="true" %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -35,16 +35,12 @@ td{
     <div>
       <table width="959" height="86" border="0" align="center" cellpadding="0" cellspacing="0" background="res/images/login_title.jpg">
         <tr>
-          <td align="center" valign="top"><table width="100%" border="0" cellspacing="0" cellpadding="0">
-            <tr>
-              <td align="right">&nbsp;</td>
-            </tr>
-          </table></td>
+          <td align="center" valign="top">  <%= GetResourceKey(GetFactoryName()) %></td>
         </tr>
       </table>
       <table width="959" border="0" align="center" cellpadding="0" cellspacing="0">
         <tr>
-          <td width="648"><img src="res/images/20210302140650.png" width="648" height="368" style="box-shadow:0px 15px 10px -15px #000;" /></td>
+          <td width="648"><img src="res/images/login_content.jpg" width="648" height="368" style="box-shadow:0px 15px 10px -15px #000;" /></td>
           <td width="311"><table width="311" height="390" border="0" align="right" cellpadding="0" cellspacing="0" background="res/images/login_form.jpg">
             <tr>
               <td><table width="90%" border="0" align="center" cellpadding="5" cellspacing="0" class="login" id="login">
@@ -70,7 +66,10 @@ td{
                     </td>
                 </tr>
                 <tr>
-                  <td align="right">账号</td>
+                  <td align="right">账号
+                            <asp:Label runat="server" id="lb" style="color:red"></asp:Label>
+                  </td>
+              
                   <td>
                       
                       <asp:TextBox ID="txtUserName" runat="server" style="width:120px" Text=""></asp:TextBox>
@@ -133,10 +132,10 @@ td{
         var obj = document.getElementById('factory');
 
         for (var i = 0; obj.options.length; i++) {
-            if ('QDVALEO' == obj.options[i].value) {
+            if ('2000' == obj.options[i].value) {
                 obj.options[i].selected = true;
                 _factory = document.getElementById(_factoryValue);
-                _factory.value = 'QDVALEO';
+                _factory.value = '2000';
             }
         }
     }
diff --git a/SCP/Default1.aspx.cs b/SCP/Default_FW.aspx.cs
similarity index 94%
rename from SCP/Default1.aspx.cs
rename to SCP/Default_FW.aspx.cs
index 812bdde..c7ad145 100644
--- a/SCP/Default1.aspx.cs
+++ b/SCP/Default_FW.aspx.cs
@@ -117,14 +117,14 @@ namespace SCP
             }
             catch (Exception ex)
             {
-
+                Alert.Show(ex.Message);
             }
         }
         private void Login(string p_userName, string p_password)
         {
             if (string.IsNullOrEmpty(txtUserName.Text) || string.IsNullOrEmpty(txtPassword.Text))
             {
-                Alert.Show(GetResourceKey("用户名或密码不能为空!"));
+                lb.Text = (GetResourceKey("用户名或密码不能为空!"));
                 return;
             }
             User user = DB.Users.Where(u => u.Name == p_userName).FirstOrDefault();
@@ -136,7 +136,7 @@ namespace SCP
 
                     if (!user.Enabled)
                     {
-                        Alert.Show(GetResourceKey("用户未启用，请联系管理员！"));
+                      lb.Text=(GetResourceKey("用户未启用，请联系管理员！"));
                     }
                     else
                     {
@@ -150,7 +150,7 @@ namespace SCP
                         }
                         else
                         {
-                            Alert.Show("不选定工厂下供应商");
+                            lb.Text = ("不选定工厂下供应商");
                             return;
                         }
                         return;
@@ -158,13 +158,13 @@ namespace SCP
                 }
                 else
                 {
-                    Alert.Show(GetResourceKey("用户名或密码错误！"));
+                    lb.Text = (GetResourceKey("用户名或密码错误！"));
                     return;
                 }
             }
             else
             {
-                Alert.Show(GetResourceKey("用户名或密码错误！"));
+                lb.Text = (GetResourceKey("用户名或密码错误！"));
                 return;
             }
         }
diff --git a/SCP/Default1.aspx.designer.cs b/SCP/Default_FW.aspx.designer.cs
similarity index 92%
rename from SCP/Default1.aspx.designer.cs
rename to SCP/Default_FW.aspx.designer.cs
index 5951a79..21533db 100644
--- a/SCP/Default1.aspx.designer.cs
+++ b/SCP/Default_FW.aspx.designer.cs
@@ -41,6 +41,15 @@ namespace SCP
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlSelect factory;
 
+        /// <summary>
+        /// lb 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.Label lb;
+
         /// <summary>
         /// txtUserName 控件。
         /// </summary>
diff --git a/SCP/SCP.csproj b/SCP/SCP.csproj
index 5499da4..f100203 100644
--- a/SCP/SCP.csproj
+++ b/SCP/SCP.csproj
@@ -208,7 +208,7 @@
     <Content Include="Admin\user_select_title.aspx" />
     <Content Include="Admin\user_view.aspx" />
     <Content Include="App_Data\nwind.xml" />
-    <Content Include="Default1.aspx" />
+    <Content Include="Default_FW.aspx" />
     <Content Include="Error.aspx" />
     <Content Include="html5\HtmlPage1.html" />
     <Content Include="res\css\error.css" />
@@ -4919,12 +4919,12 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="Common\MailHelper.cs" />
     <Compile Include="Common\ReportHelper.cs" />
-    <Compile Include="Default1.aspx.cs">
-      <DependentUpon>Default1.aspx</DependentUpon>
+    <Compile Include="Default_FW.aspx.cs">
+      <DependentUpon>Default_FW.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
     </Compile>
-    <Compile Include="Default1.aspx.designer.cs">
-      <DependentUpon>Default1.aspx</DependentUpon>
+    <Compile Include="Default_FW.aspx.designer.cs">
+      <DependentUpon>Default_FW.aspx</DependentUpon>
     </Compile>
     <Compile Include="Error.aspx.cs">
       <DependentUpon>Error.aspx</DependentUpon>
diff --git a/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.cs b/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.cs
index 699643d..7c9f6f2 100644
--- a/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.cs
+++ b/SCP/Views/富维冲插件/SCP_PO_EXTEND_DETAIL.aspx.cs
@@ -25,7 +25,7 @@ namespace SCP.Views.富维冲插件
             ResultObject<bool> saveret = new ResultObject<bool>();
             DataTable _dt = new DataTable();
             var list = ConvertHelper.ToList<SCP_PO_EXPORT_IMPORT_MODEL>(ExcelHelper.RemoveEmpty(_dt)).ToList();
-            var ls = SCP_PO_CONTROLLER.Save_EXCEL_PO_MOD1(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone, TXT_CreateTime.Text, TXT_EN.Text, TXT_EndTime.Text, TXT_PartCode.Text,
+            var ls = SCP_PO_CONTROLLER.Save_TEXT_FWCCJ(list, CurrentUser.FactoryList[0], CurrentUser.Name, DateTime.Now, CurrentUser.SubSiteList[0], CurrentUser.ChineseName, CurrentUser.CellPhone, TXT_CreateTime.Text, TXT_EN.Text, TXT_EndTime.Text, TXT_PartCode.Text,
                 TXT_PoBillNum.Text, TXT_Remark.Text, TXT_Time.Text, TXT_VendId.Text, TXT_PoUnit.Text);
 
 
diff --git a/SCP/Web.config b/SCP/Web.config
index 4b2f69c..5c07e66 100644
--- a/SCP/Web.config
+++ b/SCP/Web.config
@@ -80,7 +80,7 @@
 minFreeThreads="8" minLocalRequestFreeThreads="4" appRequestQueueLimit="100" enableVersionHeader="false"/>
     <customErrors mode="Off" />
     <authentication mode="Forms">
-      <forms name=".APPBOX_FORMS_AUTH" loginUrl="~/default1.aspx" timeout="3" defaultUrl="~/main.aspx" protection="All" path="/" />
+      <forms name=".APPBOX_FORMS_AUTH" loginUrl="~/default.aspx" timeout="3" defaultUrl="~/main.aspx" protection="All" path="/" />
     </authentication>
     <authorization>
     
