From 53309746f5a8276d3e8d38e3967e7bc3fb46921a Mon Sep 17 00:00:00 2001 From: taoge1020 Date: Tue, 19 Aug 2025 14:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=87=BA=E5=9B=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/design/volumeCatalog/index.ts | 21 ++ src/components/FileUpload/index.vue | 8 +- src/components/Process/submitVerify.vue | 36 +- src/views/design/appointment/index.vue | 4 +- src/views/design/received/index.vue | 6 +- .../design/volumeCatalog/blueprintEdit.vue | 339 ++++++++++++++++++ .../volumeCatalog/comm/TableContent.vue | 11 +- src/views/design/volumeCatalog/index.vue | 129 ++++--- src/views/design/volumeCatalog/indexEdit.vue | 339 ++++++++++++++++++ src/views/materials/appointment/index.vue | 6 +- 10 files changed, 819 insertions(+), 80 deletions(-) create mode 100644 src/views/design/volumeCatalog/blueprintEdit.vue create mode 100644 src/views/design/volumeCatalog/indexEdit.vue diff --git a/src/api/design/volumeCatalog/index.ts b/src/api/design/volumeCatalog/index.ts index 5eae539..ed38967 100644 --- a/src/api/design/volumeCatalog/index.ts +++ b/src/api/design/volumeCatalog/index.ts @@ -95,3 +95,24 @@ export const uploadVolumeFile = (query?: any): AxiosPromise => { data: query }); }; +/** + * 获取文件列表 + * @param query + */ +export const volumeFileList = (params) => { + return request({ + url: '/design/volumeFile/list', + method: 'get', + params: params + }); +}; +/** + * 获取文件详情 + * @param query + */ +export const getileDetail = (id) => { + return request({ + url: '/design/volumeFile/' + id, + method: 'get' + }); +}; diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index a871113..0adc0d8 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -48,12 +48,7 @@ tag="ul" @click.stop > -
  • +
  • {{ getFileName(file.name) }} @@ -303,6 +298,7 @@ const uploadedSuccessfully = (res: any) => { fileUploadRef.value?.clearFiles(); proxy?.$modal.closeLoading(); proxy?.$modal.msgSuccess('导入成功'); + props.onUploadSuccess?.(fileList.value, res); return; } diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index 6744b96..1484570 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -34,7 +34,7 @@ @@ -141,6 +141,15 @@ + + + + @@ -202,6 +211,8 @@ const nickName = ref({}); const isDrawing = ref(false); //图纸评审标志 const businessId = ref(''); //业务id const isShowTermination = ref(false); //显示终止 +const isShowSubmit = ref(false); //显示终止 + //节点编码 const nodeCode = ref(''); const buttonObj = ref({ @@ -293,6 +304,7 @@ const emits = defineEmits(['submitCallback', 'cancelCallback']); const handleCompleteTask = async () => { form.value.taskId = taskId.value; form.value.variables = props.taskVariables; + let verify = false; if (buttonObj.value.pop && nestNodeList.value && nestNodeList.value.length > 0) { nestNodeList.value.forEach((e) => { @@ -323,6 +335,10 @@ const handleCompleteTask = async () => { }); form.value.flowCopyList = flowCopyList; } + if (isDrawing.value) { + isShowSubmit.value = true; + return; + } await proxy?.$modal.confirm('是否确认提交?'); loading.value = true; buttonDisabled.value = true; @@ -336,7 +352,15 @@ const handleCompleteTask = async () => { buttonDisabled.value = false; } }; - +const handleShowSubmit = async () => { + await completeTask(form.value).finally(() => { + // 提交设计验证 + detailFormTeRef.value.submit(businessId.value); + }); + dialog.visible = false; + emits('submitCallback'); + proxy?.$modal.msgSuccess('操作成功'); +}; /** 驳回弹窗打开 */ const handleBackProcessOpen = async () => { backForm.value = {}; @@ -361,7 +385,7 @@ const handleBackProcess = async () => { await backProcess(backForm.value).finally(() => { loading.value = false; buttonDisabled.value = false; - if (isDrawing.value) { + if (isDrawing.value) { detailFormRef.value.submit(businessId.value); } }); diff --git a/src/views/design/appointment/index.vue b/src/views/design/appointment/index.vue index fce5a9a..c8229ad 100644 --- a/src/views/design/appointment/index.vue +++ b/src/views/design/appointment/index.vue @@ -1,6 +1,6 @@ - - + - - + - - + diff --git a/src/views/design/volumeCatalog/index.vue b/src/views/design/volumeCatalog/index.vue index b4805a7..7594c60 100644 --- a/src/views/design/volumeCatalog/index.vue +++ b/src/views/design/volumeCatalog/index.vue @@ -58,9 +58,9 @@ - + @@ -69,11 +69,6 @@ - - - @@ -161,7 +137,7 @@ - + @@ -182,40 +158,56 @@ - + + + - - - - - + @@ -240,7 +232,7 @@ import { updateVolumeCatalog, uploadVolumeFile, getVolumeCatafileList, - lookViewerFile + volumeFileList } from '@/api/design/volumeCatalog'; import { VolumeCatalogVO } from '@/api/design/volumeCatalog/types'; import { useUserStoreHook } from '@/store/modules/user'; @@ -260,7 +252,8 @@ const histroyRef = ref>(); const TableContentRef = ref>(); const single = ref(true); const multiple = ref(true); -const activeName = ref('first'); +const activeName = ref('3'); +const design = ref(''); const total = ref(0); const dialogHistory = ref(false); // 获取用户 store @@ -371,7 +364,7 @@ const handleViewHistory = async (row) => { dialogHistory.value = true; // 查看历史流程记录 nextTick(() => { - histroyRef.value?.getList(row.design); + histroyRef.value?.getList(row.id); }); }; const handleShowInfo = (val) => { @@ -421,7 +414,8 @@ const handleAdd = () => { const handleView = (row?: any) => { fileList.value = row.fileVoList; - + design.value = row.design; + getVolumeFileList('3'); viewVisible.value = true; }; @@ -511,12 +505,33 @@ const handleUploadSuccess = async (flieList: any, res: any) => { proxy?.$modal.msgSuccess('文件上传成功'); getList(); }; - -/** 审核按钮操作 */ +/** 审核蓝图按钮操作 */ +const handleAuditLantu = async (row) => { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `/approval/volumeCatalog/blueprintEdit`, + query: { + id: row.id, + type: 'update' + } + }); +}; +/** 查看蓝图按钮操作 */ +const handleAuditViewLantu = async (row) => { + proxy.$tab.closePage(proxy.$route); + proxy.$router.push({ + path: `/approval/volumeCatalog/blueprintEdit`, + query: { + id: row.id, + type: 'view' + } + }); +}; +/** 审核过程按钮操作 */ const handleAudit = async (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/approval/drawingreview/indexEdit`, + path: `/approval/volumeCatalog/indexEdit`, query: { id: row.id, type: 'update' @@ -527,7 +542,7 @@ const handleAudit = async (row) => { const handleAuditView = async (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/approval/drawingreview/indexEdit`, + path: `/approval/volumeCatalog/indexEdit`, query: { id: row.id, type: 'view' @@ -543,9 +558,17 @@ const handleUpdate = async (row?: VolumeCatalogVO) => { dialog.visible = true; dialog.title = '修改设计出图计划'; }; -// 过程图纸 -const handleClick = () => { - // +// 获取文件列表 +const getVolumeFileList = async (type) => { + let res = await volumeFileList({ volumeCatalogId: design.value, type }); + fileList.value = []; + if (res.code === 200) { + fileList.value = res.rows; + } +}; +// 切换 +const handleClick = (val) => { + getVolumeFileList(val.props.name); }; const handleAuditInfo = (row) => { // 审核图纸 diff --git a/src/views/design/volumeCatalog/indexEdit.vue b/src/views/design/volumeCatalog/indexEdit.vue new file mode 100644 index 0000000..ecf0b5f --- /dev/null +++ b/src/views/design/volumeCatalog/indexEdit.vue @@ -0,0 +1,339 @@ + + + + diff --git a/src/views/materials/appointment/index.vue b/src/views/materials/appointment/index.vue index c142742..3af5ac1 100644 --- a/src/views/materials/appointment/index.vue +++ b/src/views/materials/appointment/index.vue @@ -1,6 +1,6 @@