diff --git a/src/api/operate/materialSeal/types.ts b/src/api/operate/materialSeal/types.ts index ba71892..fe72d3a 100644 --- a/src/api/operate/materialSeal/types.ts +++ b/src/api/operate/materialSeal/types.ts @@ -19,6 +19,11 @@ export interface MaterialSealVO { */ sealAdminId: string | number; + /** + * 印章管理员姓名 + */ + sealAdminName: string | number; + /** * 启用状态 */ diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts index b7c42b6..ff7a811 100644 --- a/src/api/system/user/types.ts +++ b/src/api/system/user/types.ts @@ -1,5 +1,6 @@ import { RoleVO } from '@/api/system/role/types'; import { PostVO } from '@/api/system/post/types'; +import { string } from 'vue-types'; /** * 用户信息 @@ -48,6 +49,7 @@ export interface UserVO extends BaseEntity { postIds: any; roleId: any; admin: boolean; + employeeName: string; } /** diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue index c2697c9..d6b842a 100644 --- a/src/components/Process/submitVerify.vue +++ b/src/components/Process/submitVerify.vue @@ -14,7 +14,7 @@ - {{ user.nickName }} + {{ user.employeeName }} diff --git a/src/components/UserSelect/index.vue b/src/components/UserSelect/index.vue index 231f471..6edc396 100644 --- a/src/components/UserSelect/index.vue +++ b/src/components/UserSelect/index.vue @@ -43,7 +43,7 @@ @@ -62,7 +62,7 @@ - + diff --git a/src/views/operate/materialSeal/index.vue b/src/views/operate/materialSeal/index.vue index 446af5f..fab703d 100644 --- a/src/views/operate/materialSeal/index.vue +++ b/src/views/operate/materialSeal/index.vue @@ -1,18 +1,20 @@