From 2405410a2df3178ebacdc241522fa9aaf28f4a34 Mon Sep 17 00:00:00 2001
From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com>
Date: 星期四, 13 十一月 2025 14:42:34 +0800
Subject: [PATCH] 修改新增
---
src/views/work/documentManage/docDestruction/components/editDialog.vue | 12 --
src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue | 12 --
src/views/work/selfProblems/mngAudit/mngAuditPlan/components/editDialog.vue | 22 ++--
src/views/work/qualityInfo/inventoryRecord/components/editDialog.vue | 17 +--
src/api/onlineEducation/user.js | 8 ++
src/views/work/qualityInfo/outsourcingCooperate/outsourcedProcessReview/components/editDialog.vue | 12 --
src/views/work/documentManage/docBorrowCopy/components/editDialog.vue | 12 --
src/views/work/qualityInfo/infrastructureMng/repairRecord/components/editDialog.vue | 12 --
src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue | 12 --
src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue | 13 --
src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue | 12 --
src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue | 27 +++---
src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue | 7 +
src/views/work/qualityInfo/infrastructureMng/maintainPlan/components/editDialog.vue | 13 --
src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/components/editDialog.vue | 12 --
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue | 9 +-
src/views/work/qualityInfo/infrastructureMng/reviewRecordStatistics/components/editDialog.vue | 12 --
src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue | 7 +
18 files changed, 85 insertions(+), 146 deletions(-)
diff --git a/src/api/onlineEducation/user.js b/src/api/onlineEducation/user.js
index aa8bcff..60fc13d 100644
--- a/src/api/onlineEducation/user.js
+++ b/src/api/onlineEducation/user.js
@@ -61,3 +61,11 @@
data: data
})
}
+
+export function getEmployeeRecords(param) {
+ return request({
+ url: '/system/employee-record/getEmployeeRecordList',
+ method: 'get',
+ params: param
+ })
+}
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
index 96830dc..48c4e98 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/departDialog.vue
@@ -66,9 +66,9 @@
<el-select clearable v-model="state.form.leaderUserId" :disabled="state.title =='查看'" filterable placeholder="负责人" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -130,6 +130,7 @@
import {ElMessage} from "element-plus";
import {getDepart, getSysClause, saveDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -202,7 +203,7 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
state.userList = res.data.list?res.data.list:[]
}else{
diff --git a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
index d0d19e8..040a751 100644
--- a/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
+++ b/src/views/build/conpanyFunctionConsult/orgStructure/departManage/components/dutyDialog.vue
@@ -38,9 +38,9 @@
>
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -176,6 +176,7 @@
import {ElMessage} from "element-plus";
import {getDeptInfo, saveResponsibility} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -233,7 +234,7 @@
}
const getUserList = async ()=> {
- const res = await listUser()
+ const res = await getEmployeeRecords()
if(res.code == 200){
state.userList = res.data.list?res.data.list:[]
}else{
@@ -323,4 +324,4 @@
font-size: 14px !important;
}
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
index 3b8a12a..b86176f 100644
--- a/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
+++ b/src/views/work/assetMng/toolsMonitorMeasure/annualVerificationPlan/components/editDialog.vue
@@ -282,6 +282,7 @@
import {listUser} from "@/api/system/user";
import {getAnnualVerificationPlanDetail, saveAnnualVerificationPlan} from "@/api/assetManage/assetMng";
import {delPic} from "@/api/onlineEducation/banner";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -470,16 +471,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/components/editDialog.vue b/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/components/editDialog.vue
index fb1fe3d..8189286 100644
--- a/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/components/editDialog.vue
+++ b/src/views/work/assetMng/toolsMonitorMeasure/equipCalibrateConfirm/components/editDialog.vue
@@ -138,6 +138,7 @@
} from "@/api/innerReview/meetingReview";
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {getMaintenanceRecordDetail, getStandingBookList, updateMaintenanceRecord} from "@/api/infrastructureMng/ledger";
import {
getAnnualVerificationPlanDetail,
@@ -274,16 +275,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue b/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue
index 70739a8..b07ac2e 100644
--- a/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue
+++ b/src/views/work/assetMng/workEnvironmentControl/6sInspectChecklist/components/editDialog.vue
@@ -184,6 +184,7 @@
} from "@/api/innerReview/meetingReview";
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {getMaintenanceServiceDetail, updateMaintenanceService} from "@/api/infrastructureMng/ledger";
import {getSixInspectionDetail, saveSixInspection} from "@/api/assetManage/assetMng";
@@ -455,16 +456,9 @@
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue b/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
index ada90fe..89090cd 100644
--- a/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
+++ b/src/views/work/documentManage/docBorrowCopy/components/editDialog.vue
@@ -156,6 +156,7 @@
import {ElMessage} from "element-plus";
import {getToken} from "@/utils/auth";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {
getDocBorrowCopyDetail,
saveDocBorrowCopy,
@@ -283,16 +284,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue b/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
index 0c23b62..f9d9f0a 100644
--- a/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
+++ b/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
@@ -56,9 +56,9 @@
<el-select clearable v-model="state.form.modifierId" :disabled="state.title =='查看'" filterable placeholder="更改人" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -184,9 +184,9 @@
<el-select clearable v-model="state.form.applyId" :disabled="state.title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -209,9 +209,9 @@
<el-select clearable v-model="state.form.processId" :disabled="state.title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -234,9 +234,9 @@
<el-select clearable v-model="state.form.approvalId" :disabled="state.title =='查看'" filterable style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -339,6 +339,7 @@
getDocDistributeCollectDetail,
saveDocChangesInvalidate
} from "@/api/documentManage";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -461,10 +462,10 @@
const data = JSON.parse(JSON.stringify(state.form))
data.delEvaluateIds = state.oldList1.filter(i =>!data.documentChangesInvalidatedEvaluateList.some(item=>item.id == i.id)).map(i=>i.id)
data.delInvalidatedIssueIds = state.oldList2.filter(i =>!data.documentChangesInvalidatedIssueList.some(item=>item.id == i.id)).map(i=>i.id)
- data.modifierName = state.userList.find(i=>i.id == data.modifierId)?.name
- data.applyName = state.userList.find(i=>i.id == data.applyId)?.name
- data.processName = state.userList.find(i=>i.id == data.processId)?.name
- data.approvalName = state.userList.find(i=>i.id == data.approvalId)?.name
+ data.modifierName = state.userList.find(i=>i.userId == data.modifierId)?.name
+ data.applyName = state.userList.find(i=>i.userId == data.applyId)?.name
+ data.processName = state.userList.find(i=>i.userId == data.processId)?.name
+ data.approvalName = state.userList.find(i=>i.userId == data.approvalId)?.name
if(state.title == '新增'){
delete data.id
const res = await saveDocChangesInvalidate(data)
@@ -512,7 +513,7 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
state.userList = res.data.list?res.data.list:[]
}else{
diff --git a/src/views/work/documentManage/docDestruction/components/editDialog.vue b/src/views/work/documentManage/docDestruction/components/editDialog.vue
index e030661..f064c9b 100644
--- a/src/views/work/documentManage/docDestruction/components/editDialog.vue
+++ b/src/views/work/documentManage/docDestruction/components/editDialog.vue
@@ -187,6 +187,7 @@
import {listUser} from "@/api/system/user";
import {getMaintenanceRecordDetail, updateMaintenanceRecord} from "@/api/infrastructureMng/ledger";
import {saveDocDestructionApply} from "@/api/documentManage";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -304,16 +305,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue b/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue
index b82e14b..a61197d 100644
--- a/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue
+++ b/src/views/work/documentManage/docDistributeRetrieve/components/editDialog.vue
@@ -274,6 +274,7 @@
} from "@/api/infrastructureMng/ledger";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {getDocDistributeCollectDetail, saveDocDistributeCollect} from "@/api/documentManage";
import {getDepart, getSysClause} from "@/api/orgStructure/depart";
import {getStandardQuality, getStandardTemp} from "@/api/standardSys/standardSys";
@@ -464,16 +465,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue
index 9a00faa..35adad5 100644
--- a/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/ledger/components/editDialog.vue
@@ -46,9 +46,9 @@
<el-select clearable v-model="state.form.personResponsible" :disabled="state.title =='查看'" filterable placeholder="责任人/使用人" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -110,6 +110,7 @@
} from "@/api/innerReview/meetingReview";
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {addStandingBook, updateStandingBook} from "@/api/infrastructureMng/ledger";
const emit = defineEmits(["getList"]);
@@ -221,7 +222,7 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
state.userList = res.data.list?res.data.list:[]
}else{
diff --git a/src/views/work/qualityInfo/infrastructureMng/maintainPlan/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/maintainPlan/components/editDialog.vue
index e2ea90d..2dbc9ca 100644
--- a/src/views/work/qualityInfo/infrastructureMng/maintainPlan/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/maintainPlan/components/editDialog.vue
@@ -232,7 +232,7 @@
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
import {getMaintenancePlanDetail, getStandingBookList, updateMaintenancePlan} from "@/api/infrastructureMng/ledger";
-
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -467,16 +467,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
if(state.form.deptId){
state.interUserList = state.userList.filter(i=>i.deptId !== state.form.deptId)
}else{
diff --git a/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue
index c494413..bb898b4 100644
--- a/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/maintainRecord/components/editDialog.vue
@@ -210,7 +210,7 @@
getStandingBookList,
updateMaintenanceService
} from "@/api/infrastructureMng/ledger";
-
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -507,16 +507,9 @@
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/qualityInfo/infrastructureMng/repairRecord/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/repairRecord/components/editDialog.vue
index bfe6115..d0d6b41 100644
--- a/src/views/work/qualityInfo/infrastructureMng/repairRecord/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/repairRecord/components/editDialog.vue
@@ -231,6 +231,7 @@
} from "@/api/innerReview/meetingReview";
import {getDepart} from "@/api/orgStructure/depart";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {getMaintenanceRecordDetail, getStandingBookList, updateMaintenanceRecord} from "@/api/infrastructureMng/ledger";
const emit = defineEmits(["getList"]);
@@ -423,16 +424,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/qualityInfo/infrastructureMng/reviewRecordStatistics/components/editDialog.vue b/src/views/work/qualityInfo/infrastructureMng/reviewRecordStatistics/components/editDialog.vue
index 1647ecb..a8a9dab 100644
--- a/src/views/work/qualityInfo/infrastructureMng/reviewRecordStatistics/components/editDialog.vue
+++ b/src/views/work/qualityInfo/infrastructureMng/reviewRecordStatistics/components/editDialog.vue
@@ -213,6 +213,7 @@
} from "@/api/infrastructureMng/ledger";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -390,16 +391,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/qualityInfo/inventoryRecord/components/editDialog.vue b/src/views/work/qualityInfo/inventoryRecord/components/editDialog.vue
index 34e0161..2e57f0f 100644
--- a/src/views/work/qualityInfo/inventoryRecord/components/editDialog.vue
+++ b/src/views/work/qualityInfo/inventoryRecord/components/editDialog.vue
@@ -163,6 +163,7 @@
import {listUser} from "@/api/system/user";
import {getWarehousingRecordDetail, updateWarehousingRecord} from "@/api/outsourcingCooperate/outsourcingCooperate";
import {getMaterialList} from "@/api/outsourcingCooperate/outsourcingCooperate";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import useUserStore from "@/store/modules/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
@@ -208,7 +209,7 @@
if(isAdmin){
state.companyList = companyList
}
- await getUserList()
+ await getUserList(companyId)
await getMaterials(companyId)
state.title = type === 'add' ? '新增' : type ==='edit' ? '编辑' : '查看'
state.form.companyId = companyId
@@ -384,19 +385,13 @@
const getDeptList = async ()=>{
state.form.materialId = null
await getMaterials(state.form.companyId)
+ await getUserList(state.form.companyId)
}
-const getUserList = async ()=> {
- const res = await listUser({pageIndex: 1,pageSize: 999})
+const getUserList = async (companyId)=> {
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProcessReview/components/editDialog.vue b/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProcessReview/components/editDialog.vue
index fb4624d..3b5e65f 100644
--- a/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProcessReview/components/editDialog.vue
+++ b/src/views/work/qualityInfo/outsourcingCooperate/outsourcedProcessReview/components/editDialog.vue
@@ -304,6 +304,7 @@
} from "@/api/infrastructureMng/ledger";
import {listUser} from "@/api/system/user";
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
import {getOutsourcedReviewDetail, updateOutsourcedReview} from "@/api/outsourcingCooperate/outsourcingCooperate";
import {getDepart} from "@/api/orgStructure/depart";
@@ -515,16 +516,9 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999,companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
- state.userList = res.data.list?res.data.list.map(item=>{
- const user = item.id
- const {id, ...data} = item
- return {
- ...data,
- userId: user
- }
- }):[]
+ state.userList = res.data.list?res.data.list:[]
}else{
ElMessage.warning(res.message)
}
diff --git a/src/views/work/selfProblems/mngAudit/mngAuditPlan/components/editDialog.vue b/src/views/work/selfProblems/mngAudit/mngAuditPlan/components/editDialog.vue
index f2f5b48..e7a779f 100644
--- a/src/views/work/selfProblems/mngAudit/mngAuditPlan/components/editDialog.vue
+++ b/src/views/work/selfProblems/mngAudit/mngAuditPlan/components/editDialog.vue
@@ -51,9 +51,9 @@
<el-select clearable v-model="state.form.fictionId" :disabled="state.title =='查看'" filterable placeholder="编制" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -75,9 +75,9 @@
<el-select clearable v-model="state.form.checkId" :disabled="state.title =='查看'" filterable placeholder="审核" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -99,9 +99,9 @@
<el-select clearable v-model="state.form.ratifyId" :disabled="state.title =='查看'" filterable placeholder="批准" style="width: 100%">
<el-option
v-for="item in state.userList"
- :key="item.id"
+ :key="item.userId"
:label="item.name"
- :value="item.id"
+ :value="item.userId"
/>
</el-select>
</el-form-item>
@@ -153,7 +153,7 @@
updateSelectInconsistent
} from "@/api/innerReview/meetingReview";
import {listUser} from "@/api/system/user";
-
+import {getEmployeeRecords} from "@/api/onlineEducation/user";
const emit = defineEmits(["getList"]);
const dialogVisible = ref(false)
const superRef = ref()
@@ -254,7 +254,7 @@
}
const getUserList = async (companyId)=> {
- const res = await listUser({pageIndex: 1,pageSize: 999, companyId: companyId})
+ const res = await getEmployeeRecords({companyId: companyId})
if(res.code == 200){
state.userList = res.data.list?res.data.list:[]
}else{
@@ -266,9 +266,9 @@
console.log(state.form,'form2')
const valid = await superRef.value.validate();
if(valid){
- state.form.fictionName = state.userList.find(i=>i.id == state.form.fictionId)?.name
- state.form.checkName = state.userList.find(i=>i.id == state.form.checkId)?.name
- state.form.ratifyName = state.userList.find(i=>i.id == state.form.ratifyId)?.name
+ state.form.fictionName = state.userList.find(i=>i.userId == state.form.fictionId)?.name
+ state.form.checkName = state.userList.find(i=>i.userId == state.form.checkId)?.name
+ state.form.ratifyName = state.userList.find(i=>i.userId == state.form.ratifyId)?.name
if(state.title == '新增'){
const {id,...data} = state.form
const res = await addManagementPlan(data)
--
Gitblit v1.9.2