update 优化统一用户昵称
This commit is contained in:
@@ -43,7 +43,7 @@ export interface ButtonList {
|
|||||||
}
|
}
|
||||||
export interface FlowCopyVo {
|
export interface FlowCopyVo {
|
||||||
userId: string | number;
|
userId: string | number;
|
||||||
userName: string;
|
nickName: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface TaskOperationBo {
|
export interface TaskOperationBo {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
<el-form-item label="抄送" v-if="buttonObj.copy">
|
<el-form-item label="抄送" v-if="buttonObj.copy">
|
||||||
<el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
|
<el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
|
||||||
<el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
|
<el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
|
||||||
{{ user.userName }}
|
{{ user.nickName }}
|
||||||
</el-tag>
|
</el-tag>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item v-if="buttonObj.pop && nestNodeList && nestNodeList.length > 0" label="下一步审批人" prop="assigneeMap">
|
<el-form-item v-if="buttonObj.pop && nestNodeList && nestNodeList.length > 0" label="下一步审批人" prop="assigneeMap">
|
||||||
@@ -80,7 +80,13 @@
|
|||||||
<!-- 加签组件 -->
|
<!-- 加签组件 -->
|
||||||
<UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
|
<UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
|
||||||
<!-- 弹窗选人 -->
|
<!-- 弹窗选人 -->
|
||||||
<UserSelect ref="porUserRef" :data="form.assigneeMap[nodeCode]" :multiple="true" :userIds="popUserIds" @confirm-call-back="handlePopUser"></UserSelect>
|
<UserSelect
|
||||||
|
ref="porUserRef"
|
||||||
|
:data="form.assigneeMap[nodeCode]"
|
||||||
|
:multiple="true"
|
||||||
|
:userIds="popUserIds"
|
||||||
|
@confirm-call-back="handlePopUser"
|
||||||
|
></UserSelect>
|
||||||
|
|
||||||
<!-- 驳回开始 -->
|
<!-- 驳回开始 -->
|
||||||
<el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
|
<el-dialog v-model="backVisible" draggable title="驳回" width="40%" :close-on-click-modal="false">
|
||||||
@@ -265,7 +271,7 @@ const openDialog = async (id?: string) => {
|
|||||||
selectCopyUserList.value = task.value.copyList;
|
selectCopyUserList.value = task.value.copyList;
|
||||||
selectCopyUserIds.value = task.value.copyList.map((e) => e.userId).join(',');
|
selectCopyUserIds.value = task.value.copyList.map((e) => e.userId).join(',');
|
||||||
varNodeList.value = task.value.varList;
|
varNodeList.value = task.value.varList;
|
||||||
console.log('varNodeList', varNodeList.value)
|
console.log('varNodeList', varNodeList.value);
|
||||||
buttonDisabled.value = false;
|
buttonDisabled.value = false;
|
||||||
try {
|
try {
|
||||||
const data = {
|
const data = {
|
||||||
@@ -310,7 +316,7 @@ const handleCompleteTask = async () => {
|
|||||||
selectCopyUserList.value.forEach((e) => {
|
selectCopyUserList.value.forEach((e) => {
|
||||||
const copyUser = {
|
const copyUser = {
|
||||||
userId: e.userId,
|
userId: e.userId,
|
||||||
userName: e.userName
|
nickName: e.nickName
|
||||||
};
|
};
|
||||||
flowCopyList.push(copyUser);
|
flowCopyList.push(copyUser);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user