From 3671b9b016b038ca0f1a0cfa6ed84bc8c56f9c34 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Fri, 30 Dec 2022 09:59:44 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E5=BF=98=E8=A8=98=E5=AF=86=E7=A2=BC?=
 =?UTF-8?q?=20[WHY]=20fix=20[HOW]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

將公司下拉選單拿掉，並預設公司編號為TG
---
 EuroTran/WebApp/Page/ForgetPassword.html  |  4 ++--
 EuroTran/WebApp/Scripts/ForgetPassword.js | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/EuroTran/WebApp/Page/ForgetPassword.html b/EuroTran/WebApp/Page/ForgetPassword.html
index ed14079..735edba 100644
--- a/EuroTran/WebApp/Page/ForgetPassword.html
+++ b/EuroTran/WebApp/Page/ForgetPassword.html
@@ -50,7 +50,7 @@
                         <div class="login-box">
                             <a href="/Page/ForgetPassword.html" class="logo-name text-lg text-center">忘記密碼</a>
                             <form class="m-t-md" id="formforgetpassword">
-                                <div class="col-sm-12">
+                                <!--<div class="col-sm-12">
                                     <div class="col-sm-12">
                                         <div class="form-group">
                                             <select class="form-control w100p" id="OrgID" name="OrgID" required></select>
@@ -58,7 +58,7 @@
                                     </div>
                                     <div class="col-sm-2">
                                     </div>
-                                </div>
+                                </div>-->
                                 <div class="col-sm-12">
                                     <div class="col-sm-12">
                                         <div class="form-group">
diff --git a/EuroTran/WebApp/Scripts/ForgetPassword.js b/EuroTran/WebApp/Scripts/ForgetPassword.js
index 751d054..03462cf 100644
--- a/EuroTran/WebApp/Scripts/ForgetPassword.js
+++ b/EuroTran/WebApp/Scripts/ForgetPassword.js
@@ -10,8 +10,8 @@
         fnSetOrgIDDrop = function () {
             return CallAjax(ComFn.W_Web, 'GetOrgs', {}, function (res) {
                 var saList = $.parseJSON(res.d);
-                var sOptionHtml = createOptions(saList, 'OrgID', 'OrgName', true);
-                $('#OrgID').html(sOptionHtml).find('option:first').remove();
+                var sOptionHtml = createOptions(saList.DATA, 'OrgID', 'OrgName', true);
+                $('#OrgID').html(sOptionHtml);
             });
         },
         fnRefreshTime = function () {
@@ -31,6 +31,7 @@
         };
 
     fnSetOrgIDDrop().done(function () {
+        
         //表單欄位驗證
         $Validator = $("#formforgetpassword").validate({
             rules: {
@@ -57,8 +58,10 @@
             }
             g_api.ConnectLite(Service.auth, 'CheckMember', {
                 url: g_gd.webapilonginurl,
-                OrgID: $('#OrgID').val(),
+                OrgID: "TG",
+                //OrgID: $('#OrgID').val(),
                 UserID: $('#txtUserId').val()
+                
             }, function (res) {
                 if (res.RESULT) {
                     $('.newpwd').show();
@@ -88,7 +91,8 @@
 
             g_api.ConnectLite(Service.auth, 'ReSetPassword', {
                 url: g_gd.webapilonginurl,
-                OrgID: $('#OrgID').val(),
+                OrgID: "TG",
+                //OrgID: $('#OrgID').val(),
                 UserID: $('#txtUserId').val(),
                 VerificationCode: $('#txtVerificationCode').val(),
                 NewPsw: $('#txtNewPassword').val()