From fd10c98949580d7ae337cfb91fb80eb728e268d9 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 20 Jan 2026 10:31:38 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/ApplyViewDialog.vue | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 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 177fd42..ec99aae 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
@@ -138,7 +138,7 @@
<el-button
class="save-btn"
color="#4C34FF"
-
+
@click="rejectTheApplication"
>
@@ -148,6 +148,13 @@
</template>
</el-dialog>
+
+ <!-- 拒绝申请弹框 -->
+ <reasonForRejectionDialog
+ v-if="rejectionDialogVisible"
+ v-model="rejectionDialogVisible"
+ @confirm="handleRejectionConfirm"
+ />
</template>
<script setup>
@@ -155,10 +162,11 @@
import { getDictLabel } from '@ztzf/utils'
import { gdSupplyDemandDetailApi, putFileAttachApi,gdSupplyDemandAuditPassApi,gdSupplyDemandAuditRejectApi } from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
import { ElMessage, ElMessageBox } from 'element-plus'
+import reasonForRejectionDialog from './reasonForRejectionDialog.vue'
const dictObj = inject('dictObj')
const deptTree = inject('deptTree')
-
+const demandId = ref('')
const visible = defineModel() // 弹框显隐
const formData = ref({}) // 表单数据
const uploadRef = ref() // 上传组件引用
@@ -166,7 +174,9 @@
const fileList = ref([]) // 上传文件列表
const uploadedFiles = ref([]) // 已上传文件列表
const uploadLoading = ref(false) // 上传加载状态
-const responseId = ref([])
+const responseData = ref([])
+// 拒绝申请弹框控制
+const rejectionDialogVisible = ref(false) // 拒绝申请弹框显隐
// 步骤条数据
const steps = ref([
{ title: '需求申请', person: '张三', time: '2025-03-31 12:23:30' },
@@ -233,7 +243,8 @@
if (response.data && response.data.success) {
const fileData = response.data.data
-
+ console.log('成功数据',fileData);
+ responseData.value = fileData
// 添加到已上传文件列表
uploadedFiles.value.push({
name: fileData.name,
@@ -316,8 +327,9 @@
async function open({ row }) {
if (row?.id) {
await loadDetail(row.id)
- // 可以在这里加载已上传的文件列表
- // loadUploadedFiles(row.id)
+ demandId.value = row.id
+ console.log('row.id',demandId.value);
+
}
visible.value = true
}
@@ -347,16 +359,32 @@
}
// 拒绝申请
const rejectTheApplication = () => {
- const id = ['2013182736046530562']
- console.log('uploadedFiles.value.attachId',uploadedFiles.value.attachId)
- gdSupplyDemandAuditRejectApi({ attachIds:id }).then(() => {
+ if(responseData.value.length === 0){
+ return ElMessage.warning('请上传数据')
+ }
+ // 打开拒绝申请弹框
+ rejectionDialogVisible.value = true
+}
+
+// 处理拒绝申请确认
+const handleRejectionConfirm = (reason) => {
+ const id = [responseData.value.attachId]
+ console.log('demandId.value',demandId.value);
+
+ gdSupplyDemandAuditRejectApi({ attachIds: id, auditOpinion: reason ,demandId:'2013137230848598018'}).then(() => {
ElMessage.success('拒绝申请成功')
- // visible.value = false
+ visible.value = false
+ }).catch(error => {
+ console.error('拒绝申请失败:', error)
+ ElMessage.error('拒绝申请失败,请重试')
})
}
// 审核通过
const approvedByTheReview = () => {
- const id = ['2013182736046530562']
+ if(responseData.value.length === 0){
+ return ElMessage.warning('请上传数据')
+ }
+ const id = [responseData.value.attachId]
gdSupplyDemandAuditPassApi({ id }).then(() => {
ElMessage.success('审核通过成功')
visible.value = false
--
Gitblit v1.9.3