From 5ea049205416e245ecb1ec3d0962e48c5ec73ec3 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 28 Jan 2026 09:41:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
index 34c28df..f25db98 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue
@@ -107,8 +107,8 @@
</div>
<template #footer>
<template v-if="detailDemandStatus === '1' && !requesterProvider">
- <el-button color="#F2F3F5" @click="rejectTheApplication">拒绝申请</el-button>
- <el-button class="" color="#4C34FF" @click="approvedByTheReview">审核通过</el-button>
+ <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="rejectTheApplication">拒绝申请</el-button>
+ <el-button class="" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="approvedByTheReview">审核通过</el-button>
</template>
<template v-if="detailDemandStatus === '2'">
<el-button class="" color="#4C34FF" @click="downloadAllFiles">全部下载</el-button>
@@ -154,6 +154,7 @@
const fileList = ref([]) // 上传文件列表
const uploadedFiles = ref([]) // 已上传文件列表
const responseData = ref(null)
+const submitting = ref(false) // 提交中状态
// 自定义上传请求函数
const handleHttpRequest = async (options) => {
try {
@@ -182,10 +183,21 @@
const tableData = ref([]) // 附件表格数据
// 文件移除
const handleFileRemove = (file, fileList) => {
+console.log('删除文件', fileList);
+uploadedFiles.value = fileList
// 从已上传文件列表中移除对应文件
- if (file.response && file.response.attachId) {
- uploadedFiles.value = uploadedFiles.value.filter(item => item.attachId !== file.response.attachId)
- }
+ // if (file.response && file.response.attachId) {
+ // // uploadedFiles.value = uploadedFiles.value.filter(item => item.attachId !== file.response.attachId)
+ // // 找到 id=1 的对象的索引
+ // const index = uploadedFiles.value.findIndex(item => item.attachId !== file.response.attachId)
+
+ // // 如果找到了,移除该对象
+ // if (index !== -1) {
+ // uploadedFiles.value.splice(index, 1)
+ // }
+ // console.log('删除文件', uploadedFiles.value);
+
+ // }
// 清空响应数据
if (responseData.value && responseData.value.attachId === file.response?.attachId) {
responseData.value = null
@@ -389,6 +401,7 @@
// 从 uploadedFiles.value 中提取所有 attachId
const id = uploadedFiles.value.map(file => file.attachId)
+ submitting.value = true
gdSupplyDemandAuditRejectApi({ attachIds: id, auditOpinion: reason, demandId: demandId.value })
.then(() => {
ElMessage.success('拒绝申请成功')
@@ -400,19 +413,27 @@
ElMessage.error('拒绝申请失败,请重试')
emit('success')
})
+ .finally(() => {
+ submitting.value = false
+ })
}
// 审核通过
const approvedByTheReview = () => {
if (uploadedFiles.value.length === 0) {
return ElMessage.warning('请上传数据')
- }
+ }
// 从 uploadedFiles.value 中提取所有 attachId
const id = uploadedFiles.value.map(file => file.attachId)
- gdSupplyDemandAuditPassApi({ attachIds: id, demandId: demandId.value }).then(() => {
- ElMessage.success('审核通过成功')
- visible.value = false
- emit('success')
- })
+ submitting.value = true
+ gdSupplyDemandAuditPassApi({ attachIds: id, demandId: demandId.value })
+ .then(() => {
+ ElMessage.success('审核通过成功')
+ visible.value = false
+ emit('success')
+ })
+ .finally(() => {
+ submitting.value = false
+ })
}
defineExpose({ open })
@@ -482,4 +503,6 @@
:deep(.el-upload-list) {
margin-top: 10px;
}
+.el-upload-list__item.is-success:focus .el-upload-list__item-status-label, .el-upload-list__item.is-success:hover .el-upload-list__item-status-label{
+display: none !important;}
</style>
--
Gitblit v1.9.3