diff --git a/FrontEnd/components/service/content/selectExhibition.vue b/FrontEnd/components/service/content/selectExhibition.vue index 39a97b1..f243c1c 100644 --- a/FrontEnd/components/service/content/selectExhibition.vue +++ b/FrontEnd/components/service/content/selectExhibition.vue @@ -76,10 +76,13 @@ export default { selectMonthList: { type: Array, }, + selectExhibitionList: { + type: Array, + }, }, data() { return { - selectExhibitionList: [], + // selectExhibitionList: [], formData: { select_year: "0", select_month: "0", @@ -150,8 +153,15 @@ export default { }, getExhibitions(){ this.selectExhibitionList = []; - if((this.formData.select_year && this.formData.select_year!="0") && (this.formData.select_month && this.formData.select_month !="0")){ - this.$axios.get(`/trending/api/Onsite/Exhibitions?Lang=${this.$i18n.localeProperties["langQuery"]}&ServiceID=${this.$route.params.id}&Year=${this.formData.select_year}&Month=${this.formData.select_month}`) + let select_year = ""; + let select_month = ""; + if(this.formData.select_year!="0" && this.formData.select_year!=""){ + select_year = this.formData.select_year; + } + if(this.formData.select_month!="0" && this.formData.select_month!=""){ + select_month = this.formData.select_month; + } + this.$axios.get(`/trending/api/Onsite/Exhibitions?Lang=${this.$i18n.localeProperties["langQuery"]}&ServiceID=${this.$route.params.id}&Year=${select_year}&Month=${select_month}`) .then((response) => { if(response && response.data && response.data.DATA && response.data.DATA.rel){ let data = response.data.DATA.rel @@ -166,7 +176,6 @@ export default { } }) .catch((error) => console.log(error)); - } } }, }; diff --git a/FrontEnd/pages/service/_id.vue b/FrontEnd/pages/service/_id.vue index aa028e7..3bdde9d 100644 --- a/FrontEnd/pages/service/_id.vue +++ b/FrontEnd/pages/service/_id.vue @@ -36,7 +36,7 @@

{{ $t("Select Exhibition") }}

- +

@@ -417,6 +417,7 @@ export default { selectQuantityList: [], selectYearList: [], selectMonthList: [], + selectExhibitionList: [], selectAddressList: [], selectExhibitionServiceList: [{id: 0,show: true}], selectPackageList: [], @@ -448,7 +449,7 @@ export default { await this.getServiceData(); await this.getExtensionYear(); await this.getExtensionMonth(); - // await this.getExhibitions(); + await this.getExhibitions(); await this.getQuantitySelects(); await this.getServiceItems(); await this.getReceivingCitys(); @@ -646,6 +647,25 @@ export default { }) .catch((error) => console.log(error)); }, + async getExhibitions(){ + let select_year = ""; + let select_month = ""; + await this.$axios.get(`/trending/api/Onsite/Exhibitions?Lang=${this.$i18n.localeProperties["langQuery"]}&ServiceID=${this.$route.params.id}&Year=${select_year}&Month=${select_month}`) + .then((response) => { + if(response && response.data && response.data.DATA && response.data.DATA.rel){ + let data = response.data.DATA.rel + if(data.length>0){ + this.selectExhibitionList = data.map((item) => { + return { + id: item.ArgumentID, + name: item.ArgumentValue, + }; + }); + } + } + }) + .catch((error) => console.log(error)); + }, async getServiceItems() { this.showCardItem = false; await this.$axios