diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index ac75944b..587ababc 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -162,6 +162,7 @@ export default { mounted() { this.$store.dispatch("getUserInfo"); + this.$store.dispatch("getTaskPriority"); }, deactivated() { diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 43fc4b1f..84205665 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -293,7 +293,7 @@ maxWidth: '640px' }" :mask-closable="false"> - +
@@ -619,6 +619,7 @@ export default { this.$set(this.addData, 'column_id', column_id); this.$set(this.addData, 'project_id', this.projectDetail.id); } + this.$refs.add.defaultPriority(); this.addShow = true; }, diff --git a/resources/assets/js/pages/manage/components/TaskAdd.vue b/resources/assets/js/pages/manage/components/TaskAdd.vue index 62b26c22..6058b8d0 100644 --- a/resources/assets/js/pages/manage/components/TaskAdd.vue +++ b/resources/assets/js/pages/manage/components/TaskAdd.vue @@ -159,13 +159,6 @@ export default { }, } }, - mounted() { - this.$store.dispatch('getTaskPriority').then(() => { - if (!this.value.p_name && this.taskPriority.length > 0) { - this.choosePriority(this.taskPriority[0]) - } - }) - }, computed: { ...mapState(['userId', 'projectDetail', 'taskPriority']), }, @@ -259,6 +252,15 @@ export default { this.$set(this.value, 'p_level', item.priority) this.$set(this.value, 'p_name', item.name) this.$set(this.value, 'p_color', item.color) + }, + defaultPriority() { + if (this.taskPriority.length === 0) { + return; + } + if (this.value.p_name) { + return; + } + this.choosePriority(this.taskPriority[0]); } } } diff --git a/resources/assets/js/pages/manage/components/TaskAddSimple.vue b/resources/assets/js/pages/manage/components/TaskAddSimple.vue index 538cfefc..0a7551c1 100644 --- a/resources/assets/js/pages/manage/components/TaskAddSimple.vue +++ b/resources/assets/js/pages/manage/components/TaskAddSimple.vue @@ -105,18 +105,8 @@ export default { openAdd() { this.active = true; + this.defaultPriority(); this.$nextTick(() => { - if (this.taskPriority.length === 0) { - this.$store.dispatch('getTaskPriority').then(() => { - if (!this.addData.p_name && this.taskPriority.length > 0) { - this.choosePriority(this.taskPriority[0]) - } - }); - } else { - if (!this.addData.p_name && this.taskPriority.length > 0) { - this.choosePriority(this.taskPriority[0]) - } - } this.$refs.input.focus(); }); }, @@ -178,6 +168,16 @@ export default { this.$set(this.addData, 'p_name', item.name) this.$set(this.addData, 'p_color', item.color) this.$refs.input.focus() + }, + + defaultPriority() { + if (this.taskPriority.length === 0) { + return; + } + if (this.addData.p_name) { + return; + } + this.choosePriority(this.taskPriority[0]); } } } diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index d9d3f4e7..4643771c 100644 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -444,7 +444,6 @@ export default { }, mounted() { - this.$store.dispatch('getTaskPriority'); this.nowInterval = setInterval(() => { this.nowTime = Math.round(new Date().getTime() / 1000); }, 1000);