From 129bd0cd4df6f12dd576c262710b1fd9902c363e Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期三, 01 四月 2026 11:08:34 +0800
Subject: [PATCH] fix(qualityManagement): 修复质检表单规格型号选择逻辑和员工列表排序问题
---
src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
index ed2dafa..6bcd0ad 100644
--- a/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/meetApplication/index.vue
@@ -127,7 +127,7 @@
<el-option
v-for="person in employees"
:key="person.id"
- :label="`${person.staffName} (${person.postName})`"
+ :label="person.postName ? `${person.staffName} (${person.postName})` : person.staffName"
:value="person.id"
/>
</el-select>
@@ -152,9 +152,9 @@
</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 {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
@@ -167,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)
}
])
@@ -307,7 +307,12 @@
size: -1,
staffState: 1
}).then(res => {
- employees.value = res.data.records.sort((a, b) => a.postName.localeCompare(b.postName))
+ 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