From 5dbc69b4e792dcce998038822b92402366bec47f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 10:45:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260812' into dev_pro2.0
---
src/views/mes/workbench/index.vue | 1
src/views/mes/pro/task/data.ts | 56 +++-
src/api/mes/pro/task/index.ts | 35 +++
src/views/mes/pro/task/modules/task-list.vue | 2
src/views/mes/pro/workorder/data.ts | 23 ++
src/api/system/user/index.ts | 7
src/views/mes/workbench/components/TaskListPanel.vue | 135 ++++++++++++
src/api/mes/pro/workorder/index.ts | 14 +
src/views/mes/pro/task/index.vue | 33 ++
src/views/mes/pro/task/modules/schedule-form.vue | 51 ++--
src/views/mes/pro/feedback/data.ts | 18 +
src/views/mes/pro/workorder/index.vue | 125 +++++++++++
src/packages/constants/src/dict-enum.ts | 1
src/views/mes/workbench/components/tabs/TaskDetailTab.vue | 126 +++++++++++
14 files changed, 574 insertions(+), 53 deletions(-)
diff --git a/src/api/mes/pro/task/index.ts b/src/api/mes/pro/task/index.ts
index 515185b..a059e1c 100644
--- a/src/api/mes/pro/task/index.ts
+++ b/src/api/mes/pro/task/index.ts
@@ -1,8 +1,21 @@
-锘縤mport type { PageParam, PageResult } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
export namespace MesProTaskApi {
+ export interface PauseRecord {
+ id: number;
+ pauseTime: string;
+ pauseUserId: number;
+ pauseUserName: string;
+ reason: string;
+ remark?: string;
+ resumeTime?: string;
+ resumeUserId?: number;
+ resumeUserName?: string;
+ taskId: number;
+ }
+
/** MES 鐢熶骇浠诲姟 */
export interface Task {
id?: number;
@@ -41,6 +54,9 @@
checkFlag?: boolean; // 鏄惁璐ㄦ锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭锛�
backflushFlag?: boolean; // 鏄惁鍊掑啿锛堟淳鐢熻嚜宸ヨ壓璺嚎宸ュ簭锛�
remark?: string; // 澶囨敞
+ pauseRecords?: PauseRecord[]; // 鍋滃伐璁板綍
+ reportableQuantity?: number; // 鍙姤宸ユ暟閲�
+ assigneeUserIds?: number[]; // 鎶ュ伐浜�
}
/** MES 鐢熶骇浠诲姟鍒嗛〉鏌ヨ鍙傛暟 */
@@ -174,3 +190,20 @@
{ params: { workstationId, quantity } },
);
}
+
+/** 鐢熶骇浠诲姟鍋滃伐璇锋眰鍙傛暟 */
+export interface MesProTaskPauseReqVO {
+ id: number;
+ reason: string;
+ remark?: string;
+}
+
+/** 鐢熶骇浠诲姟鍋滃伐 */
+export function pauseTask(data: MesProTaskPauseReqVO) {
+ return requestClient.put('/mes/pro/task/pause', data);
+}
+
+/** 鐢熶骇浠诲姟澶嶅伐 */
+export function resumeTask(data: { id: number }) {
+ return requestClient.put('/mes/pro/task/resume', data);
+}
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 8dacc2e..39bcf69 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -1,4 +1,4 @@
-锘縤mport type { PageParam, PageResult } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
import { requestClient } from '#/api/request';
@@ -34,6 +34,10 @@
finishDate?: number; // 瀹屾垚鏃堕棿
cancelDate?: number; // 鍙栨秷鏃堕棿
status?: number; // 璁㈠崟鐘舵��
+ scheduleStatus?: number; // 鎺掍骇鐘舵��
+ productionStatus?: number; // 鐢熶骇鐘舵��
+ processProgressList?: ProcessProgress[]; // 宸ュ簭鐢熶骇杩涘害
+ completionProgress?: number; // 瀹屾垚杩涘害
remark?: string; // 澶囨敞
createTime?: number; // 鍒涘缓鏃堕棿
}
@@ -59,6 +63,14 @@
);
}
+/** 鑾峰緱鐢熶骇宸ュ崟璋冨害鐘舵�佸垎椤� */
+export function getWorkOrderSchedulePage(params: MesProWorkOrderApi.PageParams) {
+ return requestClient.get<PageResult<MesProWorkOrderApi.WorkOrder>>(
+ '/mes/pro/work-order/schedule-page',
+ { params },
+ );
+}
+
/** 鏌ヨ鐢熶骇璁㈠崟璇︽儏 */
export function getWorkOrder(id: number) {
return requestClient.get<MesProWorkOrderApi.WorkOrder>(
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index 1f49036..cc7ce13 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -114,3 +114,10 @@
params: { nickname },
});
}
+
+/** 閫氳繃瑙掕壊鏍囪瘑鑾峰彇鐢ㄦ埛绮剧畝淇℃伅鍒楄〃 */
+export function getSimpleUserListByRoleCode(code: string) {
+ return requestClient.get<SystemUserApi.UserSimple[]>('/system/user/list-by-role-code', {
+ params: { code },
+ });
+}
diff --git a/src/packages/constants/src/dict-enum.ts b/src/packages/constants/src/dict-enum.ts
index e74a983..2a62e5a 100644
--- a/src/packages/constants/src/dict-enum.ts
+++ b/src/packages/constants/src/dict-enum.ts
@@ -239,6 +239,7 @@
MES_DV_METERING_CHECK_RESULT: 'mes_dv_metering_check_result', // MES 璁￠噺妫�娴嬬粨璁�
MES_PRO_LINK_TYPE: 'mes_pro_link_type', // MES 宸ュ簭鍏崇郴绫诲瀷
MES_PRO_WORK_ORDER_STATUS: 'mes_pro_work_order_status', // MES 鐢熶骇宸ュ崟鐘舵��
+ ORDER_PRODUCTION_STATUS: 'order_production_status', // 鐢熶骇璁㈠崟鐘舵��
MES_PRO_WORK_ORDER_TYPE: 'mes_pro_work_order_type', // MES 宸ュ崟绫诲瀷
MES_PRO_WORK_ORDER_SOURCE_TYPE: 'mes_pro_work_order_source_type', // MES 宸ュ崟鏉ユ簮绫诲瀷
MES_PRO_TASK_STATUS: 'mes_pro_task_status', // MES 鐢熶骇浠诲姟鐘舵��
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index affe7dd..29b244a 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -1,4 +1,4 @@
-锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProFeedbackApi } from '#/api/mes/pro/feedback';
import type { MesProTaskApi } from '#/api/mes/pro/task';
@@ -264,6 +264,7 @@
taskId: undefined,
unitMeasureName: undefined,
workstationId: undefined,
+ reportableQuantity: undefined,
});
},
},
@@ -298,6 +299,7 @@
routeId: task.routeId,
unitMeasureName: task.unitMeasureName,
workstationId: task.workstationId,
+ reportableQuantity: task.reportableQuantity,
});
// 宸ヨ壓璺嚎宸ュ簭鐨� checkFlag 鍐冲畾鏁伴噺鍖哄煙灞曠ず
if (task.routeId && task.processId) {
@@ -377,6 +379,20 @@
},
},
{
+ fieldName: 'reportableQuantity',
+ label: '鍙姤宸ユ暟閲�',
+ component: 'InputNumber',
+ componentProps: {
+ class: 'w-full',
+ disabled: true,
+ precision: 2,
+ },
+ dependencies: {
+ triggerFields: ['taskId'],
+ show: (values) => !!values.taskId && ['create', 'update'].includes(formType),
+ },
+ },
+ {
fieldName: 'feedbackQuantity',
label: '鎶ュ伐鏁伴噺',
component: 'InputNumber',
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index a24e576..aeb9868 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -1,5 +1,7 @@
-锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import { z } from '#/adapter/form';
+import { getSimpleUserListByRoleCode } from '#/api/system/user';
import type { MesProTaskApi } from '#/api/mes/pro/task';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
@@ -130,15 +132,33 @@
width: 80,
},
{
+ field: 'status',
+ title: '璁㈠崟鐘舵��',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
+ },
+ },
+ {
+ field: 'productionStatus',
+ title: '鐢熶骇鐘舵��',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.ORDER_PRODUCTION_STATUS },
+ },
+ },
+ {
field: 'quantity',
title: '璁㈠崟鏁伴噺',
width: 100,
},
- {
- field: 'quantityChanged',
- title: '璋冩暣鏁伴噺',
- width: 100,
- },
+ // {
+ // field: 'quantityChanged',
+ // title: '璋冩暣鏁伴噺',
+ // width: 100,
+ // },
{
field: 'quantityProduced',
title: '宸茬敓浜ф暟閲�',
@@ -160,15 +180,7 @@
width: 120,
formatter: 'formatDate',
},
- {
- field: 'status',
- title: '鎺掍骇鐘舵��',
- width: 100,
- cellRender: {
- name: 'CellDict',
- props: { type: DICT_TYPE.MES_PRO_WORK_ORDER_STATUS },
- },
- },
+
{
title: '鎿嶄綔',
width: 160,
@@ -458,6 +470,20 @@
},
},
{
+ fieldName: 'assigneeUserIds',
+ label: '鎶ュ伐浜�',
+ component: 'ApiSelect',
+ componentProps: {
+ placeholder: '璇烽�夋嫨鎶ュ伐浜�',
+ api: getSimpleUserListByRoleCode,
+ params: { code: 'production_submit_work' },
+ labelField: 'nickname',
+ valueField: 'id',
+ mode: 'multiple',
+ },
+ rules: z.array(z.number()).min(1, '璇烽�夋嫨鎶ュ伐浜�').default([]),
+ },
+ {
fieldName: 'remark',
label: '澶囨敞',
component: 'Textarea',
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index bd75f40..79377f1 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -1,6 +1,6 @@
-锘�<script lang="ts" setup>
+<script lang="ts" setup>
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
+import {getWorkOrderSchedulePage, type MesProWorkOrderApi} from '#/api/mes/pro/workorder';
import { onMounted, ref } from 'vue';
import { useRouter } from 'vue-router';
@@ -11,7 +11,7 @@
MesProWorkOrderTypeEnum,
} from '@vben/constants';
-import { Button, Card, message } from 'ant-design-vue';
+import { Button, Card, message, Tabs } from 'ant-design-vue';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import { getGanttTaskList, previewAutoGenerate, autoGenerateTasks } from '#/api/mes/pro/task';
@@ -27,6 +27,8 @@
const ganttTasks = ref<any[]>([]); // 鐢樼壒鍥鹃瑙堟暟鎹�
const archiveVisible = ref(false);
const archiveProductCode = ref('');
+
+const activeTab = ref('PENDING'); // 榛樿閫変腑寰呮帓浜�
const [ScheduleModal, scheduleModalApi] = useVbenModal({
connectedComponent: ScheduleForm,
@@ -106,10 +108,19 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
- return await getWorkOrderPage({
+ let scheduleStatus: number | undefined = undefined;
+
+ if (activeTab.value === 'PENDING') {
+ scheduleStatus = 0; // 寰呮帓浜�
+ } else if (activeTab.value === 'FINISHED') {
+ scheduleStatus = 1; // 宸插畬鎴�
+ }
+ // activeTab === 'ALL' 鏃朵笉浼�
+
+ return await getWorkOrderSchedulePage({
pageNo: page.currentPage,
pageSize: page.pageSize,
- status: MesProWorkOrderStatusEnum.CONFIRMED,
+ scheduleStatus,
type: MesProWorkOrderTypeEnum.SELF,
...formValues,
});
@@ -147,7 +158,17 @@
<GanttChart :height="350" :readonly="true" :tasks="ganttTasks" />
</Card>
- <Grid table-title="寰呮帓浜ц鍗�">
+ <Grid>
+ <template #table-title>
+ <div class="flex flex-col gap-2">
+ <span class="text-base font-medium">鐢熶骇璁㈠崟鍒楄〃</span>
+ <Tabs v-model:activeKey="activeTab" @change="handleRefresh" :tabBarStyle="{ margin: 0, borderBottom: 0 }">
+ <Tabs.TabPane key="ALL" tab="鍏ㄩ儴" />
+ <Tabs.TabPane key="PENDING" tab="鏈畬鎴�" />
+ <Tabs.TabPane key="FINISHED" tab="宸插畬鎴�" />
+ </Tabs>
+ </div>
+ </template>
<template #toolbar-tools>
<TableAction
:actions="[
diff --git a/src/views/mes/pro/task/modules/schedule-form.vue b/src/views/mes/pro/task/modules/schedule-form.vue
index 8f67bd3..c14e0bd 100644
--- a/src/views/mes/pro/task/modules/schedule-form.vue
+++ b/src/views/mes/pro/task/modules/schedule-form.vue
@@ -1,4 +1,4 @@
-锘�<script lang="ts" setup>
+<script lang="ts" setup>
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
import type { MesProWorkOrderProcessApi } from '#/api/mes/pro/workorder/process';
@@ -50,16 +50,19 @@
message.warning('褰撳墠璁㈠崟鏈厤缃伐搴忥紝璇峰厛鍦ㄥ伐鍗曚腑缁存姢宸ュ簭淇℃伅');
return;
}
+ // 纭畾宸ヨ壓璺嚎ID锛氬伐鍗曡矾绾� 鈫� 浜у搧璺嚎
+ let tempRouteId = 0;
+ if (workOrder.value?.routeId) {
+ tempRouteId = workOrder.value.routeId;
+ } else {
+ const processes = await getRouteProcessListByProduct(productId);
+ tempRouteId = processes?.[0]?.routeId ?? 0;
+ }
+ currentRouteId.value = tempRouteId;
+
routeProcessList.value = [...woProcesses].toSorted(
(a, b) => (a.sort ?? 0) - (b.sort ?? 0),
);
- // 纭畾宸ヨ壓璺嚎ID锛氬伐鍗曡矾绾� 鈫� 浜у搧璺嚎
- if (workOrder.value?.routeId) {
- currentRouteId.value = workOrder.value.routeId;
- } else {
- const processes = await getRouteProcessListByProduct(productId);
- currentRouteId.value = processes?.[0]?.routeId ?? 0;
- }
}
/** 瀹屾垚璁㈠崟 */
@@ -131,22 +134,22 @@
:title="rp.processName"
/>
</Steps>
- <Card
- v-for="(rp, index) in routeProcessList"
- v-show="activeProcessStep === index"
- :key="rp.processId"
- class="mx-4"
- >
- <TaskList
- :color-code="rp.colorCode"
- :disabled="isReadonly"
- :item-id="rp.outputItemId || workOrder.productId"
- :process-id="rp.processId!"
- :route-id="currentRouteId"
- :work-order-id="workOrder.id!"
- :work-order-quantity="workOrder.quantity"
- />
- </Card>
+ <template v-for="(rp, index) in routeProcessList" :key="rp.processId">
+ <Card
+ v-if="activeProcessStep === index"
+ class="mx-4"
+ >
+ <TaskList
+ :color-code="rp.colorCode"
+ :disabled="isReadonly"
+ :item-id="rp.outputItemId || workOrder.productId"
+ :process-id="rp.processId!"
+ :route-id="currentRouteId"
+ :work-order-id="workOrder.id!"
+ :work-order-quantity="workOrder.quantity"
+ />
+ </Card>
+ </template>
</template>
<template #prepend-footer>
<div class="flex flex-auto items-center gap-2">
diff --git a/src/views/mes/pro/task/modules/task-list.vue b/src/views/mes/pro/task/modules/task-list.vue
index d126366..ef34471 100644
--- a/src/views/mes/pro/task/modules/task-list.vue
+++ b/src/views/mes/pro/task/modules/task-list.vue
@@ -110,6 +110,8 @@
() => props.processId,
() => handleRefresh(),
);
+
+
</script>
<template>
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index af895bd..f62e323 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -1,4 +1,4 @@
-锘縤mport type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
+import type { VbenFormApi, VbenFormSchema } from '#/adapter/form';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesProWorkOrderApi } from '#/api/mes/pro/workorder';
import type { MesProWorkOrderBomApi } from '#/api/mes/pro/workorder/bom';
@@ -413,6 +413,27 @@
},
},
{
+ field: 'productionStatus',
+ title: '鐢熶骇鐘舵��',
+ width: 100,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.ORDER_PRODUCTION_STATUS },
+ },
+ },
+ {
+ field: 'processProgressList',
+ title: '宸ュ簭鐢熶骇杩涘害',
+ width: 350,
+ slots: { default: 'processProgressList' },
+ },
+ {
+ field: 'completionProgress',
+ title: '瀹屾垚杩涘害',
+ width: 200,
+ slots: { default: 'completionProgress' },
+ },
+ {
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 9a388d0..05d1c44 100644
--- a/src/views/mes/pro/workorder/index.vue
+++ b/src/views/mes/pro/workorder/index.vue
@@ -11,7 +11,7 @@
} from "@vben/constants";
import { downloadFileFromBlobPart } from "@vben/utils";
- import { Button, message } from "ant-design-vue";
+ import { Button, message, Progress, Steps, Popover, Modal } from "ant-design-vue";
import { ACTION_ICON, TableAction, useVbenVxeGrid } from "#/adapter/vxe-table";
import {
@@ -63,6 +63,21 @@
/** 瀹屾垚璁㈠崟 */
function handleFinish(row: MesProWorkOrderApi.WorkOrder) {
formModalApi.setData({ formType: "finish", id: row.id }).open();
+ }
+
+ /** 瀹屾垚璁㈠崟鍓嶆牎楠� */
+ function handleCheckFinish(row: MesProWorkOrderApi.WorkOrder) {
+ if (row.productionStatus !== 2) {
+ Modal.confirm({
+ title: '鎿嶄綔纭',
+ content: '璇ヨ鍗曟湭瀹屾垚锛屾槸鍚︾‘璁よ缁х画瀹屾垚锛�',
+ onOk() {
+ handleFinish(row);
+ },
+ });
+ } else {
+ handleFinish(row);
+ }
}
/** 鍒犻櫎璁㈠崟 */
@@ -139,6 +154,13 @@
},
} as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
});
+
+ /** 鑾峰彇宸ュ簭鑺傜偣鐘舵�佹牱寮忕被 */
+ function getProcessNodeStatus(percent: number) {
+ if (percent >= 100) return 'completed';
+ if (percent > 0) return 'in-progress';
+ return 'pending';
+ }
</script>
<template>
@@ -168,6 +190,29 @@
@click="handleDetail(row)">
{{ row.code }}
</Button>
+ </template>
+ <template #processProgressList="{ row }">
+ <div v-if="row.processProgressList && row.processProgressList.length > 0" class="process-node-list">
+ <div
+ v-for="(item, index) in row.processProgressList"
+ :key="index"
+ class="process-node-item"
+ >
+ <div class="process-node-dot" :class="getProcessNodeStatus(item.progressPercent || item.progress || 0)"></div>
+ <div class="process-node-info">
+ <span class="process-node-name" :title="item.processName ">{{ item.processName }}</span>
+ <span class="process-node-percent">{{ item.progress || 0 }}%</span>
+ </div>
+ <div v-if="index !== row.processProgressList.length - 1" class="process-node-line"></div>
+ </div>
+ </div>
+ <span v-else>-</span>
+ </template>
+ <template #completionProgress="{ row }">
+ <div style="display: flex; align-items: center; gap: 8px; width: 100%;">
+ <Progress :percent="row.completionProgress || 0" :show-info="false" size="small" style="flex: 1; margin: 0;" />
+ <span style="white-space: nowrap; min-width: 40px; text-align: left;">{{ row.completionProgress || 0 }}%</span>
+ </div>
</template>
<template #actions="{ row }">
<TableAction :actions="[
@@ -207,7 +252,7 @@
ifShow:
row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
!!row.quantityProduced,
- onClick: handleFinish.bind(null, row),
+ onClick: handleCheckFinish.bind(null, row),
},
{
label: '鍙栨秷',
@@ -238,3 +283,79 @@
<ArchiveDetail ref="archiveDetailRef" />
</Page>
</template>
+
+<style scoped>
+.process-node-list {
+ display: flex;
+ align-items: center;
+ overflow-x: auto;
+ overflow-y: hidden;
+ max-width: 100%;
+ padding-bottom: 4px;
+}
+
+/* Custom scrollbar to make it sleek */
+.process-node-list::-webkit-scrollbar {
+ height: 4px;
+}
+.process-node-list::-webkit-scrollbar-thumb {
+ background-color: #d9d9d9;
+ border-radius: 4px;
+}
+.process-node-list::-webkit-scrollbar-track {
+ background: transparent;
+}
+
+.process-node-item {
+ display: flex;
+ align-items: center;
+ flex-shrink: 0;
+}
+
+.process-node-dot {
+ width: 8px;
+ height: 8px;
+ border-radius: 50%;
+ margin-right: 6px;
+}
+
+.process-node-dot.completed {
+ background-color: #52c41a;
+}
+.process-node-dot.in-progress {
+ background-color: #1890ff;
+}
+.process-node-dot.pending {
+ background-color: #d9d9d9;
+}
+
+.process-node-info {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-right: 12px;
+ font-size: 12px;
+ line-height: 1.2;
+}
+
+.process-node-name {
+ color: #333;
+ max-width: 80px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
+
+.process-node-percent {
+ color: #888;
+ font-size: 11px;
+}
+
+.process-node-line {
+ width: 20px;
+ height: 1px;
+ background-color: #e8e8e8;
+ margin-right: 12px;
+}
+
+</style>
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;
diff --git a/src/views/mes/workbench/components/tabs/TaskDetailTab.vue b/src/views/mes/workbench/components/tabs/TaskDetailTab.vue
index 68e1a68..9b0dcc7 100644
--- a/src/views/mes/workbench/components/tabs/TaskDetailTab.vue
+++ b/src/views/mes/workbench/components/tabs/TaskDetailTab.vue
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { PendingTask } from '../../../types';
-import { Descriptions, Progress, Tag } from 'ant-design-vue';
+import { Descriptions, Progress, Tag, Timeline, TimelineItem } from 'ant-design-vue';
defineOptions({ name: 'WorkbenchTaskDetailTab' });
@@ -91,6 +91,48 @@
</Descriptions.Item>
<Descriptions.Item label="澶囨敞" :span="2">{{ task.remark ?? '鈥�' }}</Descriptions.Item>
</Descriptions>
+
+ <!-- 鍋滃伐璁板綍 -->
+ <div v-if="task.pauseRecords && task.pauseRecords.length > 0" class="detail-pause-records">
+ <div class="detail-pause-records__title">鍋滃伐鍘嗗彶璁板綍</div>
+ <Timeline class="pause-timeline">
+ <TimelineItem
+ v-for="record in task.pauseRecords"
+ :key="record.id"
+ :color="record.resumeTime ? 'green' : 'red'"
+ >
+ <div class="pause-timeline-item">
+ <div class="pause-timeline-time">
+ <span class="time-label">{{ record.pauseTime }}</span>
+ <span class="time-separator">鑷�</span>
+ <span class="time-label" :class="{ 'is-ongoing': !record.resumeTime }">
+ {{ record.resumeTime || '姝ｅ湪鍋滃伐' }}
+ </span>
+ </div>
+ <div class="pause-timeline-content">
+ <div class="pause-info-row">
+ <span class="info-label">鎿嶄綔浜哄憳锛�</span>
+ <span class="info-value">
+ {{ record.pauseUserName }} (鍋滃伐)
+ <template v-if="record.resumeTime">
+ <span style="margin: 0 4px; color: #d9d9d9">|</span>
+ {{ record.resumeUserName }} (澶嶅伐)
+ </template>
+ </span>
+ </div>
+ <div class="pause-info-row">
+ <span class="info-label">鍋滃伐鍘熷洜锛�</span>
+ <span class="info-value">{{ record.reason }}</span>
+ </div>
+ <div class="pause-info-row" v-if="record.remark">
+ <span class="info-label">澶囨敞锛�</span>
+ <span class="info-value">{{ record.remark }}</span>
+ </div>
+ </div>
+ </div>
+ </TimelineItem>
+ </Timeline>
+ </div>
</template>
</div>
</template>
@@ -187,4 +229,86 @@
font-size: 14px;
}
}
+
+.detail-pause-records {
+ margin-top: 24px;
+}
+
+.detail-pause-records__title {
+ font-size: 16px;
+ font-weight: 600;
+ color: #1a1a1a;
+ margin-bottom: 20px;
+}
+
+.pause-timeline {
+ padding-top: 6px;
+ padding-left: 4px;
+}
+
+.pause-timeline-item {
+ background: #fafafa;
+ border: 1px solid #f0f0f0;
+ border-radius: 8px;
+ padding: 14px 18px;
+ margin-top: -6px;
+ box-shadow: 0 1px 2px rgb(0 0 0 / 2%);
+ transition: all 0.3s ease;
+
+ &:hover {
+ box-shadow: 0 4px 12px rgb(0 0 0 / 5%);
+ border-color: #e6d8d8;
+ }
+}
+
+.pause-timeline-time {
+ font-size: 13px;
+ color: #595959;
+ font-weight: 500;
+ margin-bottom: 10px;
+ display: flex;
+ align-items: center;
+ gap: 8px;
+}
+
+.time-label {
+ background: #e6f7ff;
+ color: #1890ff;
+ padding: 2px 8px;
+ border-radius: 4px;
+ font-variant-numeric: tabular-nums;
+}
+
+.time-label.is-ongoing {
+ background: #fff1f0;
+ color: #f5222d;
+}
+
+.time-separator {
+ color: #bfbfbf;
+ font-size: 12px;
+}
+
+.pause-timeline-content {
+ display: flex;
+ flex-direction: column;
+ gap: 6px;
+}
+
+.pause-info-row {
+ font-size: 13px;
+ display: flex;
+ line-height: 1.5;
+}
+
+.pause-info-row .info-label {
+ color: #8c8c8c;
+ width: 70px;
+ flex-shrink: 0;
+}
+
+.pause-info-row .info-value {
+ color: #262626;
+ flex: 1;
+}
</style>
diff --git a/src/views/mes/workbench/index.vue b/src/views/mes/workbench/index.vue
index 15c283a..b49191b 100644
--- a/src/views/mes/workbench/index.vue
+++ b/src/views/mes/workbench/index.vue
@@ -215,6 +215,7 @@
:selected-id="selectedTask?.id"
:loading="taskLoading"
@select="handleSelectTask"
+ @refresh="loadTaskList"
/>
</aside>
--
Gitblit v1.9.3