fix: 修复用户显示名不统一的bug[2345,2346,2348]

src/components/base/AppUserSearch.vue

@@ -9,9 +9,9 @@
     :loading="searchUsersloading"
     @change="handleChange"
   >
-    <el-option :label="user.realname || user.nickname" :value="user.id" v-for="user in userList" :key="user.id">
+    <el-option :label="user.realname || user.nickname || user.username" :value="user.id" v-for="user in userList" :key="user.id">
       <span style="float: left">
-        {{ user.realname || user.nickname }}
+        {{ user.realname || user.nickname || user.username }}
         <template v-if="user.mobile">(手机号：{{ user.mobile }})</template>
       </span>
       <span style="float: right; color: #8492a6; font-size: 13px; margin: 0 20px 0 10px" v-if="user.email"

src/components/layout/Header.vue

@@ -14,7 +14,7 @@
         </div>
         <el-dropdown-menu slot="dropdown">
           <div class="user">
-            <div class="user-name">{{ user.realname || user.nickname }}</div>
+            <div class="user-name">{{ user.realname || user.nickname || user.username }}</div>
             <el-button round size="medium" class="btn-logout" @click="logout">退出登录</el-button>
           </div>
         </el-dropdown-menu>

src/modules/customer/components/Contact.vue

@@ -75,7 +75,15 @@ export default {
           { prop: 'wechat', label: '微信号', align: 'center' },
           { prop: 'sub_mobile', label: '附属手机号', align: 'center' },
           { prop: 'qq', label: 'QQ号', align: 'center' },
-          { prop: 'created_by.username', label: '创建员工', align: 'center' },
+          // { prop: 'created_by.username', label: '创建员工', align: 'center' },
+          {
+            prop: 'created_by',
+            label: '创建员工',
+            // minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          },
           { prop: 'created_at', label: '创建时间', align: 'center' },
           { label: '操作', slots: 'table-operate' }
         ]

src/modules/customer/components/FollowRemark.vue

@@ -90,7 +90,7 @@ export default {
             label: '创建人',
             minWidth: '100px',
             computed({ row }) {
-              return row.created_by.realname || row.created_by.nickname
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
             }
           },
           { prop: 'created_at', label: '创建时间', minWidth: '140px' },

src/modules/customer/components/Project.vue

@@ -112,7 +112,15 @@ export default {
             }
           },
           { prop: 'cooperation_intention', label: '合作意向', align: 'center' },
-          { prop: 'created_by.username', label: '创建人', align: 'center' },
+          // { prop: 'created_by.username', label: '创建人', align: 'center' },
+          {
+            prop: 'created_by',
+            label: '创建员工',
+            // minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          },
           { prop: 'created_at', label: '创建时间', align: 'center' },
           { prop: 'remark', label: '备注', align: 'center' },
           { label: '操作', minWidth: '140px', slots: 'table-operate', align: 'center' }

src/modules/customer/views/Index.vue

@@ -188,19 +188,6 @@ export default {
           { prop: 'project_sso_id', slots: 'filter-project-ssoid', label: '项目负责人：' },
           { prop: 'region', slots: 'filter-region', label: '所在地区：' }
         ],
-        data: [
-          {
-            name: '北京大学',
-            source: '公司资源',
-            category: '普通客户',
-            address: '北京市-北京市-海淀区',
-            time: '2021-12-12 12:12',
-            project: '2',
-            contacts: '2',
-            creator: '员工A',
-            created_time: '2021-12-12 12:12'
-          }
-        ],
         columns: [
           // { type: 'selection', minWidth: '40px' },
           { prop: 'name', label: '客户名称', minWidth: '140px' },
@@ -226,7 +213,15 @@ export default {
           { prop: 'last_record_time', label: '最近跟进时间', minWidth: '150px' },
           { prop: 'project_count', label: '合作项目', minWidth: '80px' },
           { prop: 'contact_count', label: '联系人', minWidth: '80px' },
-          { prop: 'created_by.realname', label: '创建员工', minWidth: '100px' },
+          // { prop: 'created_by.realname', label: '创建员工', minWidth: '100px' },
+          {
+            prop: 'created_by',
+            label: '创建员工',
+            minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          },
           { prop: 'created_at', label: '创建时间', minWidth: '150px' },
           { label: '操作', minWidth: '140px', slots: 'table-operate' }
         ]
@@ -269,7 +264,6 @@ export default {
     },
     // 查看
     handleDetails(row) {
-      console.log(row)
       this.$router.push({
         path: '/customer-manage/details',
         query: {

src/modules/system/customergroup/components/AddCustomer.vue

@@ -59,7 +59,15 @@ export default {
           { label: '合作项目', prop: 'project_count', align: 'center' },
           { label: '所在地区', prop: 'region', align: 'center' },
           { label: '创建时间', prop: 'created_at', align: 'center' },
-          { label: '创建人', prop: 'created_by.username', align: 'center' }
+          // { label: '创建人', prop: 'created_by.username', align: 'center' }
+          {
+            prop: 'created_by',
+            label: '创建人',
+            minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          }
         ]
       }
     }

src/modules/system/customergroup/components/Customer.vue

@@ -55,7 +55,15 @@ export default {
         columns: [
           { label: '客户名称', prop: 'customer.name', align: 'center' },
           { label: '创建时间', prop: 'created_at', align: 'center' },
-          { label: '创建人', prop: 'created_by.username', align: 'center' },
+          // { label: '创建人', prop: 'created_by.username', align: 'center' },
+          {
+            prop: 'created_by',
+            label: '创建人',
+            minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          },
           { label: '操作', slots: 'table-x', align: 'center', fixed: 'right' }
         ]
       }

src/modules/system/customergroup/components/Employees.vue

@@ -47,7 +47,15 @@ export default {
           { label: '员工姓名', prop: 'sso_user.username', align: 'center' },
           { label: '手机号', prop: 'sso_user.mobile', align: 'center' },
           { label: '创建时间', prop: 'created_at', align: 'center' },
-          { label: '创建人', prop: 'created_by.username', align: 'center' },
+          // { label: '创建人', prop: 'created_by.username', align: 'center' },
+          {
+            prop: 'created_by',
+            label: '创建人',
+            minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          },
           { label: '操作', slots: 'table-x', align: 'center', fixed: 'right' }
         ]
       }

src/modules/system/customergroup/views/List.vue

@@ -69,7 +69,15 @@ export default {
           { label: '客户数量', prop: 'customer_count', align: 'center' },
           { label: '员工数量', prop: 'staff_count', align: 'center' },
           { label: '创建时间', prop: 'created_at', align: 'center' },
-          { label: '创建人', prop: 'created_by.username', align: 'center' },
+          // { label: '创建人', prop: 'created_by.username', align: 'center' },
+          {
+            prop: 'created_by',
+            label: '创建人',
+            minWidth: '100px',
+            computed({ row }) {
+              return row.created_by.realname || row.created_by.nickname || row.created_by.username
+            }
+          },
           { label: '操作', slots: 'table-x', align: 'center', width: '300', fixed: 'right' }
         ]
       }