|
@@ -139,14 +139,42 @@ export default function () {
|
|
|
} = useSearchListHeaderActionsModel()
|
|
|
|
|
|
// 页面tab切换Model
|
|
|
- const SearchTabsModel = useSearchTabsModel()
|
|
|
+
|
|
|
+ const SearchTabsModel = useSearchTabsModel({ showTabs2: !isInApp.value })
|
|
|
const { activeTab, doChangeTab } = SearchTabsModel
|
|
|
// tab切换处理
|
|
|
function onChangeTab (item) {
|
|
|
+ filterState.value = Object.assign(filterState.value, {
|
|
|
+ subtype: []
|
|
|
+ })
|
|
|
doChangeTab(item)
|
|
|
- doQuery()
|
|
|
+ if(isInApp.value) {
|
|
|
+ doQuery()
|
|
|
+ } else {
|
|
|
+ if(item.link) {
|
|
|
+ location.replace(item.link)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
+ // 处理当前信息类型--展示数据类型
|
|
|
+ const infoTypeDataType = computed(() => {
|
|
|
+ let result = 'all'
|
|
|
+ switch (activeTab.value) {
|
|
|
+ case 0:
|
|
|
+ result = 'all'
|
|
|
+ break
|
|
|
+ case 1:
|
|
|
+ result = 'base'
|
|
|
+ break
|
|
|
+ case 2:
|
|
|
+ result = 'advance'
|
|
|
+ break
|
|
|
+ }
|
|
|
+ return result
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
// 筛选条件动态配置处理
|
|
|
function disposeFilterSchema() {
|
|
|
const conf = computed(() => {
|
|
@@ -154,7 +182,7 @@ export default function () {
|
|
|
vipUser: isVip.value && isInApp.value,
|
|
|
oldUser: isOld.value && isInApp.value,
|
|
|
showVip: isLogin.value && isInApp.value,
|
|
|
- infoType: activeTab.value
|
|
|
+ infoType: infoTypeDataType.value
|
|
|
}
|
|
|
})
|
|
|
|
|
@@ -574,25 +602,24 @@ export default function () {
|
|
|
|
|
|
// window.location.replace(`/page_workDesktop/work-bench/page?link=${encodeURIComponent(goHref_ + 'goback=')}`)
|
|
|
}
|
|
|
-
|
|
|
- // onMounted(() => {
|
|
|
- // if(useRoute().query.goback) {
|
|
|
- // goBackFilter()
|
|
|
- // }
|
|
|
- // })
|
|
|
- //
|
|
|
- // // 回显
|
|
|
- // function goBackFilter () {
|
|
|
- // const sFilter = sessionStorage.getItem('search:bidding:filter')
|
|
|
- // const backFilter = sFilter ? JSON.parse(sFilter) : null
|
|
|
- // if(backFilter) {
|
|
|
- // that.$nextTick(() => {
|
|
|
- // restoreFilter(backFilter, 'pageBack')
|
|
|
- // sessionStorage.removeItem('search:bidding:filter')
|
|
|
- // })
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
+ // 监听路由事件
|
|
|
+ onMounted(() => {
|
|
|
+ if(useRoute().query.goback) {
|
|
|
+ goBackFilter()
|
|
|
+ } else if(useRoute().query.searchGroup) {
|
|
|
+ const key = Number(useRoute().query.searchGroup)
|
|
|
+ doChangeTab({ key})
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // 回显筛选条件
|
|
|
+ function goBackFilter () {
|
|
|
+ const sFilter = sessionStorage.getItem('search:bidding:filter')
|
|
|
+ const backFilter = sFilter ? JSON.parse(sFilter) : null
|
|
|
+ if(backFilter) {
|
|
|
+ restoreFilter(backFilter, 'pageBack')
|
|
|
+ sessionStorage.removeItem('search:bidding:filter')
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/** 保存、重置筛选条件部分 start ****/
|
|
@@ -648,7 +675,6 @@ export default function () {
|
|
|
}
|
|
|
}
|
|
|
function restoreFilter (viewFilter, type) {
|
|
|
- onResetFilter()
|
|
|
let resultFilter = {}
|
|
|
if(type === 'saveBack') {
|
|
|
resultFilter = FilterHistoryAjaxModelRestore.formatAll(viewFilter)
|
|
@@ -992,6 +1018,7 @@ export default function () {
|
|
|
propertyIframeSrc,
|
|
|
onSingleEmploy,
|
|
|
onAddInfoOfBI,
|
|
|
- onSingleAddInfo
|
|
|
+ onSingleAddInfo,
|
|
|
+ goWorkSpace
|
|
|
}
|
|
|
}
|