From 18c174490b5778a652c10a3b57509ff61e743dd4 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期五, 06 十一月 2026 15:32:30 +0800
Subject: [PATCH] 完善设备监测、安全管理及采购业务页面
---
src/api/erp/purchase/statistics/index.ts | 3
src/views/safety/document/index.vue | 129 ++++++++++++
src/views/mes/pro/task/data.ts | 4
src/views/safety/hazard/index.vue | 2
src/api/mes/dv/collect/index.ts | 16 +
src/views/mes/dv/statistics/oee.vue | 197 +++++++++++++++++++
src/views/mes/pro/feedback/modules/form.vue | 2
src/views/srm/tender/detail.vue | 36 +-
src/api/mes/pro/workorder/index.ts | 1
src/views/mes/pro/task/index.vue | 15 -
src/views/erp/purchase/statistics/price.vue | 17 +
src/views/mes/dv/repair/modules/form.vue | 8
src/views/srm/tender/index.vue | 42 ++-
src/components/wm-doc-import/index.vue | 31 +-
src/views/srm/tender/modules/form.vue | 2
src/api/safety/document.ts | 49 ++++
16 files changed, 485 insertions(+), 69 deletions(-)
diff --git a/src/api/erp/purchase/statistics/index.ts b/src/api/erp/purchase/statistics/index.ts
index 47aeb90..2e478ed 100644
--- a/src/api/erp/purchase/statistics/index.ts
+++ b/src/api/erp/purchase/statistics/index.ts
@@ -30,6 +30,7 @@
productId?: number; // 浜у搧缂栧彿
productName?: string; // 浜у搧鍚嶇О
productBarCode?: string; // 浜у搧鏉$爜
+ totalQuantity?: number; // 宸插鏍歌鍗曢噰璐暟閲�
avgPrice?: number; // 骞冲潎浠锋牸
minPrice?: number; // 鏈�浣庝环鏍�
maxPrice?: number; // 鏈�楂樹环鏍�
@@ -81,4 +82,4 @@
'/erp/purchase-statistics/uncompleted',
{ params },
);
-}
\ No newline at end of file
+}
diff --git a/src/api/mes/dv/collect/index.ts b/src/api/mes/dv/collect/index.ts
index 44df7ff..64265f0 100644
--- a/src/api/mes/dv/collect/index.ts
+++ b/src/api/mes/dv/collect/index.ts
@@ -26,6 +26,7 @@
workOrderId?: number; // 鐢熶骇宸ュ崟缂栧彿
workOrderCode?: string; // 鐢熶骇宸ュ崟缂栫爜
activeAlarmCount?: number; // 鏈秷闄ゆ姤璀︽暟閲�
+ dataJson?: string; // 缃戝叧涓婃姤鐨勫師濮嬬灛鏃舵暟鎹�
}
/** 鏁伴噰瀹炴椂鏁版嵁 */
@@ -86,6 +87,16 @@
dataJson?: string;
}
+ export interface OfflineInterval {
+ startTime: string;
+ endTime: string;
+ durationSeconds: number;
+ }
+ export interface OfflineResult {
+ firstSampleTime?: string;
+ intervals: OfflineInterval[];
+ }
+
/** 鏁伴噰宸ヨ壓鍙傛暟蹇収 */
export interface CollectTech {
id?: number;
@@ -96,6 +107,11 @@
}
}
+/** 鎸夋暟閲囩绾挎椂闂存煡璇㈠仠鏈哄尯闂达紝鏁版嵁鏉ヨ嚜鏁伴噰鍘嗗彶銆� */
+export function getCollectOfflineIntervals(params: { deviceCode: string; startTime: string; endTime: string }) {
+ return requestClient.get<MesCollectApi.OfflineResult>('/mes/collect/offline/intervals', { params });
+}
+
/** 鏌ヨ鏁伴噰璁惧鐘舵�佸垪琛� */
export function getCollectDeviceList() {
return requestClient.get<MesCollectApi.CollectDevice[]>(
diff --git a/src/api/mes/pro/workorder/index.ts b/src/api/mes/pro/workorder/index.ts
index 63dcc6e..011e339 100644
--- a/src/api/mes/pro/workorder/index.ts
+++ b/src/api/mes/pro/workorder/index.ts
@@ -19,6 +19,7 @@
unitMeasureName?: string; // 鍗曚綅鍚嶇О
quantity?: number; // 鐢熶骇鏁伴噺
quantityProduced?: number; // 宸茬敓浜ф暟閲�
+ completionProgressQuantity?: number; // 鎺掍骇椤甸潰鐘舵�佽繘搴﹀睍绀哄彛寰勶紝涓嶅弬涓庢姤宸ョ粺璁�
quantityChanged?: number; // 璋冩暣鏁伴噺
quantityScheduled?: number; // 宸叉帓浜ф暟閲�
clientId?: number; // 瀹㈡埛缂栧彿
diff --git a/src/api/safety/document.ts b/src/api/safety/document.ts
new file mode 100644
index 0000000..50a2c65
--- /dev/null
+++ b/src/api/safety/document.ts
@@ -0,0 +1,49 @@
+import type { PageParam, PageResult } from '@vben/request';
+import { requestClient } from '#/api/request';
+
+export interface SafetyDocument {
+ id?: number;
+ documentKey?: string;
+ revision?: number;
+ title: string;
+ category: string;
+ attachmentUrl: string;
+ description?: string;
+ effectiveDate?: string;
+ status?: string;
+ ownerUserId?: number;
+ submitterUserId?: number;
+ approverUserId?: number;
+ approvalTime?: string;
+ approvalComment?: string;
+}
+export interface SafetyDocumentApproval {
+ id: number;
+ approverUserId: number;
+ decision: string;
+ comment?: string;
+ decisionTime: string;
+ attachmentUrlSnapshot?: string;
+}
+
+export function getSafetyDocuments(params: PageParam & { title?: string; status?: string }) {
+ return requestClient.get<PageResult<SafetyDocument>>('/safety/document/page', { params });
+}
+export function getSafetyDocumentApprovals(id: number) {
+ return requestClient.get<SafetyDocumentApproval[]>('/safety/document/approvals', { params: { id } });
+}
+export function createSafetyDocument(data: SafetyDocument) {
+ return requestClient.post<number>('/safety/document/create', data);
+}
+export function updateSafetyDocument(data: SafetyDocument) {
+ return requestClient.put<boolean>('/safety/document/update', data);
+}
+export function submitSafetyDocument(id: number) {
+ return requestClient.put<boolean>('/safety/document/submit', undefined, { params: { id } });
+}
+export function approveSafetyDocument(data: { id: number; approved: boolean; comment?: string }) {
+ return requestClient.put<boolean>('/safety/document/approve', data);
+}
+export function reviseSafetyDocument(id: number) {
+ return requestClient.post<number>('/safety/document/revision', undefined, { params: { id } });
+}
diff --git a/src/components/wm-doc-import/index.vue b/src/components/wm-doc-import/index.vue
index 057aa3b..aa2f1fb 100644
--- a/src/components/wm-doc-import/index.vue
+++ b/src/components/wm-doc-import/index.vue
@@ -3,6 +3,7 @@
import { useVbenModal } from '@vben/common-ui';
import { downloadFileFromBlobPart } from '@vben/utils';
+import { shallowRef } from 'vue';
import { Button, message, Upload } from 'ant-design-vue';
@@ -10,21 +11,16 @@
defineOptions({ name: 'WmDocImportForm' });
-const props = withDefaults(
- defineProps<{
+interface ImportOptions {
/** 涓嬭浇妯℃澘鎺ュ彛 */
templateApi: () => Promise<Blob | BlobPart | any>;
/** 瀵煎叆鎺ュ彛 */
importApi: (file: File) => Promise<any>;
/** 鍗曟嵁鍚嶇О锛岀敤浜庢彁绀轰笌鏂囦欢鍚� */
subject: string;
- /** 涓婁紶妗嗘爣绛� */
- fileLabel?: string;
- }>(),
- {
- fileLabel: 'Excel 鏁版嵁',
- },
-);
+}
+
+const options = shallowRef<ImportOptions>();
const emit = defineEmits(['success']);
@@ -48,6 +44,11 @@
});
const [Modal, modalApi] = useVbenModal({
+ onOpenChange(isOpen) {
+ if (isOpen) {
+ options.value = modalApi.getData<ImportOptions>();
+ }
+ },
async onConfirm() {
const { valid } = await formApi.validate();
if (!valid) {
@@ -56,7 +57,7 @@
modalApi.lock();
const data = await formApi.getValues();
try {
- const result = (await props.importApi(data.file as File)) as any;
+ const result = (await options.value!.importApi(data.file as File)) as any;
const createCodes: string[] = result?.createCodes ?? [];
const failureCodes: Record<string, string> = result?.failureCodes ?? {};
const failCount = Object.keys(failureCodes).length;
@@ -69,7 +70,7 @@
// 缁撴灉鎻愮ず锛氭垚鍔�/澶辫触鍒嗗埆姹囨�伙紝澶辫触鏄庣粏鏈�澶氬睍绀� 5 鏉�
const lines: string[] = [];
if (createCodes.length > 0) {
- lines.push(`鎴愬姛瀵煎叆 ${createCodes.length} 寮�${props.subject}`);
+ lines.push(`鎴愬姛瀵煎叆 ${createCodes.length} 寮�${options.value!.subject}`);
}
if (failCount > 0) {
const detail = Object.entries(failureCodes)
@@ -91,6 +92,8 @@
} else {
message.warning(lines.join('锛�'));
}
+ } catch {
+ // 璇锋眰灞傚凡鎻愮ず閿欒锛屼繚鐣欏脊绐椾緵鐢ㄦ埛璋冩暣鏂囦欢鍚庨噸璇曘��
} finally {
modalApi.unlock();
}
@@ -105,16 +108,16 @@
/** 涓嬭浇妯$増 */
async function handleDownload() {
- const data = await props.templateApi();
+ const data = await options.value!.templateApi();
downloadFileFromBlobPart({
- fileName: `${props.subject}瀵煎叆妯℃澘.xls`,
+ fileName: `${options.value!.subject}瀵煎叆妯℃澘.xls`,
source: data,
});
}
</script>
<template>
- <Modal :title="`瀵煎叆${subject}`" class="w-2/5">
+ <Modal :title="`瀵煎叆${options?.subject ?? ''}`" class="w-2/5">
<Form class="mx-4">
<template #file>
<div class="w-full">
diff --git a/src/views/erp/purchase/statistics/price.vue b/src/views/erp/purchase/statistics/price.vue
index 7f9ac25..90d26d1 100644
--- a/src/views/erp/purchase/statistics/price.vue
+++ b/src/views/erp/purchase/statistics/price.vue
@@ -6,7 +6,7 @@
import { Page } from '@vben/common-ui';
-import { Tag } from 'ant-design-vue';
+import { Alert, Tag } from 'ant-design-vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { getPriceAnalysis } from '#/api/erp/purchase/statistics';
@@ -47,12 +47,17 @@
},
{
field: 'productBarCode',
- title: '浜у搧鏉$爜',
+ title: '鐗╂枡缂栫爜',
+ minWidth: 120,
+ },
+ {
+ field: 'totalQuantity',
+ title: '閲囪喘鏁伴噺',
minWidth: 120,
},
{
field: 'avgPrice',
- title: '骞冲潎浠锋牸',
+ title: '鍔犳潈骞冲潎浠锋牸',
minWidth: 120,
formatter: 'formatAmount2',
},
@@ -115,9 +120,11 @@
<template>
<Page auto-content-height>
+ <Alert class="mb-4" type="info" show-icon message="缁熻宸插鏍搁噰璐鍗曠殑鏈◣鍗曚环锛涘钩鍧囦环鏍兼寜鏁伴噺鍔犳潈锛屼环鏍煎彉鍖栫巼姣旇緝绛涢�夎寖鍥村唴鏈�杩戜袱绗旈噰璐环鏍笺��" />
<Grid table-title="閲囪喘浠锋牸鍒嗘瀽">
<template #priceChangeRate="{ row }">
- <Tag v-if="row.priceChangeRate > 0" color="red">
+ <Tag v-if="row.priceChangeRate == null">鏆傛棤瀵规瘮</Tag>
+ <Tag v-else-if="row.priceChangeRate > 0" color="red">
+{{ row.priceChangeRate }}%
</Tag>
<Tag v-else-if="row.priceChangeRate < 0" color="green">
@@ -127,4 +134,4 @@
</template>
</Grid>
</Page>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/views/mes/dv/repair/modules/form.vue b/src/views/mes/dv/repair/modules/form.vue
index ba28ebe..379d741 100644
--- a/src/views/mes/dv/repair/modules/form.vue
+++ b/src/views/mes/dv/repair/modules/form.vue
@@ -89,6 +89,8 @@
await modalApi.close();
emit('success');
message.success('鎻愪氦鎴愬姛');
+ } catch {
+ // 璇锋眰灞傚睍绀哄け璐ュ師鍥狅紝淇濈暀缁翠慨鍗曚緵淇敼銆�
} finally {
modalApi.unlock();
}
@@ -115,6 +117,8 @@
await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
+ } catch {
+ // 璇锋眰灞傚睍绀哄け璐ュ師鍥狅紝淇濈暀缁翠慨鍗曚緵淇敼銆�
} finally {
modalApi.unlock();
}
@@ -136,6 +140,8 @@
await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
+ } catch {
+ // 璇锋眰灞傚睍绀哄け璐ュ師鍥狅紝淇濈暀楠屾敹绐楀彛銆�
} finally {
modalApi.unlock();
}
@@ -174,6 +180,8 @@
}
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
+ } catch {
+ // 璇锋眰灞傚睍绀哄け璐ュ師鍥狅紝淇濈暀褰撳墠琛ㄥ崟銆�
} finally {
modalApi.unlock();
}
diff --git a/src/views/mes/dv/statistics/oee.vue b/src/views/mes/dv/statistics/oee.vue
new file mode 100644
index 0000000..34dfd39
--- /dev/null
+++ b/src/views/mes/dv/statistics/oee.vue
@@ -0,0 +1,197 @@
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue';
+
+import { Page } from '@vben/common-ui';
+import { Alert, Button, Card, Col, DatePicker, Modal, Row, Statistic, Table } from 'ant-design-vue';
+import type { Dayjs } from 'dayjs';
+import dayjs from 'dayjs';
+
+import { requestClient } from '#/api/request';
+import { getCollectDeviceList, getCollectOfflineIntervals } from '#/api/mes/dv/collect';
+import type { MesCollectApi } from '#/api/mes/dv/collect';
+
+interface DeviceOee {
+ machineryId: number;
+ machineryCode: string;
+ machineryName: string;
+ oee: number;
+ availability: number;
+ performance: number;
+ quality: number;
+ taskCount: number;
+ plannedQuantity: number;
+ producedQuantity: number;
+}
+interface OeeResult {
+ overallOee: number;
+ overallAvailability: number;
+ overallPerformance: number;
+ overallQuality: number;
+ taskCount: number;
+ items: DeviceOee[];
+}
+
+const loading = ref(false);
+const dates = ref<[Dayjs, Dayjs]>();
+const result = ref<OeeResult>();
+const collectDevices = ref<MesCollectApi.CollectDevice[]>([]);
+const collectError = ref(false);
+const collectLoading = ref(false);
+const offlineOpen = ref(false);
+const offlineLoading = ref(false);
+const offlineDevice = ref<MesCollectApi.CollectDevice>();
+const offlineRange = ref<[Dayjs, Dayjs] | undefined>([dayjs().subtract(1, 'day'), dayjs()]);
+const offlineIntervals = ref<MesCollectApi.OfflineInterval[]>([]);
+const offlineObserved = ref<string>();
+const offlineQueried = ref(false);
+const columns = [
+ { title: '璁惧缂栫爜', dataIndex: 'machineryCode' },
+ { title: '璁惧鍚嶇О', dataIndex: 'machineryName' },
+ { title: '缁煎悎鏁堢巼锛�%锛�', dataIndex: 'oee' },
+ { title: '绋煎姩鐜囷紙%锛�', dataIndex: 'availability' },
+ { title: '鎬ц兘寮�鍔ㄧ巼锛�%锛�', dataIndex: 'performance' },
+ { title: '鑹搧鐜囷紙%锛�', dataIndex: 'quality' },
+ { title: '浠诲姟鏁�', dataIndex: 'taskCount' },
+ { title: '璁″垝浜ч噺', dataIndex: 'plannedQuantity' },
+ { title: '瀹為檯浜ч噺', dataIndex: 'producedQuantity' },
+];
+const collectColumns = [
+ { title: '璁惧缂栫爜', dataIndex: 'machineryCode' },
+ { title: '璁惧鍚嶇О', dataIndex: 'machineryName' },
+ { title: '鍦ㄧ嚎鐘舵��', key: 'online' },
+ { title: '杩愯鐘舵��', dataIndex: 'stsName' },
+ { title: '閲囬泦鏁版嵁', key: 'readings', width: 300 },
+ { title: '娌规俯', dataIndex: 'ot' },
+ { title: '鏈秷闄ゆ姤璀�', dataIndex: 'activeAlarmCount' },
+ { title: '鏈�杩戦噰闆嗘椂闂�', dataIndex: 'lastCollectTime' },
+ { title: '鎿嶄綔', key: 'action', fixed: 'right' as const, width: 110 },
+];
+const offlineColumns = [
+ { title: '绂荤嚎寮�濮�', dataIndex: 'startTime' },
+ { title: '鎭㈠鎴栨煡璇㈢粨鏉�', dataIndex: 'endTime' },
+ { title: '绂荤嚎鏃堕暱', key: 'duration' },
+];
+
+function formatReadings(data?: string) {
+ if (!data) return '鏆傛棤鏁版嵁';
+ try {
+ const values: unknown = JSON.parse(data);
+ if (!values || typeof values !== 'object' || Array.isArray(values)) return '鏆傛棤鏁版嵁';
+ return Object.entries(values).slice(0, 6).map(([key, value]) => `${key}锛�${String(value)}`).join('锛�');
+ } catch {
+ return '閲囬泦鏁版嵁鏍煎紡寮傚父';
+ }
+}
+
+async function load() {
+ loading.value = true;
+ try {
+ const range = dates.value;
+ result.value = await requestClient.get<OeeResult>('/mes/dv/statistics/oee', {
+ params: range ? {
+ startTime: range[0].startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+ endTime: range[1].endOf('day').format('YYYY-MM-DD HH:mm:ss'),
+ } : {},
+ });
+ } catch {
+ result.value = undefined;
+ } finally {
+ loading.value = false;
+ }
+}
+async function loadCollect() {
+ collectLoading.value = true;
+ try {
+ collectDevices.value = await getCollectDeviceList();
+ collectError.value = false;
+ } catch {
+ collectDevices.value = [];
+ collectError.value = true;
+ } finally {
+ collectLoading.value = false;
+ }
+}
+async function loadOfflineIntervals() {
+ if (!offlineDevice.value?.collectDeviceCode || !offlineRange.value) return;
+ offlineLoading.value = true;
+ try {
+ const data = await getCollectOfflineIntervals({
+ deviceCode: offlineDevice.value.collectDeviceCode,
+ startTime: offlineRange.value[0].format('YYYY-MM-DD HH:mm:ss'),
+ endTime: offlineRange.value[1].format('YYYY-MM-DD HH:mm:ss'),
+ });
+ offlineIntervals.value = data.intervals;
+ offlineObserved.value = data.firstSampleTime;
+ offlineQueried.value = true;
+ } catch {
+ offlineIntervals.value = [];
+ offlineQueried.value = false;
+ } finally {
+ offlineLoading.value = false;
+ }
+}
+function openOffline(device: MesCollectApi.CollectDevice) {
+ offlineDevice.value = device;
+ offlineRange.value = [dayjs().subtract(1, 'day'), dayjs()];
+ offlineIntervals.value = [];
+ offlineObserved.value = undefined;
+ offlineQueried.value = false;
+ offlineOpen.value = true;
+ void loadOfflineIntervals();
+}
+function durationText(seconds: number) {
+ const minutes = Math.floor(seconds / 60);
+ return `${Math.floor(minutes / 60)}灏忔椂${minutes % 60}鍒�${seconds % 60}绉抈;
+}
+onMounted(() => { void load(); void loadCollect(); });
+</script>
+
+<template>
+ <Page auto-content-height>
+ <div class="space-y-4">
+ <Alert type="info" show-icon message="褰撳墠鎸囨爣鎸夌敓浜т换鍔¤鍒掑拰鎶ュ伐璁板綍浼扮畻锛屾湭鎺ュ叆璁惧瀹炴椂杩愯鍙婂仠鏈烘暟鎹��" />
+ <Card>
+ <div class="mb-4 flex items-center gap-3">
+ <span>浠诲姟瀹屾垚鏃ユ湡</span>
+ <DatePicker.RangePicker v-model:value="dates" />
+ <Button type="primary" :loading="loading" @click="load">鏌ヨ</Button>
+ </div>
+ <Row :gutter="16">
+ <Col :span="6"><Statistic title="缁煎悎鏁堢巼" :value="result?.overallOee ?? 0" suffix="%" /></Col>
+ <Col :span="6"><Statistic title="绋煎姩鐜�" :value="result?.overallAvailability ?? 0" suffix="%" /></Col>
+ <Col :span="6"><Statistic title="鎬ц兘寮�鍔ㄧ巼" :value="result?.overallPerformance ?? 0" suffix="%" /></Col>
+ <Col :span="6"><Statistic title="鑹搧鐜�" :value="result?.overallQuality ?? 0" suffix="%" /></Col>
+ </Row>
+ </Card>
+ <Card title="璁惧鏄庣粏">
+ <Table :columns="columns" :data-source="result?.items ?? []" :loading="loading" row-key="machineryId" :scroll="{ x: 1000 }" />
+ </Card>
+ <Card title="璁惧鏁伴噰瀹炴椂鐘舵��">
+ <template #extra><Button :loading="collectLoading" @click="loadCollect">鍒锋柊</Button></template>
+ <Alert v-if="collectError" type="warning" show-icon message="鏁伴噰鐘舵�佸姞杞藉け璐ワ紝璇锋鏌ユ暟閲囨湇鍔″悗閲嶈瘯銆�" class="mb-4" />
+ <Table :columns="collectColumns" :data-source="collectDevices" :loading="collectLoading" row-key="machineryId" :scroll="{ x: 900 }">
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'online'">{{ record.online ? '鍦ㄧ嚎' : '绂荤嚎' }}</template>
+ <template v-else-if="column.key === 'readings'">{{ formatReadings(record.dataJson) }}</template>
+ <template v-else-if="column.key === 'action'"><Button type="link" @click="openOffline(record)">鍋滄満璁板綍</Button></template>
+ </template>
+ </Table>
+ </Card>
+ <Modal v-model:open="offlineOpen" :title="`${offlineDevice?.machineryName ?? ''} - 绂荤嚎鍋滄満璁板綍`" :footer="null" width="800px">
+ <Alert class="mb-4" type="info" show-icon message="鎸夋暟閲囦腑鏂秴杩� 5 鍒嗛挓璁$畻锛涢�氫俊涓柇涔熶細璁″叆銆傞娆¢噰闆嗗墠涓嶆帹鏂紝璁板綍鍙楁暟閲囧巻鍙蹭繚鐣欐湡闄愬埗锛屽崟娆℃渶澶氭煡璇� 7 澶┿��" />
+ <Alert v-if="offlineQueried && !offlineObserved" class="mb-4" type="warning" show-icon message="璇ユ椂娈垫病鏈夊彲鐢ㄩ噰鏍疯褰曪紝鏃犳硶鍒ゆ柇鍋滄満鎯呭喌銆�" />
+ <Alert v-else-if="offlineQueried && offlineObserved && offlineRange && dayjs(offlineObserved).isAfter(offlineRange[0])" class="mb-4" type="warning" show-icon message="鏌ヨ寮�濮嬫椂娌℃湁鍘嗗彶閲囨牱锛岄娆¢噰鏍峰墠鐨勭姸鎬佹棤娉曞垽鏂��" />
+ <div class="mb-4 flex items-center gap-3">
+ <DatePicker.RangePicker v-model:value="offlineRange" show-time />
+ <Button type="primary" :loading="offlineLoading" @click="loadOfflineIntervals">鏌ヨ</Button>
+ <span v-if="offlineQueried && offlineObserved">鍖洪棿鍚堣锛歿{ durationText(offlineIntervals.reduce((sum, item) => sum + item.durationSeconds, 0)) }}</span>
+ </div>
+ <Table :columns="offlineColumns" :data-source="offlineIntervals" :loading="offlineLoading" row-key="startTime">
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'duration'">{{ durationText(record.durationSeconds) }}</template>
+ </template>
+ </Table>
+ </Modal>
+ </div>
+ </Page>
+</template>
diff --git a/src/views/mes/pro/feedback/modules/form.vue b/src/views/mes/pro/feedback/modules/form.vue
index 9e5a9a3..67a13b5 100644
--- a/src/views/mes/pro/feedback/modules/form.vue
+++ b/src/views/mes/pro/feedback/modules/form.vue
@@ -171,6 +171,8 @@
await modalApi.close();
emit('success');
message.success('鎶ュ伐鍗曞凡鎻愪氦');
+ } catch {
+ // 璇锋眰灞傚凡鎻愮ず澶辫触鍘熷洜锛屼繚鐣欏脊绐椾緵鐢ㄦ埛淇敼鍚庨噸璇曘��
} finally {
modalApi.unlock();
}
diff --git a/src/views/mes/pro/task/data.ts b/src/views/mes/pro/task/data.ts
index 0739c03..d6cc4ab 100644
--- a/src/views/mes/pro/task/data.ts
+++ b/src/views/mes/pro/task/data.ts
@@ -155,12 +155,12 @@
// },
{
field: 'quantityProduced',
- title: '宸茬敓浜ф暟閲�',
+ title: '瀹為檯鎶ュ伐鏁伴噺',
width: 100,
},
{
field: 'progressPercent',
- title: '瀹屾垚杩涘害',
+ title: '鐘舵�佽繘搴�',
width: 150,
slots: { default: 'progressPercent' },
},
diff --git a/src/views/mes/pro/task/index.vue b/src/views/mes/pro/task/index.vue
index 9621fdc..f6877ba 100644
--- a/src/views/mes/pro/task/index.vue
+++ b/src/views/mes/pro/task/index.vue
@@ -100,19 +100,12 @@
}
/**
- * 宸插畬鎴愮被鍨嬭鐨勨�滃畬鎴愭�佲�濆厹搴曞睍绀猴細
- * 宸茬敓浜ф暟閲忔寜璁㈠崟鏁伴噺灞曠ず锛堣嫢浣庝簬璁㈠崟鏁伴噺锛夛紝浣垮畬鎴愯繘搴︽樉绀轰负 100%銆�
- * 浠呬綔鐢ㄤ簬鏈〉鍒楄〃灞曠ず锛屼笉淇敼鍚庣鏁版嵁锛屼笉褰卞搷搴撳瓨/鎶ュ伐/瀵煎嚭绛夌湡瀹炲彛寰勩��
+ * 宸插畬鎴愬伐鍗曠殑鐘舵�佽繘搴︽寜瀹屾垚鐘舵�佸睍绀猴紱瀹為檯鎶ュ伐鏁伴噺淇濈暀鎺ュ彛鍘熷�笺��
*/
function normalizeCompletionDisplay(row: MesProWorkOrderApi.WorkOrder): void {
- if (!isCompletedWorkOrder(row)) {
- return;
- }
const quantity = row.quantity ?? 0;
const produced = row.quantityProduced ?? 0;
- if (produced < quantity) {
- row.quantityProduced = quantity;
- }
+ Object.assign(row, { completionProgressQuantity: isCompletedWorkOrder(row) ? Math.max(produced, quantity) : produced });
}
const [Grid, gridApi] = useVbenVxeGrid({
@@ -146,7 +139,7 @@
type: MesProWorkOrderTypeEnum.SELF,
...formValues,
});
- // 宸插畬鎴愮被鍨嬭锛氬凡鐢熶骇鏁伴噺/瀹屾垚杩涘害鍋氣�滃畬鎴愭�佲�濆厹搴曞睍绀猴紙浠呮湰椤靛睍绀猴紝涓嶆敼搴擄級
+ // 鐘舵�佽繘搴︿笌瀹為檯鎶ュ伐鏁伴噺鍒嗗埆灞曠ず銆�
if (res?.list) {
res.list.forEach(normalizeCompletionDisplay);
}
@@ -223,7 +216,7 @@
</template>
<template #progressPercent="{ row }">
<Progress
- :percent="Math.min(100, Math.round((row.quantity ? ((row.quantityProduced || 0) / row.quantity) * 100 : 0)))"
+ :percent="Math.min(100, Math.round((row.quantity ? ((row.completionProgressQuantity || 0) / row.quantity) * 100 : 0)))"
size="small"
/>
</template>
diff --git a/src/views/safety/document/index.vue b/src/views/safety/document/index.vue
new file mode 100644
index 0000000..b7f068b
--- /dev/null
+++ b/src/views/safety/document/index.vue
@@ -0,0 +1,129 @@
+<script lang="ts" setup>
+import type { SafetyDocument, SafetyDocumentApproval } from '#/api/safety/document';
+import { onMounted, reactive, ref } from 'vue';
+import { Page } from '@vben/common-ui';
+import { Alert, Button, Card, DatePicker, Form, FormItem, Input, message, Modal, Select, Space, Table, Tag } from 'ant-design-vue';
+import { uploadSafetyFiles } from '#/api/safety';
+import { approveSafetyDocument, createSafetyDocument, getSafetyDocumentApprovals, getSafetyDocuments, reviseSafetyDocument, submitSafetyDocument, updateSafetyDocument } from '#/api/safety/document';
+
+defineOptions({ name: 'SafetyDocument' });
+const rows = ref<SafetyDocument[]>([]);
+const loading = ref(false);
+const saving = ref(false);
+const uploading = ref(false);
+const open = ref(false);
+const approvalOpen = ref(false);
+const historyOpen = ref(false);
+const approvalHistory = ref<SafetyDocumentApproval[]>([]);
+const approvalRow = ref<SafetyDocument>();
+const approvalComment = ref('');
+const filters = reactive<{ title?: string; status?: string }>({});
+const paging = reactive({ current: 1, pageSize: 10, total: 0 });
+const model = reactive<SafetyDocument>({ title: '', category: '瀹夊叏绠$悊鍒跺害', attachmentUrl: '' });
+const states: Record<string, string> = { DRAFT: '鑽夌', PENDING: '寰呭鎵�', APPROVED: '宸叉壒鍑�', REJECTED: '宸查┏鍥�', SUPERSEDED: '鍘嗗彶鐗堟湰' };
+const columns = [
+ { title: '鍒跺害鍚嶇О', dataIndex: 'title' }, { title: '绫诲埆', dataIndex: 'category' },
+ { title: '鐗堟湰', dataIndex: 'revision' }, { title: '鐢熸晥鏃ユ湡', dataIndex: 'effectiveDate' },
+ { title: '鐘舵��', key: 'status' }, { title: '闄勪欢', key: 'file' },
+ { title: '鏈�杩戝鎵规剰瑙�', dataIndex: 'approvalComment' }, { title: '鎿嶄綔', key: 'action', width: 280 },
+];
+
+async function load(reset = false) {
+ if (reset) paging.current = 1;
+ loading.value = true;
+ try {
+ const result = await getSafetyDocuments({ pageNo: paging.current, pageSize: paging.pageSize, ...filters });
+ rows.value = result.list; paging.total = result.total;
+ } catch { rows.value = []; } finally { loading.value = false; }
+}
+function edit(row?: SafetyDocument) {
+ Object.assign(model, { id: undefined, title: '', category: '瀹夊叏绠$悊鍒跺害', attachmentUrl: '', description: '', effectiveDate: undefined }, row || {});
+ open.value = true;
+}
+async function upload(event: Event) {
+ const input = event.target as HTMLInputElement;
+ const file = input.files?.[0];
+ if (!file) return;
+ uploading.value = true;
+ try { const urls = await uploadSafetyFiles([file], 'safety/document'); model.attachmentUrl = urls[0] || ''; }
+ catch { /* 璇锋眰灞傚睍绀洪敊璇� */ }
+ finally { uploading.value = false; input.value = ''; }
+}
+async function save() {
+ if (!model.title.trim() || !model.category.trim() || !model.attachmentUrl.trim()) { message.warning('璇峰~鍐欏埗搴﹀悕绉般�佺被鍒苟涓婁紶闄勪欢'); return; }
+ saving.value = true;
+ try {
+ const data = { id: model.id, title: model.title, category: model.category, attachmentUrl: model.attachmentUrl, description: model.description, effectiveDate: model.effectiveDate };
+ if (model.id) await updateSafetyDocument(data); else await createSafetyDocument(data);
+ message.success('鍒跺害鑽夌宸蹭繚瀛�'); open.value = false; await load();
+ } catch { /* 璇锋眰灞傚睍绀洪敊璇� */ } finally { saving.value = false; }
+}
+async function submit(row: SafetyDocument) {
+ if (!row.id) return;
+ try { await submitSafetyDocument(row.id); message.success('宸叉彁浜ゅ鎵�'); await load(); } catch { /* 璇锋眰灞傚睍绀洪敊璇� */ }
+}
+async function revise(row: SafetyDocument) {
+ if (!row.id) return;
+ try { await reviseSafetyDocument(row.id); message.success('宸插垱寤轰慨璁㈣崏绋�'); await load(true); } catch { /* 璇锋眰灞傚睍绀洪敊璇� */ }
+}
+function openApproval(row: SafetyDocument) { approvalRow.value = row; approvalComment.value = ''; approvalOpen.value = true; }
+async function showHistory(row: SafetyDocument) {
+ if (!row.id) return;
+ try { approvalHistory.value = await getSafetyDocumentApprovals(row.id); historyOpen.value = true; } catch { /* 璇锋眰灞傚睍绀洪敊璇� */ }
+}
+async function approve(approved: boolean) {
+ if (!approvalRow.value?.id) return;
+ if (!approved && !approvalComment.value.trim()) { message.warning('椹冲洖鏃惰濉啓瀹℃壒鎰忚'); return; }
+ saving.value = true;
+ try { await approveSafetyDocument({ id: approvalRow.value.id, approved, comment: approvalComment.value }); message.success(approved ? '瀹℃壒閫氳繃' : '宸查┏鍥�'); approvalOpen.value = false; await load(); }
+ catch { /* 璇锋眰灞傚睍绀洪敊璇� */ } finally { saving.value = false; }
+}
+onMounted(() => { void load(); });
+</script>
+
+<template>
+ <Page title="瀹夊叏鍒跺害妗f" description="缁存姢瀹夊叏鍒跺害闄勪欢锛屾彁浜ゅ鎵瑰苟淇濈暀鍘嗗彶鐗堟湰銆�" auto-content-height>
+ <Card>
+ <div class="mb-4 flex flex-wrap items-center gap-3">
+ <Input v-model:value="filters.title" placeholder="鍒跺害鍚嶇О" style="width: 200px" allow-clear />
+ <Select v-model:value="filters.status" placeholder="鐘舵��" style="width: 130px" allow-clear :options="Object.entries(states).map(([value, label]) => ({ value, label }))" />
+ <Button type="primary" @click="load(true)">鏌ヨ</Button><Button v-access:code="['safety:document:create']" @click="edit()">鏂板鍒跺害</Button>
+ </div>
+ <Table :columns="columns" :data-source="rows" :loading="loading" :pagination="paging" row-key="id" :scroll="{ x: 1200 }" @change="p => { paging.current = p.current || 1; paging.pageSize = p.pageSize || 10; load(); }">
+ <template #bodyCell="{ column, record }">
+ <Tag v-if="column.key === 'status'">{{ states[record.status] || record.status }}</Tag>
+ <a v-else-if="column.key === 'file'" :href="record.attachmentUrl" target="_blank" rel="noopener noreferrer">鏌ョ湅闄勪欢</a>
+ <Space v-else-if="column.key === 'action'">
+ <Button type="link" @click="showHistory(record as SafetyDocument)">瀹℃壒璁板綍</Button>
+ <Button v-if="['DRAFT', 'REJECTED'].includes(record.status)" v-access:code="['safety:document:update']" type="link" @click="edit(record as SafetyDocument)">缂栬緫</Button>
+ <Button v-if="record.status === 'DRAFT'" v-access:code="['safety:document:update']" type="link" @click="submit(record as SafetyDocument)">鎻愪氦</Button>
+ <Button v-if="record.status === 'PENDING'" v-access:code="['safety:document:approve']" type="link" @click="openApproval(record as SafetyDocument)">瀹℃壒</Button>
+ <Button v-if="record.status === 'APPROVED'" v-access:code="['safety:document:create']" type="link" @click="revise(record as SafetyDocument)">鍒涘缓淇</Button>
+ </Space>
+ </template>
+ </Table>
+ </Card>
+ <Modal v-model:open="open" title="鍒跺害鑽夌" :confirm-loading="saving" ok-text="淇濆瓨" @ok="save">
+ <Form layout="vertical">
+ <FormItem label="鍒跺害鍚嶇О" required><Input v-model:value="model.title" :maxlength="200" /></FormItem>
+ <FormItem label="绫诲埆" required><Input v-model:value="model.category" :maxlength="50" /></FormItem>
+ <FormItem label="鐢熸晥鏃ユ湡" extra="鏆備笉鏀寔鏈潵鏃ユ湡鑷姩鐢熸晥锛涜缃湭鏉ユ棩鏈熸椂锛岃鍦ㄧ敓鏁堟棩鏈熷綋澶╁鎵广��"><DatePicker v-model:value="model.effectiveDate" value-format="YYYY-MM-DD" class="w-full" /></FormItem>
+ <FormItem label="鍒跺害闄勪欢" required><input type="file" accept=".pdf,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png" :disabled="uploading" @change="upload" /><div v-if="model.attachmentUrl">闄勪欢宸蹭笂浼�</div></FormItem>
+ <FormItem label="璇存槑"><Input.TextArea v-model:value="model.description" :maxlength="2000" :rows="3" /></FormItem>
+ </Form>
+ </Modal>
+ <Modal v-model:open="approvalOpen" title="瀹℃壒鍒跺害" :footer="null">
+ <Alert type="info" show-icon message="鎻愪氦浜轰笉鑳藉鎵硅嚜宸辩殑鍒跺害銆�" class="mb-4" />
+ <Input.TextArea v-model:value="approvalComment" placeholder="瀹℃壒鎰忚锛岄┏鍥炴椂蹇呭~" :maxlength="500" :rows="3" />
+ <div class="mt-4 flex justify-end gap-2"><Button :loading="saving" danger @click="approve(false)">椹冲洖</Button><Button :loading="saving" type="primary" @click="approve(true)">閫氳繃</Button></div>
+ </Modal>
+ <Modal v-model:open="historyOpen" title="瀹℃壒璁板綍" :footer="null">
+ <Table :data-source="approvalHistory" row-key="id" :pagination="false" :columns="[{ title: '瀹℃壒浜鸿处鍙风紪鍙�', dataIndex: 'approverUserId' }, { title: '缁撴灉', key: 'decision' }, { title: '鎰忚', dataIndex: 'comment' }, { title: '鏃堕棿', dataIndex: 'decisionTime' }, { title: '瀹℃壒鏃堕檮浠�', key: 'attachment' }]">
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'decision'">{{ states[record.decision] || record.decision }}</template>
+ <a v-else-if="column.key === 'attachment' && record.attachmentUrlSnapshot" :href="record.attachmentUrlSnapshot" target="_blank" rel="noopener noreferrer">鏌ョ湅</a>
+ </template>
+ </Table>
+ </Modal>
+ </Page>
+</template>
diff --git a/src/views/safety/hazard/index.vue b/src/views/safety/hazard/index.vue
index 4c817aa..57e481e 100644
--- a/src/views/safety/hazard/index.vue
+++ b/src/views/safety/hazard/index.vue
@@ -236,6 +236,8 @@
message.success('宸插垎娲�');
assignOpen.value = false;
await load();
+ } catch {
+ // 璇锋眰灞傛彁绀哄師鍥狅紝淇濈暀鍒嗘淳绐楀彛渚涚敤鎴蜂慨姝c��
} finally {
saving.value = false;
}
diff --git a/src/views/srm/tender/detail.vue b/src/views/srm/tender/detail.vue
index afcabf7..3fb5fbb 100644
--- a/src/views/srm/tender/detail.vue
+++ b/src/views/srm/tender/detail.vue
@@ -88,13 +88,12 @@
message.warning('璇ョ墿鏂欏凡娣诲姞锛岃鍕块噸澶嶆坊鍔�');
return;
}
- if (materialForm.value.id) {
- await updateMaterial(materialForm.value);
- } else {
- await createMaterial(materialForm.value);
- }
- materialFormVisible.value = false;
- loadMaterials();
+ try {
+ if (materialForm.value.id) await updateMaterial(materialForm.value);
+ else await createMaterial(materialForm.value);
+ materialFormVisible.value = false;
+ await loadMaterials();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒锛屼繚鐣欒〃鍗� */ }
}
function onMaterialSelect(item?: MdmItemApi.Item) {
if (item) {
@@ -129,9 +128,11 @@
try { bidList.value = await getBidListByProject(projectId); } finally { bidLoading.value = false; }
}
async function handleCreateBid() {
- await createBid(bidForm.value);
- bidFormVisible.value = false;
- loadBids();
+ try {
+ await createBid(bidForm.value);
+ bidFormVisible.value = false;
+ await loadBids();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒锛屼繚鐣欒〃鍗� */ }
}
async function handleWithdrawBid(id: number) {
await withdrawBid(id);
@@ -170,13 +171,12 @@
bidTotalDraft.value = bid?.bidTotalAmount ?? undefined;
}
async function handleSaveQuote() {
- if (quoteForm.value.id) {
- await updateQuote(quoteForm.value);
- } else {
- await createQuote(quoteForm.value);
- }
- quoteFormVisible.value = false;
- loadQuotes(selectedBidId.value);
+ try {
+ if (quoteForm.value.id) await updateQuote(quoteForm.value);
+ else await createQuote(quoteForm.value);
+ quoteFormVisible.value = false;
+ await loadQuotes(selectedBidId.value);
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒锛屼繚鐣欒〃鍗� */ }
}
function handleAddQuote() {
quoteForm.value = { bidId: selectedBidId.value!, tenderMaterialId: undefined! };
@@ -1081,4 +1081,4 @@
</a-modal>
</template>
</Page>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/views/srm/tender/index.vue b/src/views/srm/tender/index.vue
index 44f6ed7..1023e44 100644
--- a/src/views/srm/tender/index.vue
+++ b/src/views/srm/tender/index.vue
@@ -56,46 +56,48 @@
await deleteTenderProject(row.id!);
message.success($t('ui.actionMessage.deleteSuccess', [row.tenderName]));
handleRefresh();
+ } catch {
+ // 璇锋眰灞傚凡鎻愮ず澶辫触鍘熷洜銆�
} finally {
hideLoading();
}
}
async function handlePublish(row: SrmTenderApi.TenderProjectVO) {
- await publishTender(row.id!);
- message.success('鍙戝竷鎴愬姛');
- handleRefresh();
+ try {
+ await publishTender(row.id!); message.success('鍙戝竷鎴愬姛'); handleRefresh();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒 */ }
}
async function handleStartBidding(row: SrmTenderApi.TenderProjectVO) {
- await startBidding(row.id!);
- message.success('宸插紑濮嬫姇鏍�');
- handleRefresh();
+ try {
+ await startBidding(row.id!); message.success('宸插紑濮嬫姇鏍�'); handleRefresh();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒 */ }
}
async function handleStartEvaluation(row: SrmTenderApi.TenderProjectVO) {
- await startEvaluation(row.id!);
- message.success('宸插紑濮嬭瘎鏍�');
- handleRefresh();
+ try {
+ await startEvaluation(row.id!); message.success('宸插紑濮嬭瘎鏍�'); handleRefresh();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒 */ }
}
async function handleClose(row: SrmTenderApi.TenderProjectVO) {
- await closeTender(row.id!);
- message.success('宸插叧闂�');
- handleRefresh();
+ try {
+ await closeTender(row.id!); message.success('宸插叧闂�'); handleRefresh();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒 */ }
}
async function handleGeneratePurchaseOrder(row: SrmTenderApi.TenderProjectVO) {
if (!row.awardId) return;
- await generatePurchaseOrder(row.awardId);
- message.success('閲囪喘璁㈠崟宸茬敓鎴�');
- handleRefresh();
+ try {
+ await generatePurchaseOrder(row.awardId); message.success('閲囪喘璁㈠崟宸茬敓鎴�'); handleRefresh();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒 */ }
}
async function handleStartPriceComparing(row: SrmTenderApi.TenderProjectVO) {
- await startPriceComparing(row.id!);
- message.success('宸插紑濮嬫瘮浠�');
- handleRefresh();
+ try {
+ await startPriceComparing(row.id!); message.success('宸插紑濮嬫瘮浠�'); handleRefresh();
+ } catch { /* 璇锋眰灞傚凡鎻愮ず閿欒 */ }
}
// 纭涓爣鐩稿叧
@@ -114,6 +116,8 @@
label: `${b.supplierName} - ${b.bidNo} (楼${b.bidTotalAmount ?? 0})`,
value: b.id!,
}));
+ } catch {
+ return;
} finally {
confirmLoading.value = false;
}
@@ -134,6 +138,8 @@
message.success('纭涓爣鎴愬姛锛岄噰璐鍗曞凡鑷姩鐢熸垚');
confirmModalApi.close();
handleRefresh();
+ } catch {
+ // 璇锋眰灞傚凡鎻愮ず澶辫触鍘熷洜锛屼繚鐣欏脊绐椼��
} finally {
confirmLoading.value = false;
}
diff --git a/src/views/srm/tender/modules/form.vue b/src/views/srm/tender/modules/form.vue
index 652d017..6ca8f35 100644
--- a/src/views/srm/tender/modules/form.vue
+++ b/src/views/srm/tender/modules/form.vue
@@ -68,6 +68,8 @@
await modalApi.close();
emit('success');
message.success($t('ui.actionMessage.operationSuccess'));
+ } catch {
+ // 璇锋眰灞傚凡鎻愮ず澶辫触鍘熷洜锛屼繚鐣欏綋鍓嶈〃鍗曘��
} finally {
modalApi.unlock();
}
--
Gitblit v1.9.3