wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

BUG 修改

This commit is contained in:
a0049873 2022-07-22 17:24:17 +08:00
parent b8afda6f0a
commit f372ae6b73
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
back/src/views/modules/workBench/components/dept-todo-view.vue
View File

@ -15,21 +15,19 @@
<div v-for="(item, i) in dataInfo.list" :key="i"> <div v-for="(item, i) in dataInfo.list" :key="i">
<!-- 待办 --> <!-- 待办 -->
<el-tooltip effect="dark" v-if="dataInfo.type === 'todo'" <el-tooltip effect="dark" v-if="dataInfo.type === 'todo'"
:content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')" :content="(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
placement="top"> placement="top">
<div class="list-item ellipsis"> <div class="list-item ellipsis">
<!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} --> <!-- {{ `${(item.processDefinitionName || '--')}${item.taskName ? ('—' + item.taskName) : ''}` }} -->
{{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'?'申请':'')}} {{(item.userName || '--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
</div> </div>
</el-tooltip> </el-tooltip>
<!-- 已办 --> <!-- 已办 -->
<el-tooltip effect="dark" v-else <el-tooltip effect="dark" v-else
:content="`${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : ''}`" :content="(item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')"
placement="top"> placement="top">
<div class="list-item ellipsis"> <div class="list-item ellipsis">
{{ `${(item.processDefinitionName || '--')}${item.resourceName ? ('—' + item.resourceName) : {{ (item.startUserName||'--')+'提交的'+(item.processDefinitionName|| '--')+(item.processDefinitionName!=='能力申请'&&item.processDefinitionName!=='能力需求申请'?'申请':'')}}
''}`
}}
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>

18
front/src/views/home/DetailsPageconetent.vue
View File

@ -1034,7 +1034,8 @@
loading.value = false loading.value = false
} else { } else {
resourceTotal.value = res.data.data.total || '' resourceTotal.value = res.data.data.total || ''
getShoppingCartList(res.data.data.records) resourceList.data = res.data.data.records || []
// getShoppingCartList(res.data.data.records)
} }
}) })
} }
@ -1111,7 +1112,8 @@
loading.value = false loading.value = false
} else { } else {
resourceTotal.value = res.data.data.total || '' resourceTotal.value = res.data.data.total || ''
getShoppingCartList(res.data.data.records) resourceList.data = res.data.data.records || []
// getShoppingCartList(res.data.data.records)
} }
}) })
} }
@ -1129,12 +1131,12 @@
}).then((res) => { }).then((res) => {
console.log('申购车列表================>', res.data.data.records) console.log('申购车列表================>', res.data.data.records)
shoppingCartList.value = res.data.data.records shoppingCartList.value = res.data.data.records
list.map((item) => { // list.map((item) => {
item.isInShoppingCart = false // item.isInShoppingCart = false
item.isInShoppingCart = shoppingCartList.value.some((item2) => { // item.isInShoppingCart = shoppingCartList.value.some((item2) => {
return item.id === item2.resourceId // return item.id === item2.resourceId
}) // })
}) // })
console.log('经过过滤后的列表信息', list) console.log('经过过滤后的列表信息', list)
resourceList.data = list resourceList.data = list
}) })

4
front/src/views/home/components/searchResultList.vue
View File

@ -589,7 +589,6 @@
// 加入申购车 // 加入申购车
const addShoppingCart = (item, index) => { const addShoppingCart = (item, index) => {
console.log('item===============>', item) console.log('item===============>', item)
mybus.emit('changeSelcted', index)
if (flag.value && item.id) { if (flag.value && item.id) {
flag.value = false flag.value = false
sgcInsert({ sgcInsert({
@ -600,6 +599,7 @@
console.log(res) console.log(res)
message.success('添加申购车成功！') message.success('添加申购车成功！')
mybus.emit('getSgcNum') mybus.emit('getSgcNum')
mybus.emit('changeSelcted', index)
flag.value = true flag.value = true
}) })
} }
@ -789,7 +789,7 @@
}, },
beforeUnmount() { beforeUnmount() {
mybus.off('chongzhi') mybus.off('chongzhi')
mybus.emit('changeSelcted') // mybus.emit('changeSelcted')
}, },
} }
</script> </script>