优化显示

app/Http/Transformers/SupplierTransformer.php

@@ -80,13 +80,13 @@ class SupplierTransformer
             $onJobUserNameList = array_values($onJobChannelUsers);
             $onJobUserNameList = array_values($onJobChannelUsers);
             $channelUserNameList = !empty($supplier['channel_username']) ? explode(',',
             $channelUserNameList = !empty($supplier['channel_username']) ? explode(',',
                 $supplier['channel_username']) : [];
                 $supplier['channel_username']) : [];
-            if (empty($channelUserNameList)) {
+            if (empty($supplier['channel_uid'])) {
+                $supplier['resign_channel_username'] = $supplier['on_job_channel_username'] = '';
                 continue;
                 continue;
             }
             }
             $resignChannelUserNameList = $onJobChannelUserNameList = [];
             $resignChannelUserNameList = $onJobChannelUserNameList = [];
             //然后判断哪些是离职,哪些是在职的
             //然后判断哪些是离职,哪些是在职的
             foreach ($channelUserNameList as $username) {
             foreach ($channelUserNameList as $username) {
-//                dump($username, $onJobUserNameList);
                 if (!in_array($username, $onJobUserNameList)) {
                 if (!in_array($username, $onJobUserNameList)) {
                     $resignChannelUserNameList[] = $username;
                     $resignChannelUserNameList[] = $username;
                 } else {
                 } else {

resources/views/script/SupplierListScript.blade.php

@@ -143,12 +143,13 @@
             },
             },
             {
             {
                 field: 'channel_username', title: '采购员', align: 'center', width: 130, templet: function (data) {
                 field: 'channel_username', title: '采购员', align: 'center', width: 130, templet: function (data) {
-                    if(!data.channel_username){
-                        return '';
-                    }
                     if (data.resign_channel_username) {
                     if (data.resign_channel_username) {
-                        return `<span>${data.on_job_channel_username}</span>` + `,<span style="color: #D7D7D7">${data.resign_channel_username}</span>`;
-                    }else{
+                        if (data.on_job_channel_username) {
+                            return `<span>${data.on_job_channel_username}</span>` + `,<span style="color: #D7D7D7">${data.resign_channel_username}</span>`;
+                        } else {
+                            return `<span style="color: #D7D7D7">${data.resign_channel_username}</span>`
+                        }
+                    } else {
                         return `<span>${data.on_job_channel_username}</span>`;
                         return `<span>${data.on_job_channel_username}</span>`;
                     }
                     }
                 }
                 }