From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue
index 43e7c61..0d4cb30 100644
--- a/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue
+++ b/applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue
@@ -37,13 +37,16 @@
<div class="gd-table-toolbar">
<el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">供需填报新增</el-button>
-<!-- <el-button :icon="Delete" color="#4C34FF" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>-->
</div>
<div class="gd-table-container" v-loading="loading">
<div class="gd-table-content gd-table-content-bg">
- <el-table class="gd-table" :data="list" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="46" />
+ <el-table class="gd-table" :data="list">
+ <el-table-column label="序号" width="60" align="center">
+ <template #default="scope">
+ {{ ((searchParams.current - 1) * searchParams.size + scope.$index + 1).toString().padStart(2, '0') }}
+ </template>
+ </el-table-column>
<el-table-column prop="demandName" show-overflow-tooltip label="需求名称" />
<el-table-column prop="demandType" show-overflow-tooltip label="需求类型">
<template v-slot="{ row }">
@@ -51,7 +54,7 @@
</template>
</el-table-column>
<el-table-column prop="contactPerson" show-overflow-tooltip label="需求联系人" />
- <el-table-column prop="contactPhone" show-overflow-tooltip label="需求联系人电话" />
+ <el-table-column prop="contactPhone" show-overflow-tooltip width="120" label="需求联系人电话" />
<el-table-column prop="contactEmail" show-overflow-tooltip label="需求邮箱" />
<el-table-column prop="demandStatus" show-overflow-tooltip label="需求状态">
<template v-slot="{ row }">
@@ -73,12 +76,13 @@
<el-table-column prop="responsibleDeptName" show-overflow-tooltip label="责任部门" />
<el-table-column prop="dataSource" show-overflow-tooltip label="数据来源依据" />
<el-table-column prop="demandInfo" show-overflow-tooltip label="需求信息项" />
- <el-table-column label="操作" class-name="operation-btns">
+ <el-table-column label="操作" class-name="operation-btns" width="130">
<template v-slot="{ row }">
- <el-link @click="openForm('view', row)">查看</el-link>
- <el-link @click="openForm('edit', row)" v-if="row.demandStatus !== '1'">编辑</el-link>
- <el-link @click="handleDelete(row)" v-if="row.demandStatus !== '1'">删除</el-link>
- </template>
+ <el-link @click="openForm('view', row)">查看</el-link>
+ <!-- 只对非审批状态显示编辑和删除按钮 -->
+ <el-link @click="openForm('edit', row)" v-if="!['1', '2', '3'].includes(row.demandStatus)">编辑</el-link>
+ <el-link @click="handleDelete(row)" v-if="!['1', '2', '3'].includes(row.demandStatus)">删除</el-link>
+ </template>
</el-table-column>
</el-table>
</div>
@@ -96,7 +100,7 @@
</div>
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
- <ApplyViewDialog ref="applyDialogRef" v-if="applyDialogVisible" v-model="applyDialogVisible" />
+ <ApplyViewDialog ref="applyDialogRef" @success="getList" v-if="applyDialogVisible" v-model="applyDialogVisible" />
</basic-container>
</template>
<script setup>
@@ -124,7 +128,6 @@
const total = ref(0) // 总条数
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
-const selectedIds = ref([]) // 勾选的ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
const dialogVisible = ref(false)
@@ -144,7 +147,10 @@
}
provide('deptTree', deptTree)
provide('treeProps', treeProps)
-
+const detailDemandStatus = ref('')
+provide('detailDemandStatus', detailDemandStatus)
+const reasonForRejection = ref('') //拒绝原因
+provide('reasonForRejection', reasonForRejection)
// 根据部门ID获取部门名称
function getDeptNameById(deptId, deptList) {
if (!deptId || !Array.isArray(deptList)) return ''
@@ -192,8 +198,10 @@
// 新增/编辑/查看 弹框
function openForm(mode, row) {
- if (mode === 'view' && row?.demandStatus === '1') {
- // 如果是查看申请中的记录，使用申请详情弹框
+ detailDemandStatus.value = row?.demandStatus
+ // 对于所有审批相关状态（申请中、审核通过、审核拒绝）都使用申请详情弹框
+ if (mode === 'view' && ['1', '2', '3'].includes(row?.demandStatus)) {
+ // 使用申请详情弹框
openApplyViewDialog(row)
} else {
// 其他情况使用原有弹框
@@ -216,24 +224,18 @@
// 删除
async function handleDelete(row) {
- const tips = row ? '该条' : '选中的项'
- await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
+ await ElMessageBox.confirm('确认删除该条记录吗？', '提示', {
type: 'warning',
customClass: 'gd-confirm-custom',
confirmButtonClass: 'gd-confirm-button',
cancelButtonClass: 'gd-confirm-cancel-button',
})
- const ids = row ? row.id : selectedIds.value.join(',')
- await gdSupplyDemandRemoveApi({ ids })
+ await gdSupplyDemandRemoveApi({ ids: row.id })
ElMessage.success('删除成功')
- selectedIds.value = []
getList()
}
-// 勾选值设置
-function handleSelectionChange(rows) {
- selectedIds.value = rows.map(item => item.id)
-}
+
// 获取字典
function getDictList() {
--
Gitblit v1.9.3