修复简单需求

app/Http/Services/SupplierAuditService.php

@@ -64,10 +64,10 @@ class SupplierAuditService
         if ($result) {
         if ($result) {
             //如果状态是复审
             //如果状态是复审
             if ($supplier['status'] == SupplierChannelModel::STATUS_NEED_REVIEW) {
             if ($supplier['status'] == SupplierChannelModel::STATUS_NEED_REVIEW) {
-                $auditStatus = $status == SupplierChannelModel::STATUS_PASSED ? '复审通过' : '复审不通过,原因是 : ' . $rejectReason;
+                $auditStatus = $status == SupplierChannelModel::STATUS_PASSED ? '复审通过 '.$rejectReason : '复审不通过,原因是 : ' . $rejectReason;
                 $action = '复审供应商';
                 $action = '复审供应商';
             } else {
             } else {
-                $auditStatus = $status == SupplierChannelModel::STATUS_PASSED ? '审核通过' : '审核不通过,原因是 : ' . $rejectReason;
+                $auditStatus = $status == SupplierChannelModel::STATUS_PASSED ? '审核通过 '.$rejectReason : '审核不通过,原因是 : ' . $rejectReason;
             }
             }
             $logService = new LogService();
             $logService = new LogService();
             $content = $auditStatus;
             $content = $auditStatus;

resources/views/script/SkuListScript.blade.php

@@ -43,6 +43,7 @@
 
 
         let cols = [
         let cols = [
             {type: 'checkbox'},
             {type: 'checkbox'},
+            {field: 'goods_id', title: 'SKUID', align: 'center', width: 180},
             {field: 'cp_time', title: '上架有效期', align: 'center', width: 180},
             {field: 'cp_time', title: '上架有效期', align: 'center', width: 180},
 
 
             {
             {
@@ -56,7 +57,17 @@
             },
             },
             {field: 'encap', title: '封装', align: 'center', width: 80},
             {field: 'encap', title: '封装', align: 'center', width: 80},
             {field: 'goods_label_name', title: 'SKU显示类型', align: 'center', width: 120},
             {field: 'goods_label_name', title: 'SKU显示类型', align: 'center', width: 120},
-            {field: 'canal', title: '供应商编码', align: 'center', width: 120},
+            {
+                field: 'canal', title: '供应商编码', align: 'center', width: 120, templet: function (data) {
+                    if (data.canal) {
+                        let supplierId = data.canal.replace(/\D/g, '');
+                        return "<a ew-href='/supplier/SupplierDetail?view=iframe&supplier_id=" + supplierId +
+                            "' class='list-href' ew-title='供应商详情 - " + data.canal + "'>" + data.canal + "</a>";
+                    } else {
+                        return data.canal;
+                    }
+                }
+            },
             {
             {
                 field: 'moq', title: '起订量', align: 'center', width: 70
                 field: 'moq', title: '起订量', align: 'center', width: 70
             },
             },
@@ -100,7 +111,6 @@
                     return "人工上传";
                     return "人工上传";
                 }
                 }
             },
             },
-            {field: 'goods_id', title: 'SKUID', align: 'center', width: 180},
         ];
         ];
         let currentPage = 0;
         let currentPage = 0;
         table.render({
         table.render({

resources/views/web/sku/SkuListCommon.blade.php

@@ -123,10 +123,18 @@
                 @inject('statusPresenter','App\Presenters\StatusPresenter')
                 @inject('statusPresenter','App\Presenters\StatusPresenter')
                 {!! $statusPresenter->render('customer_tags/condition','标签',null,$skuTags) !!}
                 {!! $statusPresenter->render('customer_tags/condition','标签',null,$skuTags) !!}
             </div>
             </div>
+            <div class="layui-inline">
+                <label class="layui-form-label">SKUID</label>
+                <div class="layui-input-inline">
+                    <input type="text" value="" name="goods_id/condition" lay-verify="numeric" placeholder="请输入商品id" autocomplete="off"
+                           class="layui-input">
+                </div>
+            </div>
             <div class="layui-inline" style="width: 600px">
             <div class="layui-inline" style="width: 600px">
                 @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
                 @inject('transformableTimeIntervalPresenter','App\Presenters\Filter\TransformableTimeIntervalPresenter')
                 {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'上传时间']) !!}
                 {!! $transformableTimeIntervalPresenter->render(['update_time'=>'更新时间','create_time'=>'上传时间']) !!}
             </div>
             </div>
+
         </div>
         </div>
         <div class="layui-row" style="margin-top:10px;margin-bottom: 10px;margin-left: 20px;">
         <div class="layui-row" style="margin-top:10px;margin-bottom: 10px;margin-left: 20px;">
             <button class="layui-btn layui-btn-sm layui-btn load" id="getSupplierListButton" lay-submit=""
             <button class="layui-btn layui-btn-sm layui-btn load" id="getSupplierListButton" lay-submit=""