Browse Source

[WHAT] 展館管理 [WHY] [HOW]

1. 展館管理內地區模組下拉選單皆調整為有搜尋欄
2. 城市管理:國家欄位改為必填
Dev
Janie 2 years ago
parent
commit
bcc3359330
  1. 6
      EuroTran/EasyBL.WEBAPP/ShowEasy/VenueMaintain_UpdService.cs
  2. 4
      EuroTran/WebApp/Page/ShowEasy/CityMaintain_Upd.html
  3. 7
      EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Qry.html
  4. 7
      EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Upd.html
  5. 1
      EuroTran/WebApp/Scripts/pages/ShowEasy/CityMaintain_Upd.js
  6. 39
      EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Qry.js
  7. 33
      EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Upd.js

6
EuroTran/EasyBL.WEBAPP/ShowEasy/VenueMaintain_UpdService.cs

@ -261,11 +261,15 @@ namespace EasyBL.WEBAPP.WSM
do
{
var iVenue = _fetchString(i_crm, @"VenueID");
var iCityID = _fetchInt(i_crm, @"CityID");
var iCountryID = _fetchInt(i_crm, @"CountryID");
var sVenueName_EN = _fetchString(i_crm, @"VenueName_EN");
var sVenueName = _fetchString(i_crm, @"VenueName");
var iCout = db.Queryable<SETB_ORG_Venue>()
.Where(x => x.OrgID == i_crm.ORIGID && x.DelStatus == "N")
.WhereIF(!string.IsNullOrEmpty(iVenue), x => x.VenueID == iVenue)
.WhereIF(iCityID != -1, x => x.CityID == iCityID)
.WhereIF(iCountryID != -1, x => x.CountryID == iCountryID)
//.WhereIF(iVenue != -1 , x => x.VenueID == iVenue)
.WhereIF(!String.IsNullOrEmpty(sVenueName_EN) , x => x.VenueName_EN == sVenueName_EN)
.WhereIF(!String.IsNullOrEmpty(sVenueName), x => x.VenueName == sVenueName)
@ -351,7 +355,7 @@ namespace EasyBL.WEBAPP.WSM
var iRegionID = _fetchInt(i_crm, @"RegionID");
var saCountry = db.Queryable<SETB_SYS_Country>()
//搜尋條件
.Where(x => x.OrgID == i_crm.ORIGID && x.Effective == "Y" && x.DelStatus == "N")
.Where(x => x.OrgID == i_crm.ORIGID && x.Effective == "Y" && x.DelStatus == "N")
.WhereIF(iRegionID != -1, x => x.RegionID == iRegionID)
.ToList();
rm = new SuccessResponseMessage(null, i_crm);

4
EuroTran/WebApp/Page/ShowEasy/CityMaintain_Upd.html

@ -54,7 +54,7 @@
<div class="col-sm-3">
<select class="form-control w100p" id="RegionID" name="RegionID" maxlength="36" required data-msg="CityMaintain_Upd.RegionID_required" datamsg="請選擇洲別"></select>
</div>
<label class="col-sm-2 control-label" for="input-Default">
<label class="col-sm-2 control-label"><b class="t-red">*</b>
<span data-i18n="CityMaintain_Upd.CountryID">國家</span><span></span>
</label>
<div class="col-sm-3">
@ -65,7 +65,7 @@
<div class="form-group">
<label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="CityMaintain_Upd.CityName">城市名稱</span></label>
<div class="col-sm-3">
<input type="text" class="form-control w100p" name="CityName" id="CityName" maxlength="200" required data-msg="CityMaintain_Upd.CityName_required" datamsg="請輸入城市名稱">
<input type="text" class="form-control w100p" name="CityName" id="CityName" data-type="select2" maxlength="200" required data-msg="CityMaintain_Upd.CityName_required" datamsg="請輸入城市名稱">
</div>
<label class="col-sm-2 control-label" for="input-Default"><b class="t-red">*</b><span data-i18n="CityMaintain_Upd.CityName_EN">城市英文名稱</span></label>
<div class="col-sm-3">

7
EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Qry.html

@ -15,6 +15,7 @@
<link href="/Scripts/plugins/toastr/toastr.min.css" rel="stylesheet" type="text/css" />
<link href="/Scripts/3rd/jGrid/jsgrid.min.css" rel="stylesheet" />
<link href="/Scripts/3rd/jGrid/jsgrid-theme.min.css" rel="stylesheet" />
<link href="/Scripts/3rd/select2/css/select2.min.css" rel="stylesheet" />
<link href="/Content/modern.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/custom.min.css" rel="stylesheet" />
<link href="/Content/themes/red.css" rel="stylesheet" type="text/css" />
@ -44,16 +45,16 @@
<select class="form-control w100p" id="RegionID" name="RegionID"></select>
</div>
<label class="col-sm-1 control-label" for="input-Default">
<span data-i18n="VenueMaintain_Qry.CountryID"></span><span></span>
<span data-i18n="VenueMaintain_Qry.CountryID"></span><span></span>
</label>
<div class="col-sm-3">
<select class="form-control w100p" id="CountryID" name="CountryID"></select>
<select class="form-control w100p" data-type="select2" id="CountryID" name="CountryID"></select>
</div>
<label class="col-sm-1 control-label" for="input-Default">
<span data-i18n="VenueMaintain_Qry.CityID">城市</span><span></span>
</label>
<div class="col-sm-3">
<select class="form-control w100p" id="CityID" name="CityID"></select>
<select class="form-control w100p" data-type="select2" id="CityID" name="CityID"></select>
</div>
</div>
<div class="form-group">

7
EuroTran/WebApp/Page/ShowEasy/VenueMaintain_Upd.html

@ -17,6 +17,9 @@
<link href="/Content/custom.min.css" rel="stylesheet" type="text/css" />
<link href="/Content/themes/red.css" rel="stylesheet" type="text/css" />
<link href="/Content/style2.0.css" rel="stylesheet" type="text/css" />
<link href="/Scripts/3rd/jGrid/jsgrid.min.css" rel="stylesheet" />
<link href="/Scripts/3rd/jGrid/jsgrid-theme.min.css" rel="stylesheet" />
<link href="/Scripts/3rd/select2/css/select2.min.css" rel="stylesheet" />
</head>
<body>
<div class="page-inner">
@ -71,11 +74,11 @@
<div class="form-group">
<label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="VenueMaintain_Upd.RegionID">洲別</span></label>
<div class="col-sm-3">
<select class="form-control w100p" id="RegionID" name="RegionID"></select>
<select class="form-control w100p" id="RegionID" name="RegionID" required data-msg="VenueMaintain_Upd.Region_required"></select>
</div>
<label class="col-sm-2 control-label"><b class="t-red">*</b><span data-i18n="VenueMaintain_Upd.CountryID">國別</span></label>
<div class="col-sm-3">
<select class="form-control w100p" id="CountryID" name="CountryID"></select>
<select class="form-control w100p" id="CountryID" name="CountryID" data-type="select2" required data-msg="VenueMaintain_Upd.Country_required"></select>
</div>
</div>
<!--城市下拉選單、排序-->

1
EuroTran/WebApp/Scripts/pages/ShowEasy/CityMaintain_Upd.js

@ -63,7 +63,6 @@ var fnPageInit = function () {
pargs._getPageVal();//緩存頁面值,用於清除
}
});
$('#RegionID').select2();
$('#CountryID').select2();
}

39
EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Qry.js

@ -54,7 +54,7 @@ var fnPageInit = function () {
* @param {Object} pargs CanDo 對象*/
pageInit: function (pargs) {
var postArray = [];
postArray.push(fnSetRegionIDdrop(), fnCountryDrop(), fnCityDrop());
postArray.push(fnSetRegionIDdrop());
$.whenArray(postArray).done(function () {
pargs._reSetQueryPm();
pargs._initGrid();
@ -65,29 +65,38 @@ var fnPageInit = function () {
//城市下拉選單
fnCityDrop = function () {
return g_api.ConnectLite(canDo.ProgramId, "QueryCityList", {
RegionID: $("#CountryID").val() //國家下拉選單內容會因選擇不同的RegionID改變
CountryID: $("#CountryID").val() //國家下拉選單內容會因選擇不同的RegionID改變
},
function (res) {
if (res.RESULT) {
var saCityList = res.DATA.rel;
var sOptionHtml = createOptions(saCityList, 'CityID', 'CityName', true);
$('#CityID').html(sOptionHtml);
if (saCityList.length > 0) {
$('#CityID').html(createOptions(saCityList, 'CityID', 'CityName', true)).select2();
}
}
});
},
//國家下拉選單
fnCountryDrop = function () {
return g_api.ConnectLite(canDo.ProgramId, "QueryList", {
return g_api.ConnectLite(canDo.ProgramId, "QueryList", {
RegionID: $("#RegionID").val() //國家下拉選單內容會因選擇不同的RegionID改變
},
function (res) {
if (res.RESULT) {
var saList = res.DATA.rel;
var sOptionHtml = createOptions(saList, 'CountryID', 'CountryName', true);
$('#CountryID').html(sOptionHtml);
}
});
},
function (res) {
if (res.RESULT) {
var saList = res.DATA.rel;
console.log(saList);
if (saList.length > 0) {
$('#CountryID').html(createOptions(saList, 'CountryID', 'CountryName', true)).on('change', function () {
$('#CityID').empty();
if ($('#CountryID').val()) {
fnCityDrop();
}
}).select2();
}
}
});
},
//洲別類別下拉選單
@ -97,6 +106,8 @@ var fnPageInit = function () {
if (res.RESULT) {
var regionList = res.DATA.rel;
$('#RegionID').html(createOptions(regionList, 'RegionID', 'RegionName', true)).on('change', function () {
$('#CountryID').empty();
$('#CityID').empty();
if ($('#RegionID').val()) { //監聽RegionID,若RegionID值改變,執行fnCountryDrop()
fnCountryDrop(); //選取不同的洲別,國家下拉選單也會出現相應的國家,如選擇亞洲,國家下拉選單內都會是亞洲的國家
}
@ -106,4 +117,4 @@ var fnPageInit = function () {
};
};
require(['base', 'jsgrid', 'cando'], fnPageInit);
require(['base', 'jsgrid', 'cando', 'select2'], fnPageInit);

33
EuroTran/WebApp/Scripts/pages/ShowEasy/VenueMaintain_Upd.js

@ -118,29 +118,36 @@ var fnPageInit = function () {
$('#VenueID').prop('disabled', true);
postArray.push(pargs._getOne());
}
postArray.push(fnSetRegionIDdrop(), fnCountryDrop(), fnSetCityValueDrop(), fnSetOrderByValueDrop());
postArray.push(fnSetRegionIDdrop());
$.whenArray(postArray).done(function (res) {
if (pargs.action === 'upd' && res[0].RESULT) {
var oRes = res[0].DATA.rel;
pargs._setFormVal(oRes);
}
});
$('#CountryID').select2();
$('#CityID').select2();
}
}),
//國家下拉選單
fnCountryDrop = function (RegionID) {
return g_api.ConnectLite(canDo.ProgramId, "GetCountry",
{ RegionID: $("#RegionID").val() }, //依據所選擇的洲別顯示相對應的國家選單
return g_api.ConnectLite(canDo.ProgramId, "GetCountry", {
RegionID: $('#RegionID').val()
}, //依據所選擇的洲別顯示相對應的國家選單
function (res) {
if (res.RESULT) {
var saList = res.DATA.rel;
$('#CountryID').html(createOptions(saList, 'CountryID', 'CountryName', true)).on('change', function () {
if ($('#CountryID').val()) {
fnSetCityValueDrop(); //若CountryID改變,觸發City選單
}
});
if (saList.length > 0) {
$('#CountryID').html(createOptions(saList, 'CountryID', 'CountryName', true)).on('change', function () {
$('#CityID').empty();
$('#OrderByValue').empty();
if ($('#CountryID').val()) {
fnSetCityValueDrop();
}
});
}
}
});
},
@ -153,6 +160,7 @@ var fnPageInit = function () {
if (res.RESULT) {
var saList = res.DATA.rel;
$('#CityID').html(createOptions(saList, 'CityID', 'CityName', true)).on('change', function () {
$('#OrderByValue').empty();
if ($('#CityID').val()) {
fnSetOrderByValueDrop(); //若CityID改變,觸發OrderByValue選單
}
@ -168,6 +176,9 @@ var fnPageInit = function () {
if (res.RESULT) {
var regionList = res.DATA.rel;;
$('#RegionID').html(createOptions(regionList, 'RegionID', 'RegionName', true)).on('change', function () {
$('#CountryID').empty();
$('#CityID').empty();
$('#OrderByValue').empty();
if ($('#RegionID').val()) {
fnCountryDrop(); //若RegionID改變,觸發國家選單
}
@ -184,16 +195,14 @@ var fnPageInit = function () {
var iCount = res.DATA.rel;
if (canDo.action === 'add') {
iCount++;
console.log('排序' + iCount);
}
$('#OrderByValue').html(createOptions(iCount));
if (canDo.action === 'add') {
$('#OrderByValue').val(iCount);
console.log('OrderByValue' + OrderByValue);
}
}
});
};
};
require(['base', 'cando'], fnPageInit);
require(['base', 'cando', 'select2'], fnPageInit);
|||||||
100:0
Loading…
Cancel
Save