fix

app/Http/Services/LogService.php

@@ -119,7 +119,7 @@ class LogService
                             continue;
                             continue;
                         }
                         }
                         $content .= array_get(config('fixed.FileNameMapping'),
                         $content .= array_get(config('fixed.FileNameMapping'),
-                                $key) . '由 [' . $oldFileName . '] 修改为 [' . $newFileName . ']; ';
+                                $key) . '由 [ ' . $oldFileName . ' ] 修改为 [' . $newFileName . ']; ';
                     }
                     }
                     $result[] = $content;
                     $result[] = $content;
                 }
                 }

app/Http/Services/SupplierAuditService.php

@@ -67,7 +67,12 @@ class SupplierAuditService
         //针对非禁止交易状态的供应商重新分配渠道员,且必填信息不完整
         //针对非禁止交易状态的供应商重新分配渠道员,且必填信息不完整
         if (!empty($supplier) && ($supplier['status'] != SupplierChannelModel::STATUS_DISABLE)) {
         if (!empty($supplier) && ($supplier['status'] != SupplierChannelModel::STATUS_DISABLE)) {
             //开始检查
             //开始检查
-            return !$this->checkHasAllRequireField($supplier);
+            //如果全部必填字段都有了,就返回false(不需要跟进)
+            if ($this->checkHasAllRequireField($supplier)) {
+                return false;
+            }else{
+                return true;
+            }
         }
         }
         //或者单纯只是禁用状态的供应商重新分配渠道员,也是要处理待跟进状态
         //或者单纯只是禁用状态的供应商重新分配渠道员,也是要处理待跟进状态
         if (!empty($supplier) && ($supplier['status'] == SupplierChannelModel::STATUS_DISABLE)) {
         if (!empty($supplier) && ($supplier['status'] == SupplierChannelModel::STATUS_DISABLE)) {

app/Http/Services/SupplierService.php

@@ -133,7 +133,7 @@ class SupplierService
                 $this->saveSkuAuditRulerToRedis($supplierId, $channel['sku_audit_ruler']);
                 $this->saveSkuAuditRulerToRedis($supplierId, $channel['sku_audit_ruler']);
                 $this->saveSkuUploadRulerToRedis($supplierId, $channel['sku_upload_ruler']);
                 $this->saveSkuUploadRulerToRedis($supplierId, $channel['sku_upload_ruler']);
                 //判断是否要移出待跟进
                 //判断是否要移出待跟进
-//                $this->updateIsFollowUp($supplierId);
+                $this->updateIsFollowUp($supplierId);
             }
             }
             //重新生成外部显示的编码
             //重新生成外部显示的编码
             $supplierSn = $this->generateSupplierSn($supplierId, $channel['supplier_group']);
             $supplierSn = $this->generateSupplierSn($supplierId, $channel['supplier_group']);

resources/views/script/SupplierListScript.blade.php

@@ -11,6 +11,7 @@
         let initCondition = {source_type: 'all'};
         let initCondition = {source_type: 'all'};
         let whereCondition = initCondition;
         let whereCondition = initCondition;
         let type = 'all';
         let type = 'all';
+        let currentPage = 1;
 
 
         //点击罗盘筛选
         //点击罗盘筛选
         $('.main_filter').click(function () {
         $('.main_filter').click(function () {
@@ -88,6 +89,11 @@
             , cols: [cols]
             , cols: [cols]
             , id: 'list'
             , id: 'list'
             , page: {}
             , page: {}
+            , done: function(res, curr, count){
+                //得到当前页码
+                console.log(curr);
+                currentPage = curr;
+            }
         });
         });
 
 
         //保存需要刷新的页面数据
         //保存需要刷新的页面数据

resources/views/script/supplier/SupplierContactScript.blade.php

@@ -22,15 +22,15 @@
                 },
                 },
                     @endif
                     @endif
                 {
                 {
-                    field: 'supplier_consignee', title: '联系人', align: 'center'
+                    field: 'supplier_consignee', title: '联系人', align: 'center',width:150
                 },
                 },
-                {field: 'supplier_position', title: '职位', align: 'center'},
-                {field: 'supplier_email', title: '邮箱', align: 'center'},
-                {field: 'supplier_mobile', title: '手机号', align: 'center'},
-                {field: 'supplier_telephone', title: '座机', align: 'center'},
-                {field: 'supplier_qq', title: 'QQ', align: 'center'},
-                {field: 'supplier_fax', title: '传真', align: 'center'},
-                {field: 'channel_name', title: '采购员', align: 'center'},
+                {field: 'supplier_position', title: '职位', align: 'center',width: 100},
+                {field: 'supplier_email', title: '邮箱', align: 'center',width: 200},
+                {field: 'supplier_mobile', title: '手机号', align: 'center',width: 150},
+                {field: 'supplier_telephone', title: '座机', align: 'center',width: 180},
+                {field: 'supplier_qq', title: 'QQ', align: 'center',width: 120},
+                {field: 'supplier_fax', title: '传真', align: 'center',width: 140},
+                {field: 'channel_name', title: '采购员', align: 'center',width: 170},
             ]],
             ]],
             id: 'contactList',
             id: 'contactList',
             page: {},
             page: {},

resources/views/web/AuditSupplier.blade.php

@@ -20,10 +20,12 @@
             <div class="layui-form-item">
             <div class="layui-form-item">
                 <label class="layui-form-label">审核内容 : </label>
                 <label class="layui-form-label">审核内容 : </label>
                 <div class="layui-input-block block-42" style="padding-top: 7px">
                 <div class="layui-input-block block-42" style="padding-top: 7px">
-                    {{$auditContent['action'] .' : '}}
+                    <b>{{$auditContent['action'] .' : '}}</b>
                     @if(is_array($auditContent['content']))
                     @if(is_array($auditContent['content']))
                         @foreach($auditContent['content'] as $content)
                         @foreach($auditContent['content'] as $content)
-                            {{$content}}
+                            <p>
+                                {{$content}}
+                            </p>
                         @endforeach
                         @endforeach
                     @else
                     @else
                         {{$auditContent['content']}}
                         {{$auditContent['content']}}