From 0f146fac10a1cfcce1b178f2c04eef82c3892085 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Tue, 13 Dec 2022 17:57:12 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E5=B1=95=E9=A4=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20[WHY]=20feature=20[HOW]=20=E4=BE=9D=E7=85=A7clickup=E6=8F=90?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E5=95=8F=E9=A1=8C=E9=80=B2=E8=A1=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

展館管理：
1. 查詢頁面欄位簡體中文修正
2. 查詢頁面欄位順序調整
3. 編輯頁面欄位調整
---
 .../Page/ShowEasy/VenueMaintain_Upd.html      | 24 +++++++++----------
 .../pages/ShowEasy/VenueMaintain_Qry.js       |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Upd.html b/EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Upd.html
index 10ba2e9..36949ec 100644
--- a/EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Upd.html
+++ b/EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Upd.html
@@ -67,7 +67,7 @@
                             </div>
                             <label class="col-sm-2 control-label"><span data-i18n="VenueMaintain_Upd.VenueSlug">展館別名</span>：</label>
                             <div class="col-sm-3">
-                                <input type="text" class="form-control w100p" name="VenueSlug" id="VenueSlug" maxlength="200" placeholderid="VenueMaintain_Upd.Instruction_SlugName" placeholder="可以是多筆，請用逗號分隔開，如別名1，別名2">
+                                <input type="text" class="form-control w100p" name="VenueSlug" id="VenueSlug" maxlength="200" placeholderid="VenueMaintain_Upd.Instruction_SlugName" placeholder="可以是多筆,請用逗號分隔開,如別名1,別名2">
                             </div>
                         </div>
                         <!--洲別、國別下拉選單-->
@@ -81,29 +81,29 @@
                                 <select class="form-control w100p" id="CountryID" name="CountryID" data-type="select2" required data-msg="VenueMaintain_Upd.Country_required" datamsg="請選擇國家"></select>
                             </div>
                         </div>
-                        <!--城市下拉選單、排序-->
+                        <!--城市下拉選單-->
                         <div class="form-group">
                             <label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="VenueMaintain_Upd.CityID">城市</span>：</label>
                             <div class="col-sm-3">
                                 <select class="form-control w100p" id="CityID" name="CityID" required data-msg="VenueMaintain_Upd.City_required" datamsg="請輸入展館名稱"></select>
                             </div>
-                            <label class="col-sm-2 control-label"><span data-i18n="common.OrderByValue">排序</span>：</label>
-                            <div class="col-sm-3">
-                                <select class="form-control w100p" id="OrderByValue" name="OrderByValue" required data-msg="common.OrderByValue_required" datamsg="請選擇排序欄位"></select>
+                        </div>
+                        <!--展館地址-->
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label"><span data-i18n="VenueMaintain_Upd.Address">展館地址</span>：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="form-control w100p" name="Address" id="Address" maxlength="200">
                             </div>
                         </div>
-                        <!--網站-->
+                        <!--網站、排序-->
                         <div class="form-group">
                             <label class="col-sm-2 control-label"><span data-i18n="VenueMaintain_Upd.Website">網站連結</span>：</label>
                             <div class="col-sm-3">
                                 <input type="text" class="form-control w100p" name="Website" id="Website" maxlength="200">
                             </div>
-                        </div>
-                        <!--展館地址-->
-                        <div class="form-group">
-                            <label class="col-sm-2 control-label"><span data-i18n="VenueMaintain_Upd.Address">展館地址</span>：</label>
-                            <div class="col-sm-8">
-                                <input type="text" class="form-control w100p" name="Address" id="Address" maxlength="200">
+                            <label class="col-sm-2 control-label"><span data-i18n="common.OrderByValue">排序</span>：</label>
+                            <div class="col-sm-3">
+                                <select class="form-control w100p" id="OrderByValue" name="OrderByValue" required data-msg="common.OrderByValue_required" datamsg="請選擇排序欄位"></select>
                             </div>
                         </div>
                         <div class="form-group">
diff --git a/EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Qry.js b/EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Qry.js
index 9a022d6..2740ba9 100644
--- a/EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Qry.js
+++ b/EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Qry.js
@@ -10,13 +10,13 @@ var fnPageInit = function () {
         //Grid欄位設置（可以是 function）
         gridFields: [
             { name: "RowIndex", title: 'common.RowNumber', align: 'center', width: 50, sorting: false },
-            { name: "RegionName", title: 'VenueMaintain_Qry.RegionName', width: 125 },
-            { name: "CountryName", title: 'VenueMaintain_Qry.CountryName', width: 125 },
-            { name: "CityName", title: 'VenueMaintain_Qry.CityName', width: 125 },
             { name: "VenueID", title: 'VenueMaintain_Qry.VenueID', width: 100 },
             { name: "VenueName", title: 'VenueMaintain_Qry.VenueName', width: 200 },
             { name: "VenueName_EN", title: 'VenueMaintain_Qry.VenueName_EN', width: 200 },
             { name: "ShortName", title: 'VenueMaintain_Qry.ShortName', width: 125 },
+            { name: "RegionName", title: 'VenueMaintain_Qry.RegionName', width: 125 },
+            { name: "CountryName", title: 'VenueMaintain_Qry.CountryName', width: 125 },
+            { name: "CityName", title: 'VenueMaintain_Qry.CityName', width: 125 },
             {
                 name: "Effective", title: 'common.Status', width: 100, align: 'center', itemTemplate: function (val) {
                     return val === 'Y' ? i18next.t('common.Enable') : i18next.t('common.Disable');