From bd96ac239ba897edc2f8bed5cfb426e0f54ee877 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期二, 20 一月 2026 09:57:29 +0800
Subject: [PATCH] 人员列表接口替换
---
src/pages/index.vue | 46 +++++++-------
src/pages/managementMeetings/meetApplication/index.vue | 12 ++-
src/pages.json | 30 +++++-----
src/pages/managementMeetings/meetPublish/index.vue | 8 +-
src/pages/managementMeetings/meetSummary/index.vue | 9 +-
src/api/personnelManagement/onboarding.js | 8 ++
src/pages/managementMeetings/meetExamine/index.vue | 8 +-
7 files changed, 66 insertions(+), 55 deletions(-)
diff --git a/src/api/personnelManagement/onboarding.js b/src/api/personnelManagement/onboarding.js
index 39dbf22..61de00a 100644
--- a/src/api/personnelManagement/onboarding.js
+++ b/src/api/personnelManagement/onboarding.js
@@ -47,3 +47,11 @@
method: "get",
});
}
+// 鏌ヨ鍦ㄨ亴鍛樺伐鍙拌处
+export function staffOnJobListPage(query) {
+ return request({
+ url: '/staff/staffOnJob/listPage',
+ method: 'get',
+ params: query,
+ })
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 53ecfbb..ca4a8e0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -535,13 +535,13 @@
"navigationStyle": "custom"
}
},
- {
- "path": "pages/productionManagement/operationScheduling/index",
- "style": {
- "navigationBarTitleText": "宸ュ簭鎺掍骇",
- "navigationStyle": "custom"
- }
- },
+ // {
+ // "path": "pages/productionManagement/operationScheduling/index",
+ // "style": {
+ // "navigationBarTitleText": "宸ュ簭鎺掍骇",
+ // "navigationStyle": "custom"
+ // }
+ // },
{
"path": "pages/productionManagement/productionReport/index",
"style": {
@@ -549,13 +549,13 @@
"navigationStyle": "custom"
}
},
- {
- "path": "pages/productionManagement/productionCosting/index",
- "style": {
- "navigationBarTitleText": "鐢熶骇鏍哥畻",
- "navigationStyle": "custom"
- }
- },
+ // {
+ // "path": "pages/productionManagement/productionCosting/index",
+ // "style": {
+ // "navigationBarTitleText": "鐢熶骇鏍哥畻",
+ // "navigationStyle": "custom"
+ // }
+ // },
{
"path": "pages/inventoryManagement/receiptManagement/index",
"style": {
@@ -800,4 +800,4 @@
"navigationBarTitleText": "RuoYi",
"navigationBarBackgroundColor": "#FFFFFF"
}
-}
+}
\ No newline at end of file
diff --git a/src/pages/index.vue b/src/pages/index.vue
index edfb7b1..5fa2e5c 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -86,29 +86,29 @@
<!-- </view>-->
<!-- </view>-->
<!-- <!– 鍗忓悓鍔炲叕妯″潡 –>-->
- <!-- <view class="common-module collaboration-module">-->
- <!-- <view class="module-header">-->
- <!-- <view class="module-title-container">-->
- <!-- <text class="module-title">鍗忓悓鍔炲叕</text>-->
- <!-- </view>-->
- <!-- </view>-->
- <!-- <view class="module-content">-->
- <!-- <up-grid :border="false"-->
- <!-- col="4">-->
- <!-- <up-grid-item v-for="(item, index) in collaborationItems"-->
- <!-- :key="index"-->
- <!-- @click="handleCommonItemClick(item)">-->
- <!-- <view class="icon-container"-->
- <!-- :style="{ background: item.bgColor }">-->
- <!-- <up-icon :name="item.icon"-->
- <!-- :size="58"-->
- <!-- color="#ffffff"></up-icon>-->
- <!-- </view>-->
- <!-- <text class="item-label">{{item.label}}</text>-->
- <!-- </up-grid-item>-->
- <!-- </up-grid>-->
- <!-- </view>-->
- <!-- </view>-->
+ <view class="common-module collaboration-module">
+ <view class="module-header">
+ <view class="module-title-container">
+ <text class="module-title">鍗忓悓鍔炲叕</text>
+ </view>
+ </view>
+ <view class="module-content">
+ <up-grid :border="false"
+ col="4">
+ <up-grid-item v-for="(item, index) in collaborationItems"
+ :key="index"
+ @click="handleCommonItemClick(item)">
+ <view class="icon-container"
+ :style="{ background: item.bgColor }">
+ <up-icon :name="item.icon"
+ :size="58"
+ color="#ffffff"></up-icon>
+ </view>
+ <text class="item-label">{{item.label}}</text>
+ </up-grid-item>
+ </up-grid>
+ </view>
+ </view>
<!-- 鐢熶骇绠℃帶妯″潡 -->
<!-- <view class="common-module production-module">-->
<!-- <view class="module-header">-->
diff --git a/src/pages/managementMeetings/meetApplication/index.vue b/src/pages/managementMeetings/meetApplication/index.vue
index ac7eb16..22bf041 100644
--- a/src/pages/managementMeetings/meetApplication/index.vue
+++ b/src/pages/managementMeetings/meetApplication/index.vue
@@ -151,7 +151,7 @@
<u-checkbox v-for="option in employees"
:key="option.id"
:name="option.id"
- :label="`${option.staffName} (${option.postJob})`"
+ :label="`${option.staffName} (${option.postName})`"
class="checkbox-item"></u-checkbox>
</view>
</u-checkbox-group>
@@ -178,7 +178,7 @@
saveMeetingApplication,
getRoomEnum,
} from "@/api/managementMeetings/meeting";
- import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
+ import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
import dayjs from "dayjs";
const userStore = useUserStore();
@@ -412,10 +412,12 @@
initPageData();
initTimeOptions();
getMeetingRooms();
- getStaffOnJob().then(res => {
- employees.value = res.data.sort((a, b) =>
- a.postJob.localeCompare(b.postJob)
+ staffOnJobListPage().then(res => {
+ console.log(res.data.records, "res.data.records");
+ employees.value = res.data.records.sort((a, b) =>
+ a.postName.localeCompare(b.postName)
);
+ console.log(employees.value, "employees.value");
});
});
diff --git a/src/pages/managementMeetings/meetExamine/index.vue b/src/pages/managementMeetings/meetExamine/index.vue
index ec96321..0b39095 100644
--- a/src/pages/managementMeetings/meetExamine/index.vue
+++ b/src/pages/managementMeetings/meetExamine/index.vue
@@ -102,7 +102,7 @@
getExamineList,
getRoomEnum,
} from "@/api/managementMeetings/meetExamine";
- import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
+ import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
import { onShow } from "@dcloudio/uni-app";
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";
@@ -138,10 +138,10 @@
const staffList = ref([]);
// 鍛樺伐鍒楄〃鏌ヨ
const getStaffOnJobList = () => {
- return getStaffOnJob()
+ return staffOnJobListPage()
.then(res => {
console.log(res.data, "res.data");
- staffList.value = res.data;
+ staffList.value = res.data.records;
})
.catch(() => {
closeToast();
@@ -174,7 +174,7 @@
.map(staff => {
return {
id: staff.id,
- name: `${staff.staffName}(${staff.postJob})`,
+ name: `${staff.staffName}(${staff.postName})`,
};
});
console.log(it, "it2");
diff --git a/src/pages/managementMeetings/meetPublish/index.vue b/src/pages/managementMeetings/meetPublish/index.vue
index 0cbfbbf..f4a1ad4 100644
--- a/src/pages/managementMeetings/meetPublish/index.vue
+++ b/src/pages/managementMeetings/meetPublish/index.vue
@@ -102,7 +102,7 @@
getMeetingPublish,
getRoomEnum,
} from "@/api/managementMeetings/meetExamine";
- import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
+ import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
import { onShow } from "@dcloudio/uni-app";
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";
@@ -138,10 +138,10 @@
const staffList = ref([]);
// 鍛樺伐鍒楄〃鏌ヨ
const getStaffOnJobList = () => {
- return getStaffOnJob()
+ return staffOnJobListPage()
.then(res => {
console.log(res.data, "res.data");
- staffList.value = res.data;
+ staffList.value = res.data.records;
})
.catch(() => {
closeToast();
@@ -174,7 +174,7 @@
.map(staff => {
return {
id: staff.id,
- name: `${staff.staffName}(${staff.postJob})`,
+ name: `${staff.staffName}(${staff.postName})`,
};
});
console.log(it, "it2");
diff --git a/src/pages/managementMeetings/meetSummary/index.vue b/src/pages/managementMeetings/meetSummary/index.vue
index 05f06d9..7db6649 100644
--- a/src/pages/managementMeetings/meetSummary/index.vue
+++ b/src/pages/managementMeetings/meetSummary/index.vue
@@ -102,7 +102,7 @@
getMeetingPublish,
getRoomEnum,
} from "@/api/managementMeetings/meetExamine";
- import { getStaffOnJob } from "@/api/personnelManagement/onboarding";
+ import { staffOnJobListPage } from "@/api/personnelManagement/onboarding";
import { onShow } from "@dcloudio/uni-app";
import useUserStore from "@/store/modules/user";
import dayjs from "dayjs";
@@ -138,10 +138,10 @@
const staffList = ref([]);
// 鍛樺伐鍒楄〃鏌ヨ
const getStaffOnJobList = () => {
- return getStaffOnJob()
+ return staffOnJobListPage()
.then(res => {
console.log(res.data, "res.data");
- staffList.value = res.data;
+ staffList.value = res.data.records;
})
.catch(() => {
closeToast();
@@ -169,12 +169,13 @@
it.meetingTime = `${it.meetingDate} ${dayjs(it.startTime).format(
"HH:mm:ss"
)} ~ ${dayjs(it.endTime).format("HH:mm:ss")}`;
+ console.log(staffList.value, "staffList.value");
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})`,
};
});
console.log(it, "it2");
--
Gitblit v1.9.3