+
+
+
+
+
+
diff --git a/web-admin/src/views/production/production-work-order/index.vue b/web-admin/src/views/production/production-work-order/index.vue
index 0c92c4e1..0356fe1c 100644
--- a/web-admin/src/views/production/production-work-order/index.vue
+++ b/web-admin/src/views/production/production-work-order/index.vue
@@ -3,38 +3,10 @@
+
+
+
+
+ 生产任务
+
+
+
+
+
+ {{ productionTaskTypeTag(row.taskType, row.orderSource).label }}
+
+
+
+
+ {{ row.routeName || '—' }}
+
+
+
+ {{
+ taskStatusTag(row.taskStatus).label
+ }}
+
+
+
+
+
+ {{ row.conclusionLabel || productionConclusionLabel(row.conclusion) }}
+
+ —
+
+
+
+ {{ row.startedTime || '—' }}
+
+
+ {{ row.completedTime || '—' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
@@ -123,13 +88,14 @@
+
+
-
-
-
- ('inbound')
const showReceptionCols = computed(
@@ -831,14 +714,6 @@
}
return map[status] || { label: status, type: 'info' }
}
- const taskStatusLabel = (status: string) => {
- const map: Record = {
- dpz: { label: '待配置', type: 'info' },
- jxz: { label: '进行中', type: 'warning' },
- ywc: { label: '已完成', type: 'success' }
- }
- return map[status] || { label: status, type: 'info' }
- }
const sourceTag = (source: string) => {
const map: Record = {
cell_storage: { label: '细胞存储', type: 'success' },
@@ -867,6 +742,7 @@
const workOrderListTableRef = ref()
const loading = ref(false)
const pagination = reactive({ page: 1, pageSize: 10, total: 0 })
+ const taskSubListRefreshToken = ref(0)
const canToolbarDispatch = computed(() => {
if (selectedRows.value.length !== 1) return false
@@ -898,11 +774,6 @@
return selectedRows.value[0]
}
- function handleToolbarEditTask() {
- const row = requireSingleSelection('编辑任务')
- if (row) handleEditTask(row)
- }
-
function handleToolbarDispatch() {
const row = requireSingleSelection('派发任务')
if (!row) return
@@ -931,13 +802,29 @@
}
ElMessage.success(rows.length === 1 ? '工单已完成' : `已完成 ${rows.length} 个工单`)
clearSelection()
- loadData()
+ taskSubListRefreshToken.value += 1
+ await loadData()
}
async function layoutWorkOrderTable() {
await nextTick()
workOrderListTableRef.value?.doLayout?.()
}
+
+ async function handleWorkOrderRowExpand(_row: any, _expandedRows: any[]) {
+ await layoutWorkOrderTable()
+ }
+
+ async function handleWorkOrderTasksChanged() {
+ taskSubListRefreshToken.value += 1
+ await loadData()
+ await layoutWorkOrderTable()
+ }
+
+ async function handleDispatchSuccess() {
+ taskSubListRefreshToken.value += 1
+ await loadData()
+ }
async function handleDelete(row: any) {
await ElMessageBox.confirm('确定要删除该生产工单吗？', '提示', { type: 'warning' })
await fetchDeleteProductionWorkOrder(row.id)
@@ -1255,65 +1142,6 @@
dispatchVisible.value = true
}
- // ── 编辑已有任务 ──────────────────────────────────────
- const editTaskVisible = ref(false)
- const editTaskRow = ref(null)
- const editTaskId = ref('')
- const editTaskName = ref('')
-
- // 任务选择弹窗
- const taskSelectVisible = ref(false)
- const taskSelectList = ref([])
- const taskSelectLoading = ref(false)
- const currentWorkOrderRow = ref(null)
-
- async function handleEditTask(row: any) {
- currentWorkOrderRow.value = row
- taskSelectLoading.value = true
- taskSelectVisible.value = true
- taskSelectList.value = []
- try {
- const res = await fetchProductionTaskList({ workOrderId: row.id, pageSize: 100 })
- taskSelectList.value = res.list || []
- } catch {
- taskSelectList.value = []
- } finally {
- taskSelectLoading.value = false
- }
- }
-
- function openTaskEditor(task: any) {
- editTaskId.value = task.id
- editTaskName.value = task.taskName || ''
- editTaskRow.value = null
- editTaskVisible.value = true
- taskSelectVisible.value = false
- }
-
- // ── 编辑任务基本信息 ──────────────────────────────────
- const editTaskInfoVisible = ref(false)
- const editTaskInfoId = ref('')
-
- function openEditTaskInfo(task: any) {
- editTaskInfoId.value = task.id
- editTaskInfoVisible.value = true
- }
-
- function handleEditTaskInfoSuccess() {
- if (currentWorkOrderRow.value) {
- handleEditTask(currentWorkOrderRow.value)
- }
- }
-
- async function handleDeleteTask(task: any) {
- await ElMessageBox.confirm('确定要删除该任务吗？删除后不可恢复。', '提示', { type: 'warning' })
- await fetchDeleteProductionTask(task.id)
- ElMessage.success('任务已删除')
- await loadData()
- if (currentWorkOrderRow.value) {
- handleEditTask(currentWorkOrderRow.value)
- }
- }
// 输入检索条件时自动搜索（防抖 300ms）
watchDebounced(
[searchForm, createTimeRange],
@@ -1325,96 +1153,47 @@
)
onMounted(() => {
- const tab = route.query.tab
- if (tab === 'task') {
- mainTab.value = 'task'
- }
loadData()
})
+
- 生产工单
-
-
- {{ row.routeName || '—' }}
-
-
-
-
- {{ taskStatusLabel(row.taskStatus).label }}
-
-
-
-
-
-
- {{ row.conclusionLabel || productionConclusionLabel(row.conclusion) }}
-
- —
-
-
-
- {{ row.remark || '—' }}
-
-
-
- 编辑信息
- 编辑工艺
- 删除
-
-
-
-
-