From beb95fb5fc166804056abafd70fc01ac27de7621 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 26 Jan 2026 09:11:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 240 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 177 insertions(+), 63 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 8df7d39..de830e5 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
@@ -5,9 +5,10 @@
:title="titleEnum[dialogMode]"
@closed="visible = false"
destroy-on-close
+ :close-on-click-modal="false"
>
<div class="detail-container" v-if="dialogReadonly">
- <el-row>
+ <el-row class="detail-row-view">
<el-col :span="12">
<div class="label">标题</div>
<div class="val">{{ formData.title }}</div>
@@ -24,10 +25,6 @@
<div class="label">提交人联系方式</div>
<div class="val">{{ formData.submitterContact }}</div>
</el-col>
- <!-- <el-col :span="12">
- <div class="label">提交单位</div>
- <div class="val">{{ formData.submitUnitName }}</div>
- </el-col> -->
<el-col :span="12">
<div class="label">目录/申请资源名称</div>
<div class="val">{{ formData.catalogResourceName }}</div>
@@ -42,9 +39,45 @@
</el-col>
<el-col :span="12">
<div class="label">相关附件</div>
- <div class="val">{{ formData.attachName || '暂无附件' }}</div>
+ <div class="val">{{ formData.attachNames || '暂无附件' }}</div>
+ </el-col>
+ <el-col :span="12" v-if="detailObjectionStatus === '2'">
+ <div class="label">其他异议详情</div>
+ <div class="val">{{ formData.otherObjectionDetail }}</div>
+ </el-col>
+ <el-col :span="12" v-if="detailObjectionStatus === '2'">
+ <div class="label">审核意见</div>
+ <div class="val">{{ formData.reviewOpinion }}</div>
</el-col>
</el-row>
+ <div v-if=" detailObjectionStatus === '1'">
+ <div class="detail-title" :style="{ marginTop:pxToRem(20)}">异议反馈</div>
+ <el-form ref="feedbackFormRef" class="gd-dialog-form" :model="feedbackFormData"
+ :rules="feedbackRules" label-width="140px">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="其他异议详情" prop="otherObjectionDetail">
+ <el-input
+ class="gd-input"
+ v-model="feedbackFormData.otherObjectionDetail"
+ placeholder="请输入"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="审核意见" prop="reviewOpinion">
+ <el-input
+ class="gd-input"
+ v-model="feedbackFormData.reviewOpinion"
+ placeholder="请输入"
+ clearable
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ </div>
</div>
<el-form
@@ -54,7 +87,7 @@
:model="formData"
:rules="rules"
:disabled="dialogReadonly"
- label-width="120px"
+ label-width="180px"
>
<el-row>
<el-col :span="12">
@@ -90,20 +123,6 @@
<el-input class="gd-input" v-model="formData.submitterContact" placeholder="请输入" clearable />
</el-form-item>
</el-col>
-<!-- <el-col :span="12">-->
-<!-- <el-form-item label="提交单位" prop="submitUnitId">-->
-<!-- <el-tree-select-->
-<!-- class="gd-select"-->
-<!-- popper-class="gd-tree-select-popper"-->
-<!-- v-model="formData.submitUnitId"-->
-<!-- node-key="id"-->
-<!-- :data="deptTree"-->
-<!-- :props="treeProps"-->
-<!-- check-strictly-->
-<!-- clearable-->
-<!-- />-->
-<!-- </el-form-item>-->
-<!-- </el-col>-->
<el-col :span="12">
<el-form-item label="目录/申请资源名称" prop="catalogResourceName">
<el-input class="gd-input" v-model="formData.catalogResourceName" placeholder="请输入" clearable />
@@ -155,19 +174,50 @@
</el-col>
</el-row>
</el-form>
- <template #footer>
- <el-button
- class="save-btn"
- color="#4C34FF"
- v-if="!dialogReadonly"
- :loading="submitting"
- :disabled="submitting"
- @click="handleSubmit"
- >
- 保存
- </el-button>
- <el-button color="#F2F3F5" @click="handleApply">申请</el-button>
+ <template #footer>
+ <template v-if="!dialogReadonly">
+ <el-button
+ color="#F2F3F5"
+
+ v-if="!dialogReadonly"
+ :loading="submitting"
+ :disabled="submitting"
+ @click="handleSubmit"
+ >
+ 保存
+ </el-button>
+ <el-button class="save-btn" color="#4C34FF" :loading="submitting" :disabled="submitting" @click="handleApply">申请</el-button>
+ </template>
+ <template v-if="dialogReadonly && detailObjectionStatus === '1'">
+ <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">取消</el-button>
+
+ <el-button
+ class="save-btn"
+ color="#4C34FF"
+
+ :loading="submitting"
+ :disabled="submitting"
+ @click="handleFeedbackSubmit"
+
+ >
+ 反馈
+ </el-button>
+ <el-button
+ class="save-btn"
+ color="#4C34FF"
+
+ :loading="submitting"
+ :disabled="submitting"
+ @click="handleDownloadAttach"
+
+ >
+ 下载附件
+ </el-button>
+ </template>
+ <template v-if="detailObjectionStatus === '2'">
+<!-- <el-button color="#F2F3F5" :loading="submitting" :disabled="submitting" @click="visible = false">关闭</el-button>-->
+ </template>
</template>
</el-dialog>
</template>
@@ -179,9 +229,10 @@
import {
gdDataObjectionDetailApi,
gdDataObjectionSubmitApi,
+ getAttachDetailApi,
} from '@/views/orderView/orderDataManage/dataObjection/dataObjectionApi'
import { putFileAttachApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
-
+import { pxToRem } from '@/utils/rem'
// 初始化表单数据
const initForm = () => ({
title: '',
@@ -197,18 +248,28 @@
attachId: '',
attachName: '',
}
- ]
+ ],
+ objectionStatus: '',
+})
+
+// 初始化异议反馈表单数据
+const initFeedbackForm = () => ({
+ otherObjectionDetail: '',
+ reviewOpinion: '',
+ objectionStatus: '2'
})
// 注入部门树和字典
const deptTree = inject('deptTree')
const treeProps = inject('treeProps')
const dictObj = inject('dictObj')
-
+const detailObjectionStatus = inject('detailObjectionStatus')
const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
+const feedbackFormRef = ref(null) // 反馈表单实例
const formData = ref(initForm()) // 表单数据
+const feedbackFormData = ref(initFeedbackForm()) // 异议反馈表单数据
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
@@ -216,6 +277,7 @@
const titleEnum = ref({ edit: '编辑', view: '查看', add: '数据异议申请' })
const fileList = ref([]) // 上传文件列表
const uploadedFiles = ref([]) // 已上传文件列表
+const attachmentDetailsList = ref([])
// 表单校验规则
const rules = {
@@ -226,6 +288,12 @@
catalogResourceName: fieldRules(true),
objectionDesc: fieldRules(true),
objectionBasis: fieldRules(true),
+}
+
+// 异议反馈表单校验规则
+const feedbackRules = {
+ otherObjectionDetail: fieldRules(true),
+ reviewOpinion: fieldRules(true),
}
// 自定义上传请求
@@ -250,9 +318,6 @@
if (file.response && file.response.attachId) {
uploadedFiles.value = uploadedFiles.value.filter(item => item.attachId !== file.response.attachId)
}
- // 更新formData中的附件信息
- formData.value.attachId = uploadedFiles.value.map(f => f.attachId).join(',')
- formData.value.attachName = uploadedFiles.value.map(f => f.originalName).join(',')
}
// 上传前验证
@@ -281,9 +346,6 @@
link: fileData.link,
attachId: fileData.attachId,
})
- // 更新formData中的附件信息
- formData.value.attachId = uploadedFiles.value.map(f => f.attachId).join(',')
- formData.value.attachName = uploadedFiles.value.map(f => f.originalName).join(',')
ElMessage.success('文件上传成功！')
}
}
@@ -293,8 +355,8 @@
ElMessage.error(error?.message || '文件上传失败，请重试')
}
-// 提交新增/编辑
-async function handleSubmit() {
+// 提交数据的通用函数
+async function submitForm(objectionStatus) {
const isValid = await formRef.value?.validate().catch(() => false)
if (!isValid) return
submitting.value = true
@@ -310,14 +372,12 @@
objectionBasis: formData.value.objectionBasis,
areaCode: formData.value.areaCode || '',
handleUnit: formData.value.handleUnit || '',
- objectionStatus: formData.value.objectionStatus || '',
- otherObjectionDetail: formData.value.otherObjectionDetail || '',
- reviewOpinion: formData.value.reviewOpinion || '',
// 构建附件列表
attachmentList: uploadedFiles.value.map(file => ({
attachId: file.attachId,
attachName: file.originalName,
- }))
+ })),
+ objectionStatus: objectionStatus
}
await gdDataObjectionSubmitApi(submitData)
ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
@@ -327,16 +387,78 @@
submitting.value = false
}
}
+
+// 提交新增/编辑（保存）
+async function handleSubmit() {
+ await submitForm('0')
+}
+
// 申请提交
async function handleApply() {
-
+ await submitForm('1')
+}
+
+// 处理异议反馈提交
+async function handleFeedbackSubmit() {
+ // 验证反馈表单
+ const isValid = await feedbackFormRef.value?.validate().catch(() => false)
+ if (!isValid) return
+ submitting.value = true
+ try {
+ // 构建反馈提交数据
+ const submitData = {
+ id: formData.value.id,
+ otherObjectionDetail: feedbackFormData.value.otherObjectionDetail || '',
+ reviewOpinion: feedbackFormData.value.reviewOpinion || '',
+ objectionStatus: '2'
+ }
+ await gdDataObjectionSubmitApi(submitData)
+ ElMessage.success('反馈提交成功')
+ visible.value = false
+ emit('success')
+ } finally {
+ submitting.value = false
+ }
}
// 加载详情
async function loadDetail() {
if (!formData.value.id) return
const res = await gdDataObjectionDetailApi({ id: formData.value.id })
formData.value = res?.data?.data ?? {}
+ if (formData.value.attachIds) {
+ getAttachDetail(formData.value.attachIds)
+ }
}
+// 获取附件详情
+async function getAttachDetail(attachIds) {
+ // 如果 attachIds 是字符串，尝试分割成数组
+ const ids = typeof attachIds === 'string' ? attachIds.split(',') : Array.isArray(attachIds) ? attachIds : [attachIds]
+ 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() {
+ if (attachmentDetailsList.value.length === 0) {
+ ElMessage.warning('没有可下载的附件')
+ return
+ }
+
+ // 遍历所有附件并下载
+ attachmentDetailsList.value.forEach(attach => {
+ if (attach.link) {
+ const link = document.createElement('a')
+ link.href = attach.link
+ link.download = attach.originalName || attach.name
+ link.style.display = 'none'
+ document.body.appendChild(link)
+ link.click()
+ document.body.removeChild(link)
+ }
+ })
+}
+
// 打开弹框
async function open({ mode = 'add', row } = {}) {
@@ -344,7 +466,10 @@
// 重置文件列表
fileList.value = []
uploadedFiles.value = []
+ // 重置表单数据
formData.value = dialogMode.value === 'add' ? initForm() : row
+ // 重置反馈表单数据
+ feedbackFormData.value = initFeedbackForm()
if (dialogMode.value !== 'add') {
await loadDetail()
}
@@ -356,22 +481,11 @@
<style scoped lang="scss">
.detail-container {
padding: 20px;
- .label {
- font-weight: 500;
- color: #333333;
- margin-bottom: 8px;
- }
- .val {
- padding: 8px;
- background-color: #f5f7fa;
- border-radius: 4px;
- min-height: 32px;
- word-break: break-all;
- margin-bottom: 16px;
- }
}
-
.upload-container {
width: 100%;
}
+.label {
+ width: 120px !important;
+}
</style>
--
Gitblit v1.9.3