From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/task-work-order/src/views/orderView/orderDataManage/supplyAdd/index.vue | 127 ++++++++++++++++++++++++++++++------------
1 files changed, 90 insertions(+), 37 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 a234a92..ac44ba2 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
@@ -3,7 +3,7 @@
<el-form ref="queryParamsRef" :model="searchParams" class="gd-search-form">
<el-form-item label="需求名称" prop="demandName">
<el-input
- class="gd-input"
+ class="gd-input gray"
v-model="searchParams.demandName"
placeholder="请输入"
clearable
@@ -13,7 +13,7 @@
<el-form-item label="需求状态" prop="demandStatus">
<el-select
- class="gd-select"
+ class="gd-select gray"
popper-class="gd-select-popper"
v-model="searchParams.demandStatus"
placeholder="请选择"
@@ -35,15 +35,18 @@
</el-form-item>
</el-form>
- <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 class="gd-table-toolbar" v-if="permissionList.addBtn">
+ <el-button :icon="Plus" color="#4C34FF" type="primary" @click="openForm('add')">供需填报新增</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="70" align="center">
+ <template #default="scope">
+ {{ scope.$index + 1 }}
+ </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,12 +54,12 @@
</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="180" label="需求联系人电话" />
<el-table-column prop="contactEmail" show-overflow-tooltip label="需求邮箱" />
<el-table-column prop="demandStatus" show-overflow-tooltip label="需求状态">
- <!-- <template v-slot="{ row }">
+ <template v-slot="{ row }">
{{ getDictLabel(row.demandStatus, dictObj.demandStatus) }}
- </template> -->
+ </template>
</el-table-column>
<el-table-column prop="updateCycle" show-overflow-tooltip label="更新周期" />
<el-table-column prop="applyBasis" show-overflow-tooltip label="申请依据" />
@@ -73,11 +76,11 @@
<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="150">
<template v-slot="{ row }">
- <el-link @click="openForm('view', row)">查看</el-link>
- <el-link @click="openForm('edit', row)">编辑</el-link>
- <el-link @click="handleDelete(row)">删除</el-link>
+ <el-link type="primary" @click="openForm('view', row)">查看</el-link>
+ <el-link type="primary" @click="openForm('edit', row)" v-if="!['1', '2', '3'].includes(row.demandStatus) && permissionList.addBtn">编辑</el-link>
+ <el-link type="primary" @click="handleDelete(row)" v-if="!['1', '2', '3'].includes(row.demandStatus) && permissionList.deleteBtn">删除</el-link>
</template>
</el-table-column>
</el-table>
@@ -96,21 +99,25 @@
</div>
<FormDiaLog ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
+ <ApplyViewDialog ref="applyDialogRef" @success="getList" v-if="applyDialogVisible" v-model="applyDialogVisible" />
</basic-container>
</template>
<script setup>
import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, nextTick } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import { getDeptTree } from '@/api/system/dept'
import { getDictLabel } from '@ztzf/utils'
import FormDiaLog from './FormDiaLog.vue'
+import ApplyViewDialog from './ApplyViewDialog.vue'
import {
gdSupplyDemandPageApi,
gdSupplyDemandRemoveApi,
} from '@/views/orderView/orderDataManage/supplyAdd/supplyAddApi'
-
+import { useStore } from 'vuex'
+const store = useStore()
+const permission = computed(() => store.state.user.permission);
// 初始化查询参数
const initSearchParams = () => ({
demandName: '', // 需求名称
@@ -122,14 +129,16 @@
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)
+const applyDialogRef = ref(null) // 申请详情弹框实例
+const applyDialogVisible = ref(false)
const dictObj = ref({
requirementType: [], // 需求类型
sharedType: [], // 共享类型
appSceneType: [], // 应用场景类型
+ demandStatus: [], // 需求状态
})
provide('dictObj', dictObj)
const deptTree = ref([]) // 部门树
@@ -139,13 +148,47 @@
}
provide('deptTree', deptTree)
provide('treeProps', treeProps)
+const detailDemandStatus = ref('')
+provide('detailDemandStatus', detailDemandStatus)
+const reasonForRejection = ref('') //拒绝原因
+provide('reasonForRejection', reasonForRejection)
+
+function validData(value, defaultValue) {
+ return value !== undefined ? value : defaultValue
+}
+const permissionList = computed(() => {
+ return {
+ addBtn: validData(permission.value.orderData_addDemand, false),
+ deleteBtn: validData(permission.value.orderData_delete, false),
+ }
+})
+
+// 根据部门ID获取部门名称
+function getDeptNameById(deptId, deptList) {
+ if (!deptId || !Array.isArray(deptList)) return ''
+ for (const dept of deptList) {
+ if (dept.id === deptId) {
+ return dept.name
+ }
+ if (Array.isArray(dept.children) && dept.children.length > 0) {
+ const name = getDeptNameById(deptId, dept.children)
+ if (name) return name
+ }
+ }
+ return ''
+}
// 获取列表
async function getList() {
loading.value = true
try {
const res = await gdSupplyDemandPageApi(searchParams.value)
- list.value = res?.data?.data?.records ?? []
+ const records = res?.data?.data?.records ?? []
+ // 为每条记录添加部门名称
+ list.value = records.map(item => ({
+ ...item,
+ responsibleDeptName: item.responsibleDeptName || getDeptNameById(item.responsibleDeptId, deptTree.value),
+ }))
total.value = res?.data?.data?.total ?? 0
} finally {
loading.value = false
@@ -167,51 +210,61 @@
// 新增/编辑/查看 弹框
function openForm(mode, row) {
- dialogVisible.value = true
- nextTick(() => {
- dialogRef.value?.open({ mode, row })
- })
+ detailDemandStatus.value = row?.demandStatus
+ // 对于所有审批相关状态（申请中、审核通过、审核拒绝）都使用申请详情弹框
+ if (mode === 'view' && ['1', '2', '3'].includes(row?.demandStatus)) {
+ // 使用申请详情弹框
+ openApplyViewDialog(row)
+ } else {
+ // 其他情况使用原有弹框
+ dialogVisible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode, row })
+ })
+ }
+}
+
+// 打开申请详情弹框
+function openApplyViewDialog(row) {
+ if (row?.id) {
+ applyDialogVisible.value = true
+ nextTick(() => {
+ applyDialogRef.value?.open({ row })
+ })
+ }
}
// 删除
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() {
- getDictionaryByCode('requirementType,sharedType,appSceneType').then(res => {
+ return getDictionaryByCode('requirementType,sharedType,appSceneType,demandStatus').then(res => {
dictObj.value = res.data.data
})
}
// 获取部门树
function getDeptTreeFun() {
- getDeptTree().then(res => {
+ return getDeptTree().then(res => {
deptTree.value = res.data.data
})
}
-onMounted(() => {
+onMounted(async () => {
+ // 先获取字典和部门树数据，再获取列表数据
+ await Promise.all([getDictList(), getDeptTreeFun()])
getList()
- getDictList()
- getDeptTreeFun()
})
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3