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