Merge remote-tracking branch 'origin/master'

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;
 

mes-ui/mes-ui-admin-vue3/src/layout/components/Footer/src/Footer.vue

@@ -17,12 +17,20 @@ const title = computed(() => appStore.getTitle)
 <template>
   <div
     :class="prefixCls"
-    class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
+    class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center  text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
   >
-    <span class="text-14px">Copyright ©上海长江云息数字科技有限公司,All Rights Reserved.
-      <br/>专注工业信息化-供应链解决方案
-    </span>
    
+    
+    <el-row>
+      <el-col>
+         <span class="text-14px">Copyright ©上海长江云息数字科技有限公司,All Rights Reserved.</span>
+      </el-col>
+      <el-col style="margin-top:10px">
+      <span class="text-14px">
+      专注工业信息化-供应链解决方案
+    </span>
+      </el-col>
+    </el-row>
      <span class="text-14px"></span>
   </div>
 </template>

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

mes-ui/mes-ui-admin-vue3/src/views/heli/dept/index.vue

@@ -12,7 +12,7 @@
       :inline="true"
       label-width="108px"
     >
-      <el-form-item label="部门名称" label-width="108px" prop="title">
+      <el-form-item label="部门名称" label-width="108px" prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入部门名称"
@@ -166,6 +166,8 @@ const handleQuery = () => {
 const resetQuery = () => {
   queryParams.pageNo = 1
   queryFormRef.value.resetFields()
+  console.log(queryParams);
+
   handleQuery()
 }