From 2540d86f0dbd77f654f558c3bf9d5ddbe7422f16 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 03 七月 2026 17:22:09 +0800
Subject: [PATCH] fix: 完成设计项目和归档台账接口对接，功能联调
---
src/views/mes/pd/archive/modules/detail.vue | 160 +++++++++++++++++++++++++++++------------------------
1 files changed, 88 insertions(+), 72 deletions(-)
diff --git a/src/views/mes/pd/archive/modules/detail.vue b/src/views/mes/pd/archive/modules/detail.vue
index 6b3875f..9eeee80 100644
--- a/src/views/mes/pd/archive/modules/detail.vue
+++ b/src/views/mes/pd/archive/modules/detail.vue
@@ -1,104 +1,120 @@
<script lang="ts" setup>
import type { MesPdArchiveApi } from '#/api/mes/pd/archive';
-import type { MesPdVersionChangeApi } from '#/api/mes/pd/version-change';
import { ref } from 'vue';
import { useVbenModal } from '#/packages/effects/common-ui/src';
+import { DICT_TYPE } from '#/packages/constants/src';
-import { Alert, Descriptions, Tabs } from 'ant-design-vue';
+import { Descriptions, Table, Tabs } from 'ant-design-vue';
-import { getPdArchive } from '#/api/mes/pd/archive';
+import { getPdArchiveDetailByProduct } from '#/api/mes/pd/archive';
-import MaterialPanel from '#/views/mes/pd/project/modules/material-panel.vue';
-import VersionChangeList from '#/views/mes/pd/project/modules/version-change/version-change-list.vue';
+const loading = ref(false);
+const detailList = ref<MesPdArchiveApi.DetailItem[]>([]);
+const activeProject = ref('0');
-const detail = ref<MesPdArchiveApi.Archive>();
-const activeTab = ref('version-change');
-const materialVersion = ref<string>();
-const materialVersionHint = ref<string>();
+const archiveColumns = [
+ { title: '褰掓。缂栧彿', dataIndex: 'archiveCode', key: 'archiveCode' },
+ { title: '褰掓。浜�', dataIndex: 'archiverNickname', key: 'archiverNickname' },
+ { title: '褰掓。鐘舵��', dataIndex: 'archiveStatus', key: 'archiveStatus' },
+ { title: '褰掓。鏃堕棿', dataIndex: 'archiveTime', key: 'archiveTime' },
+ { title: '澶囨敞', dataIndex: 'remark', key: 'remark', ellipsis: true },
+];
-function handleViewMaterials(row: MesPdVersionChangeApi.VersionChange) {
- materialVersion.value = row.toVersion;
- materialVersionHint.value = `鍙樻洿鍗� ${row.code}锛�${row.fromVersion} 鈫� ${row.toVersion}`;
- activeTab.value = 'material';
-}
-
-function clearMaterialVersionFilter() {
- materialVersion.value = detail.value?.version;
- materialVersionHint.value = undefined;
-}
+const documentColumns = [
+ { title: '璧勬枡鍚嶇О', dataIndex: 'documentName', key: 'documentName' },
+ { title: '璧勬枡绫诲瀷', dataIndex: 'documentType', key: 'documentType' },
+ { title: '鐗堟湰', dataIndex: 'documentVersion', key: 'documentVersion', width: 80 },
+ { title: '鏂囦欢鍚�', dataIndex: 'fileName', key: 'fileName' },
+ { title: '涓婁紶浜�', dataIndex: 'uploadUserNickname', key: 'uploadUserNickname' },
+ { title: '涓婁紶鏃堕棿', dataIndex: 'uploadTime', key: 'uploadTime' },
+ {
+ title: '鎿嶄綔',
+ key: 'action',
+ width: 80,
+ },
+];
const [Modal, modalApi] = useVbenModal({
async onOpenChange(isOpen: boolean) {
if (!isOpen) {
- detail.value = undefined;
- activeTab.value = 'version-change';
- materialVersion.value = undefined;
- materialVersionHint.value = undefined;
+ detailList.value = [];
+ activeProject.value = '0';
return;
}
- const data = modalApi.getData<{ id: number }>();
- modalApi.lock();
+ const data = modalApi.getData<{ productCode: number }>();
+ loading.value = true;
try {
- detail.value = await getPdArchive(data.id);
- materialVersion.value = detail.value.version;
+ detailList.value = await getPdArchiveDetailByProduct(data.productCode);
+ activeProject.value = '0';
} finally {
- modalApi.unlock();
+ loading.value = false;
}
},
});
defineExpose({
- open: (id: number) => modalApi.setData({ id }).open(),
+ open: (productCode: number) => modalApi.setData({ productCode }).open(),
});
</script>
<template>
- <Modal class="w-4/5" title="褰掓。璇︽儏">
- <Descriptions v-if="detail" :column="3" bordered class="mx-4 mb-4" size="small">
- <Descriptions.Item label="褰掓。缂栧彿">{{ detail.code }}</Descriptions.Item>
- <Descriptions.Item label="浜у搧缂栫爜">{{ detail.productCode }}</Descriptions.Item>
- <Descriptions.Item label="浜у搧鍚嶇О">{{ detail.productName }}</Descriptions.Item>
- <Descriptions.Item label="璁捐鐗堟湰">{{ detail.version }}</Descriptions.Item>
- <Descriptions.Item label="浠诲姟缂栫爜">{{ detail.projectCode }}</Descriptions.Item>
- <Descriptions.Item label="浠诲姟鍚嶇О">{{ detail.projectName }}</Descriptions.Item>
- <Descriptions.Item label="璧勬枡鏁�">{{ detail.documentCount ?? '-' }}</Descriptions.Item>
- <Descriptions.Item label="褰掓。浜�">{{ detail.archiverName || '-' }}</Descriptions.Item>
- <Descriptions.Item label="褰掓。璺緞" :span="3">
- {{ detail.storagePath || '-' }}
- </Descriptions.Item>
- <Descriptions.Item label="澶囨敞" :span="3">{{ detail.remark || '-' }}</Descriptions.Item>
- </Descriptions>
+ <Modal class="w-4/5" title="褰掓。璇︽儏" :loading="loading">
+ <Tabs v-if="detailList.length > 0" v-model:active-key="activeProject" type="card">
+ <Tabs.TabPane
+ v-for="(detail, index) in detailList"
+ :key="String(index)"
+ :tab="detail.project.taskName || '椤圭洰'"
+ >
+ <!-- 椤圭洰淇℃伅 -->
+ <Descriptions :column="3" bordered size="small" class="mb-4">
+ <Descriptions.Item label="浠诲姟缂栫爜">{{ detail.project.taskCode }}</Descriptions.Item>
+ <Descriptions.Item label="浠诲姟鍚嶇О">{{ detail.project.taskName }}</Descriptions.Item>
+ <Descriptions.Item label="浜у搧缂栫爜">{{ detail.project.productCode }}</Descriptions.Item>
+ <Descriptions.Item label="浜у搧鍚嶇О">{{ detail.project.productName }}</Descriptions.Item>
+ <Descriptions.Item label="鐗堟湰鍙�">{{ detail.project.version }}</Descriptions.Item>
+ <Descriptions.Item label="涓昏璁″笀">{{ detail.project.chiefDesignerNickname }}</Descriptions.Item>
+ <Descriptions.Item label="瀹℃牳浜�">{{ detail.project.reviewerNickname }}</Descriptions.Item>
+ <Descriptions.Item label="璁″垝瀹屾垚">{{ detail.project.planFinishTime }}</Descriptions.Item>
+ </Descriptions>
- <template v-if="detail?.projectId">
- <Tabs v-model:active-key="activeTab" class="mx-4">
- <Tabs.TabPane key="version-change" tab="鐗堟湰鍙樻洿璁板綍">
- <VersionChangeList
- form-type="detail"
- :project-id="detail.projectId"
- :project-version="detail.version"
- @view-materials="handleViewMaterials"
+ <!-- 褰掓。璁板綍 -->
+ <div class="mb-4">
+ <h4 class="mb-2 text-sm font-medium">褰掓。璁板綍</h4>
+ <Table
+ :columns="archiveColumns"
+ :data-source="detail.archives"
+ :pagination="false"
+ bordered
+ row-key="id"
+ size="small"
/>
- </Tabs.TabPane>
- <Tabs.TabPane key="material" tab="鐗堟湰璧勬枡">
- <Alert
- v-if="materialVersionHint"
- class="mb-3"
- closable
- show-icon
- type="info"
- :message="`姝ｅ湪鏌ョ湅 ${materialVersion} 鐗堟湰璧勬枡锛�${materialVersionHint}锛塦"
- @close="clearMaterialVersionFilter"
- />
- <MaterialPanel
- form-type="detail"
- :project-id="detail.projectId"
- table-title="鐗堟湰璧勬枡"
- :version="materialVersion"
- />
- </Tabs.TabPane>
- </Tabs>
- </template>
+ </div>
+
+ <!-- 璁捐璧勬枡 -->
+ <div>
+ <h4 class="mb-2 text-sm font-medium">璁捐璧勬枡</h4>
+ <Table
+ :columns="documentColumns"
+ :data-source="detail.documents"
+ :pagination="false"
+ bordered
+ row-key="id"
+ size="small"
+ >
+ <template #bodyCell="{ column, record }">
+ <template v-if="column.key === 'action'">
+ <a v-if="record.fileUrl" :href="record.fileUrl" target="_blank" class="text-primary">涓嬭浇</a>
+ <span v-else class="text-gray-400">-</span>
+ </template>
+ </template>
+ </Table>
+ </div>
+ </Tabs.TabPane>
+ </Tabs>
+ <div v-else class="py-8 text-center text-gray-400">
+ 鏆傛棤褰掓。璁板綍
+ </div>
</Modal>
</template>
--
Gitblit v1.9.3