From e8b30f7b0156600f3e4703a9c4de793cdf7729c8 Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期三, 01 四月 2026 14:06:12 +0800
Subject: [PATCH] fix: 修复采购发票台账、付款台账、不合格品管理和协同审批表单的问题
---
src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
index 1a2859a..6bcd0ad 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
@@ -1,9 +1,5 @@
<template>
- <div class="app-container">
- <!-- 椤甸潰鏍囬 -->
- <div class="page-header">
- <h2>浼氳鐢宠</h2>
- </div>
+ <div>
<!-- 鐢宠绫诲瀷閫夋嫨 -->
<el-card class="type-card">
@@ -131,7 +127,7 @@
<el-option
v-for="person in employees"
:key="person.id"
- :label="`${person.staffName} (${person.postJob})`"
+ :label="person.postName ? `${person.staffName} (${person.postName})` : person.staffName"
:value="person.id"
/>
</el-select>
@@ -156,11 +152,11 @@
</template>
<script setup>
-import {ref, reactive, onMounted} from 'vue'
+import {ref, reactive, onMounted, markRaw} from 'vue'
import {ElMessage} from 'element-plus'
-import {Plus, Document, Promotion, Bell} from '@element-plus/icons-vue'
+import {Document, Promotion, Bell} from '@element-plus/icons-vue'
import {getRoomEnum, saveMeetingApplication} from '@/api/collaborativeApproval/meeting.js'
-import {getStaffOnJob} from "@/api/personnelManagement/onboarding.js";
+import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
// 褰撳墠鐢宠绫诲瀷
const currentType = ref('department') // approval: 瀹℃壒娴佺▼, department: 閮ㄩ棬绾�, notification: 閫氱煡鍙戝竷
@@ -171,19 +167,19 @@
value: 'approval',
name: '瀹℃壒娴佺▼浼氳',
desc: '闇�瑕佺粡杩囧绾у鎵圭殑浼氳鐢宠',
- icon: Document
+ icon: markRaw(Document)
},
{
value: 'department',
name: '閮ㄩ棬绾т細璁�',
desc: '閮ㄩ棬鍐呴儴浼氳鐢宠娴佺▼',
- icon: Promotion
+ icon: markRaw(Promotion)
},
{
value: 'notification',
name: '浼氳閫氱煡',
desc: '鏃犻渶瀹℃壒鐩存帴鍙戝竷鐨勪細璁�氱煡',
- icon: Bell
+ icon: markRaw(Bell)
}
])
@@ -306,8 +302,17 @@
getRoomEnum().then(res => {
meetingRooms.value = res.data
})
- getStaffOnJob().then(res => {
- employees.value = res.data.sort((a, b) => a.postJob.localeCompare(b.postJob))
+ staffOnJobListPage({
+ current: -1,
+ size: -1,
+ staffState: 1
+ }).then(res => {
+ console.log(res.data.records,"杩欎釜鏄繑鍥炵殑鏁版嵁鍦板潃")
+ employees.value = res.data.records.sort((a, b) => {
+ const nameA = a.postName || ''
+ const nameB = b.postName?.trim() || ''
+ return nameA.localeCompare(nameB)
+ })
})
})
</script>
--
Gitblit v1.9.3