From d5092e7a58d3ed3bfff7e52d92a8448c20658869 Mon Sep 17 00:00:00 2001 From: taoge1020 Date: Fri, 15 Aug 2025 19:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload/index.vue | 2 +- src/views/design/Professional/index.vue | 20 ++++++++++++++++++-- src/views/design/billofQuantities/index.vue | 16 +++++++++------- src/views/design/designChange/index.vue | 2 +- src/views/design/drawing/indexEdit.vue | 2 +- src/views/design/scheme/index.vue | 8 ++++---- src/views/design/subcontract/index.vue | 2 +- 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index c8a53c9..2d278c1 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -314,7 +314,7 @@ const uploadedSuccessfully = (res: any) => { emit('update:modelValue', listToString(fileList.value)); proxy?.$modal.closeLoading(); } - if (props.autoUpload) { + if (props.autoUpload && props.limit === fileList.value.length) { fileUploadRef.value?.clearFiles(); fileList.value = []; emit('update:modelValue', ''); // 同步到外部 v-model diff --git a/src/views/design/Professional/index.vue b/src/views/design/Professional/index.vue index 9f445a9..9f08f48 100644 --- a/src/views/design/Professional/index.vue +++ b/src/views/design/Professional/index.vue @@ -45,10 +45,26 @@ 导出 - 查看流程 + 查看流程 - 查看文件 + 查看文件 diff --git a/src/views/design/billofQuantities/index.vue b/src/views/design/billofQuantities/index.vue index a791844..fdde420 100644 --- a/src/views/design/billofQuantities/index.vue +++ b/src/views/design/billofQuantities/index.vue @@ -265,18 +265,20 @@ function importExcel(options) { proxy.$modal.msgSuccess(res.msg || '导入成功'); // 更新列表 if (state.work_order_type == 3) { - getVersionNums(false); - }else{ - getVersionNums(); + getVersionNums(false); + } else { + getVersionNums(); } } else { proxy.$modal.msgError(res.msg || '导入失败'); } - }).catch(()=>{ - proxy.$modal.msgError(res.msg || '导入失败'); - }).finally(() => { - state.loading.list = false; }) + .catch((err) => { + proxy.$modal.msgError(err.msg || '导入失败'); + }) + .finally(() => { + state.loading.list = false; + }); } // 切换表名 function handleChange(sheet) { diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index e630761..d1a5231 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -106,7 +106,7 @@ link icon="View" v-hasPermi="['design:designChange:query']" - v-if="scope.row.status == 'draft' || scope.row.status == 'termination'" + v-if="scope.row.status == 'back' || scope.row.status == 'termination'" @click="handleViewHistory(scope.row)" >查看单据 diff --git a/src/views/design/drawing/indexEdit.vue b/src/views/design/drawing/indexEdit.vue index 157de01..76c3b5b 100644 --- a/src/views/design/drawing/indexEdit.vue +++ b/src/views/design/drawing/indexEdit.vue @@ -29,7 +29,7 @@ >
- +
diff --git a/src/views/design/scheme/index.vue b/src/views/design/scheme/index.vue index 540830b..07b8aa1 100644 --- a/src/views/design/scheme/index.vue +++ b/src/views/design/scheme/index.vue @@ -8,7 +8,7 @@ - 搜索 + 搜索 重置 @@ -48,7 +48,7 @@ v-if="scope.row.status !== 'draft'" icon="Edit" @click="handleView(scope.row)" - v-hasPermi="['design:PrelimScheme:edit']" + v-hasPermi="['design:PrelimScheme:query']" >查看流程 修改 - 删除 + > --> diff --git a/src/views/design/subcontract/index.vue b/src/views/design/subcontract/index.vue index 387b12b..5687027 100644 --- a/src/views/design/subcontract/index.vue +++ b/src/views/design/subcontract/index.vue @@ -8,7 +8,7 @@ - 搜索 + 搜索 重置