小时
@@ -224,7 +207,7 @@
-
+
@@ -259,9 +242,29 @@ import { useAuthStore } from '../stores/auth'
const authStore = useAuthStore()
const CONTENT_PHASE_MAP = {
- '策划案': '前期', '剧本': '前期', '分镜': '前期', '人设图': '前期', '场景图': '前期',
- '动画制作': '制作',
- '配音': '后期', '音效': '后期', '修补镜头': '后期', '剪辑': '后期',
+ '策划案': '前期', '大纲/梗概': '前期', '概念设计图': '前期', '测试片': '前期',
+ '剧本': '前期', '分镜': '前期', '人设图': '前期', '场景图': '前期', '道具图': '前期',
+ '动画制作': '中期',
+ 'AI配音': '后期', '音效': '后期', '修补镜头': '后期', '剪辑': '后期', '音乐/BGM': '后期', '字幕': '后期',
+}
+
+// 按阶段分组的内容类型（有序）
+const PHASE_CONTENT_TYPES = {
+ '前期': ['策划案', '大纲/梗概', '概念设计图', '测试片', '剧本', '分镜', '人设图', '场景图', '道具图'],
+ '中期': ['动画制作'],
+ '后期': ['AI配音', '音效', '修补镜头', '剪辑', '音乐/BGM', '字幕'],
+}
+
+// 项目级内容类型（不需要选集数）
+const PROJECT_LEVEL_TYPES = new Set(['策划案', '大纲/梗概', '概念设计图', '测试片'])
+function needsEpisode(contentType) {
+ return !PROJECT_LEVEL_TYPES.has(contentType)
+}
+
+// 前期内容不显示产出时长
+const NO_DURATION_TYPES = new Set(PHASE_CONTENT_TYPES['前期'])
+function showDuration(contentType) {
+ return !NO_DURATION_TYPES.has(contentType)
}
const loading = ref(false)
@@ -271,26 +274,86 @@ const submissions = ref([])
const projects = ref([])
const users = ref([])
const dateRange = ref(null)
-const filter = reactive({ project_id: null, start_date: null, end_date: null })
+const filter = reactive({ project_id: null, user_id: null, start_date: null, end_date: null })
const activeProjects = computed(() => projects.value.filter(p => p.status === '制作中'))
const today = new Date().toISOString().split('T')[0]
const form = reactive({
- project_id: null, project_phase: '制作', work_type: '制作',
+ project_id: null, project_phase: '中期', work_type: '制作',
content_type: '动画制作', duration_minutes: 0, duration_seconds: 0,
hours_spent: null, submit_to: '组长', description: '', submit_date: today,
delay_reason: '', episode_number: null, user_id: null,
})
-// 选择内容类型时自动设置对应的项目阶段
-watch(() => form.content_type, (val) => {
- if (CONTENT_PHASE_MAP[val]) {
- form.project_phase = CONTENT_PHASE_MAP[val]
+// ── 编辑逻辑 ──
+const showEdit = ref(false)
+const editing = ref(false)
+const editForm = reactive({
+ _id: null,
+ _project_name: '',
+ _project_id: null,
+ project_phase: '',
+ work_type: '',
+ content_type: '',
+ duration_minutes: 0,
+ duration_seconds: 0,
+ hours_spent: null,
+ submit_to: '',
+ description: '',
+ submit_date: '',
+ change_reason: '',
+ episode_number: null,
+})
+
+// 根据阶段过滤内容类型
+const filteredContentTypes = computed(() => PHASE_CONTENT_TYPES[form.project_phase] || [])
+const editFilteredContentTypes = computed(() => {
+ const types = PHASE_CONTENT_TYPES[editForm.project_phase] || []
+ // 编辑时如果当前值不在列表中（旧数据兼容），也加入
+ if (editForm.content_type && !types.includes(editForm.content_type)) {
+ return [editForm.content_type, ...types]
+ }
+ return types
+})
+
+// 切换阶段时重置内容类型为该阶段第一个
+watch(() => form.project_phase, (phase) => {
+ const types = PHASE_CONTENT_TYPES[phase]
+ if (types && !types.includes(form.content_type)) {
+ form.content_type = types[0]
}
})
-// 里程碑超期检测（利用 projectApi.list 返回的 milestones 数据）
+watch(() => editForm.project_phase, (phase) => {
+ const types = PHASE_CONTENT_TYPES[phase]
+ if (types && !types.includes(editForm.content_type)) {
+ editForm.content_type = types[0]
+ }
+})
+
+// 内容类型变化时：前期隐藏产出时长清零 + 项目级清空集数
+watch(() => form.content_type, (val) => {
+ if (NO_DURATION_TYPES.has(val)) {
+ form.duration_minutes = 0
+ form.duration_seconds = 0
+ }
+ if (!needsEpisode(val)) {
+ form.episode_number = null
+ }
+})
+
+watch(() => editForm.content_type, (val) => {
+ if (NO_DURATION_TYPES.has(val)) {
+ editForm.duration_minutes = 0
+ editForm.duration_seconds = 0
+ }
+ if (!needsEpisode(val)) {
+ editForm.episode_number = null
+ }
+})
+
+// 里程碑超期检测
const selectedProject = computed(() =>
projects.value.find(p => p.id === form.project_id) || null
)
@@ -312,6 +375,24 @@ const episodeOptions = computed(() => {
return Array.from({length: proj.episode_count}, (_, i) => i + 1)
})
+// ── 今日工时 ──
+const dailyHours = ref(null)
+const dialogDailyHours = ref(null)
+
+async function loadDailyHours() {
+ try {
+ const params = { date: today }
+ if (form.user_id) params.user_id = form.user_id
+ dialogDailyHours.value = await submissionApi.dailyHours(params)
+ } catch { /* ignore */ }
+}
+
+async function loadListDailyHours() {
+ try {
+ dailyHours.value = await submissionApi.dailyHours({ date: today })
+ } catch { /* ignore */ }
+}
+
function formatSecs(s) {
if (!s) return '0秒'
const m = Math.floor(s / 60)
@@ -332,6 +413,9 @@ async function load() {
async function handleCreate() {
if (!form.project_id) { ElMessage.warning('请选择项目'); return }
+ if (needsEpisode(form.content_type) && !form.episode_number) { ElMessage.warning('请选择集数'); return }
+ if (!form.description?.trim()) { ElMessage.warning('请填写描述'); return }
+ if (!form.hours_spent || form.hours_spent <= 0) { ElMessage.warning('请填写投入时长'); return }
if (isMilestoneOverdue.value && !form.delay_reason?.trim()) {
ElMessage.warning('该里程碑已超期，请填写延期原因')
return
@@ -350,29 +434,15 @@ async function handleCreate() {
form.episode_number = null
form.user_id = null
load()
+ // 刷新工时进度
+ loadListDailyHours()
+ const updated = await submissionApi.dailyHours({ date: today })
+ if (updated && updated.remaining > 0) {
+ ElMessage.info(`今日还有 ${updated.remaining}h 工时未填报`)
+ }
} finally { creating.value = false }
}
-// ── 编辑逻辑 ──
-const showEdit = ref(false)
-const editing = ref(false)
-const editForm = reactive({
- _id: null,
- _project_name: '',
- _project_id: null,
- project_phase: '',
- work_type: '',
- content_type: '',
- duration_minutes: 0,
- duration_seconds: 0,
- hours_spent: null,
- submit_to: '',
- description: '',
- submit_date: '',
- change_reason: '',
- episode_number: null,
-})
-
const editEpisodeOptions = computed(() => {
const proj = projects.value.find(p => p.id === editForm._project_id)
if (!proj || !proj.episode_count) return []
@@ -432,8 +502,14 @@ async function handleDeleteFromEdit() {
}
}
+// 打开新增弹窗时加载工时
+watch(showCreate, (val) => {
+ if (val) loadDailyHours()
+})
+
onMounted(async () => {
load()
+ loadListDailyHours()
try { projects.value = await projectApi.list({}) } catch {}
if (authStore.hasPermission('submission:proxy')) {
try { users.value = await userApi.brief() } catch {}
@@ -448,4 +524,6 @@ onMounted(async () => {
.inline-field { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
.field-unit { font-size: 13px; color: var(--text-secondary); white-space: nowrap; }
.field-hint { font-size: 12px; color: var(--text-placeholder, #C0C4CC); }
+.daily-hours-bar { display: flex; align-items: center; gap: 12px; margin-bottom: 16px; padding: 10px 16px; background: var(--bg-card); border: 1px solid var(--border-color); border-radius: var(--radius-md); }
+.daily-label { font-size: 13px; color: var(--text-secondary); white-space: nowrap; }
diff --git a/frontend/src/views/Users.vue b/frontend/src/views/Users.vue
index 2718497..03f46be 100644
--- a/frontend/src/views/Users.vue
+++ b/frontend/src/views/Users.vue
@@ -54,7 +54,7 @@
-
+
@@ -119,7 +119,7 @@ const sortedUsers = computed(() => {
})
})
const form = reactive({
- username: '', password: '', name: '', phase_group: '制作', role_id: null,
+ username: '', password: '', name: '', phase_group: '中期', role_id: null,
monthly_salary: 0, bonus: 0, social_insurance: 0, is_active: 1,
})