From 78680af87284d343cf8aba9a10f6ab1923ce1acf Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 28 Jan 2026 14:15:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/dataObjection/FormDiaLog.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..c4e9fa1 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">
@@ -189,7 +189,7 @@
</el-button>
<el-button class="" color="#4C34FF" :loading="submitting" :disabled="submitting" @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 +233,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: '',
@@ -365,6 +369,8 @@
try {
// 构建符合接口要求的提交数据
const submitData = {
+ // 编辑模式下传递id
+ ...(formData.value.id && { id: formData.value.id }),
title: formData.value.title,
objectionType: formData.value.objectionType,
submitter: formData.value.submitter,
@@ -438,7 +444,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() {
--
Gitblit v1.9.3