fixy

app/src/plugins/tm@overview/tasks-unscheduled/_components/a-unscheduled-table.vue

@@ -15,8 +15,7 @@
 
 				<td>{{ subtask.project_code }}</td>
 				<td>{{ subtask.title ?? subtask.master_task?.name ?? subtask.master_task }}</td>
-				<td v-if="subtask.deadline">{{ subtaskDeadline(subtask?.deadline) }}</td>
-				<td v-else></td>
+				<td>{{ getDeadline(subtask) }}</td>
 				<td>{{ subtask.spent_time }} h</td>
 				<td class="task-action">
 					<div class="d-flex justify-start">
@@ -32,6 +31,7 @@
 
 <script>
 import moment from 'moment'
+import { mapGetters } from 'vuex'
 
 export default {
 	props: {
@@ -41,6 +41,10 @@ export default {
 		}
 	},
 
+	computed: {
+		...mapGetters('tm', ['mastertasks'])
+	},
+
 	methods: {
 		editTask(subtask, editMode) {
 			this.$events.emit('show-subtask-modal', {subtask, editMode})
@@ -50,8 +54,11 @@ export default {
 			this.$events.emit('show-delete-task-modal', {subtask})
 		},
 
-		subtaskDeadline(value) {
-			return moment(value).format('DD.MM.yyyy')
+		getDeadline(subtask) {
+			if(subtask.deadline) return moment(subtask.deadline).format('DD.MM.yyyy')
+			else if(!this.mastertasks) return ''
+			const masterTask = this.mastertasks.find((mt) => mt.id === subtask.master_task_id)
+			return moment(masterTask).format('DD.MM.yyyy') ? moment(masterTask.deadline).format('DD.MM.yyyy') : ''
 		}
 	}
 }