diff --git a/front/src/views/personalCenter/components/MyApply.vue b/front/src/views/personalCenter/components/MyApply.vue index 83dcc304..f8c7d3e9 100644 --- a/front/src/views/personalCenter/components/MyApply.vue +++ b/front/src/views/personalCenter/components/MyApply.vue @@ -129,8 +129,12 @@ let typeList = ref([ '能力下架', '能力需求', '需求评论', - '设备申请' ]) +// 西海岸-设备申请 +let isXiHaiAn = whoShow.itShowXiHaiAn; +if (isXiHaiAn) { + typeList.value.push('设备申请') +} const typeStrObj = { '能力上架': 'resourcemountapply', '能力下架': 'resourcundercarriageapply', @@ -141,6 +145,9 @@ let tabList = ref(['全部', '审核中', '审核完成']) const contentList = reactive({ data: [] }) let tabIndex = ref(0) let typeIndex = ref(0) +let typeName = ref(typeList.value[0]) +console.log('typeName------------>', typeName); + const videoVisible = ref(false) const numFlag = ref(true) const columns = ref([ @@ -182,6 +189,7 @@ const changeType = (item, index) => { ended.value = '' page.value = 1 typeIndex.value = index + typeName.value = item getApplyList() } let name = ref('') @@ -379,7 +387,7 @@ const getApplyList = () => { if (ended.value === '') { delete params.ended } - if (typeIndex.value == 0) { + if (typeName.value == '能力申请') { getTabilityapplication(params).then((res) => { contentList.data = [] console.log('获取我的申请===============>', res.data.data) @@ -388,9 +396,16 @@ const getApplyList = () => { showType.value = '能力申请' initNum2() }) - } else if (typeIndex.value !== 1) { - let typeName = typeList.value[typeIndex.value] - processDefinitionKey.value = typeStrObj[typeName] + } else if (typeName.value == '能力评价') { + contentList.data = [] + num.value = [] + showType.value = '' + } else if (typeName.value == '设备申请') { + contentList.data = [] + num.value = [] + showType.value = '' + } else if (Object.keys(typeStrObj).includes(typeName.value)) { + processDefinitionKey.value = typeStrObj[typeName.value] params.processDefinitionKey = processDefinitionKey.value; getMyProcessInstancePage(params).then((res) => { contentList.data = []