From 9f2eadc93076df899ca7770bdc51dafb5e6d5210 Mon Sep 17 00:00:00 2001 From: siontion Date: Thu, 11 Jan 2024 18:15:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8F=B7username=20=E5=A7=93=E5=90=8Dnicknam?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 客户信息增加工号username 姓名nickname --- .../controller/admin/user/vo/user/UserSimpleRespVO.java | 4 ++++ .../src/views/heli/customer/CustomerForm.vue | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java index 985188ba..c67c482d 100644 --- a/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java +++ b/mes-module-system/mes-module-system-biz/src/main/java/com/chanko/yunxi/mes/module/system/controller/admin/user/vo/user/UserSimpleRespVO.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.system.controller.admin.user.vo.user; +import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,6 +15,9 @@ public class UserSimpleRespVO { @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") private Long id; + @Schema(description = "工号", requiredMode = Schema.RequiredMode.REQUIRED, example = "mes") + private String username; + @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道") private String nickname; diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue index b136c0cb..16b760d4 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue @@ -325,7 +325,6 @@ const formData = ref({ contact3Addr: undefined, status: 1, logo: undefined, - logo: undefined, payType: undefined, accountName: undefined, bankNo: undefined, @@ -347,7 +346,7 @@ const open = async (type: string, id?: number) => { userList.value.forEach((element) => { element.value = element.id - element.label = element.id + element.nickname + element.label = element.username +" "+ element.nickname }) dialogVisible.value = true