From 5b2f6743459bb2da4bddaeb958dcd642d4838a1c Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 28 Jan 2026 17:39:33 +0800
Subject: [PATCH] feat:添加部门判断
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
index 9768af6..239cb33 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue
@@ -50,7 +50,7 @@
<div class="val">{{ formData.reviewOpinion }}</div>
</el-col>
</el-row>
- <div v-if=" detailObjectionStatus === '1'">
+ <div v-if=" detailObjectionStatus === '1' && !requesterProvider">
<div class="detail-title" :style="{ marginTop:pxToRem(20)}">异议反馈</div>
<el-form ref="feedbackFormRef" class="gd-dialog-form" :model="feedbackFormData"
:rules="feedbackRules" label-width="140px">
@@ -153,7 +153,6 @@
<div class="upload-container">
<el-upload
:http-request="handleHttpRequest"
- :limit="3"
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
:on-remove="handleFileRemove"
@@ -166,7 +165,7 @@
<el-button type="primary">选择文件</el-button>
</template>
<template #tip>
- <div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式文件</div>
+ <div class="el-upload__tip">支持上传 (.zip/.rar/.7z/.tar/.gz)格式</div>
</template>
</el-upload>
</div>
@@ -178,18 +177,18 @@
<template #footer>
<template v-if="!dialogReadonly">
<el-button
- color="#F2F3F5"
+ color="#F2F3F5"
- v-if="!dialogReadonly"
- :loading="submitting"
- :disabled="submitting"
- @click="handleSubmit"
- >
- 保存
- </el-button>
- <el-button class="" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
+ v-if="!dialogReadonly"
+ :loading="submitting || uploading"
+ :disabled="submitting || uploading"
+ @click="handleSubmit"
+ >
+ 保存
+ </el-button>
+ <el-button class="" color="#4C34FF" :loading="submitting || uploading" :disabled="submitting || uploading" @click="handleApply">申请</el-button>
</template>
- <template v-if="dialogReadonly && detailObjectionStatus === '1'">
+ <template v-if="dialogReadonly && detailObjectionStatus === '1' && !requesterProvider">
<el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>
<el-button
@@ -233,8 +232,12 @@
} from '@/views/orderView/orderDataManage/dataObjection/dataObjectionApi'
import { putFileAttachApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
import { pxToRem } from '@/utils/rem'
+import { useStore } from 'vuex'
+const store = useStore()
+const requesterProvider = computed(() => store.state.user.userInfo?.role_id === '2014158512610869250')
// 初始化表单数据
const initForm = () => ({
+ id:'',
title: '',
objectionType: '',
submitter: '',
@@ -278,6 +281,7 @@
const fileList = ref([]) // 上传文件列表
const uploadedFiles = ref([]) // 已上传文件列表
const attachmentDetailsList = ref([])
+const uploading = ref(false) // 文件上传中状态
// 表单校验规则
const rules = {
@@ -288,6 +292,8 @@
catalogResourceName: fieldRules(true),
objectionDesc: fieldRules(true),
objectionBasis: fieldRules(true),
+ // attachId: dialogMode.value === 'add' ? fieldRules(true) : fieldRules(false)
+
}
// 异议反馈表单校验规则
@@ -298,6 +304,7 @@
// 自定义上传请求
const handleHttpRequest = async options => {
+ uploading.value = true
try {
const formDataObj = new FormData()
formDataObj.append('file', options.file)
@@ -310,6 +317,8 @@
} catch (error) {
options.onError(error)
console.error('文件上传失败:', error)
+ } finally {
+ uploading.value = false
}
}
@@ -326,11 +335,11 @@
ElMessage.error('只能上传压缩文件格式：.zip/.rar/.7z/.tar/.gz')
return false
}
- const maxSize = 100 * 1024 * 1024 // 100MB
- if (file.size > maxSize) {
- ElMessage.error('文件大小不能超过100MB')
- return false
- }
+ // const maxSize = 100 * 1024 * 1024 // 100MB
+ // if (file.size > maxSize) {
+ // ElMessage.error('文件大小不能超过100MB')
+ // return false
+ // }
return true
}
@@ -357,14 +366,18 @@
async function submitForm(objectionStatus) {
const isValid = await formRef.value?.validate().catch(() => false)
if (!isValid) return
- if (uploadedFiles.value.length === 0) {
- return ElMessage.warning('请上传附件')
+ // 只在新增时校验附件是否上传
+ if (dialogMode.value === 'add' && uploadedFiles.value.length === 0) {
+ ElMessage.warning('请上传附件')
+ return
}
submitting.value = true
try {
// 构建符合接口要求的提交数据
const submitData = {
+ // 编辑模式下传递id
+ ...(formData.value.id && { id: formData.value.id }),
title: formData.value.title,
objectionType: formData.value.objectionType,
submitter: formData.value.submitter,
@@ -374,11 +387,13 @@
objectionBasis: formData.value.objectionBasis,
areaCode: formData.value.areaCode || '',
handleUnit: formData.value.handleUnit || '',
- // 构建附件列表
- attachmentList: uploadedFiles.value.map(file => ({
- attachId: file.attachId,
- attachName: file.originalName,
- })),
+ // 只在有附件时才构建附件列表
+ ...(uploadedFiles.value.length > 0 && {
+ attachmentList: uploadedFiles.value.map(file => ({
+ attachId: file.attachId,
+ attachName: file.originalName,
+ })),
+ }),
objectionStatus: objectionStatus
}
await gdDataObjectionSubmitApi(submitData)
@@ -438,7 +453,6 @@
const detailPromises = ids.map(id => getAttachDetailApi({ id }))
const results = await Promise.all(detailPromises)
attachmentDetailsList.value = results.map(res => res.data.data).filter(Boolean)
- console.log('附件详情', attachmentDetailsList.value)
}
// 处理附件下载
async function handleDownloadAttach() {
@@ -487,6 +501,9 @@
}
.upload-container {
width: 100%;
+ .el-upload__tip {
+ display: inline;
+ }
}
.label {
width: 120px !important;
--
Gitblit v1.9.3