From 44cd199a79b5d9e7cc0900166340e3c4991c0fcf Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 17 六月 2026 14:15:52 +0800
Subject: [PATCH] fix：1.发货台账删除去掉 2.出库台账反审添加
---
src/views/collaborativeApproval/notificationManagement/summary/index.vue | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/src/views/collaborativeApproval/notificationManagement/summary/index.vue b/src/views/collaborativeApproval/notificationManagement/summary/index.vue
index 04eaa4a..9f3fc7f 100644
--- a/src/views/collaborativeApproval/notificationManagement/summary/index.vue
+++ b/src/views/collaborativeApproval/notificationManagement/summary/index.vue
@@ -1,13 +1,7 @@
<template>
- <div class="app-container">
- <!-- 椤甸潰鏍囬 -->
- <div class="page-header">
- <h2>浼氳绾</h2>
- </div>
+ <div>
- <!-- 鎼滅储鍖哄煙 -->
- <el-card class="search-card">
- <el-form :model="searchForm" inline>
+ <el-form :model="searchForm" inline>
<el-form-item label="浼氳涓婚">
<el-input v-model="searchForm.title" placeholder="璇疯緭鍏ヤ細璁富棰�" clearable />
</el-form-item>
@@ -19,11 +13,10 @@
<el-button @click="resetSearch">閲嶇疆</el-button>
</el-form-item>
</el-form>
- </el-card>
<!-- 浼氳鍒楄〃 -->
<el-card>
- <el-table v-loading="loading" :data="meetingList" border>
+ <el-table v-loading="loading" :data="meetingList" border :height="tableHeight">
<el-table-column prop="title" label="浼氳涓婚" align="center" min-width="200" show-overflow-tooltip />
<el-table-column prop="applicant" label="鐢宠浜�" align="center" width="120" />
<el-table-column prop="host" label="涓绘寔浜�" align="center" width="120" />
@@ -35,7 +28,7 @@
<el-table-column prop="location" label="浼氳鍦扮偣" align="center" width="150" />
<el-table-column prop="participants" label="鍙備細浜烘暟" align="center" width="100">
<template #default="scope">
- {{ scope.row.participants.length }}浜�
+ {{ scope.row.staffCount }}浜�
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="200" fixed="right">
@@ -153,8 +146,8 @@
<template #footer>
<div class="dialog-footer">
- <el-button @click="minutesDialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="submitMinutes">淇� 瀛�</el-button>
+ <el-button @click="minutesDialogVisible = false">鍙� 娑�</el-button>
</div>
</template>
</el-dialog>
@@ -167,14 +160,17 @@
import Pagination from '@/components/Pagination/index.vue'
import Editor from '@/components/Editor/index.vue'
import { getRoomEnum, getMeetingPublish ,getMeetingMinutesByMeetingId,saveMeetingMinutes} from '@/api/collaborativeApproval/meeting.js'
-import { getStaffOnJob } from "@/api/personnelManagement/onboarding.js"
import dayjs from "dayjs"
+import {staffOnJobListPage} from "@/api/personnelManagement/staffOnJob.js";
// 鏁版嵁鍒楄〃鍔犺浇鐘舵��
const loading = ref(false)
// 鎬绘潯鏁�
const total = ref(0)
+
+// 琛ㄦ牸楂樺害锛堟牴鎹獥鍙ｉ珮搴﹁嚜閫傚簲锛�
+const tableHeight = ref(window.innerHeight - 380)
const roomEnum = ref([])
const staffList = ref([])
@@ -211,14 +207,14 @@
let resp = await getMeetingPublish({ ...searchForm, ...queryParams })
meetingList.value = resp.data.records.map(it => {
let room = roomEnum.value.find(room => it.roomId === room.id)
- it.location = `${room.name}(${room.location})`
+ it.location = room ? `${room.name}(${room.location})` : ''
let staffs = JSON.parse(it.participants)
- it.staffCount = staffs.size
+ it.staffCount = staffs.length
it.meetingTime = `${it.meetingDate} ${dayjs(it.startTime).format('HH:mm:ss')} ~ ${dayjs(it.endTime).format('HH:mm:ss')}`
it.participants = staffList.value.filter(staff => staffs.some(id => id === staff.id)).map(staff => {
return {
id: staff.id,
- name: `${staff.staffName}(${staff.postJob})`
+ name: `${staff.staffName}${staff.postName ? ` (${staff.postName})` : ''}`
}
})
@@ -264,7 +260,7 @@
<p><strong>涓绘寔浜猴細</strong>${row.host}</p>
<p><strong>鍙備細浜哄憳锛�</strong></p>
<ol>
- ${row.participants.map(p => `<li>${p.name}</li>`).join('')}
+ ${(row.participants || []).map(p => `<li>${p?.name || ''}</li>`).join('')}
</ol>
<p><strong>浼氳鍐呭锛�</strong></p>
<ol>
@@ -341,9 +337,9 @@
// 椤甸潰鍔犺浇鏃惰幏鍙栨暟鎹�
onMounted(async () => {
- const [resp1, resp2] = await Promise.all([getRoomEnum(), getStaffOnJob()])
+ const [resp1, resp2] = await Promise.all([getRoomEnum(), staffOnJobListPage({current: -1, size: -1, staffState: 1})])
roomEnum.value = resp1.data
- staffList.value = resp2.data
+ staffList.value = resp2.data.records
await getList()
})
@@ -371,9 +367,7 @@
}
.dialog-footer {
- display: flex;
- justify-content: flex-end;
- gap: 10px;
+ text-align: center;
}
.content-section h4 {
--
Gitblit v1.9.3