From 14817696a26eb142ccae03fa7c43050840e057f5 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期一, 17 八月 2026 09:35:03 +0800
Subject: [PATCH] feat(mes): 优化生产订单与排产任务列表显示，新增启停工及校验逻辑 1. 生产订单列表展示优化 (WorkOrder) - 新增「生产状态」列，全局注册 `ORDER_PRODUCTION_STATUS` 常量并绑定系统动态字典。 - 彻底重构「工序生产进度」单元格显示：弃用臃肿的 Steps 组件，改为极简横向布局（彩色状态圆点 + 进度百分比），解决表格行高被强行撑开及内容截断问题，支持横向滚动。 - 优化「完成进度」列宽及展示样式，将百分比数值外置同行显示，更加直观。 2. 排产任务列表改造 (Task) - 顶部表头重构，由单一标题重构为「全部 / 未完成 / 已完成」的 Tabs 标签页切换结构。 - 重写数据过滤逻辑，剥离写死的 status 查询，改为使用 `scheduleStatus` 字段动态响应 Tabs 切换 (0: 未完成, 1: 已完成)。 3. 工单业务逻辑增强与状态流转 - 落实「工单查询逻辑设计方案」，优化底层的工单条件检索逻辑。 - 实现「添加工单启停功能」与「停工状态」，支持工单在执行过程中的暂停与恢复业务流转。 - 强化容错与防呆设计：操作「完成订单」时增加前置校验 `handleCheckFinish`，若生产状态为未完成，强制弹出二次确认 Modal，避免误操作。 # 相关讨论/参考方案 # - 添加工单启停功能 # - 停工状态功能设计方案 # - 工单查询逻辑设计方案 # - 工单完成进度显示优化
---
src/views/mes/workbench/components/TaskListPanel.vue | 135 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 134 insertions(+), 1 deletions(-)
diff --git a/src/views/mes/workbench/components/TaskListPanel.vue b/src/views/mes/workbench/components/TaskListPanel.vue
index 6530d39..90141ef 100644
--- a/src/views/mes/workbench/components/TaskListPanel.vue
+++ b/src/views/mes/workbench/components/TaskListPanel.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import type { PendingTask } from '../../types';
+
import { computed, ref } from 'vue';
@@ -15,7 +15,13 @@
const emit = defineEmits<{
select: [task: PendingTask];
+ refresh: [];
}>();
+
+import { pauseTask, resumeTask } from '#/api/mes/pro/task';
+import { Form, FormItem, Input, Modal, message, Button } from 'ant-design-vue';
+import { confirm } from '@vben/common-ui';
+import type {PendingTask} from "#/views/mes/workbench/types";
const searchKeyword = ref('');
@@ -41,6 +47,50 @@
if (rate >= 100) return '#52c41a';
if (rate >= 60) return '#1890ff';
return '#faad14';
+}
+
+const pauseModalVisible = ref(false);
+const pauseFormRef = ref();
+const pauseFormState = ref({ id: 0, reason: '', remark: '' });
+const pauseLoading = ref(false);
+
+const pauseRules = {
+ reason: [{ required: true, message: '璇疯緭鍏ュ仠宸ュ師鍥�', trigger: 'blur' }],
+};
+
+function handlePause(item: PendingTask, event: Event) {
+ event.stopPropagation();
+ pauseFormState.value = { id: item.id!, reason: '', remark: '' };
+ pauseModalVisible.value = true;
+}
+
+async function submitPause() {
+ await pauseFormRef.value?.validate();
+ pauseLoading.value = true;
+ try {
+ await pauseTask(pauseFormState.value);
+ message.success('鍋滃伐鎴愬姛');
+ pauseModalVisible.value = false;
+ emit('refresh');
+ } finally {
+ pauseLoading.value = false;
+ }
+}
+
+async function handleResume(item: PendingTask, event: Event) {
+ event.stopPropagation();
+ try {
+ await confirm('纭瑕佸宸ヨ浠诲姟鍚楋紵');
+ } catch {
+ return;
+ }
+ try {
+ await resumeTask({ id: item.id! });
+ message.success('澶嶅伐鎴愬姛');
+ emit('refresh');
+ } catch (error: any) {
+ // Error is handled by request interceptor
+ }
}
</script>
@@ -99,6 +149,27 @@
>
{{ item.feedbackRate ?? 0 }}%
</span>
+ <div class="task-card__actions">
+ <Button
+ v-if="item.status === 9"
+ type="primary"
+ size="small"
+ class="task-card__action-btn resume-btn"
+ @click="handleResume(item, $event)"
+ >
+ 澶嶅伐
+ </Button>
+ <Button
+ v-else
+ type="primary"
+ danger
+ size="small"
+ class="task-card__action-btn pause-btn"
+ @click="handlePause(item, $event)"
+ >
+ 鍋滃伐
+ </Button>
+ </div>
</div>
<div class="task-card__progress-row">
@@ -144,6 +215,42 @@
</div>
</div>
</div>
+
+ <Modal
+ v-model:open="pauseModalVisible"
+ title="鐢熶骇浠诲姟鍋滃伐"
+ @ok="submitPause"
+ :confirm-loading="pauseLoading"
+ destroy-on-close
+ >
+ <Form
+ ref="pauseFormRef"
+ :model="pauseFormState"
+ :rules="pauseRules"
+ :label-col="{ span: 4 }"
+ :wrapper-col="{ span: 20 }"
+ style="margin-top: 20px"
+ >
+ <FormItem label="鍋滃伐鍘熷洜" name="reason">
+ <Input.TextArea
+ v-model:value="pauseFormState.reason"
+ placeholder="璇疯緭鍏ュ仠宸ュ師鍥狅紙濡傦細璁惧鏁呴殰銆佺己鏂欑瓑锛�"
+ :rows="3"
+ :maxlength="100"
+ show-count
+ />
+ </FormItem>
+ <FormItem label="澶囨敞" name="remark">
+ <Input.TextArea
+ v-model:value="pauseFormState.remark"
+ placeholder="璇疯緭鍏ュ娉ㄨ鏄�"
+ :rows="2"
+ :maxlength="200"
+ show-count
+ />
+ </FormItem>
+ </Form>
+ </Modal>
</section>
</template>
@@ -290,6 +397,32 @@
font-variant-numeric: tabular-nums;
}
+.task-card__actions {
+ display: flex;
+ align-items: center;
+ margin-left: auto;
+}
+
+.task-card__action-btn {
+ font-size: 13px;
+ border-radius: 4px;
+}
+
+.pause-btn {
+ box-shadow: 0 2px 4px rgb(255 77 79 / 20%);
+}
+
+.resume-btn {
+ background-color: #52c41a;
+ border-color: #52c41a;
+ box-shadow: 0 2px 4px rgb(82 196 26 / 20%);
+}
+.resume-btn:hover,
+.resume-btn:focus {
+ background-color: #73d13d;
+ border-color: #73d13d;
+}
+
.task-card__progress-row {
display: flex;
align-items: baseline;
--
Gitblit v1.9.3