bug修复
This commit is contained in:
parent
44ea0bf906
commit
c291ea45b0
|
|
@ -207,10 +207,10 @@ export default {
|
|||
}
|
||||
},
|
||||
closeSelectedTag(view) {
|
||||
this.$tab.refreshPage(view)
|
||||
this.$tab.closePage(view).then(({ visitedViews }) => {
|
||||
if (this.isActive(view)) {
|
||||
this.toLastView(visitedViews, view)
|
||||
this.$store.dispatch('tagsView/delIframeView', this.$route)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,10 +13,7 @@
|
|||
:sendParams="{
|
||||
proId: proId,
|
||||
teamId: teamId,
|
||||
time: [
|
||||
new Date().toISOString().split('T')[0],
|
||||
new Date().toISOString().split('T')[0],
|
||||
],
|
||||
time: times,
|
||||
}"
|
||||
>
|
||||
<template slot="btn" slot-scope="{ queryParams }">
|
||||
|
|
@ -100,6 +97,7 @@ export default {
|
|||
getPersonListAPI,
|
||||
idNumber: '',
|
||||
workerId: '',
|
||||
times: [],
|
||||
timeRange: [
|
||||
new Date().toISOString().split('T')[0],
|
||||
new Date().toISOString().split('T')[0],
|
||||
|
|
@ -107,6 +105,12 @@ export default {
|
|||
slots: ['attNum', 'notAttNum'],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.times = [
|
||||
new Date().toISOString().split('T')[0],
|
||||
new Date().toISOString().split('T')[0],
|
||||
]
|
||||
},
|
||||
methods: {
|
||||
// 导出
|
||||
onHandleExportPerson(queryParams) {
|
||||
|
|
@ -130,6 +134,10 @@ export default {
|
|||
this.$refs.personTableRef.queryParams.startDate,
|
||||
this.$refs.personTableRef.queryParams.endDate,
|
||||
]
|
||||
this.times = [
|
||||
this.$refs.personTableRef.queryParams.startDate,
|
||||
this.$refs.personTableRef.queryParams.endDate,
|
||||
]
|
||||
this.idNumber = data.idNumber
|
||||
this.workerId = data.workerId
|
||||
this.personDialogConfig.outerVisible = true
|
||||
|
|
|
|||
|
|
@ -77,7 +77,13 @@
|
|||
v-if="subTeamDialogConfig.outerTitle === '连续七天未打卡'"
|
||||
/>
|
||||
|
||||
<PersonTable :teamId="teamId" :proId="proId" v-else />
|
||||
<keep-alive>
|
||||
<PersonTable
|
||||
:teamId="teamId"
|
||||
:proId="proId"
|
||||
v-show="subTeamDialogConfig.outerTitle == '人员'"
|
||||
/>
|
||||
</keep-alive>
|
||||
</template>
|
||||
</DialogModel>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -76,6 +76,8 @@ export default {
|
|||
$route: {
|
||||
handler(newVal) {
|
||||
// this.proId = newVal.query.proId
|
||||
|
||||
console.log(newVal.query, 'newVal.query')
|
||||
const {
|
||||
proId,
|
||||
proName,
|
||||
|
|
|
|||
|
|
@ -29,9 +29,9 @@ export default {
|
|||
},
|
||||
created() {
|
||||
// 从路由参数获取项目ID
|
||||
this.projectId = this.$route.query?.id
|
||||
this.proName = this.$route.query?.proName
|
||||
this.subComName = this.$route.query?.subComName
|
||||
// this.projectId = this.$route.query?.id
|
||||
// this.proName = this.$route.query?.proName
|
||||
// this.subComName = this.$route.query?.subComName
|
||||
},
|
||||
methods: {
|
||||
// 处理卡片点击事件
|
||||
|
|
@ -67,5 +67,18 @@ export default {
|
|||
})
|
||||
},
|
||||
},
|
||||
|
||||
watch: {
|
||||
$route: {
|
||||
handler(newVal) {
|
||||
const { id, proName, subComName } = newVal.query
|
||||
this.projectId = id
|
||||
this.proName = proName
|
||||
this.subComName = subComName
|
||||
},
|
||||
immediate: true,
|
||||
deep: true,
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue