From 654c6b9c6fdcf98621fbe4d638e7bfdb3b60820f Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 03 十二月 2025 16:17:06 +0800
Subject: [PATCH] 修改
---
src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue b/src/views/work/documentManage/docChangeInvalidate/components/editDialog.vue
index 0c23b62..a652495 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,9 +513,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:[]
+ state.userList = res.data ? res.data :[]
}else{
ElMessage.warning(res.message)
}
--
Gitblit v1.9.2