From f7e06aaee32674791f63d6e5111c0d0a3f4de4a3 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 28 八月 2026 15:13:13 +0800
Subject: [PATCH] feat(hrm): 新增班次/排班页面，优化薪酬核算
---
src/views/mes/pro/workorder/index.vue | 140 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 134 insertions(+), 6 deletions(-)
diff --git a/src/views/mes/pro/workorder/index.vue b/src/views/mes/pro/workorder/index.vue
index 9a388d0..6c3ef86 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 {
@@ -32,7 +32,8 @@
destroyOnClose: true,
});
- const archiveDetailRef = ref<InstanceType<typeof ArchiveDetail>>();
+ const archiveVisible = ref(false);
+ const archiveProductCode = ref('');
// const barcodeDetailRef = ref<InstanceType<typeof BarcodeDetail>>(); // 鏉＄爜璇︽儏寮圭獥
/** 鍒锋柊琛ㄦ牸 */
@@ -65,6 +66,21 @@
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);
+ }
+ }
+
/** 鍒犻櫎璁㈠崟 */
async function handleDelete(row: MesProWorkOrderApi.WorkOrder) {
const hideLoading = message.loading({
@@ -85,6 +101,12 @@
await cancelWorkOrder(row.id!);
message.success("璁㈠崟宸插彇娑�");
handleRefresh();
+ }
+
+ /** 鎵撳紑褰掓。璇︽儏 */
+ function handleArchive(row: MesProWorkOrderApi.WorkOrder) {
+ archiveProductCode.value = row.productCode || '';
+ archiveVisible.value = true;
}
/** 鏌ョ湅璁㈠崟鏉＄爜 */
@@ -139,6 +161,13 @@
},
} as VxeTableGridOptions<MesProWorkOrderApi.WorkOrder>,
});
+
+ /** 鑾峰彇宸ュ簭鑺傜偣鐘舵�佹牱寮忕被 */
+ function getProcessNodeStatus(percent: number) {
+ if (percent >= 100) return 'completed';
+ if (percent > 0) return 'in-progress';
+ return 'pending';
+ }
</script>
<template>
@@ -169,6 +198,29 @@
{{ 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="[
{
@@ -192,7 +244,7 @@
},
},
{
- label: $t('common.create'),
+ label: '鏂板瀛愯鍗�',
type: 'link',
auth: ['mes:pro-work-order:create'],
ifShow:
@@ -207,7 +259,7 @@
ifShow:
row.status === MesProWorkOrderStatusEnum.CONFIRMED &&
!!row.quantityProduced,
- onClick: handleFinish.bind(null, row),
+ onClick: handleCheckFinish.bind(null, row),
},
{
label: '鍙栨秷',
@@ -229,12 +281,88 @@
{
label: '褰掓。',
type: 'link',
- onClick: () => archiveDetailRef.value?.open(row.productCode),
+ onClick: handleArchive.bind(null, row),
},
]" />
</template>
</Grid>
<!-- <BarcodeDetail ref="barcodeDetailRef" /> -->
- <ArchiveDetail ref="archiveDetailRef" />
+ <ArchiveDetail :visible="archiveVisible" :product-code="archiveProductCode" @update:visible="archiveVisible = $event" />
</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>
--
Gitblit v1.9.3