Skip to content

B
bigwood
Commit 50c3e056 authored by youjie's avatar youjie
Browse files
Options

no message

parent 8e523146
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 30 deletions
src/components/searchdata/search.vue
View file @ 50c3e056
......@@ -67,13 +67,17 @@
</div>
<div v-if="searchClone.lineId&&xilies.length>0" class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between">
<span>{{$t('v103.scheduledTrip.allcommoditytype')}}</span>
<template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==2">
{{x.Name}}
<q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,2)"/>
</span>
</template>
<span class="text-grey-8 col-12 row justify-between">
<span>商品系列</span>
<span v-if="!searchClone.lineTeamId">选择商品系列</span>
<template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==2">
{{x.Name}}
<q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,2)"/>
</span>
</template>
</span>
</div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy2">
<div class="bg-white q-pb-lg" style="width: 300px;">
......@@ -93,13 +97,17 @@
</div>
<div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between">
<span>出发城市</span>
<template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==3">
{{x.Name}}
<q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,3)"/>
</span>
</template>
<span class="text-grey-8 col-12 row justify-between">
<span>出发城市</span>
<span v-if="!searchClone.startCityId">选择出发城市</span>
<template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==3">
{{x.Name}}
<q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,3)"/>
</span>
</template>
</span>
</div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy3">
<div class="bg-white q-pb-lg" style="width: 300px;">
......@@ -120,13 +128,17 @@
<div>
<div v-if="(searchClone.startDate&&!searchClone.endDate)||(!searchClone.startDate&&!searchClone.endDate)" class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between">
<span>出发日期</span>
<template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==5">
{{x.Name}}
<q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,5)"/>
</span>
</template>
<span class="text-grey-8 col-12 row justify-between">
<span>出发日期</span>
<span v-if="!datesId">选择出发日期</span>
<template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==5">
{{x.Name}}
<q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,5)"/>
</span>
</template>
</span>
</div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy5">
<div class="bg-white q-pb-lg" style="width: 300px;">
......@@ -144,6 +156,7 @@
</div>
</q-popup-proxy>
</div>
<!-- v-if="(!search.msg.startDate&&!search.msg.endDate)||(search.msg.startDate&&search.msg.endDate)" -->
<div class="q-my-md row no-padding bg-grey-3" v-if="(!searchClone.startDate&&!searchClone.endDate)||(searchClone.startDate&&searchClone.endDate)">
<div
class="q-px-md q-py-sm"
......@@ -157,7 +170,14 @@
? `${dateRange.from} - ${dateRange.to}`
: $t('v103.scheduledTrip.screeningdate')
}}
<template v-for="(x, i) in chosenAddress">
<template v-if="x.type==6">
<q-icon class="cursor-pointer text-grey-6 q-pl-lg" name="close" @click.stop="removeChosen(x,i,6)"/>
</template>
</template>
</span>
<!-- <q-icon class="cursor-pointer text-grey-6" name="close" @click.stop="removeChosen(x,i,6)"/> -->
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy">
<div>
<q-date
......@@ -590,6 +610,11 @@
search.datesId = 0
search.msg.startDate = ''
search.msg.endDate = ''
}else if(type==6){
data.dateRange = null
search.datesId = 0
search.msg.startDate = ''
search.msg.endDate = ''
}
search.chosenAddress.splice(i,1)
},
......@@ -904,6 +929,8 @@
if($q.platform.is.mobile){
if(qDateProxy6.value) qDateProxy6.value.hide()
}
// search.msg.startDate = x.startDate
// search.msg.startDate = x.endDate
setTimeout(()=>{
search.chosenAddress.push(obj);
},200)
......@@ -941,15 +968,15 @@
);
},
dateRangeHandler(e) {
data.searchClone.startDate = `${e.from.year}/${e.from.month}/${e.from.day}`;
data.searchClone.endDate = `${e.to.year}/${e.to.month}/${e.to.day} `;
let startDate = `${e.from.year}/${e.from.month}/${e.from.day}`;
let endDate = `${e.to.year}/${e.to.month}/${e.to.day} `;
if (qDateProxy.value) qDateProxy.value.hide()
let obj= {
startDate: data.searchClone.startDate,
endDate: data.searchClone.endDate,
startDate: startDate,
endDate: endDate,
}
search.msg.startDate = data.searchClone.startDate
search.msg.endDate = data.searchClone.endDate
search.msg.startDate = startDate
search.msg.endDate = endDate
methods.changeChosenHandler(obj,null,6)
},
// 商品类型
......@@ -990,9 +1017,9 @@
data.datesId = n.datesId
data.searchClone.startDate = ""
}
if(!n.msg.startDate&&!n.msg.endDate){
data.dateRange = { from: n.msg.startDate, to: n.msg.endDate };
}
data.dateRange = { from: n.msg.startDate, to: n.msg.endDate };
data.searchClone.startDate = n.msg.startDate
data.searchClone.endDate = n.msg.endDate
if(n.deleteChosen){
data.areaList.forEach(x=>{
x.SubList.forEach(y=>{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment